Discard duplicate collection name from account serialization

Signed-off-by: Christopher Ng <chrng8@gmail.com>

diff --git a/lib/private/Accounts/Account.php b/lib/private/Accounts/Account.php
index 540d15cd4b9e9ba0ba563b90ba4027947bfe5868..7d36af561ce81e4be99fdebe47fe82e0f27bbd0d 100644 (file)
--- a/lib/private/Accounts/Account.php
+++ b/lib/private/Accounts/Account.php
@@ -104,9 +104,16 @@ class Account implements IAccount {
                return $result;
        }
 
-       /** @return IAccountPropertyCollection[]|IAccountProperty[] */
+       /** @return array<string, IAccountProperty|array<int, IAccountProperty>> */
        public function jsonSerialize(): array {
-               return $this->properties;
+               $properties = $this->properties;
+               foreach ($properties as $propertyName => $propertyObject) {
+                       if ($propertyObject instanceof IAccountPropertyCollection) {
+                               // Override collection serialization to discard duplicate name
+                               $properties[$propertyName] = $propertyObject->jsonSerialize()[$propertyName];
+                       }
+               }
+               return $properties;
        }
 
        public function getUser(): IUser {

diff --git a/tests/lib/Accounts/AccountTest.php b/tests/lib/Accounts/AccountTest.php
index 0e0c42804e43403e68bf4dc899565b4094b92c87..064a9bf2732a69c0c427cd29509c872bc1b730aa 100644 (file)
--- a/tests/lib/Accounts/AccountTest.php
+++ b/tests/lib/Accounts/AccountTest.php
@@ -120,12 +120,26 @@ class AccountTest extends TestCase {
                $user = $this->createMock(IUser::class);
                $properties = [
                        IAccountManager::PROPERTY_WEBSITE => new AccountProperty(IAccountManager::PROPERTY_WEBSITE, 'https://example.com', IAccountManager::SCOPE_PUBLISHED, IAccountManager::NOT_VERIFIED, ''),
-                       IAccountManager::PROPERTY_EMAIL => new AccountProperty(IAccountManager::PROPERTY_EMAIL, 'user@example.com', IAccountManager::SCOPE_LOCAL, IAccountManager::VERIFIED, '')
+                       IAccountManager::PROPERTY_EMAIL => new AccountProperty(IAccountManager::PROPERTY_EMAIL, 'user@example.com', IAccountManager::SCOPE_LOCAL, IAccountManager::VERIFIED, ''),
+                       IAccountManager::COLLECTION_EMAIL => [
+                               new AccountProperty(IAccountManager::COLLECTION_EMAIL, 'apple@orange.com', IAccountManager::SCOPE_LOCAL, IAccountManager::NOT_VERIFIED, ''),
+                               new AccountProperty(IAccountManager::COLLECTION_EMAIL, 'banana@orange.com', IAccountManager::SCOPE_PUBLISHED, IAccountManager::VERIFICATION_IN_PROGRESS, ''),
+                               new AccountProperty(IAccountManager::COLLECTION_EMAIL, 'kiwi@watermelon.com', IAccountManager::SCOPE_PUBLISHED, IAccountManager::VERIFIED, ''),
+                       ],
                ];
+
                $account = new Account($user);
                $account->setProperty(IAccountManager::PROPERTY_WEBSITE, 'https://example.com', IAccountManager::SCOPE_PUBLISHED, IAccountManager::NOT_VERIFIED);
                $account->setProperty(IAccountManager::PROPERTY_EMAIL, 'user@example.com', IAccountManager::SCOPE_LOCAL, IAccountManager::VERIFIED);
 
+               $col = new AccountPropertyCollection(IAccountManager::COLLECTION_EMAIL);
+               $col->setProperties([
+                       new AccountProperty($col->getName(), 'apple@orange.com', IAccountManager::SCOPE_LOCAL, IAccountManager::NOT_VERIFIED, ''),
+                       new AccountProperty($col->getName(), 'banana@orange.com', IAccountManager::SCOPE_PUBLISHED, IAccountManager::VERIFICATION_IN_PROGRESS, ''),
+                       new AccountProperty($col->getName(), 'kiwi@watermelon.com', IAccountManager::SCOPE_PUBLISHED, IAccountManager::VERIFIED, ''),
+               ]);
+               $account->setPropertyCollection($col);
+
                $this->assertEquals($properties, $account->jsonSerialize());
        }
 }