do not use private AccountManager in UsersController

- extends IAccountProperty for verificationData getters and setters
- implementation thereof ^
- and of course adaption of UsersController

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>

2 files changed, 17 insertions, 2 deletions

diff --git a/lib/public/Accounts/IAccount.php b/lib/public/Accounts/IAccount.php
index 3f8c86cbc1a..7397eb4fea8 100644
--- a/lib/public/Accounts/IAccount.php
+++ b/lib/public/Accounts/IAccount.php
@@ -44,9 +44,10 @@ interface IAccount extends \JsonSerializable {
 	 * @param string $value
 	 * @param string $scope Must be one of the VISIBILITY_ prefixed constants of \OCP\Accounts\IAccountManager
 	 * @param string $verified \OCP\Accounts\IAccountManager::NOT_VERIFIED | \OCP\Accounts\IAccountManager::VERIFICATION_IN_PROGRESS | \OCP\Accounts\IAccountManager::VERIFIED
+	 * @param string $verificationData Optional, defaults to empty string. Since @22.0.0.
 	 * @return IAccount
 	 */
-	public function setProperty(string $property, string $value, string $scope, string $verified): IAccount;
+	public function setProperty(string $property, string $value, string $scope, string $verified, string $verificationData = ''): IAccount;
 
 	/**
 	 * Get a property by its key
@@ -60,7 +61,7 @@ interface IAccount extends \JsonSerializable {
 	public function getProperty(string $property): IAccountProperty;
 
 	/**
-	 * Get all properties of an account
+	 * Get all properties of an account. Array indices are property names.
 	 *
 	 * @since 15.0.0
 	 *
diff --git a/lib/public/Accounts/IAccountProperty.php b/lib/public/Accounts/IAccountProperty.php
index 1366ddd9543..dcc81f02cac 100644
--- a/lib/public/Accounts/IAccountProperty.php
+++ b/lib/public/Accounts/IAccountProperty.php
@@ -101,4 +101,18 @@ interface IAccountProperty extends \JsonSerializable {
 	 * @return string
 	 */
 	public function getVerified(): string;
+
+	/**
+	 * Sets data for verification purposes.
+	 *
+	 * @since 22.0.0
+	 */
+	public function setVerificationData(string $verificationData): IAccountProperty;
+
+	/**
+	 * Retrieves data for verification purposes.
+	 *
+	 * @since 22.0.0
+	 */
+	public function getVerificationData(): string;
 }