nextcloud / server

lib/public/Accounts/IAccountManager.php

Indentation +199 added lines, -199 removed lines

@@ -18,203 +18,203 @@
  *
  */
 interface IAccountManager {
-	/**
-	 * Contact details visible locally only
-	 *
-	 * @since 21.0.1
-	 */
-	public const SCOPE_PRIVATE = 'v2-private';
-
-	/**
-	 * Contact details visible locally and through public link access on local instance
-	 *
-	 * @since 21.0.1
-	 */
-	public const SCOPE_LOCAL = 'v2-local';
-
-	/**
-	 * Contact details visible locally, through public link access and on trusted federated servers.
-	 *
-	 * @since 21.0.1
-	 */
-	public const SCOPE_FEDERATED = 'v2-federated';
-
-	/**
-	 * Contact details visible locally, through public link access, on trusted federated servers
-	 * and published to the public lookup server.
-	 *
-	 * @since 21.0.1
-	 */
-	public const SCOPE_PUBLISHED = 'v2-published';
-
-	/**
-	 * The list of allowed scopes
-	 *
-	 * @since 25.0.0
-	 */
-	public const ALLOWED_SCOPES = [
-		self::SCOPE_PRIVATE,
-		self::SCOPE_LOCAL,
-		self::SCOPE_FEDERATED,
-		self::SCOPE_PUBLISHED,
-	];
-
-	/**
-	 * @since 15.0.0
-	 */
-	public const PROPERTY_AVATAR = 'avatar';
-
-	/**
-	 * @since 15.0.0
-	 */
-	public const PROPERTY_DISPLAYNAME = 'displayname';
-
-	/**
-	 * @since 27.0.0
-	 * @deprecated 27.0.0 only added for backwards compatibility with provisioning_api UsersController::getCurrentUser
-	 */
-	public const PROPERTY_DISPLAYNAME_LEGACY = 'display-name';
-
-	/**
-	 * @since 15.0.0
-	 */
-	public const PROPERTY_PHONE = 'phone';
-
-	/**
-	 * @since 15.0.0
-	 */
-	public const PROPERTY_EMAIL = 'email';
-
-	/**
-	 * @since 15.0.0
-	 */
-	public const PROPERTY_WEBSITE = 'website';
-
-	/**
-	 * @since 15.0.0
-	 */
-	public const PROPERTY_ADDRESS = 'address';
-
-	/**
-	 * @since 15.0.0
-	 */
-	public const PROPERTY_TWITTER = 'twitter';
-
-	/**
-	 * @since 26.0.0
-	 */
-	public const PROPERTY_FEDIVERSE = 'fediverse';
-
-	/**
-	 * @since 23.0.0
-	 */
-	public const PROPERTY_ORGANISATION = 'organisation';
-
-	/**
-	 * @since 23.0.0
-	 */
-	public const PROPERTY_ROLE = 'role';
-
-	/**
-	 * @since 23.0.0
-	 */
-	public const PROPERTY_HEADLINE = 'headline';
-
-	/**
-	 * @since 23.0.0
-	 */
-	public const PROPERTY_BIOGRAPHY = 'biography';
-
-	/**
-	 * @since 23.0.0
-	 */
-	public const PROPERTY_PROFILE_ENABLED = 'profile_enabled';
-
-	/**
-	 * @since 30.0.0
-	 */
-	public const PROPERTY_BIRTHDATE = 'birthdate';
-
-	/**
-	 * @since 31.0.0
-	 */
-	public const PROPERTY_PRONOUNS = 'pronouns';
-
-	/**
-	 * The list of allowed properties
-	 *
-	 * @since 25.0.0
-	 */
-	public const ALLOWED_PROPERTIES = [
-		self::PROPERTY_ADDRESS,
-		self::PROPERTY_AVATAR,
-		self::PROPERTY_BIOGRAPHY,
-		self::PROPERTY_BIRTHDATE,
-		self::PROPERTY_DISPLAYNAME,
-		self::PROPERTY_EMAIL,
-		self::PROPERTY_FEDIVERSE,
-		self::PROPERTY_HEADLINE,
-		self::PROPERTY_ORGANISATION,
-		self::PROPERTY_PHONE,
-		self::PROPERTY_PROFILE_ENABLED,
-		self::PROPERTY_PRONOUNS,
-		self::PROPERTY_ROLE,
-		self::PROPERTY_TWITTER,
-		self::PROPERTY_WEBSITE,
-	];
-
-
-	/**
-	 * @since 22.0.0
-	 */
-	public const COLLECTION_EMAIL = 'additional_mail';
-
-	/**
-	 * @since 15.0.0
-	 */
-	public const NOT_VERIFIED = '0';
-
-	/**
-	 * @since 15.0.0
-	 */
-	public const VERIFICATION_IN_PROGRESS = '1';
-
-	/**
-	 * @since 15.0.0
-	 */
-	public const VERIFIED = '2';
-
-	/**
-	 * Get the account data for a given user
-	 *
-	 * @since 15.0.0
-	 *
-	 * @param IUser $user
-	 * @return IAccount
-	 */
-	public function getAccount(IUser $user): IAccount;
-
-	/**
-	 * Update the account data with for the user
-	 *
-	 * @since 21.0.1
-	 *
-	 * @param IAccount $account
-	 * @throws \InvalidArgumentException Message is the property that was invalid
-	 */
-	public function updateAccount(IAccount $account): void;
-
-	/**
-	 * Search for users based on account data
-	 *
-	 * @param string $property - property or property collection name – since
-	 *                         NC 22 the implementation MAY add a fitting property collection into the
-	 *                         search even if a property name was given e.g. email property and email
-	 *                         collection)
-	 * @param string[] $values
-	 * @return array
-	 *
-	 * @since 21.0.0
-	 */
-	public function searchUsers(string $property, array $values): array;
+    /**
+     * Contact details visible locally only
+     *
+     * @since 21.0.1
+     */
+    public const SCOPE_PRIVATE = 'v2-private';
+
+    /**
+     * Contact details visible locally and through public link access on local instance
+     *
+     * @since 21.0.1
+     */
+    public const SCOPE_LOCAL = 'v2-local';
+
+    /**
+     * Contact details visible locally, through public link access and on trusted federated servers.
+     *
+     * @since 21.0.1
+     */
+    public const SCOPE_FEDERATED = 'v2-federated';
+
+    /**
+     * Contact details visible locally, through public link access, on trusted federated servers
+     * and published to the public lookup server.
+     *
+     * @since 21.0.1
+     */
+    public const SCOPE_PUBLISHED = 'v2-published';
+
+    /**
+     * The list of allowed scopes
+     *
+     * @since 25.0.0
+     */
+    public const ALLOWED_SCOPES = [
+        self::SCOPE_PRIVATE,
+        self::SCOPE_LOCAL,
+        self::SCOPE_FEDERATED,
+        self::SCOPE_PUBLISHED,
+    ];
+
+    /**
+     * @since 15.0.0
+     */
+    public const PROPERTY_AVATAR = 'avatar';
+
+    /**
+     * @since 15.0.0
+     */
+    public const PROPERTY_DISPLAYNAME = 'displayname';
+
+    /**
+     * @since 27.0.0
+     * @deprecated 27.0.0 only added for backwards compatibility with provisioning_api UsersController::getCurrentUser
+     */
+    public const PROPERTY_DISPLAYNAME_LEGACY = 'display-name';
+
+    /**
+     * @since 15.0.0
+     */
+    public const PROPERTY_PHONE = 'phone';
+
+    /**
+     * @since 15.0.0
+     */
+    public const PROPERTY_EMAIL = 'email';
+
+    /**
+     * @since 15.0.0
+     */
+    public const PROPERTY_WEBSITE = 'website';
+
+    /**
+     * @since 15.0.0
+     */
+    public const PROPERTY_ADDRESS = 'address';
+
+    /**
+     * @since 15.0.0
+     */
+    public const PROPERTY_TWITTER = 'twitter';
+
+    /**
+     * @since 26.0.0
+     */
+    public const PROPERTY_FEDIVERSE = 'fediverse';
+
+    /**
+     * @since 23.0.0
+     */
+    public const PROPERTY_ORGANISATION = 'organisation';
+
+    /**
+     * @since 23.0.0
+     */
+    public const PROPERTY_ROLE = 'role';
+
+    /**
+     * @since 23.0.0
+     */
+    public const PROPERTY_HEADLINE = 'headline';
+
+    /**
+     * @since 23.0.0
+     */
+    public const PROPERTY_BIOGRAPHY = 'biography';
+
+    /**
+     * @since 23.0.0
+     */
+    public const PROPERTY_PROFILE_ENABLED = 'profile_enabled';
+
+    /**
+     * @since 30.0.0
+     */
+    public const PROPERTY_BIRTHDATE = 'birthdate';
+
+    /**
+     * @since 31.0.0
+     */
+    public const PROPERTY_PRONOUNS = 'pronouns';
+
+    /**
+     * The list of allowed properties
+     *
+     * @since 25.0.0
+     */
+    public const ALLOWED_PROPERTIES = [
+        self::PROPERTY_ADDRESS,
+        self::PROPERTY_AVATAR,
+        self::PROPERTY_BIOGRAPHY,
+        self::PROPERTY_BIRTHDATE,
+        self::PROPERTY_DISPLAYNAME,
+        self::PROPERTY_EMAIL,
+        self::PROPERTY_FEDIVERSE,
+        self::PROPERTY_HEADLINE,
+        self::PROPERTY_ORGANISATION,
+        self::PROPERTY_PHONE,
+        self::PROPERTY_PROFILE_ENABLED,
+        self::PROPERTY_PRONOUNS,
+        self::PROPERTY_ROLE,
+        self::PROPERTY_TWITTER,
+        self::PROPERTY_WEBSITE,
+    ];
+
+
+    /**
+     * @since 22.0.0
+     */
+    public const COLLECTION_EMAIL = 'additional_mail';
+
+    /**
+     * @since 15.0.0
+     */
+    public const NOT_VERIFIED = '0';
+
+    /**
+     * @since 15.0.0
+     */
+    public const VERIFICATION_IN_PROGRESS = '1';
+
+    /**
+     * @since 15.0.0
+     */
+    public const VERIFIED = '2';
+
+    /**
+     * Get the account data for a given user
+     *
+     * @since 15.0.0
+     *
+     * @param IUser $user
+     * @return IAccount
+     */
+    public function getAccount(IUser $user): IAccount;
+
+    /**
+     * Update the account data with for the user
+     *
+     * @since 21.0.1
+     *
+     * @param IAccount $account
+     * @throws \InvalidArgumentException Message is the property that was invalid
+     */
+    public function updateAccount(IAccount $account): void;
+
+    /**
+     * Search for users based on account data
+     *
+     * @param string $property - property or property collection name – since
+     *                         NC 22 the implementation MAY add a fitting property collection into the
+     *                         search even if a property name was given e.g. email property and email
+     *                         collection)
+     * @param string[] $values
+     * @return array
+     *
+     * @since 21.0.0
+     */
+    public function searchUsers(string $property, array $values): array;
 }

lib/private/Accounts/AccountProperty.php

Indentation +120 added lines, -120 removed lines

@@ -13,124 +13,124 @@
 use OCP\Accounts\IAccountProperty;
 
 class AccountProperty implements IAccountProperty {
-	/**
-	 * @var IAccountManager::SCOPE_*
-	 */
-	private string $scope;
-	private string $locallyVerified = IAccountManager::NOT_VERIFIED;
-
-	public function __construct(
-		private string $name,
-		private string $value,
-		string $scope,
-		private string $verified,
-		private string $verificationData,
-	) {
-		$this->setScope($scope);
-	}
-
-	public function jsonSerialize(): array {
-		return [
-			'name' => $this->getName(),
-			'value' => $this->getValue(),
-			'scope' => $this->getScope(),
-			'verified' => $this->getVerified(),
-			'verificationData' => $this->getVerificationData(),
-		];
-	}
-
-	/**
-	 * Set the value of a property
-	 *
-	 * @since 15.0.0
-	 */
-	public function setValue(string $value): IAccountProperty {
-		$this->value = $value;
-		return $this;
-	}
-
-	/**
-	 * Set the scope of a property
-	 *
-	 * @since 15.0.0
-	 */
-	public function setScope(string $scope): IAccountProperty {
-		if (!in_array($scope, IAccountManager::ALLOWED_SCOPES, )) {
-			throw new InvalidArgumentException('Invalid scope');
-		}
-		/** @var IAccountManager::SCOPE_* $scope */
-		$this->scope = $scope;
-		return $this;
-	}
-
-	/**
-	 * Set the verification status of a property
-	 *
-	 * @since 15.0.0
-	 */
-	public function setVerified(string $verified): IAccountProperty {
-		$this->verified = $verified;
-		return $this;
-	}
-
-	/**
-	 * Get the name of a property
-	 *
-	 * @since 15.0.0
-	 */
-	public function getName(): string {
-		return $this->name;
-	}
-
-	/**
-	 * Get the value of a property
-	 *
-	 * @since 15.0.0
-	 */
-	public function getValue(): string {
-		return $this->value;
-	}
-
-	/**
-	 * Get the scope of a property
-	 *
-	 * @since 15.0.0
-	 */
-	public function getScope(): string {
-		return $this->scope;
-	}
-
-	/**
-	 * Get the verification status of a property
-	 *
-	 * @since 15.0.0
-	 */
-	public function getVerified(): string {
-		return $this->verified;
-	}
-
-	public function setVerificationData(string $verificationData): IAccountProperty {
-		$this->verificationData = $verificationData;
-		return $this;
-	}
-
-	public function getVerificationData(): string {
-		return $this->verificationData;
-	}
-
-	public function setLocallyVerified(string $verified): IAccountProperty {
-		if (!in_array($verified, [
-			IAccountManager::NOT_VERIFIED,
-			IAccountManager::VERIFICATION_IN_PROGRESS,
-			IAccountManager::VERIFIED,
-		])) {
-			throw new InvalidArgumentException('Provided verification value is invalid');
-		}
-		$this->locallyVerified = $verified;
-		return $this;
-	}
-
-	public function getLocallyVerified(): string {
-		return $this->locallyVerified;
-	}
+    /**
+     * @var IAccountManager::SCOPE_*
+     */
+    private string $scope;
+    private string $locallyVerified = IAccountManager::NOT_VERIFIED;
+
+    public function __construct(
+        private string $name,
+        private string $value,
+        string $scope,
+        private string $verified,
+        private string $verificationData,
+    ) {
+        $this->setScope($scope);
+    }
+
+    public function jsonSerialize(): array {
+        return [
+            'name' => $this->getName(),
+            'value' => $this->getValue(),
+            'scope' => $this->getScope(),
+            'verified' => $this->getVerified(),
+            'verificationData' => $this->getVerificationData(),
+        ];
+    }
+
+    /**
+     * Set the value of a property
+     *
+     * @since 15.0.0
+     */
+    public function setValue(string $value): IAccountProperty {
+        $this->value = $value;
+        return $this;
+    }
+
+    /**
+     * Set the scope of a property
+     *
+     * @since 15.0.0
+     */
+    public function setScope(string $scope): IAccountProperty {
+        if (!in_array($scope, IAccountManager::ALLOWED_SCOPES, )) {
+            throw new InvalidArgumentException('Invalid scope');
+        }
+        /** @var IAccountManager::SCOPE_* $scope */
+        $this->scope = $scope;
+        return $this;
+    }
+
+    /**
+     * Set the verification status of a property
+     *
+     * @since 15.0.0
+     */
+    public function setVerified(string $verified): IAccountProperty {
+        $this->verified = $verified;
+        return $this;
+    }
+
+    /**
+     * Get the name of a property
+     *
+     * @since 15.0.0
+     */
+    public function getName(): string {
+        return $this->name;
+    }
+
+    /**
+     * Get the value of a property
+     *
+     * @since 15.0.0
+     */
+    public function getValue(): string {
+        return $this->value;
+    }
+
+    /**
+     * Get the scope of a property
+     *
+     * @since 15.0.0
+     */
+    public function getScope(): string {
+        return $this->scope;
+    }
+
+    /**
+     * Get the verification status of a property
+     *
+     * @since 15.0.0
+     */
+    public function getVerified(): string {
+        return $this->verified;
+    }
+
+    public function setVerificationData(string $verificationData): IAccountProperty {
+        $this->verificationData = $verificationData;
+        return $this;
+    }
+
+    public function getVerificationData(): string {
+        return $this->verificationData;
+    }
+
+    public function setLocallyVerified(string $verified): IAccountProperty {
+        if (!in_array($verified, [
+            IAccountManager::NOT_VERIFIED,
+            IAccountManager::VERIFICATION_IN_PROGRESS,
+            IAccountManager::VERIFIED,
+        ])) {
+            throw new InvalidArgumentException('Provided verification value is invalid');
+        }
+        $this->locallyVerified = $verified;
+        return $this;
+    }
+
+    public function getLocallyVerified(): string {
+        return $this->locallyVerified;
+    }
 }

Spacing +1 added lines, -1 removed lines

@@ -55,7 +55,7 @@
 	 * @since 15.0.0
 	 */
 	public function setScope(string $scope): IAccountProperty {
-		if (!in_array($scope, IAccountManager::ALLOWED_SCOPES, )) {
+		if (!in_array($scope, IAccountManager::ALLOWED_SCOPES,)) {
 			throw new InvalidArgumentException('Invalid scope');
 		}
 		/** @var IAccountManager::SCOPE_* $scope */

lib/private/Accounts/AccountManager.php

Indentation +768 added lines, -768 removed lines

@@ -52,772 +52,772 @@
  * @package OC\Accounts
  */
 class AccountManager implements IAccountManager {
-	use TAccountsHelper;
-
-	use TProfileHelper;
-
-	private string $table = 'accounts';
-	private string $dataTable = 'accounts_data';
-	private ?IL10N $l10n = null;
-	private CappedMemoryCache $internalCache;
-
-	/**
-	 * The list of default scopes for each property.
-	 */
-	public const DEFAULT_SCOPES = [
-		self::PROPERTY_ADDRESS => self::SCOPE_LOCAL,
-		self::PROPERTY_AVATAR => self::SCOPE_FEDERATED,
-		self::PROPERTY_BIOGRAPHY => self::SCOPE_LOCAL,
-		self::PROPERTY_BIRTHDATE => self::SCOPE_LOCAL,
-		self::PROPERTY_DISPLAYNAME => self::SCOPE_FEDERATED,
-		self::PROPERTY_EMAIL => self::SCOPE_FEDERATED,
-		self::PROPERTY_FEDIVERSE => self::SCOPE_LOCAL,
-		self::PROPERTY_HEADLINE => self::SCOPE_LOCAL,
-		self::PROPERTY_ORGANISATION => self::SCOPE_LOCAL,
-		self::PROPERTY_PHONE => self::SCOPE_LOCAL,
-		self::PROPERTY_PRONOUNS => self::SCOPE_FEDERATED,
-		self::PROPERTY_ROLE => self::SCOPE_LOCAL,
-		self::PROPERTY_TWITTER => self::SCOPE_LOCAL,
-		self::PROPERTY_WEBSITE => self::SCOPE_LOCAL,
-	];
-
-	public function __construct(
-		private IDBConnection $connection,
-		private IConfig $config,
-		private IEventDispatcher $dispatcher,
-		private IJobList $jobList,
-		private LoggerInterface $logger,
-		private IVerificationToken $verificationToken,
-		private IMailer $mailer,
-		private Defaults $defaults,
-		private IFactory $l10nFactory,
-		private IURLGenerator $urlGenerator,
-		private ICrypto $crypto,
-		private IPhoneNumberUtil $phoneNumberUtil,
-		private IClientService $clientService,
-	) {
-		$this->internalCache = new CappedMemoryCache();
-	}
-
-	/**
-	 * @param IAccountProperty[] $properties
-	 */
-	protected function testValueLengths(array $properties, bool $throwOnData = false): void {
-		foreach ($properties as $property) {
-			if (strlen($property->getValue()) > 2048) {
-				if ($throwOnData) {
-					throw new InvalidArgumentException($property->getName());
-				} else {
-					$property->setValue('');
-				}
-			}
-		}
-	}
-
-	protected function testPropertyScope(IAccountProperty $property, array $allowedScopes, bool $throwOnData): void {
-		if ($throwOnData && !in_array($property->getScope(), $allowedScopes, true)) {
-			throw new InvalidArgumentException('scope');
-		}
-
-		if (
-			$property->getScope() === self::SCOPE_PRIVATE
-			&& in_array($property->getName(), [self::PROPERTY_DISPLAYNAME, self::PROPERTY_EMAIL])
-		) {
-			if ($throwOnData) {
-				// v2-private is not available for these fields
-				throw new InvalidArgumentException('scope');
-			} else {
-				// default to local
-				$property->setScope(self::SCOPE_LOCAL);
-			}
-		} else {
-			$property->setScope($property->getScope());
-		}
-	}
-
-	protected function updateUser(IUser $user, array $data, ?array $oldUserData, bool $throwOnData = false): array {
-		if ($oldUserData === null) {
-			$oldUserData = $this->getUser($user, false);
-		}
-
-		$updated = true;
-
-		if ($oldUserData !== $data) {
-			$this->updateExistingUser($user, $data, $oldUserData);
-		} else {
-			// nothing needs to be done if new and old data set are the same
-			$updated = false;
-		}
-
-		if ($updated) {
-			$this->dispatcher->dispatchTyped(new UserUpdatedEvent(
-				$user,
-				$data,
-			));
-		}
-
-		return $data;
-	}
-
-	/**
-	 * delete user from accounts table
-	 */
-	public function deleteUser(IUser $user): void {
-		$uid = $user->getUID();
-		$query = $this->connection->getQueryBuilder();
-		$query->delete($this->table)
-			->where($query->expr()->eq('uid', $query->createNamedParameter($uid)))
-			->executeStatement();
-
-		$this->deleteUserData($user);
-	}
-
-	/**
-	 * delete user from accounts table
-	 */
-	public function deleteUserData(IUser $user): void {
-		$uid = $user->getUID();
-		$query = $this->connection->getQueryBuilder();
-		$query->delete($this->dataTable)
-			->where($query->expr()->eq('uid', $query->createNamedParameter($uid)))
-			->executeStatement();
-	}
-
-	/**
-	 * get stored data from a given user
-	 */
-	protected function getUser(IUser $user, bool $insertIfNotExists = true): array {
-		$uid = $user->getUID();
-		$query = $this->connection->getQueryBuilder();
-		$query->select('data')
-			->from($this->table)
-			->where($query->expr()->eq('uid', $query->createParameter('uid')))
-			->setParameter('uid', $uid);
-		$result = $query->executeQuery();
-		$accountData = $result->fetchAll();
-		$result->closeCursor();
-
-		if (empty($accountData)) {
-			$userData = $this->buildDefaultUserRecord($user);
-			if ($insertIfNotExists) {
-				$this->insertNewUser($user, $userData);
-			}
-			return $userData;
-		}
-
-		$userDataArray = $this->importFromJson($accountData[0]['data'], $uid);
-		if ($userDataArray === null || $userDataArray === []) {
-			return $this->buildDefaultUserRecord($user);
-		}
-
-		return $this->addMissingDefaultValues($userDataArray, $this->buildDefaultUserRecord($user));
-	}
-
-	public function searchUsers(string $property, array $values): array {
-		// the value col is limited to 255 bytes. It is used for searches only.
-		$values = array_map(function (string $value) {
-			return Util::shortenMultibyteString($value, 255);
-		}, $values);
-		$chunks = array_chunk($values, 500);
-		$query = $this->connection->getQueryBuilder();
-		$query->select('*')
-			->from($this->dataTable)
-			->where($query->expr()->eq('name', $query->createNamedParameter($property)))
-			->andWhere($query->expr()->in('value', $query->createParameter('values')));
-
-		$matches = [];
-		foreach ($chunks as $chunk) {
-			$query->setParameter('values', $chunk, IQueryBuilder::PARAM_STR_ARRAY);
-			$result = $query->executeQuery();
-
-			while ($row = $result->fetch()) {
-				$matches[$row['uid']] = $row['value'];
-			}
-			$result->closeCursor();
-		}
-
-		$result = array_merge($matches, $this->searchUsersForRelatedCollection($property, $values));
-
-		return array_flip($result);
-	}
-
-	protected function searchUsersForRelatedCollection(string $property, array $values): array {
-		return match ($property) {
-			IAccountManager::PROPERTY_EMAIL => array_flip($this->searchUsers(IAccountManager::COLLECTION_EMAIL, $values)),
-			default => [],
-		};
-	}
-
-	/**
-	 * check if we need to ask the server for email verification, if yes we create a cronjob
-	 */
-	protected function checkEmailVerification(IAccount $updatedAccount, array $oldData): void {
-		try {
-			$property = $updatedAccount->getProperty(self::PROPERTY_EMAIL);
-		} catch (PropertyDoesNotExistException $e) {
-			return;
-		}
-
-		$oldMailIndex = array_search(self::PROPERTY_EMAIL, array_column($oldData, 'name'), true);
-		$oldMail = $oldMailIndex !== false ? $oldData[$oldMailIndex]['value'] : '';
-
-		if ($oldMail !== $property->getValue()) {
-			$this->jobList->add(
-				VerifyUserData::class,
-				[
-					'verificationCode' => '',
-					'data' => $property->getValue(),
-					'type' => self::PROPERTY_EMAIL,
-					'uid' => $updatedAccount->getUser()->getUID(),
-					'try' => 0,
-					'lastRun' => time()
-				]
-			);
-
-			$property->setVerified(self::VERIFICATION_IN_PROGRESS);
-		}
-	}
-
-	protected function checkLocalEmailVerification(IAccount $updatedAccount, array $oldData): void {
-		$mailCollection = $updatedAccount->getPropertyCollection(self::COLLECTION_EMAIL);
-		foreach ($mailCollection->getProperties() as $property) {
-			if ($property->getLocallyVerified() !== self::NOT_VERIFIED) {
-				continue;
-			}
-			if ($this->sendEmailVerificationEmail($updatedAccount->getUser(), $property->getValue())) {
-				$property->setLocallyVerified(self::VERIFICATION_IN_PROGRESS);
-			}
-		}
-	}
-
-	protected function sendEmailVerificationEmail(IUser $user, string $email): bool {
-		$ref = \substr(hash('sha256', $email), 0, 8);
-		$key = $this->crypto->encrypt($email);
-		$token = $this->verificationToken->create($user, 'verifyMail' . $ref, $email);
-
-		$link = $this->urlGenerator->linkToRouteAbsolute(
-			'provisioning_api.Verification.verifyMail',
-			[
-				'userId' => $user->getUID(),
-				'token' => $token,
-				'key' => $key
-			]
-		);
-
-		$emailTemplate = $this->mailer->createEMailTemplate('core.EmailVerification', [
-			'link' => $link,
-		]);
-
-		if (!$this->l10n) {
-			$this->l10n = $this->l10nFactory->get('core');
-		}
-
-		$emailTemplate->setSubject($this->l10n->t('%s email verification', [$this->defaults->getName()]));
-		$emailTemplate->addHeader();
-		$emailTemplate->addHeading($this->l10n->t('Email verification'));
-
-		$emailTemplate->addBodyText(
-			htmlspecialchars($this->l10n->t('Click the following button to confirm your email.')),
-			$this->l10n->t('Click the following link to confirm your email.')
-		);
-
-		$emailTemplate->addBodyButton(
-			htmlspecialchars($this->l10n->t('Confirm your email')),
-			$link,
-			false
-		);
-		$emailTemplate->addFooter();
-
-		try {
-			$message = $this->mailer->createMessage();
-			$message->setTo([$email => $user->getDisplayName()]);
-			$message->setFrom([Util::getDefaultEmailAddress('verification-noreply') => $this->defaults->getName()]);
-			$message->useTemplate($emailTemplate);
-			$this->mailer->send($message);
-		} catch (Exception $e) {
-			// Log the exception and continue
-			$this->logger->info('Failed to send verification mail', [
-				'app' => 'core',
-				'exception' => $e
-			]);
-			return false;
-		}
-		return true;
-	}
-
-	/**
-	 * Make sure that all expected data are set
-	 */
-	protected function addMissingDefaultValues(array $userData, array $defaultUserData): array {
-		foreach ($defaultUserData as $defaultDataItem) {
-			// If property does not exist, initialize it
-			$userDataIndex = array_search($defaultDataItem['name'], array_column($userData, 'name'));
-			if ($userDataIndex === false) {
-				$userData[] = $defaultDataItem;
-				continue;
-			}
-
-			// Merge and extend default missing values
-			$userData[$userDataIndex] = array_merge($defaultDataItem, $userData[$userDataIndex]);
-		}
-
-		return $userData;
-	}
-
-	protected function updateVerificationStatus(IAccount $updatedAccount, array $oldData): void {
-		static $propertiesVerifiableByLookupServer = [
-			self::PROPERTY_TWITTER,
-			self::PROPERTY_FEDIVERSE,
-			self::PROPERTY_WEBSITE,
-			self::PROPERTY_EMAIL,
-		];
-
-		foreach ($propertiesVerifiableByLookupServer as $propertyName) {
-			try {
-				$property = $updatedAccount->getProperty($propertyName);
-			} catch (PropertyDoesNotExistException $e) {
-				continue;
-			}
-			$wasVerified = isset($oldData[$propertyName])
-				&& isset($oldData[$propertyName]['verified'])
-				&& $oldData[$propertyName]['verified'] === self::VERIFIED;
-			if ((!isset($oldData[$propertyName])
-					|| !isset($oldData[$propertyName]['value'])
-					|| $property->getValue() !== $oldData[$propertyName]['value'])
-				&& ($property->getVerified() !== self::NOT_VERIFIED
-					|| $wasVerified)
-			) {
-				$property->setVerified(self::NOT_VERIFIED);
-			}
-		}
-	}
-
-	/**
-	 * add new user to accounts table
-	 */
-	protected function insertNewUser(IUser $user, array $data): void {
-		$uid = $user->getUID();
-		$jsonEncodedData = $this->prepareJson($data);
-		$query = $this->connection->getQueryBuilder();
-		$query->insert($this->table)
-			->values(
-				[
-					'uid' => $query->createNamedParameter($uid),
-					'data' => $query->createNamedParameter($jsonEncodedData),
-				]
-			)
-			->executeStatement();
-
-		$this->deleteUserData($user);
-		$this->writeUserData($user, $data);
-	}
-
-	protected function prepareJson(array $data): string {
-		$preparedData = [];
-		foreach ($data as $dataRow) {
-			$propertyName = $dataRow['name'];
-			unset($dataRow['name']);
-
-			if (isset($dataRow['locallyVerified']) && $dataRow['locallyVerified'] === self::NOT_VERIFIED) {
-				// do not write default value, save DB space
-				unset($dataRow['locallyVerified']);
-			}
-
-			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
-	 */
-	protected function updateExistingUser(IUser $user, array $data, array $oldData): void {
-		$uid = $user->getUID();
-		$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)))
-			->executeStatement();
-
-		$this->deleteUserData($user);
-		$this->writeUserData($user, $data);
-	}
-
-	protected function writeUserData(IUser $user, array $data): void {
-		$query = $this->connection->getQueryBuilder();
-		$query->insert($this->dataTable)
-			->values(
-				[
-					'uid' => $query->createNamedParameter($user->getUID()),
-					'name' => $query->createParameter('name'),
-					'value' => $query->createParameter('value'),
-				]
-			);
-		$this->writeUserDataProperties($query, $data);
-	}
-
-	protected function writeUserDataProperties(IQueryBuilder $query, array $data): void {
-		foreach ($data as $property) {
-			if ($property['name'] === self::PROPERTY_AVATAR) {
-				continue;
-			}
-
-			// the value col is limited to 255 bytes. It is used for searches only.
-			$value = $property['value'] ? Util::shortenMultibyteString($property['value'], 255) : '';
-
-			$query->setParameter('name', $property['name'])
-				->setParameter('value', $value);
-			$query->executeStatement();
-		}
-	}
-
-	/**
-	 * build default user record in case not data set exists yet
-	 */
-	protected function buildDefaultUserRecord(IUser $user): array {
-		$scopes = array_merge(self::DEFAULT_SCOPES, array_filter($this->config->getSystemValue('account_manager.default_property_scope', []), static function (string $scope, string $property) {
-			return in_array($property, self::ALLOWED_PROPERTIES, true) && in_array($scope, self::ALLOWED_SCOPES, true);
-		}, ARRAY_FILTER_USE_BOTH));
-
-		return [
-			[
-				'name' => self::PROPERTY_DISPLAYNAME,
-				'value' => $user->getDisplayName(),
-				// Display name must be at least SCOPE_LOCAL
-				'scope' => $scopes[self::PROPERTY_DISPLAYNAME] === self::SCOPE_PRIVATE ? self::SCOPE_LOCAL : $scopes[self::PROPERTY_DISPLAYNAME],
-				'verified' => self::NOT_VERIFIED,
-			],
-
-			[
-				'name' => self::PROPERTY_ADDRESS,
-				'value' => '',
-				'scope' => $scopes[self::PROPERTY_ADDRESS],
-				'verified' => self::NOT_VERIFIED,
-			],
-
-			[
-				'name' => self::PROPERTY_WEBSITE,
-				'value' => '',
-				'scope' => $scopes[self::PROPERTY_WEBSITE],
-				'verified' => self::NOT_VERIFIED,
-			],
-
-			[
-				'name' => self::PROPERTY_EMAIL,
-				'value' => $user->getEMailAddress(),
-				// Email must be at least SCOPE_LOCAL
-				'scope' => $scopes[self::PROPERTY_EMAIL] === self::SCOPE_PRIVATE ? self::SCOPE_LOCAL : $scopes[self::PROPERTY_EMAIL],
-				'verified' => self::NOT_VERIFIED,
-			],
-
-			[
-				'name' => self::PROPERTY_AVATAR,
-				'scope' => $scopes[self::PROPERTY_AVATAR],
-			],
-
-			[
-				'name' => self::PROPERTY_PHONE,
-				'value' => '',
-				'scope' => $scopes[self::PROPERTY_PHONE],
-				'verified' => self::NOT_VERIFIED,
-			],
-
-			[
-				'name' => self::PROPERTY_TWITTER,
-				'value' => '',
-				'scope' => $scopes[self::PROPERTY_TWITTER],
-				'verified' => self::NOT_VERIFIED,
-			],
-
-			[
-				'name' => self::PROPERTY_FEDIVERSE,
-				'value' => '',
-				'scope' => $scopes[self::PROPERTY_FEDIVERSE],
-				'verified' => self::NOT_VERIFIED,
-			],
-
-			[
-				'name' => self::PROPERTY_ORGANISATION,
-				'value' => '',
-				'scope' => $scopes[self::PROPERTY_ORGANISATION],
-			],
-
-			[
-				'name' => self::PROPERTY_ROLE,
-				'value' => '',
-				'scope' => $scopes[self::PROPERTY_ROLE],
-			],
-
-			[
-				'name' => self::PROPERTY_HEADLINE,
-				'value' => '',
-				'scope' => $scopes[self::PROPERTY_HEADLINE],
-			],
-
-			[
-				'name' => self::PROPERTY_BIOGRAPHY,
-				'value' => '',
-				'scope' => $scopes[self::PROPERTY_BIOGRAPHY],
-			],
-
-			[
-				'name' => self::PROPERTY_BIRTHDATE,
-				'value' => '',
-				'scope' => $scopes[self::PROPERTY_BIRTHDATE],
-			],
-
-			[
-				'name' => self::PROPERTY_PROFILE_ENABLED,
-				'value' => $this->isProfileEnabledByDefault($this->config) ? '1' : '0',
-			],
-
-			[
-				'name' => self::PROPERTY_PRONOUNS,
-				'value' => '',
-				'scope' => $scopes[self::PROPERTY_PRONOUNS],
-			],
-		];
-	}
-
-	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,
-			''
-		);
-		$p->setLocallyVerified($data['locallyVerified'] ?? self::NOT_VERIFIED);
-		$collection->addProperty($p);
-
-		return $collection;
-	}
-
-	private function parseAccountData(IUser $user, $data): Account {
-		$account = new Account($user);
-		foreach ($data as $accountData) {
-			if ($this->isCollection($accountData['name'])) {
-				$account->setPropertyCollection($this->arrayDataToCollection($account, $accountData));
-			} else {
-				$account->setProperty($accountData['name'], $accountData['value'] ?? '', $accountData['scope'] ?? self::SCOPE_LOCAL, $accountData['verified'] ?? self::NOT_VERIFIED);
-				if (isset($accountData['locallyVerified'])) {
-					$property = $account->getProperty($accountData['name']);
-					$property->setLocallyVerified($accountData['locallyVerified']);
-				}
-			}
-		}
-		return $account;
-	}
-
-	public function getAccount(IUser $user): IAccount {
-		$cached = $this->internalCache->get($user->getUID());
-		if ($cached !== null) {
-			return $cached;
-		}
-		$account = $this->parseAccountData($user, $this->getUser($user));
-		if ($user->getBackend() instanceof IGetDisplayNameBackend) {
-			$property = $account->getProperty(self::PROPERTY_DISPLAYNAME);
-			$account->setProperty(self::PROPERTY_DISPLAYNAME, $user->getDisplayName(), $property->getScope(), $property->getVerified());
-		}
-		$this->internalCache->set($user->getUID(), $account);
-		return $account;
-	}
-
-	/**
-	 * Converts value (phone number) in E.164 format when it was a valid number
-	 * @throws InvalidArgumentException When the phone number was invalid or no default region is set and the number doesn't start with a country code
-	 */
-	protected function sanitizePropertyPhoneNumber(IAccountProperty $property): void {
-		$defaultRegion = $this->config->getSystemValueString('default_phone_region', '');
-
-		if ($defaultRegion === '') {
-			// When no default region is set, only +49… numbers are valid
-			if (!str_starts_with($property->getValue(), '+')) {
-				throw new InvalidArgumentException(self::PROPERTY_PHONE);
-			}
-
-			$defaultRegion = 'EN';
-		}
-
-		$phoneNumber = $this->phoneNumberUtil->convertToStandardFormat($property->getValue(), $defaultRegion);
-		if ($phoneNumber === null) {
-			throw new InvalidArgumentException(self::PROPERTY_PHONE);
-		}
-		$property->setValue($phoneNumber);
-	}
-
-	/**
-	 * @throws InvalidArgumentException When the website did not have http(s) as protocol or the host name was empty
-	 */
-	private function sanitizePropertyWebsite(IAccountProperty $property): void {
-		$parts = parse_url($property->getValue());
-		if (!isset($parts['scheme']) || ($parts['scheme'] !== 'https' && $parts['scheme'] !== 'http')) {
-			throw new InvalidArgumentException(self::PROPERTY_WEBSITE);
-		}
-
-		if (!isset($parts['host']) || $parts['host'] === '') {
-			throw new InvalidArgumentException(self::PROPERTY_WEBSITE);
-		}
-	}
-
-	/**
-	 * @throws InvalidArgumentException If the property value is not a valid user handle according to X's rules
-	 */
-	private function sanitizePropertyTwitter(IAccountProperty $property): void {
-		if ($property->getName() === self::PROPERTY_TWITTER) {
-			$matches = [];
-			// twitter handles only contain alpha numeric characters and the underscore and must not be longer than 15 characters
-			if (preg_match('/^@?([a-zA-Z0-9_]{2,15})$/', $property->getValue(), $matches) !== 1) {
-				throw new InvalidArgumentException(self::PROPERTY_TWITTER);
-			}
-
-			// drop the leading @ if any to make it the valid handle
-			$property->setValue($matches[1]);
-
-		}
-	}
-
-	/**
-	 * @throws InvalidArgumentException If the property value is not a valid fediverse handle (username@instance where instance is a valid domain)
-	 */
-	private function sanitizePropertyFediverse(IAccountProperty $property): void {
-		if ($property->getName() === self::PROPERTY_FEDIVERSE) {
-			$matches = [];
-			if (preg_match('/^@?([^@\s\/\\\]+)@([^\s\/\\\]+)$/', trim($property->getValue()), $matches) !== 1) {
-				throw new InvalidArgumentException(self::PROPERTY_FEDIVERSE);
-			}
-
-			[, $username, $instance] = $matches;
-			$validated = filter_var($instance, FILTER_VALIDATE_DOMAIN, FILTER_FLAG_HOSTNAME);
-			if ($validated !== $instance) {
-				throw new InvalidArgumentException(self::PROPERTY_FEDIVERSE);
-			}
-
-			if ($this->config->getSystemValueBool('has_internet_connection', true)) {
-				$client = $this->clientService->newClient();
-
-				try {
-					// try the public account lookup API of mastodon
-					$response = $client->get("https://{$instance}/api/v1/accounts/lookup?acct={$username}@{$instance}");
-					// should be a json response with account information
-					$data = $response->getBody();
-					if (is_resource($data)) {
-						$data = stream_get_contents($data);
-					}
-					$decoded = json_decode($data, true);
-					// ensure the username is the same the user passed
-					// in this case we can assume this is a valid fediverse server and account
-					if (!is_array($decoded) || ($decoded['username'] ?? '') !== $username) {
-						throw new InvalidArgumentException();
-					}
-				} catch (InvalidArgumentException) {
-					throw new InvalidArgumentException(self::PROPERTY_FEDIVERSE);
-				} catch (\Exception $error) {
-					$this->logger->error('Could not verify fediverse account', ['exception' => $error, 'instance' => $instance]);
-					throw new InvalidArgumentException(self::PROPERTY_FEDIVERSE);
-				}
-			}
-
-			$property->setValue("$username@$instance");
-		}
-	}
-
-	public function updateAccount(IAccount $account): void {
-		$this->testValueLengths(iterator_to_array($account->getAllProperties()), true);
-		try {
-			$property = $account->getProperty(self::PROPERTY_PHONE);
-			if ($property->getValue() !== '') {
-				$this->sanitizePropertyPhoneNumber($property);
-			}
-		} catch (PropertyDoesNotExistException $e) {
-			//  valid case, nothing to do
-		}
-
-		try {
-			$property = $account->getProperty(self::PROPERTY_WEBSITE);
-			if ($property->getValue() !== '') {
-				$this->sanitizePropertyWebsite($property);
-			}
-		} catch (PropertyDoesNotExistException $e) {
-			//  valid case, nothing to do
-		}
-
-		try {
-			$property = $account->getProperty(self::PROPERTY_TWITTER);
-			if ($property->getValue() !== '') {
-				$this->sanitizePropertyTwitter($property);
-			}
-		} catch (PropertyDoesNotExistException $e) {
-			//  valid case, nothing to do
-		}
-
-		try {
-			$property = $account->getProperty(self::PROPERTY_FEDIVERSE);
-			if ($property->getValue() !== '') {
-				$this->sanitizePropertyFediverse($property);
-			}
-		} catch (PropertyDoesNotExistException $e) {
-			//  valid case, nothing to do
-		}
-
-		foreach ($account->getAllProperties() as $property) {
-			$this->testPropertyScope($property, self::ALLOWED_SCOPES, true);
-		}
-
-		$oldData = $this->getUser($account->getUser(), false);
-		$this->updateVerificationStatus($account, $oldData);
-		$this->checkEmailVerification($account, $oldData);
-		$this->checkLocalEmailVerification($account, $oldData);
-
-		$data = [];
-		foreach ($account->getAllProperties() as $property) {
-			/** @var IAccountProperty $property */
-			$data[] = [
-				'name' => $property->getName(),
-				'value' => $property->getValue(),
-				'scope' => $property->getScope(),
-				'verified' => $property->getVerified(),
-				'locallyVerified' => $property->getLocallyVerified(),
-			];
-		}
-
-		$this->updateUser($account->getUser(), $data, $oldData, true);
-		$this->internalCache->set($account->getUser()->getUID(), $account);
-	}
+    use TAccountsHelper;
+
+    use TProfileHelper;
+
+    private string $table = 'accounts';
+    private string $dataTable = 'accounts_data';
+    private ?IL10N $l10n = null;
+    private CappedMemoryCache $internalCache;
+
+    /**
+     * The list of default scopes for each property.
+     */
+    public const DEFAULT_SCOPES = [
+        self::PROPERTY_ADDRESS => self::SCOPE_LOCAL,
+        self::PROPERTY_AVATAR => self::SCOPE_FEDERATED,
+        self::PROPERTY_BIOGRAPHY => self::SCOPE_LOCAL,
+        self::PROPERTY_BIRTHDATE => self::SCOPE_LOCAL,
+        self::PROPERTY_DISPLAYNAME => self::SCOPE_FEDERATED,
+        self::PROPERTY_EMAIL => self::SCOPE_FEDERATED,
+        self::PROPERTY_FEDIVERSE => self::SCOPE_LOCAL,
+        self::PROPERTY_HEADLINE => self::SCOPE_LOCAL,
+        self::PROPERTY_ORGANISATION => self::SCOPE_LOCAL,
+        self::PROPERTY_PHONE => self::SCOPE_LOCAL,
+        self::PROPERTY_PRONOUNS => self::SCOPE_FEDERATED,
+        self::PROPERTY_ROLE => self::SCOPE_LOCAL,
+        self::PROPERTY_TWITTER => self::SCOPE_LOCAL,
+        self::PROPERTY_WEBSITE => self::SCOPE_LOCAL,
+    ];
+
+    public function __construct(
+        private IDBConnection $connection,
+        private IConfig $config,
+        private IEventDispatcher $dispatcher,
+        private IJobList $jobList,
+        private LoggerInterface $logger,
+        private IVerificationToken $verificationToken,
+        private IMailer $mailer,
+        private Defaults $defaults,
+        private IFactory $l10nFactory,
+        private IURLGenerator $urlGenerator,
+        private ICrypto $crypto,
+        private IPhoneNumberUtil $phoneNumberUtil,
+        private IClientService $clientService,
+    ) {
+        $this->internalCache = new CappedMemoryCache();
+    }
+
+    /**
+     * @param IAccountProperty[] $properties
+     */
+    protected function testValueLengths(array $properties, bool $throwOnData = false): void {
+        foreach ($properties as $property) {
+            if (strlen($property->getValue()) > 2048) {
+                if ($throwOnData) {
+                    throw new InvalidArgumentException($property->getName());
+                } else {
+                    $property->setValue('');
+                }
+            }
+        }
+    }
+
+    protected function testPropertyScope(IAccountProperty $property, array $allowedScopes, bool $throwOnData): void {
+        if ($throwOnData && !in_array($property->getScope(), $allowedScopes, true)) {
+            throw new InvalidArgumentException('scope');
+        }
+
+        if (
+            $property->getScope() === self::SCOPE_PRIVATE
+            && in_array($property->getName(), [self::PROPERTY_DISPLAYNAME, self::PROPERTY_EMAIL])
+        ) {
+            if ($throwOnData) {
+                // v2-private is not available for these fields
+                throw new InvalidArgumentException('scope');
+            } else {
+                // default to local
+                $property->setScope(self::SCOPE_LOCAL);
+            }
+        } else {
+            $property->setScope($property->getScope());
+        }
+    }
+
+    protected function updateUser(IUser $user, array $data, ?array $oldUserData, bool $throwOnData = false): array {
+        if ($oldUserData === null) {
+            $oldUserData = $this->getUser($user, false);
+        }
+
+        $updated = true;
+
+        if ($oldUserData !== $data) {
+            $this->updateExistingUser($user, $data, $oldUserData);
+        } else {
+            // nothing needs to be done if new and old data set are the same
+            $updated = false;
+        }
+
+        if ($updated) {
+            $this->dispatcher->dispatchTyped(new UserUpdatedEvent(
+                $user,
+                $data,
+            ));
+        }
+
+        return $data;
+    }
+
+    /**
+     * delete user from accounts table
+     */
+    public function deleteUser(IUser $user): void {
+        $uid = $user->getUID();
+        $query = $this->connection->getQueryBuilder();
+        $query->delete($this->table)
+            ->where($query->expr()->eq('uid', $query->createNamedParameter($uid)))
+            ->executeStatement();
+
+        $this->deleteUserData($user);
+    }
+
+    /**
+     * delete user from accounts table
+     */
+    public function deleteUserData(IUser $user): void {
+        $uid = $user->getUID();
+        $query = $this->connection->getQueryBuilder();
+        $query->delete($this->dataTable)
+            ->where($query->expr()->eq('uid', $query->createNamedParameter($uid)))
+            ->executeStatement();
+    }
+
+    /**
+     * get stored data from a given user
+     */
+    protected function getUser(IUser $user, bool $insertIfNotExists = true): array {
+        $uid = $user->getUID();
+        $query = $this->connection->getQueryBuilder();
+        $query->select('data')
+            ->from($this->table)
+            ->where($query->expr()->eq('uid', $query->createParameter('uid')))
+            ->setParameter('uid', $uid);
+        $result = $query->executeQuery();
+        $accountData = $result->fetchAll();
+        $result->closeCursor();
+
+        if (empty($accountData)) {
+            $userData = $this->buildDefaultUserRecord($user);
+            if ($insertIfNotExists) {
+                $this->insertNewUser($user, $userData);
+            }
+            return $userData;
+        }
+
+        $userDataArray = $this->importFromJson($accountData[0]['data'], $uid);
+        if ($userDataArray === null || $userDataArray === []) {
+            return $this->buildDefaultUserRecord($user);
+        }
+
+        return $this->addMissingDefaultValues($userDataArray, $this->buildDefaultUserRecord($user));
+    }
+
+    public function searchUsers(string $property, array $values): array {
+        // the value col is limited to 255 bytes. It is used for searches only.
+        $values = array_map(function (string $value) {
+            return Util::shortenMultibyteString($value, 255);
+        }, $values);
+        $chunks = array_chunk($values, 500);
+        $query = $this->connection->getQueryBuilder();
+        $query->select('*')
+            ->from($this->dataTable)
+            ->where($query->expr()->eq('name', $query->createNamedParameter($property)))
+            ->andWhere($query->expr()->in('value', $query->createParameter('values')));
+
+        $matches = [];
+        foreach ($chunks as $chunk) {
+            $query->setParameter('values', $chunk, IQueryBuilder::PARAM_STR_ARRAY);
+            $result = $query->executeQuery();
+
+            while ($row = $result->fetch()) {
+                $matches[$row['uid']] = $row['value'];
+            }
+            $result->closeCursor();
+        }
+
+        $result = array_merge($matches, $this->searchUsersForRelatedCollection($property, $values));
+
+        return array_flip($result);
+    }
+
+    protected function searchUsersForRelatedCollection(string $property, array $values): array {
+        return match ($property) {
+            IAccountManager::PROPERTY_EMAIL => array_flip($this->searchUsers(IAccountManager::COLLECTION_EMAIL, $values)),
+            default => [],
+        };
+    }
+
+    /**
+     * check if we need to ask the server for email verification, if yes we create a cronjob
+     */
+    protected function checkEmailVerification(IAccount $updatedAccount, array $oldData): void {
+        try {
+            $property = $updatedAccount->getProperty(self::PROPERTY_EMAIL);
+        } catch (PropertyDoesNotExistException $e) {
+            return;
+        }
+
+        $oldMailIndex = array_search(self::PROPERTY_EMAIL, array_column($oldData, 'name'), true);
+        $oldMail = $oldMailIndex !== false ? $oldData[$oldMailIndex]['value'] : '';
+
+        if ($oldMail !== $property->getValue()) {
+            $this->jobList->add(
+                VerifyUserData::class,
+                [
+                    'verificationCode' => '',
+                    'data' => $property->getValue(),
+                    'type' => self::PROPERTY_EMAIL,
+                    'uid' => $updatedAccount->getUser()->getUID(),
+                    'try' => 0,
+                    'lastRun' => time()
+                ]
+            );
+
+            $property->setVerified(self::VERIFICATION_IN_PROGRESS);
+        }
+    }
+
+    protected function checkLocalEmailVerification(IAccount $updatedAccount, array $oldData): void {
+        $mailCollection = $updatedAccount->getPropertyCollection(self::COLLECTION_EMAIL);
+        foreach ($mailCollection->getProperties() as $property) {
+            if ($property->getLocallyVerified() !== self::NOT_VERIFIED) {
+                continue;
+            }
+            if ($this->sendEmailVerificationEmail($updatedAccount->getUser(), $property->getValue())) {
+                $property->setLocallyVerified(self::VERIFICATION_IN_PROGRESS);
+            }
+        }
+    }
+
+    protected function sendEmailVerificationEmail(IUser $user, string $email): bool {
+        $ref = \substr(hash('sha256', $email), 0, 8);
+        $key = $this->crypto->encrypt($email);
+        $token = $this->verificationToken->create($user, 'verifyMail' . $ref, $email);
+
+        $link = $this->urlGenerator->linkToRouteAbsolute(
+            'provisioning_api.Verification.verifyMail',
+            [
+                'userId' => $user->getUID(),
+                'token' => $token,
+                'key' => $key
+            ]
+        );
+
+        $emailTemplate = $this->mailer->createEMailTemplate('core.EmailVerification', [
+            'link' => $link,
+        ]);
+
+        if (!$this->l10n) {
+            $this->l10n = $this->l10nFactory->get('core');
+        }
+
+        $emailTemplate->setSubject($this->l10n->t('%s email verification', [$this->defaults->getName()]));
+        $emailTemplate->addHeader();
+        $emailTemplate->addHeading($this->l10n->t('Email verification'));
+
+        $emailTemplate->addBodyText(
+            htmlspecialchars($this->l10n->t('Click the following button to confirm your email.')),
+            $this->l10n->t('Click the following link to confirm your email.')
+        );
+
+        $emailTemplate->addBodyButton(
+            htmlspecialchars($this->l10n->t('Confirm your email')),
+            $link,
+            false
+        );
+        $emailTemplate->addFooter();
+
+        try {
+            $message = $this->mailer->createMessage();
+            $message->setTo([$email => $user->getDisplayName()]);
+            $message->setFrom([Util::getDefaultEmailAddress('verification-noreply') => $this->defaults->getName()]);
+            $message->useTemplate($emailTemplate);
+            $this->mailer->send($message);
+        } catch (Exception $e) {
+            // Log the exception and continue
+            $this->logger->info('Failed to send verification mail', [
+                'app' => 'core',
+                'exception' => $e
+            ]);
+            return false;
+        }
+        return true;
+    }
+
+    /**
+     * Make sure that all expected data are set
+     */
+    protected function addMissingDefaultValues(array $userData, array $defaultUserData): array {
+        foreach ($defaultUserData as $defaultDataItem) {
+            // If property does not exist, initialize it
+            $userDataIndex = array_search($defaultDataItem['name'], array_column($userData, 'name'));
+            if ($userDataIndex === false) {
+                $userData[] = $defaultDataItem;
+                continue;
+            }
+
+            // Merge and extend default missing values
+            $userData[$userDataIndex] = array_merge($defaultDataItem, $userData[$userDataIndex]);
+        }
+
+        return $userData;
+    }
+
+    protected function updateVerificationStatus(IAccount $updatedAccount, array $oldData): void {
+        static $propertiesVerifiableByLookupServer = [
+            self::PROPERTY_TWITTER,
+            self::PROPERTY_FEDIVERSE,
+            self::PROPERTY_WEBSITE,
+            self::PROPERTY_EMAIL,
+        ];
+
+        foreach ($propertiesVerifiableByLookupServer as $propertyName) {
+            try {
+                $property = $updatedAccount->getProperty($propertyName);
+            } catch (PropertyDoesNotExistException $e) {
+                continue;
+            }
+            $wasVerified = isset($oldData[$propertyName])
+                && isset($oldData[$propertyName]['verified'])
+                && $oldData[$propertyName]['verified'] === self::VERIFIED;
+            if ((!isset($oldData[$propertyName])
+                    || !isset($oldData[$propertyName]['value'])
+                    || $property->getValue() !== $oldData[$propertyName]['value'])
+                && ($property->getVerified() !== self::NOT_VERIFIED
+                    || $wasVerified)
+            ) {
+                $property->setVerified(self::NOT_VERIFIED);
+            }
+        }
+    }
+
+    /**
+     * add new user to accounts table
+     */
+    protected function insertNewUser(IUser $user, array $data): void {
+        $uid = $user->getUID();
+        $jsonEncodedData = $this->prepareJson($data);
+        $query = $this->connection->getQueryBuilder();
+        $query->insert($this->table)
+            ->values(
+                [
+                    'uid' => $query->createNamedParameter($uid),
+                    'data' => $query->createNamedParameter($jsonEncodedData),
+                ]
+            )
+            ->executeStatement();
+
+        $this->deleteUserData($user);
+        $this->writeUserData($user, $data);
+    }
+
+    protected function prepareJson(array $data): string {
+        $preparedData = [];
+        foreach ($data as $dataRow) {
+            $propertyName = $dataRow['name'];
+            unset($dataRow['name']);
+
+            if (isset($dataRow['locallyVerified']) && $dataRow['locallyVerified'] === self::NOT_VERIFIED) {
+                // do not write default value, save DB space
+                unset($dataRow['locallyVerified']);
+            }
+
+            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
+     */
+    protected function updateExistingUser(IUser $user, array $data, array $oldData): void {
+        $uid = $user->getUID();
+        $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)))
+            ->executeStatement();
+
+        $this->deleteUserData($user);
+        $this->writeUserData($user, $data);
+    }
+
+    protected function writeUserData(IUser $user, array $data): void {
+        $query = $this->connection->getQueryBuilder();
+        $query->insert($this->dataTable)
+            ->values(
+                [
+                    'uid' => $query->createNamedParameter($user->getUID()),
+                    'name' => $query->createParameter('name'),
+                    'value' => $query->createParameter('value'),
+                ]
+            );
+        $this->writeUserDataProperties($query, $data);
+    }
+
+    protected function writeUserDataProperties(IQueryBuilder $query, array $data): void {
+        foreach ($data as $property) {
+            if ($property['name'] === self::PROPERTY_AVATAR) {
+                continue;
+            }
+
+            // the value col is limited to 255 bytes. It is used for searches only.
+            $value = $property['value'] ? Util::shortenMultibyteString($property['value'], 255) : '';
+
+            $query->setParameter('name', $property['name'])
+                ->setParameter('value', $value);
+            $query->executeStatement();
+        }
+    }
+
+    /**
+     * build default user record in case not data set exists yet
+     */
+    protected function buildDefaultUserRecord(IUser $user): array {
+        $scopes = array_merge(self::DEFAULT_SCOPES, array_filter($this->config->getSystemValue('account_manager.default_property_scope', []), static function (string $scope, string $property) {
+            return in_array($property, self::ALLOWED_PROPERTIES, true) && in_array($scope, self::ALLOWED_SCOPES, true);
+        }, ARRAY_FILTER_USE_BOTH));
+
+        return [
+            [
+                'name' => self::PROPERTY_DISPLAYNAME,
+                'value' => $user->getDisplayName(),
+                // Display name must be at least SCOPE_LOCAL
+                'scope' => $scopes[self::PROPERTY_DISPLAYNAME] === self::SCOPE_PRIVATE ? self::SCOPE_LOCAL : $scopes[self::PROPERTY_DISPLAYNAME],
+                'verified' => self::NOT_VERIFIED,
+            ],
+
+            [
+                'name' => self::PROPERTY_ADDRESS,
+                'value' => '',
+                'scope' => $scopes[self::PROPERTY_ADDRESS],
+                'verified' => self::NOT_VERIFIED,
+            ],
+
+            [
+                'name' => self::PROPERTY_WEBSITE,
+                'value' => '',
+                'scope' => $scopes[self::PROPERTY_WEBSITE],
+                'verified' => self::NOT_VERIFIED,
+            ],
+
+            [
+                'name' => self::PROPERTY_EMAIL,
+                'value' => $user->getEMailAddress(),
+                // Email must be at least SCOPE_LOCAL
+                'scope' => $scopes[self::PROPERTY_EMAIL] === self::SCOPE_PRIVATE ? self::SCOPE_LOCAL : $scopes[self::PROPERTY_EMAIL],
+                'verified' => self::NOT_VERIFIED,
+            ],
+
+            [
+                'name' => self::PROPERTY_AVATAR,
+                'scope' => $scopes[self::PROPERTY_AVATAR],
+            ],
+
+            [
+                'name' => self::PROPERTY_PHONE,
+                'value' => '',
+                'scope' => $scopes[self::PROPERTY_PHONE],
+                'verified' => self::NOT_VERIFIED,
+            ],
+
+            [
+                'name' => self::PROPERTY_TWITTER,
+                'value' => '',
+                'scope' => $scopes[self::PROPERTY_TWITTER],
+                'verified' => self::NOT_VERIFIED,
+            ],
+
+            [
+                'name' => self::PROPERTY_FEDIVERSE,
+                'value' => '',
+                'scope' => $scopes[self::PROPERTY_FEDIVERSE],
+                'verified' => self::NOT_VERIFIED,
+            ],
+
+            [
+                'name' => self::PROPERTY_ORGANISATION,
+                'value' => '',
+                'scope' => $scopes[self::PROPERTY_ORGANISATION],
+            ],
+
+            [
+                'name' => self::PROPERTY_ROLE,
+                'value' => '',
+                'scope' => $scopes[self::PROPERTY_ROLE],
+            ],
+
+            [
+                'name' => self::PROPERTY_HEADLINE,
+                'value' => '',
+                'scope' => $scopes[self::PROPERTY_HEADLINE],
+            ],
+
+            [
+                'name' => self::PROPERTY_BIOGRAPHY,
+                'value' => '',
+                'scope' => $scopes[self::PROPERTY_BIOGRAPHY],
+            ],
+
+            [
+                'name' => self::PROPERTY_BIRTHDATE,
+                'value' => '',
+                'scope' => $scopes[self::PROPERTY_BIRTHDATE],
+            ],
+
+            [
+                'name' => self::PROPERTY_PROFILE_ENABLED,
+                'value' => $this->isProfileEnabledByDefault($this->config) ? '1' : '0',
+            ],
+
+            [
+                'name' => self::PROPERTY_PRONOUNS,
+                'value' => '',
+                'scope' => $scopes[self::PROPERTY_PRONOUNS],
+            ],
+        ];
+    }
+
+    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,
+            ''
+        );
+        $p->setLocallyVerified($data['locallyVerified'] ?? self::NOT_VERIFIED);
+        $collection->addProperty($p);
+
+        return $collection;
+    }
+
+    private function parseAccountData(IUser $user, $data): Account {
+        $account = new Account($user);
+        foreach ($data as $accountData) {
+            if ($this->isCollection($accountData['name'])) {
+                $account->setPropertyCollection($this->arrayDataToCollection($account, $accountData));
+            } else {
+                $account->setProperty($accountData['name'], $accountData['value'] ?? '', $accountData['scope'] ?? self::SCOPE_LOCAL, $accountData['verified'] ?? self::NOT_VERIFIED);
+                if (isset($accountData['locallyVerified'])) {
+                    $property = $account->getProperty($accountData['name']);
+                    $property->setLocallyVerified($accountData['locallyVerified']);
+                }
+            }
+        }
+        return $account;
+    }
+
+    public function getAccount(IUser $user): IAccount {
+        $cached = $this->internalCache->get($user->getUID());
+        if ($cached !== null) {
+            return $cached;
+        }
+        $account = $this->parseAccountData($user, $this->getUser($user));
+        if ($user->getBackend() instanceof IGetDisplayNameBackend) {
+            $property = $account->getProperty(self::PROPERTY_DISPLAYNAME);
+            $account->setProperty(self::PROPERTY_DISPLAYNAME, $user->getDisplayName(), $property->getScope(), $property->getVerified());
+        }
+        $this->internalCache->set($user->getUID(), $account);
+        return $account;
+    }
+
+    /**
+     * Converts value (phone number) in E.164 format when it was a valid number
+     * @throws InvalidArgumentException When the phone number was invalid or no default region is set and the number doesn't start with a country code
+     */
+    protected function sanitizePropertyPhoneNumber(IAccountProperty $property): void {
+        $defaultRegion = $this->config->getSystemValueString('default_phone_region', '');
+
+        if ($defaultRegion === '') {
+            // When no default region is set, only +49… numbers are valid
+            if (!str_starts_with($property->getValue(), '+')) {
+                throw new InvalidArgumentException(self::PROPERTY_PHONE);
+            }
+
+            $defaultRegion = 'EN';
+        }
+
+        $phoneNumber = $this->phoneNumberUtil->convertToStandardFormat($property->getValue(), $defaultRegion);
+        if ($phoneNumber === null) {
+            throw new InvalidArgumentException(self::PROPERTY_PHONE);
+        }
+        $property->setValue($phoneNumber);
+    }
+
+    /**
+     * @throws InvalidArgumentException When the website did not have http(s) as protocol or the host name was empty
+     */
+    private function sanitizePropertyWebsite(IAccountProperty $property): void {
+        $parts = parse_url($property->getValue());
+        if (!isset($parts['scheme']) || ($parts['scheme'] !== 'https' && $parts['scheme'] !== 'http')) {
+            throw new InvalidArgumentException(self::PROPERTY_WEBSITE);
+        }
+
+        if (!isset($parts['host']) || $parts['host'] === '') {
+            throw new InvalidArgumentException(self::PROPERTY_WEBSITE);
+        }
+    }
+
+    /**
+     * @throws InvalidArgumentException If the property value is not a valid user handle according to X's rules
+     */
+    private function sanitizePropertyTwitter(IAccountProperty $property): void {
+        if ($property->getName() === self::PROPERTY_TWITTER) {
+            $matches = [];
+            // twitter handles only contain alpha numeric characters and the underscore and must not be longer than 15 characters
+            if (preg_match('/^@?([a-zA-Z0-9_]{2,15})$/', $property->getValue(), $matches) !== 1) {
+                throw new InvalidArgumentException(self::PROPERTY_TWITTER);
+            }
+
+            // drop the leading @ if any to make it the valid handle
+            $property->setValue($matches[1]);
+
+        }
+    }
+
+    /**
+     * @throws InvalidArgumentException If the property value is not a valid fediverse handle (username@instance where instance is a valid domain)
+     */
+    private function sanitizePropertyFediverse(IAccountProperty $property): void {
+        if ($property->getName() === self::PROPERTY_FEDIVERSE) {
+            $matches = [];
+            if (preg_match('/^@?([^@\s\/\\\]+)@([^\s\/\\\]+)$/', trim($property->getValue()), $matches) !== 1) {
+                throw new InvalidArgumentException(self::PROPERTY_FEDIVERSE);
+            }
+
+            [, $username, $instance] = $matches;
+            $validated = filter_var($instance, FILTER_VALIDATE_DOMAIN, FILTER_FLAG_HOSTNAME);
+            if ($validated !== $instance) {
+                throw new InvalidArgumentException(self::PROPERTY_FEDIVERSE);
+            }
+
+            if ($this->config->getSystemValueBool('has_internet_connection', true)) {
+                $client = $this->clientService->newClient();
+
+                try {
+                    // try the public account lookup API of mastodon
+                    $response = $client->get("https://{$instance}/api/v1/accounts/lookup?acct={$username}@{$instance}");
+                    // should be a json response with account information
+                    $data = $response->getBody();
+                    if (is_resource($data)) {
+                        $data = stream_get_contents($data);
+                    }
+                    $decoded = json_decode($data, true);
+                    // ensure the username is the same the user passed
+                    // in this case we can assume this is a valid fediverse server and account
+                    if (!is_array($decoded) || ($decoded['username'] ?? '') !== $username) {
+                        throw new InvalidArgumentException();
+                    }
+                } catch (InvalidArgumentException) {
+                    throw new InvalidArgumentException(self::PROPERTY_FEDIVERSE);
+                } catch (\Exception $error) {
+                    $this->logger->error('Could not verify fediverse account', ['exception' => $error, 'instance' => $instance]);
+                    throw new InvalidArgumentException(self::PROPERTY_FEDIVERSE);
+                }
+            }
+
+            $property->setValue("$username@$instance");
+        }
+    }
+
+    public function updateAccount(IAccount $account): void {
+        $this->testValueLengths(iterator_to_array($account->getAllProperties()), true);
+        try {
+            $property = $account->getProperty(self::PROPERTY_PHONE);
+            if ($property->getValue() !== '') {
+                $this->sanitizePropertyPhoneNumber($property);
+            }
+        } catch (PropertyDoesNotExistException $e) {
+            //  valid case, nothing to do
+        }
+
+        try {
+            $property = $account->getProperty(self::PROPERTY_WEBSITE);
+            if ($property->getValue() !== '') {
+                $this->sanitizePropertyWebsite($property);
+            }
+        } catch (PropertyDoesNotExistException $e) {
+            //  valid case, nothing to do
+        }
+
+        try {
+            $property = $account->getProperty(self::PROPERTY_TWITTER);
+            if ($property->getValue() !== '') {
+                $this->sanitizePropertyTwitter($property);
+            }
+        } catch (PropertyDoesNotExistException $e) {
+            //  valid case, nothing to do
+        }
+
+        try {
+            $property = $account->getProperty(self::PROPERTY_FEDIVERSE);
+            if ($property->getValue() !== '') {
+                $this->sanitizePropertyFediverse($property);
+            }
+        } catch (PropertyDoesNotExistException $e) {
+            //  valid case, nothing to do
+        }
+
+        foreach ($account->getAllProperties() as $property) {
+            $this->testPropertyScope($property, self::ALLOWED_SCOPES, true);
+        }
+
+        $oldData = $this->getUser($account->getUser(), false);
+        $this->updateVerificationStatus($account, $oldData);
+        $this->checkEmailVerification($account, $oldData);
+        $this->checkLocalEmailVerification($account, $oldData);
+
+        $data = [];
+        foreach ($account->getAllProperties() as $property) {
+            /** @var IAccountProperty $property */
+            $data[] = [
+                'name' => $property->getName(),
+                'value' => $property->getValue(),
+                'scope' => $property->getScope(),
+                'verified' => $property->getVerified(),
+                'locallyVerified' => $property->getLocallyVerified(),
+            ];
+        }
+
+        $this->updateUser($account->getUser(), $data, $oldData, true);
+        $this->internalCache->set($account->getUser()->getUID(), $account);
+    }
 }

tests/lib/Accounts/AccountPropertyTest.php

Indentation +106 added lines, -106 removed lines

@@ -16,117 +16,117 @@
  * @package Test\Accounts
  */
 class AccountPropertyTest extends TestCase {
-	public function testConstructor(): void {
-		$accountProperty = new AccountProperty(
-			IAccountManager::PROPERTY_WEBSITE,
-			'https://example.com',
-			IAccountManager::SCOPE_PUBLISHED,
-			IAccountManager::VERIFIED,
-			''
-		);
-		$this->assertEquals(IAccountManager::PROPERTY_WEBSITE, $accountProperty->getName());
-		$this->assertEquals('https://example.com', $accountProperty->getValue());
-		$this->assertEquals(IAccountManager::SCOPE_PUBLISHED, $accountProperty->getScope());
-		$this->assertEquals(IAccountManager::VERIFIED, $accountProperty->getVerified());
-	}
+    public function testConstructor(): void {
+        $accountProperty = new AccountProperty(
+            IAccountManager::PROPERTY_WEBSITE,
+            'https://example.com',
+            IAccountManager::SCOPE_PUBLISHED,
+            IAccountManager::VERIFIED,
+            ''
+        );
+        $this->assertEquals(IAccountManager::PROPERTY_WEBSITE, $accountProperty->getName());
+        $this->assertEquals('https://example.com', $accountProperty->getValue());
+        $this->assertEquals(IAccountManager::SCOPE_PUBLISHED, $accountProperty->getScope());
+        $this->assertEquals(IAccountManager::VERIFIED, $accountProperty->getVerified());
+    }
 
-	public function testSetValue(): void {
-		$accountProperty = new AccountProperty(
-			IAccountManager::PROPERTY_WEBSITE,
-			'https://example.com',
-			IAccountManager::SCOPE_PUBLISHED,
-			IAccountManager::VERIFIED,
-			''
-		);
-		$actualReturn = $accountProperty->setValue('https://example.org');
-		$this->assertEquals('https://example.org', $accountProperty->getValue());
-		$this->assertEquals('https://example.org', $actualReturn->getValue());
-	}
+    public function testSetValue(): void {
+        $accountProperty = new AccountProperty(
+            IAccountManager::PROPERTY_WEBSITE,
+            'https://example.com',
+            IAccountManager::SCOPE_PUBLISHED,
+            IAccountManager::VERIFIED,
+            ''
+        );
+        $actualReturn = $accountProperty->setValue('https://example.org');
+        $this->assertEquals('https://example.org', $accountProperty->getValue());
+        $this->assertEquals('https://example.org', $actualReturn->getValue());
+    }
 
-	public function testSetScope(): void {
-		$accountProperty = new AccountProperty(
-			IAccountManager::PROPERTY_WEBSITE,
-			'https://example.com',
-			IAccountManager::SCOPE_PUBLISHED,
-			IAccountManager::VERIFIED,
-			''
-		);
-		$actualReturn = $accountProperty->setScope(IAccountManager::SCOPE_LOCAL);
-		$this->assertEquals(IAccountManager::SCOPE_LOCAL, $accountProperty->getScope());
-		$this->assertEquals(IAccountManager::SCOPE_LOCAL, $actualReturn->getScope());
-	}
+    public function testSetScope(): void {
+        $accountProperty = new AccountProperty(
+            IAccountManager::PROPERTY_WEBSITE,
+            'https://example.com',
+            IAccountManager::SCOPE_PUBLISHED,
+            IAccountManager::VERIFIED,
+            ''
+        );
+        $actualReturn = $accountProperty->setScope(IAccountManager::SCOPE_LOCAL);
+        $this->assertEquals(IAccountManager::SCOPE_LOCAL, $accountProperty->getScope());
+        $this->assertEquals(IAccountManager::SCOPE_LOCAL, $actualReturn->getScope());
+    }
 
-	public function scopesProvider() {
-		return [
-			// current values
-			[IAccountManager::SCOPE_PRIVATE, IAccountManager::SCOPE_PRIVATE],
-			[IAccountManager::SCOPE_LOCAL, IAccountManager::SCOPE_LOCAL],
-			[IAccountManager::SCOPE_FEDERATED, IAccountManager::SCOPE_FEDERATED],
-			[IAccountManager::SCOPE_PUBLISHED, IAccountManager::SCOPE_PUBLISHED],
-			// invalid values
-			['unknown', null],
-			['v2-unknown', null],
-		];
-	}
+    public function scopesProvider() {
+        return [
+            // current values
+            [IAccountManager::SCOPE_PRIVATE, IAccountManager::SCOPE_PRIVATE],
+            [IAccountManager::SCOPE_LOCAL, IAccountManager::SCOPE_LOCAL],
+            [IAccountManager::SCOPE_FEDERATED, IAccountManager::SCOPE_FEDERATED],
+            [IAccountManager::SCOPE_PUBLISHED, IAccountManager::SCOPE_PUBLISHED],
+            // invalid values
+            ['unknown', null],
+            ['v2-unknown', null],
+        ];
+    }
 
-	/**
-	 * @dataProvider scopesProvider
-	 */
-	public function testSetScopeMapping(string $storedScope, ?string $returnedScope): void {
-		if ($returnedScope === null) {
-			$this->expectException(\InvalidArgumentException::class);
-		}
-		$accountProperty = new AccountProperty(
-			IAccountManager::PROPERTY_WEBSITE,
-			'https://example.com',
-			$storedScope,
-			IAccountManager::VERIFIED,
-			''
-		);
-		$this->assertEquals($returnedScope, $accountProperty->getScope());
-	}
+    /**
+     * @dataProvider scopesProvider
+     */
+    public function testSetScopeMapping(string $storedScope, ?string $returnedScope): void {
+        if ($returnedScope === null) {
+            $this->expectException(\InvalidArgumentException::class);
+        }
+        $accountProperty = new AccountProperty(
+            IAccountManager::PROPERTY_WEBSITE,
+            'https://example.com',
+            $storedScope,
+            IAccountManager::VERIFIED,
+            ''
+        );
+        $this->assertEquals($returnedScope, $accountProperty->getScope());
+    }
 
-	public function testSetVerified(): void {
-		$accountProperty = new AccountProperty(
-			IAccountManager::PROPERTY_WEBSITE,
-			'https://example.com',
-			IAccountManager::SCOPE_PUBLISHED,
-			IAccountManager::VERIFIED,
-			''
-		);
-		$actualReturn = $accountProperty->setVerified(IAccountManager::NOT_VERIFIED);
-		$this->assertEquals(IAccountManager::NOT_VERIFIED, $accountProperty->getVerified());
-		$this->assertEquals(IAccountManager::NOT_VERIFIED, $actualReturn->getVerified());
-	}
+    public function testSetVerified(): void {
+        $accountProperty = new AccountProperty(
+            IAccountManager::PROPERTY_WEBSITE,
+            'https://example.com',
+            IAccountManager::SCOPE_PUBLISHED,
+            IAccountManager::VERIFIED,
+            ''
+        );
+        $actualReturn = $accountProperty->setVerified(IAccountManager::NOT_VERIFIED);
+        $this->assertEquals(IAccountManager::NOT_VERIFIED, $accountProperty->getVerified());
+        $this->assertEquals(IAccountManager::NOT_VERIFIED, $actualReturn->getVerified());
+    }
 
-	public function testSetVerificationData(): void {
-		$accountProperty = new AccountProperty(
-			IAccountManager::PROPERTY_WEBSITE,
-			'https://example.com',
-			IAccountManager::SCOPE_PUBLISHED,
-			IAccountManager::VERIFIED,
-			''
-		);
-		$token = uniqid();
-		$actualReturn = $accountProperty->setVerificationData($token);
-		$this->assertEquals($token, $accountProperty->getVerificationData());
-		$this->assertEquals($token, $actualReturn->getVerificationData());
-	}
+    public function testSetVerificationData(): void {
+        $accountProperty = new AccountProperty(
+            IAccountManager::PROPERTY_WEBSITE,
+            'https://example.com',
+            IAccountManager::SCOPE_PUBLISHED,
+            IAccountManager::VERIFIED,
+            ''
+        );
+        $token = uniqid();
+        $actualReturn = $accountProperty->setVerificationData($token);
+        $this->assertEquals($token, $accountProperty->getVerificationData());
+        $this->assertEquals($token, $actualReturn->getVerificationData());
+    }
 
-	public function testJsonSerialize(): void {
-		$accountProperty = new AccountProperty(
-			IAccountManager::PROPERTY_WEBSITE,
-			'https://example.com',
-			IAccountManager::SCOPE_PUBLISHED,
-			IAccountManager::VERIFIED,
-			'60a7a633b74af',
-		);
-		$this->assertEquals([
-			'name' => IAccountManager::PROPERTY_WEBSITE,
-			'value' => 'https://example.com',
-			'scope' => IAccountManager::SCOPE_PUBLISHED,
-			'verified' => IAccountManager::VERIFIED,
-			'verificationData' => '60a7a633b74af'
-		], $accountProperty->jsonSerialize());
-	}
+    public function testJsonSerialize(): void {
+        $accountProperty = new AccountProperty(
+            IAccountManager::PROPERTY_WEBSITE,
+            'https://example.com',
+            IAccountManager::SCOPE_PUBLISHED,
+            IAccountManager::VERIFIED,
+            '60a7a633b74af',
+        );
+        $this->assertEquals([
+            'name' => IAccountManager::PROPERTY_WEBSITE,
+            'value' => 'https://example.com',
+            'scope' => IAccountManager::SCOPE_PUBLISHED,
+            'verified' => IAccountManager::VERIFIED,
+            'verificationData' => '60a7a633b74af'
+        ], $accountProperty->jsonSerialize());
+    }
 }