Merge pull request #31487 from nextcloud/enh/account-json-serialization

Author: Pytal

lib/private/Accounts/Account.php

@@ -104,9 +104,16 @@ public function getFilteredProperties(string $scope = null, string $verified = n
 		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 {

tests/lib/Accounts/AccountTest.php

@@ -120,12 +120,26 @@ public function testJsonSerialize() {
 		$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, '[email protected]', IAccountManager::SCOPE_LOCAL, IAccountManager::VERIFIED, '')
+			IAccountManager::PROPERTY_EMAIL => new AccountProperty(IAccountManager::PROPERTY_EMAIL, '[email protected]', IAccountManager::SCOPE_LOCAL, IAccountManager::VERIFIED, ''),
+			IAccountManager::COLLECTION_EMAIL => [
+				new AccountProperty(IAccountManager::COLLECTION_EMAIL, '[email protected]', IAccountManager::SCOPE_LOCAL, IAccountManager::NOT_VERIFIED, ''),
+				new AccountProperty(IAccountManager::COLLECTION_EMAIL, '[email protected]', IAccountManager::SCOPE_PUBLISHED, IAccountManager::VERIFICATION_IN_PROGRESS, ''),
+				new AccountProperty(IAccountManager::COLLECTION_EMAIL, '[email protected]', 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, '[email protected]', IAccountManager::SCOPE_LOCAL, IAccountManager::VERIFIED);
 
+		$col = new AccountPropertyCollection(IAccountManager::COLLECTION_EMAIL);
+		$col->setProperties([
+			new AccountProperty($col->getName(), '[email protected]', IAccountManager::SCOPE_LOCAL, IAccountManager::NOT_VERIFIED, ''),
+			new AccountProperty($col->getName(), '[email protected]', IAccountManager::SCOPE_PUBLISHED, IAccountManager::VERIFICATION_IN_PROGRESS, ''),
+			new AccountProperty($col->getName(), '[email protected]', IAccountManager::SCOPE_PUBLISHED, IAccountManager::VERIFIED, ''),
+		]);
+		$account->setPropertyCollection($col);
+
 		$this->assertEquals($properties, $account->jsonSerialize());
 	}
 }