Bladeren bron
adjust internal data handling logic to fix store and load
- format as stored previously in oc_accounts table is kept Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>tags/v23.0.0beta1
Arthur Schiwon
2 jaren geleden
5 gewijzigde bestanden met toevoegingen van 266 en 282 verwijderingen
+ 10
- 6
lib/private/Accounts/Account.php
Bestand weergeven
| @@ -33,6 +33,7 @@ use OCP\Accounts\IAccountProperty; | |||
| use OCP\Accounts\IAccountPropertyCollection; | |||
| use OCP\Accounts\PropertyDoesNotExistException; | |||
| use OCP\IUser; | |||
| use RuntimeException; | |||
| class Account implements IAccount { | |||
| use TAccountsHelper; | |||
| @@ -116,13 +117,16 @@ class Account implements IAccount { | |||
| return $this; | |||
| } | |||
| public function getPropertyCollection(string $propertyCollection): IAccountPropertyCollection { | |||
| if (!array_key_exists($propertyCollection, $this->properties)) { | |||
| throw new PropertyDoesNotExistException($propertyCollection); | |||
| public function getPropertyCollection(string $propertyCollectionName): IAccountPropertyCollection { | |||
| if (!$this->isCollection($propertyCollectionName)) { | |||
| throw new PropertyDoesNotExistException($propertyCollectionName); | |||
| } | |||
| if (!$this->properties[$propertyCollection] instanceof IAccountPropertyCollection) { | |||
| throw new \RuntimeException('Requested collection is not an IAccountPropertyCollection'); | |||
| if (!array_key_exists($propertyCollectionName, $this->properties)) { | |||
| $this->properties[$propertyCollectionName] = new AccountPropertyCollection($propertyCollectionName); | |||
| } | |||
| return $this->properties[$propertyCollection]; | |||
| if (!$this->properties[$propertyCollectionName] instanceof IAccountPropertyCollection) { | |||
| throw new RuntimeException('Requested collection is not an IAccountPropertyCollection'); | |||
| } | |||
| return $this->properties[$propertyCollectionName]; | |||
| } | |||
| } | |||
+ 137
- 126
lib/private/Accounts/AccountManager.php
Bestand weergeven
| @@ -224,10 +224,10 @@ class AccountManager implements IAccountManager { | |||
| } | |||
| protected function updateUser(IUser $user, array $data, bool $throwOnData = false): array { | |||
| $userData = $this->getUser($user, false); | |||
| $oldUserData = $this->getUser($user, false); | |||
| $updated = true; | |||
| if ($userData !== $data) { | |||
| if ($oldUserData !== $data) { | |||
| $this->updateExistingUser($user, $data); | |||
| } else { | |||
| @@ -295,10 +295,9 @@ class AccountManager implements IAccountManager { | |||
| return $userData; | |||
| } | |||
| $userDataArray = json_decode($accountData[0]['data'], true); | |||
| $jsonError = json_last_error(); | |||
| if ($userDataArray === null || $userDataArray === [] || $jsonError !== JSON_ERROR_NONE) { | |||
| $this->logger->critical("User data of $uid contained invalid JSON (error $jsonError), hence falling back to a default user record"); | |||
| $userDataArray = $this->importFromJson($accountData[0]['data'], $uid); | |||
| if ($userDataArray === null || $userDataArray === []) { | |||
| return $this->buildDefaultUserRecord($user); | |||
| } | |||
| @@ -348,7 +347,8 @@ class AccountManager implements IAccountManager { | |||
| } catch (PropertyDoesNotExistException $e) { | |||
| return; | |||
| } | |||
| if ($oldData[self::PROPERTY_EMAIL]['value'] !== $property->getValue()) { | |||
| $oldMail = isset($oldData[self::PROPERTY_EMAIL]) ? $oldData[self::PROPERTY_EMAIL]['value']['value'] : ''; | |||
| if ($oldMail !== $property->getValue()) { | |||
| $this->jobList->add(VerifyUserData::class, | |||
| [ | |||
| 'verificationCode' => '', | |||
| @@ -369,25 +369,14 @@ class AccountManager implements IAccountManager { | |||
| /** | |||
| * make sure that all expected data are set | |||
| * | |||
| * @param array $userData | |||
| * @return array | |||
| */ | |||
| protected function addMissingDefaultValues(array $userData) { | |||
| foreach ($userData as $key => $value) { | |||
| if (!isset($userData[$key]['verified']) && !$this->isCollection($key)) { | |||
| $userData[$key]['verified'] = self::NOT_VERIFIED; | |||
| protected function addMissingDefaultValues(array $userData): array { | |||
| foreach ($userData as $i => $value) { | |||
| if (!isset($value['verified'])) { | |||
| $userData[$i]['verified'] = self::NOT_VERIFIED; | |||
| } | |||
| if ($this->isCollection($key)) { | |||
| foreach ($value as &$singlePropertyData) { | |||
| $singlePropertyData['name'] = $key; | |||
| } | |||
| } else { | |||
| $userData[$key]['name'] = $key; | |||
| } | |||
| } | |||
| if (!isset($userData[IAccountManager::COLLECTION_EMAIL])) { | |||
| $userData[IAccountManager::COLLECTION_EMAIL] = []; | |||
| } | |||
| return $userData; | |||
| @@ -420,22 +409,6 @@ class AccountManager implements IAccountManager { | |||
| } | |||
| } | |||
| protected function dataArrayToJson(array $accountData): string { | |||
| $jsonData = []; | |||
| foreach ($accountData as $property => $data) { | |||
| //$property = $data['name']; | |||
| unset($data['name']); | |||
| if ($this->isCollection($property)) { | |||
| if (!isset($jsonData[$property])) { | |||
| $jsonData[$property] = []; | |||
| } | |||
| $jsonData[$property][] = $data; | |||
| } else { | |||
| $jsonData[$property] = $data; | |||
| } | |||
| } | |||
| return json_encode($jsonData); | |||
| } | |||
| /** | |||
| * add new user to accounts table | |||
| @@ -445,7 +418,7 @@ class AccountManager implements IAccountManager { | |||
| */ | |||
| protected function insertNewUser(IUser $user, array $data): void { | |||
| $uid = $user->getUID(); | |||
| $jsonEncodedData = $this->dataArrayToJson($data); | |||
| $jsonEncodedData = $this->prepareJson($data); | |||
| $query = $this->connection->getQueryBuilder(); | |||
| $query->insert($this->table) | |||
| ->values( | |||
| @@ -460,6 +433,49 @@ class AccountManager implements IAccountManager { | |||
| $this->writeUserData($user, $data); | |||
| } | |||
| protected function prepareJson(array $data): string { | |||
| $preparedData = []; | |||
| foreach ($data as $dataRow) { | |||
| $propertyName = $dataRow['name']; | |||
| unset($dataRow['name']); | |||
| if (!$this->isCollection($propertyName)) { | |||
| $preparedData[$propertyName] = $dataRow; | |||
| continue; | |||
| } | |||
| if (!isset($preparedData[$propertyName])) { | |||
| $preparedData[$propertyName] = []; | |||
| } | |||
| $preparedData[$propertyName][] = $dataRow; | |||
| } | |||
| return json_encode($preparedData); | |||
| } | |||
| protected function importFromJson(string $json, string $userId): ?array { | |||
| $result = []; | |||
| $jsonArray = json_decode($json, true); | |||
| $jsonError = json_last_error(); | |||
| if ($jsonError !== JSON_ERROR_NONE) { | |||
| $this->logger->critical( | |||
| 'User data of {uid} contained invalid JSON (error {json_error}), hence falling back to a default user record', | |||
| [ | |||
| 'uid' => $userId, | |||
| 'json_error' => $jsonError | |||
| ] | |||
| ); | |||
| return null; | |||
| } | |||
| foreach ($jsonArray as $propertyName => $row) { | |||
| if (!$this->isCollection($propertyName)) { | |||
| $result[] = array_merge($row, ['name' => $propertyName]); | |||
| continue; | |||
| } | |||
| foreach ($row as $singleRow) { | |||
| $result[] = array_merge($singleRow, ['name' => $propertyName]); | |||
| } | |||
| } | |||
| return $result; | |||
| } | |||
| /** | |||
| * update existing user in accounts table | |||
| * | |||
| @@ -468,12 +484,12 @@ class AccountManager implements IAccountManager { | |||
| */ | |||
| protected function updateExistingUser(IUser $user, array $data): void { | |||
| $uid = $user->getUID(); | |||
| $jsonEncodedData = json_encode($data); | |||
| $jsonEncodedData = $this->prepareJson($data); | |||
| $query = $this->connection->getQueryBuilder(); | |||
| $query->update($this->table) | |||
| ->set('data', $query->createNamedParameter($jsonEncodedData)) | |||
| ->where($query->expr()->eq('uid', $query->createNamedParameter($uid))) | |||
| ->execute(); | |||
| ->executeStatement(); | |||
| $this->deleteUserData($user); | |||
| $this->writeUserData($user, $data); | |||
| @@ -493,18 +509,13 @@ class AccountManager implements IAccountManager { | |||
| } | |||
| protected function writeUserDataProperties(IQueryBuilder $query, array $data): void { | |||
| foreach ($data as $propertyName => $property) { | |||
| if (isset($property['name']) && $property['name'] === self::PROPERTY_AVATAR) { | |||
| continue; | |||
| } | |||
| if ($this->isCollection($property['name'] ?? $propertyName) && !isset($property['name'])) { | |||
| foreach ($property as $singleProperty) { | |||
| $this->writeUserDataProperties($query, [$propertyName => $singleProperty]); | |||
| } | |||
| foreach ($data as $property) { | |||
| if ($property['name'] === self::PROPERTY_AVATAR) { | |||
| continue; | |||
| } | |||
| $query->setParameter('name', $property['name'] ?? $propertyName) | |||
| $query->setParameter('name', $property['name']) | |||
| ->setParameter('value', $property['value'] ?? ''); | |||
| $query->executeStatement(); | |||
| } | |||
| @@ -518,79 +529,79 @@ class AccountManager implements IAccountManager { | |||
| */ | |||
| protected function buildDefaultUserRecord(IUser $user) { | |||
| return [ | |||
| self::PROPERTY_DISPLAYNAME => | |||
| [ | |||
| 'name' => self::PROPERTY_DISPLAYNAME, | |||
| 'value' => $user->getDisplayName(), | |||
| 'scope' => self::SCOPE_FEDERATED, | |||
| 'verified' => self::NOT_VERIFIED, | |||
| ], | |||
| self::PROPERTY_ADDRESS => | |||
| [ | |||
| 'name' => self::PROPERTY_ADDRESS, | |||
| 'value' => '', | |||
| 'scope' => self::SCOPE_LOCAL, | |||
| 'verified' => self::NOT_VERIFIED, | |||
| ], | |||
| self::PROPERTY_WEBSITE => | |||
| [ | |||
| 'name' => self::PROPERTY_WEBSITE, | |||
| 'value' => '', | |||
| 'scope' => self::SCOPE_LOCAL, | |||
| 'verified' => self::NOT_VERIFIED, | |||
| ], | |||
| self::PROPERTY_EMAIL => | |||
| [ | |||
| 'name' => self::PROPERTY_EMAIL, | |||
| 'value' => $user->getEMailAddress(), | |||
| 'scope' => self::SCOPE_FEDERATED, | |||
| 'verified' => self::NOT_VERIFIED, | |||
| ], | |||
| self::PROPERTY_AVATAR => | |||
| [ | |||
| 'name' => self::PROPERTY_AVATAR, | |||
| 'scope' => self::SCOPE_FEDERATED | |||
| ], | |||
| self::PROPERTY_PHONE => | |||
| [ | |||
| 'name' => self::PROPERTY_PHONE, | |||
| 'value' => '', | |||
| 'scope' => self::SCOPE_LOCAL, | |||
| 'verified' => self::NOT_VERIFIED, | |||
| ], | |||
| self::PROPERTY_TWITTER => | |||
| [ | |||
| 'name' => self::PROPERTY_TWITTER, | |||
| 'value' => '', | |||
| 'scope' => self::SCOPE_LOCAL, | |||
| 'verified' => self::NOT_VERIFIED, | |||
| ], | |||
| self::COLLECTION_EMAIL => [], | |||
| [ | |||
| 'name' => self::PROPERTY_DISPLAYNAME, | |||
| 'value' => $user->getDisplayName(), | |||
| 'scope' => self::SCOPE_FEDERATED, | |||
| 'verified' => self::NOT_VERIFIED, | |||
| ], | |||
| [ | |||
| 'name' => self::PROPERTY_ADDRESS, | |||
| 'value' => '', | |||
| 'scope' => self::SCOPE_LOCAL, | |||
| 'verified' => self::NOT_VERIFIED, | |||
| ], | |||
| [ | |||
| 'name' => self::PROPERTY_WEBSITE, | |||
| 'value' => '', | |||
| 'scope' => self::SCOPE_LOCAL, | |||
| 'verified' => self::NOT_VERIFIED, | |||
| ], | |||
| [ | |||
| 'name' => self::PROPERTY_EMAIL, | |||
| 'value' => $user->getEMailAddress(), | |||
| 'scope' => self::SCOPE_FEDERATED, | |||
| 'verified' => self::NOT_VERIFIED, | |||
| ], | |||
| [ | |||
| 'name' => self::PROPERTY_AVATAR, | |||
| 'scope' => self::SCOPE_FEDERATED | |||
| ], | |||
| [ | |||
| 'name' => self::PROPERTY_PHONE, | |||
| 'value' => '', | |||
| 'scope' => self::SCOPE_LOCAL, | |||
| 'verified' => self::NOT_VERIFIED, | |||
| ], | |||
| [ | |||
| 'name' => self::PROPERTY_TWITTER, | |||
| 'value' => '', | |||
| 'scope' => self::SCOPE_LOCAL, | |||
| 'verified' => self::NOT_VERIFIED, | |||
| ], | |||
| ]; | |||
| } | |||
| private function arrayDataToCollection(string $collectionName, array $data): IAccountPropertyCollection { | |||
| $collection = new AccountPropertyCollection($collectionName); | |||
| foreach ($data as $propertyData) { | |||
| $p = new AccountProperty( | |||
| $collectionName, | |||
| $propertyData['value'] ?? '', | |||
| $propertyData['scope'] ?? self::SCOPE_LOCAL, | |||
| $propertyData['verified'] ?? self::NOT_VERIFIED, | |||
| '' | |||
| ); | |||
| $collection->addProperty($p); | |||
| } | |||
| private function arrayDataToCollection(IAccount $account, array $data): IAccountPropertyCollection { | |||
| $collection = $account->getPropertyCollection($data['name']); | |||
| $p = new AccountProperty( | |||
| $data['name'], | |||
| $data['value'] ?? '', | |||
| $data['scope'] ?? self::SCOPE_LOCAL, | |||
| $data['verified'] ?? self::NOT_VERIFIED, | |||
| '' | |||
| ); | |||
| $collection->addProperty($p); | |||
| return $collection; | |||
| } | |||
| private function parseAccountData(IUser $user, $data): Account { | |||
| $account = new Account($user); | |||
| foreach ($data as $property => $accountData) { | |||
| if ($this->isCollection($property)) { | |||
| $account->setPropertyCollection($this->arrayDataToCollection($property, $accountData)); | |||
| foreach ($data as $accountData) { | |||
| if ($this->isCollection($accountData['name'])) { | |||
| $account->setPropertyCollection($this->arrayDataToCollection($account, $accountData)); | |||
| } else { | |||
| $account->setProperty($property, $accountData['value'] ?? '', $accountData['scope'] ?? self::SCOPE_LOCAL, $accountData['verified'] ?? self::NOT_VERIFIED); | |||
| $account->setProperty($accountData['name'], $accountData['value'] ?? '', $accountData['scope'] ?? self::SCOPE_LOCAL, $accountData['verified'] ?? self::NOT_VERIFIED); | |||
| } | |||
| } | |||
| return $account; | |||
| @@ -601,16 +612,6 @@ class AccountManager implements IAccountManager { | |||
| } | |||
| public function updateAccount(IAccount $account): void { | |||
| $data = []; | |||
| foreach ($account->getAllProperties() as $property) { | |||
| $data[] = [ | |||
| 'name' => $property->getName(), | |||
| 'value' => $property->getValue(), | |||
| 'scope' => $property->getScope(), | |||
| 'verified' => $property->getVerified(), | |||
| ]; | |||
| } | |||
| $this->testValueLengths(iterator_to_array($account->getAllProperties()), true); | |||
| try { | |||
| @@ -644,6 +645,16 @@ class AccountManager implements IAccountManager { | |||
| $this->updateVerificationStatus($account, $oldData); | |||
| $this->checkEmailVerification($account, $oldData); | |||
| $data = []; | |||
| foreach ($account->getAllProperties() as $property) { | |||
| $data[] = [ | |||
| 'name' => $property->getName(), | |||
| 'value' => $property->getValue(), | |||
| 'scope' => $property->getScope(), | |||
| 'verified' => $property->getVerified(), | |||
| ]; | |||
| } | |||
| $this->updateUser($account->getUser(), $data, true); | |||
| } | |||
| } | |||
+ 8
- 3
lib/private/Avatar/AvatarManager.php
Bestand weergeven
| @@ -39,6 +39,7 @@ use OC\KnownUser\KnownUserService; | |||
| use OC\User\Manager; | |||
| use OC\User\NoUserException; | |||
| use OCP\Accounts\IAccountManager; | |||
| use OCP\Accounts\PropertyDoesNotExistException; | |||
| use OCP\Files\IAppData; | |||
| use OCP\Files\NotFoundException; | |||
| use OCP\Files\NotPermittedException; | |||
| @@ -126,9 +127,13 @@ class AvatarManager implements IAvatarManager { | |||
| $folder = $this->appData->newFolder($userId); | |||
| } | |||
| $account = $this->accountManager->getAccount($user); | |||
| $avatarProperties = $account->getProperty(IAccountManager::PROPERTY_AVATAR); | |||
| $avatarScope = $avatarProperties->getScope(); | |||
| try { | |||
| $account = $this->accountManager->getAccount($user); | |||
| $avatarProperties = $account->getProperty(IAccountManager::PROPERTY_AVATAR); | |||
| $avatarScope = $avatarProperties->getScope(); | |||
| } catch (PropertyDoesNotExistException $e) { | |||
| $avatarScope = ''; | |||
| } | |||
| if ( | |||
| // v2-private scope hides the avatar from public access and from unknown users | |||
+ 2
- 1
lib/public/Accounts/IAccount.php
Bestand weergeven
| @@ -94,9 +94,10 @@ interface IAccount extends \JsonSerializable { | |||
| /** | |||
| * Returns the requestes propery collection (multi-value properties) | |||
| * | |||
| * @throws PropertyDoesNotExistException against invalid collection name | |||
| * @since 22.0.0 | |||
| */ | |||
| public function getPropertyCollection(string $propertyCollection): IAccountPropertyCollection; | |||
| public function getPropertyCollection(string $propertyCollectionName): IAccountPropertyCollection; | |||
| /** | |||
| * Get all properties that match the provided filters for scope and verification status | |||
+ 109
- 146
tests/lib/Accounts/AccountManagerTest.php
Bestand weergeven
| @@ -108,32 +108,32 @@ class AccountManagerTest extends TestCase { | |||
| [ | |||
| 'user' => $this->makeUser('j.doe', 'Jane Doe', 'jane.doe@acme.com'), | |||
| 'data' => [ | |||
| IAccountManager::PROPERTY_DISPLAYNAME => [ | |||
| [ | |||
| 'name' => IAccountManager::PROPERTY_DISPLAYNAME, | |||
| 'value' => 'Jane Doe', | |||
| 'scope' => IAccountManager::SCOPE_PUBLISHED | |||
| ], | |||
| IAccountManager::PROPERTY_EMAIL => [ | |||
| [ | |||
| 'name' => IAccountManager::PROPERTY_EMAIL, | |||
| 'value' => 'jane.doe@acme.com', | |||
| 'scope' => IAccountManager::SCOPE_LOCAL | |||
| ], | |||
| IAccountManager::PROPERTY_TWITTER => [ | |||
| [ | |||
| 'name' => IAccountManager::PROPERTY_TWITTER, | |||
| 'value' => '@sometwitter', | |||
| 'scope' => IAccountManager::SCOPE_PUBLISHED | |||
| ], | |||
| IAccountManager::PROPERTY_PHONE => [ | |||
| [ | |||
| 'name' => IAccountManager::PROPERTY_PHONE, | |||
| 'value' => '+491601231212', | |||
| 'scope' => IAccountManager::SCOPE_FEDERATED | |||
| ], | |||
| IAccountManager::PROPERTY_ADDRESS => [ | |||
| [ | |||
| 'name' => IAccountManager::PROPERTY_ADDRESS, | |||
| 'value' => 'some street', | |||
| 'scope' => IAccountManager::SCOPE_LOCAL | |||
| ], | |||
| IAccountManager::PROPERTY_WEBSITE => [ | |||
| [ | |||
| 'name' => IAccountManager::PROPERTY_WEBSITE, | |||
| 'value' => 'https://acme.com', | |||
| 'scope' => IAccountManager::SCOPE_PRIVATE | |||
| @@ -143,32 +143,32 @@ class AccountManagerTest extends TestCase { | |||
| [ | |||
| 'user' => $this->makeUser('a.allison', 'Alice Allison', 'a.allison@example.org'), | |||
| 'data' => [ | |||
| IAccountManager::PROPERTY_DISPLAYNAME => [ | |||
| [ | |||
| 'name' => IAccountManager::PROPERTY_DISPLAYNAME, | |||
| 'value' => 'Alice Allison', | |||
| 'scope' => IAccountManager::SCOPE_LOCAL | |||
| ], | |||
| IAccountManager::PROPERTY_EMAIL => [ | |||
| [ | |||
| 'name' => IAccountManager::PROPERTY_EMAIL, | |||
| 'value' => 'a.allison@example.org', | |||
| 'scope' => IAccountManager::SCOPE_LOCAL | |||
| ], | |||
| IAccountManager::PROPERTY_TWITTER => [ | |||
| [ | |||
| 'name' => IAccountManager::PROPERTY_TWITTER, | |||
| 'value' => '@a_alice', | |||
| 'scope' => IAccountManager::SCOPE_FEDERATED | |||
| ], | |||
| IAccountManager::PROPERTY_PHONE => [ | |||
| [ | |||
| 'name' => IAccountManager::PROPERTY_PHONE, | |||
| 'value' => '+491602312121', | |||
| 'scope' => IAccountManager::SCOPE_LOCAL | |||
| ], | |||
| IAccountManager::PROPERTY_ADDRESS => [ | |||
| [ | |||
| 'name' => IAccountManager::PROPERTY_ADDRESS, | |||
| 'value' => 'Dundee Road 45', | |||
| 'scope' => IAccountManager::SCOPE_LOCAL | |||
| ], | |||
| IAccountManager::PROPERTY_WEBSITE => [ | |||
| [ | |||
| 'name' => IAccountManager::PROPERTY_WEBSITE, | |||
| 'value' => 'https://example.org', | |||
| 'scope' => IAccountManager::SCOPE_LOCAL | |||
| @@ -178,66 +178,112 @@ class AccountManagerTest extends TestCase { | |||
| [ | |||
| 'user' => $this->makeUser('b32c5a5b-1084-4380-8856-e5223b16de9f', 'Armel Oliseh', 'oliseh@example.com'), | |||
| 'data' => [ | |||
| IAccountManager::PROPERTY_DISPLAYNAME => ['value' => 'Armel Oliseh', 'scope' => IAccountManager::SCOPE_PUBLISHED], | |||
| IAccountManager::PROPERTY_EMAIL => ['value' => 'oliseh@example.com', 'scope' => IAccountManager::SCOPE_PUBLISHED], | |||
| IAccountManager::PROPERTY_TWITTER => ['value' => '', 'scope' => IAccountManager::SCOPE_LOCAL], | |||
| IAccountManager::PROPERTY_PHONE => ['value' => '+491603121212', 'scope' => IAccountManager::SCOPE_PUBLISHED], | |||
| IAccountManager::PROPERTY_ADDRESS => ['value' => 'Sunflower Blvd. 77', 'scope' => IAccountManager::SCOPE_PUBLISHED], | |||
| IAccountManager::PROPERTY_WEBSITE => ['value' => 'https://example.com', 'scope' => IAccountManager::SCOPE_PUBLISHED], | |||
| [ | |||
| 'name' => IAccountManager::PROPERTY_DISPLAYNAME, | |||
| 'value' => 'Armel Oliseh', | |||
| 'scope' => IAccountManager::SCOPE_PUBLISHED | |||
| ], | |||
| [ | |||
| 'name' => IAccountManager::PROPERTY_EMAIL, | |||
| 'value' => 'oliseh@example.com', | |||
| 'scope' => IAccountManager::SCOPE_PUBLISHED | |||
| ], | |||
| [ | |||
| 'name' => IAccountManager::PROPERTY_TWITTER, | |||
| 'value' => '', | |||
| 'scope' => IAccountManager::SCOPE_LOCAL | |||
| ], | |||
| [ | |||
| 'name' => IAccountManager::PROPERTY_PHONE, | |||
| 'value' => '+491603121212', | |||
| 'scope' => IAccountManager::SCOPE_PUBLISHED | |||
| ], | |||
| [ | |||
| 'name' => IAccountManager::PROPERTY_ADDRESS, | |||
| 'value' => 'Sunflower Blvd. 77', | |||
| 'scope' => IAccountManager::SCOPE_PUBLISHED | |||
| ], | |||
| [ | |||
| 'name' => IAccountManager::PROPERTY_WEBSITE, | |||
| 'value' => 'https://example.com', | |||
| 'scope' => IAccountManager::SCOPE_PUBLISHED | |||
| ], | |||
| ], | |||
| ], | |||
| [ | |||
| 'user' => $this->makeUser('31b5316a-9b57-4b17-970a-315a4cbe73eb', 'K. Cheng', 'cheng@emca.com'), | |||
| 'data' => [ | |||
| IAccountManager::PROPERTY_DISPLAYNAME => ['value' => 'K. Cheng', 'scope' => IAccountManager::SCOPE_FEDERATED], | |||
| IAccountManager::PROPERTY_EMAIL => ['value' => 'cheng@emca.com', 'scope' => IAccountManager::SCOPE_FEDERATED], | |||
| IAccountManager::PROPERTY_TWITTER => ['value' => '', 'scope' => IAccountManager::SCOPE_LOCAL], | |||
| IAccountManager::PROPERTY_PHONE => ['value' => '+71601212123', 'scope' => IAccountManager::SCOPE_LOCAL], | |||
| IAccountManager::PROPERTY_ADDRESS => ['value' => 'Pinapple Street 22', 'scope' => IAccountManager::SCOPE_LOCAL], | |||
| IAccountManager::PROPERTY_WEBSITE => ['value' => 'https://emca.com', 'scope' => IAccountManager::SCOPE_FEDERATED], | |||
| IAccountManager::COLLECTION_EMAIL => [ | |||
| [ | |||
| 'name' => IAccountManager::COLLECTION_EMAIL, | |||
| 'value' => 'k.cheng@emca.com', | |||
| 'scope' => IAccountManager::SCOPE_LOCAL | |||
| ], | |||
| [ | |||
| 'name' => IAccountManager::COLLECTION_EMAIL, | |||
| 'value' => 'kai.cheng@emca.com', | |||
| 'scope' => IAccountManager::SCOPE_LOCAL | |||
| ], | |||
| [ | |||
| 'name' => IAccountManager::PROPERTY_DISPLAYNAME, | |||
| 'value' => 'K. Cheng', | |||
| 'scope' => IAccountManager::SCOPE_FEDERATED | |||
| ], | |||
| [ | |||
| 'name' => IAccountManager::PROPERTY_EMAIL, | |||
| 'value' => 'cheng@emca.com', | |||
| 'scope' => IAccountManager::SCOPE_FEDERATED | |||
| ], | |||
| [ | |||
| 'name' => IAccountManager::PROPERTY_TWITTER, | |||
| 'value' => '', ' | |||
| scope' => IAccountManager::SCOPE_LOCAL | |||
| ], | |||
| [ | |||
| 'name' => IAccountManager::PROPERTY_PHONE, | |||
| 'value' => '+71601212123', | |||
| 'scope' => IAccountManager::SCOPE_LOCAL | |||
| ], | |||
| [ | |||
| 'name' => IAccountManager::PROPERTY_ADDRESS, | |||
| 'value' => 'Pinapple Street 22', | |||
| 'scope' => IAccountManager::SCOPE_LOCAL | |||
| ], | |||
| [ | |||
| 'name' => IAccountManager::PROPERTY_WEBSITE, | |||
| 'value' => 'https://emca.com', | |||
| 'scope' => IAccountManager::SCOPE_FEDERATED | |||
| ], | |||
| [ | |||
| 'name' => IAccountManager::COLLECTION_EMAIL, | |||
| 'value' => 'k.cheng@emca.com', | |||
| 'scope' => IAccountManager::SCOPE_LOCAL | |||
| ], | |||
| [ | |||
| 'name' => IAccountManager::COLLECTION_EMAIL, | |||
| 'value' => 'kai.cheng@emca.com', | |||
| 'scope' => IAccountManager::SCOPE_LOCAL | |||
| ], | |||
| ], | |||
| ], | |||
| [ | |||
| 'user' => $this->makeUser('goodpal@elpmaxe.org', 'Goodpal, Kim', 'goodpal@elpmaxe.org'), | |||
| 'data' => [ | |||
| IAccountManager::PROPERTY_DISPLAYNAME => [ | |||
| [ | |||
| 'name' => IAccountManager::PROPERTY_DISPLAYNAME, | |||
| 'value' => 'Goodpal, Kim', | |||
| 'scope' => IAccountManager::SCOPE_PUBLISHED | |||
| ], | |||
| IAccountManager::PROPERTY_EMAIL => [ | |||
| [ | |||
| 'name' => IAccountManager::PROPERTY_EMAIL, | |||
| 'value' => 'goodpal@elpmaxe.org', | |||
| 'scope' => IAccountManager::SCOPE_PUBLISHED | |||
| ], | |||
| IAccountManager::PROPERTY_TWITTER => [ | |||
| [ | |||
| 'name' => IAccountManager::PROPERTY_TWITTER, | |||
| 'value' => '', | |||
| 'scope' => IAccountManager::SCOPE_LOCAL | |||
| ], | |||
| IAccountManager::PROPERTY_PHONE => [ | |||
| [ | |||
| 'name' => IAccountManager::PROPERTY_PHONE, | |||
| 'value' => '+71602121231', | |||
| 'scope' => IAccountManager::SCOPE_FEDERATED | |||
| ], | |||
| IAccountManager::PROPERTY_ADDRESS => [ | |||
| [ | |||
| 'name' => IAccountManager::PROPERTY_ADDRESS, | |||
| 'value' => 'Octopus Ave 17', | |||
| 'scope' => IAccountManager::SCOPE_FEDERATED | |||
| ], | |||
| IAccountManager::PROPERTY_WEBSITE => [ | |||
| [ | |||
| 'name' => IAccountManager::PROPERTY_WEBSITE, | |||
| 'value' => 'https://elpmaxe.org', | |||
| 'scope' => IAccountManager::SCOPE_PUBLISHED | |||
| @@ -324,82 +370,15 @@ class AccountManagerTest extends TestCase { | |||
| ]; | |||
| } | |||
| /** | |||
| * @dataProvider dataTestGetUser | |||
| * | |||
| * @param string $setUser | |||
| * @param array $setData | |||
| * @param IUser $askUser | |||
| * @param array $expectedData | |||
| * @param bool $userAlreadyExists | |||
| */ | |||
| public function testGetUser($setUser, $setData, $askUser, $expectedData, $userAlreadyExists) { | |||
| $accountManager = $this->getInstance(['buildDefaultUserRecord', 'insertNewUser', 'addMissingDefaultValues']); | |||
| if (!$userAlreadyExists) { | |||
| $accountManager->expects($this->once())->method('buildDefaultUserRecord') | |||
| ->with($askUser)->willReturn($expectedData); | |||
| $accountManager->expects($this->once())->method('insertNewUser') | |||
| ->with($askUser, $expectedData); | |||
| } | |||
| if (empty($expectedData)) { | |||
| $accountManager->expects($this->never())->method('addMissingDefaultValues'); | |||
| } else { | |||
| $accountManager->expects($this->once())->method('addMissingDefaultValues')->with($expectedData) | |||
| ->willReturn($expectedData); | |||
| } | |||
| $this->addDummyValuesToTable($setUser, $setData); | |||
| $this->assertEquals($expectedData, $this->invokePrivate($accountManager, 'getUser', [$askUser])); | |||
| } | |||
| public function dataTestGetUser() { | |||
| $user1 = $this->getMockBuilder(IUser::class)->getMock(); | |||
| $user1->expects($this->any())->method('getUID')->willReturn('user1'); | |||
| $user2 = $this->getMockBuilder(IUser::class)->getMock(); | |||
| $user2->expects($this->any())->method('getUID')->willReturn('user2'); | |||
| return [ | |||
| ['user1', ['key' => 'value'], $user1, ['key' => 'value'], true], | |||
| ['user1', ['key' => 'value'], $user2, [], false], | |||
| ]; | |||
| } | |||
| public function testUpdateExistingUser() { | |||
| $user = $this->getMockBuilder(IUser::class)->getMock(); | |||
| $user->expects($this->atLeastOnce())->method('getUID')->willReturn('uid'); | |||
| $oldData = ['key' => ['value' => 'value', 'name' => 'name']]; | |||
| $newData = ['newKey' => ['value' => 'newValue', 'name' => 'name']]; | |||
| $this->addDummyValuesToTable('uid', $oldData); | |||
| $this->invokePrivate($this->accountManager, 'updateExistingUser', [$user, $newData]); | |||
| $newDataFromTable = $this->getDataFromTable('uid'); | |||
| $this->assertEquals($newData, $newDataFromTable); | |||
| } | |||
| public function testInsertNewUser() { | |||
| $user = $this->getMockBuilder(IUser::class)->getMock(); | |||
| $uid = 'uid'; | |||
| $data = ['key' => ['value' => 'value', 'name' => 'name']]; | |||
| $user->expects($this->atLeastOnce())->method('getUID')->willReturn($uid); | |||
| $this->assertNull($this->getDataFromTable($uid)); | |||
| $this->invokePrivate($this->accountManager, 'insertNewUser', [$user, $data]); | |||
| $dataFromDb = $this->getDataFromTable($uid); | |||
| $dataFromDb['key']['name'] = 'name'; // from transformation | |||
| $this->assertEquals($data, $dataFromDb); | |||
| } | |||
| public function testAddMissingDefaultValues() { | |||
| $input = [ | |||
| 'key1' => ['value' => 'value1', 'verified' => '0'], | |||
| 'key2' => ['value' => 'value1'], | |||
| ['value' => 'value1', 'verified' => '0', 'name' => 'key1'], | |||
| ['value' => 'value1', 'name' => 'key2'], | |||
| ]; | |||
| $expected = [ | |||
| 'key1' => ['value' => 'value1', 'verified' => '0', 'name' => 'key1'], | |||
| 'key2' => ['value' => 'value1', 'verified' => '0', 'name' => 'key2'], | |||
| 'additional_mail' => [] | |||
| ['value' => 'value1', 'verified' => '0', 'name' => 'key1'], | |||
| ['value' => 'value1', 'name' => 'key2', 'verified' => '0'], | |||
| ]; | |||
| $result = $this->invokePrivate($this->accountManager, 'addMissingDefaultValues', [$input]); | |||
| @@ -419,46 +398,30 @@ class AccountManagerTest extends TestCase { | |||
| ->execute(); | |||
| } | |||
| private function getDataFromTable($uid) { | |||
| $query = $this->connection->getQueryBuilder(); | |||
| $query->select('data')->from($this->table) | |||
| ->where($query->expr()->eq('uid', $query->createParameter('uid'))) | |||
| ->setParameter('uid', $uid); | |||
| $query->execute(); | |||
| $qResult = $query->execute(); | |||
| $result = $qResult->fetchAll(); | |||
| $qResult->closeCursor(); | |||
| if (!empty($result)) { | |||
| return json_decode($result[0]['data'], true); | |||
| } | |||
| } | |||
| public function testGetAccount() { | |||
| $accountManager = $this->getInstance(['getUser']); | |||
| /** @var IUser $user */ | |||
| $user = $this->createMock(IUser::class); | |||
| $data = [ | |||
| IAccountManager::PROPERTY_TWITTER => | |||
| [ | |||
| 'value' => '@twitterhandle', | |||
| 'scope' => IAccountManager::SCOPE_LOCAL, | |||
| 'verified' => IAccountManager::NOT_VERIFIED, | |||
| ], | |||
| IAccountManager::PROPERTY_EMAIL => | |||
| [ | |||
| 'value' => 'test@example.com', | |||
| 'scope' => IAccountManager::SCOPE_PUBLISHED, | |||
| 'verified' => IAccountManager::VERIFICATION_IN_PROGRESS, | |||
| ], | |||
| IAccountManager::PROPERTY_WEBSITE => | |||
| [ | |||
| 'value' => 'https://example.com', | |||
| 'scope' => IAccountManager::SCOPE_FEDERATED, | |||
| 'verified' => IAccountManager::VERIFIED, | |||
| ], | |||
| [ | |||
| 'value' => '@twitterhandle', | |||
| 'scope' => IAccountManager::SCOPE_LOCAL, | |||
| 'verified' => IAccountManager::NOT_VERIFIED, | |||
| 'name' => IAccountManager::PROPERTY_TWITTER, | |||
| ], | |||
| [ | |||
| 'value' => 'test@example.com', | |||
| 'scope' => IAccountManager::SCOPE_PUBLISHED, | |||
| 'verified' => IAccountManager::VERIFICATION_IN_PROGRESS, | |||
| 'name' => IAccountManager::PROPERTY_EMAIL, | |||
| ], | |||
| [ | |||
| 'value' => 'https://example.com', | |||
| 'scope' => IAccountManager::SCOPE_FEDERATED, | |||
| 'verified' => IAccountManager::VERIFIED, | |||
| 'name' => IAccountManager::PROPERTY_WEBSITE, | |||
| ], | |||
| ]; | |||
| $expected = new Account($user); | |||
| $expected->setProperty(IAccountManager::PROPERTY_TWITTER, '@twitterhandle', IAccountManager::SCOPE_LOCAL, IAccountManager::NOT_VERIFIED); | |||
Laden…