sascha
/
nextcloud-server
mirror of https://github.com/nextcloud/server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #12013 from nextcloud/bugfix/noid/accountmanager 

Fix small issues with IAccountManager API
pull/11889/head
Roeland Jago Douma 2018-10-24 13:49:00 +07:00 committed by GitHub
parent b3a0d87117 f47f5ad0ea
commit 5cdc85cf66
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/private/Accounts/AccountManager.php
Unescape Escape View File

@ -330,7 +330,7 @@ class AccountManager implements IAccountManager {
private function parseAccountData(IUser $user, $data): Account {
$account = new Account($user);
foreach($data as $property => $accountData) {
$account->setProperty($property, $accountData['value'], $accountData['scope'], $accountData['verified']);
$account->setProperty($property, $accountData['value'] ?? '', $accountData['scope'], $accountData['verified']);
}
return $account;
}

2
lib/private/Server.php
Unescape Escape View File

@ -124,6 +124,7 @@ use OC\Dashboard\DashboardManager;
use OCA\Theming\ImageManager;
use OCA\Theming\ThemingDefaults;
use OCP\Accounts\IAccountManager;
use OCP\App\IAppManager;
use OCP\AppFramework\Utility\ITimeFactory;
use OCP\Collaboration\AutoComplete\IManager;
@ -1175,6 +1176,7 @@ class Server extends ServerContainer implements IServerContainer {
);
});
$this->registerAlias(IContactsStore::class, ContactsStore::class);
$this->registerAlias(IAccountManager::class, AccountManager::class);
$this->registerService(IStorageFactory::class, function() {
return new StorageFactory();

2
lib/public/Accounts/IAccount.php
Unescape Escape View File

@ -78,7 +78,7 @@ interface IAccount extends \JsonSerializable {
* @param string $verified \OCP\Accounts\IAccountManager::NOT_VERIFIED | \OCP\Accounts\IAccountManager::VERIFICATION_IN_PROGRESS | \OCP\Accounts\IAccountManager::VERIFIED
* @return IAccountProperty[]
*/
public function getFilteredProperties(string $scope, string $verified): array;
public function getFilteredProperties(string $scope = null, string $verified = null): array;
/**
* Get the related user for the account data