nextcloud / server

lib/public/Accounts/IAccountManager.php

Indentation +97 added lines, -97 removed lines

@@ -38,101 +38,101 @@
  */
 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';
-
-	/**
-	 * Contact details only visible locally
-	 *
-	 * @deprecated 21.0.1
-	 */
-	public const VISIBILITY_PRIVATE = 'private';
-
-	/**
-	 * Contact details visible on trusted federated servers.
-	 *
-	 * @deprecated 21.0.1
-	 */
-	public const VISIBILITY_CONTACTS_ONLY = 'contacts';
-
-	/**
-	 * Contact details visible on trusted federated servers and in the public lookup server.
-	 *
-	 * @deprecated 21.0.1
-	 */
-	public const VISIBILITY_PUBLIC = 'public';
-
-	public const PROPERTY_AVATAR = 'avatar';
-	public const PROPERTY_DISPLAYNAME = 'displayname';
-	public const PROPERTY_PHONE = 'phone';
-	public const PROPERTY_EMAIL = 'email';
-	public const PROPERTY_WEBSITE = 'website';
-	public const PROPERTY_ADDRESS = 'address';
-	public const PROPERTY_TWITTER = 'twitter';
-
-	public const COLLECTION_EMAIL = 'additional_mail';
-
-	public const NOT_VERIFIED = '0';
-	public const VERIFICATION_IN_PROGRESS = '1';
-	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';
+
+    /**
+     * Contact details only visible locally
+     *
+     * @deprecated 21.0.1
+     */
+    public const VISIBILITY_PRIVATE = 'private';
+
+    /**
+     * Contact details visible on trusted federated servers.
+     *
+     * @deprecated 21.0.1
+     */
+    public const VISIBILITY_CONTACTS_ONLY = 'contacts';
+
+    /**
+     * Contact details visible on trusted federated servers and in the public lookup server.
+     *
+     * @deprecated 21.0.1
+     */
+    public const VISIBILITY_PUBLIC = 'public';
+
+    public const PROPERTY_AVATAR = 'avatar';
+    public const PROPERTY_DISPLAYNAME = 'displayname';
+    public const PROPERTY_PHONE = 'phone';
+    public const PROPERTY_EMAIL = 'email';
+    public const PROPERTY_WEBSITE = 'website';
+    public const PROPERTY_ADDRESS = 'address';
+    public const PROPERTY_TWITTER = 'twitter';
+
+    public const COLLECTION_EMAIL = 'additional_mail';
+
+    public const NOT_VERIFIED = '0';
+    public const VERIFICATION_IN_PROGRESS = '1';
+    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/public/Accounts/IAccount.php

Indentation +78 added lines, -78 removed lines

@@ -36,89 +36,89 @@
  */
 interface IAccount extends \JsonSerializable {
 
-	/**
-	 * Set a property with data
-	 *
-	 * @since 15.0.0
-	 *
-	 * @param string $property  Must be one of the PROPERTY_ prefixed constants of \OCP\Accounts\IAccountManager
-	 * @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, string $verificationData = ''): IAccount;
+    /**
+     * Set a property with data
+     *
+     * @since 15.0.0
+     *
+     * @param string $property  Must be one of the PROPERTY_ prefixed constants of \OCP\Accounts\IAccountManager
+     * @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, string $verificationData = ''): IAccount;
 
-	/**
-	 * Get a property by its key
-	 *
-	 * @since 15.0.0
-	 *
-	 * @param string $property Must be one of the PROPERTY_ prefixed constants of \OCP\Accounts\IAccountManager
-	 * @return IAccountProperty
-	 * @throws PropertyDoesNotExistException
-	 */
-	public function getProperty(string $property): IAccountProperty;
+    /**
+     * Get a property by its key
+     *
+     * @since 15.0.0
+     *
+     * @param string $property Must be one of the PROPERTY_ prefixed constants of \OCP\Accounts\IAccountManager
+     * @return IAccountProperty
+     * @throws PropertyDoesNotExistException
+     */
+    public function getProperty(string $property): IAccountProperty;
 
-	/**
-	 * Get all properties of an account. Array indices are property names.
-	 * Values from IAccountPropertyCollections are not included in the return
-	 * array.
-	 *
-	 * @since 15.0.0
-	 * @deprecated 22.0.0 use getAllProperties()
-	 */
-	public function getProperties(): array;
+    /**
+     * Get all properties of an account. Array indices are property names.
+     * Values from IAccountPropertyCollections are not included in the return
+     * array.
+     *
+     * @since 15.0.0
+     * @deprecated 22.0.0 use getAllProperties()
+     */
+    public function getProperties(): array;
 
-	/**
-	 * Get all properties of an account. Array indices are numeric. To get
-	 * the property name, call getName() against the value.
-	 *
-	 * IAccountPropertyCollections are being flattened into an IAccountProperty
-	 * for each value.
-	 *
-	 * @since 22.0.0
-	 *
-	 * @return Generator<int, IAccountProperty>
-	 */
-	public function getAllProperties(): Generator;
+    /**
+     * Get all properties of an account. Array indices are numeric. To get
+     * the property name, call getName() against the value.
+     *
+     * IAccountPropertyCollections are being flattened into an IAccountProperty
+     * for each value.
+     *
+     * @since 22.0.0
+     *
+     * @return Generator<int, IAccountProperty>
+     */
+    public function getAllProperties(): Generator;
 
-	/**
-	 * Set a property collection (multi-value properties)
-	 *
-	 * @since 22.0.0
-	 */
-	public function setPropertyCollection(IAccountPropertyCollection $propertyCollection): IAccount;
+    /**
+     * Set a property collection (multi-value properties)
+     *
+     * @since 22.0.0
+     */
+    public function setPropertyCollection(IAccountPropertyCollection $propertyCollection): IAccount;
 
-	/**
-	 * Returns the requestes propery collection (multi-value properties)
-	 *
-	 * @since 22.0.0
-	 */
-	public function getPropertyCollection(string $propertyCollection): IAccountPropertyCollection;
+    /**
+     * Returns the requestes propery collection (multi-value properties)
+     *
+     * @since 22.0.0
+     */
+    public function getPropertyCollection(string $propertyCollection): IAccountPropertyCollection;
 
-	/**
-	 * Get all properties that match the provided filters for scope and verification status
-	 *
-	 * Since 22.0.0 values from IAccountPropertyCollection are included, but also
-	 * as IAccountProperty instances. They for properties of IAccountPropertyCollection are
-	 * suffixed incrementally, i.e. #0, #1 ... #n – the numbers have no further meaning.
-	 *
-	 * @since 15.0.0
-	 *
-	 * @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
-	 * @return IAccountProperty[]
-	 */
-	public function getFilteredProperties(string $scope = null, string $verified = null): array;
+    /**
+     * Get all properties that match the provided filters for scope and verification status
+     *
+     * Since 22.0.0 values from IAccountPropertyCollection are included, but also
+     * as IAccountProperty instances. They for properties of IAccountPropertyCollection are
+     * suffixed incrementally, i.e. #0, #1 ... #n – the numbers have no further meaning.
+     *
+     * @since 15.0.0
+     *
+     * @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
+     * @return IAccountProperty[]
+     */
+    public function getFilteredProperties(string $scope = null, string $verified = null): array;
 
-	/**
-	 * Get the related user for the account data
-	 *
-	 * @since 15.0.0
-	 *
-	 * @return IUser
-	 */
-	public function getUser(): IUser;
+    /**
+     * Get the related user for the account data
+     *
+     * @since 15.0.0
+     *
+     * @return IUser
+     */
+    public function getUser(): IUser;
 }

lib/public/Accounts/IAccountPropertyCollection.php

Indentation +38 added lines, -38 removed lines

@@ -38,47 +38,47 @@
  */
 interface IAccountPropertyCollection extends JsonSerializable {
 
-	/**
-	 * retuns the collection name
-	 *
-	 * @since 22.0.0
-	 */
-	public function getName(): string;
+    /**
+     * retuns the collection name
+     *
+     * @since 22.0.0
+     */
+    public function getName(): string;
 
-	/**
-	 * set properties of this collection
-	 *
-	 * @param IAccountProperty[] $properties
-	 * @throws InvalidArgumentException
-	 * @since 22.0.0
-	 */
-	public function setProperties(array $properties): IAccountPropertyCollection;
+    /**
+     * set properties of this collection
+     *
+     * @param IAccountProperty[] $properties
+     * @throws InvalidArgumentException
+     * @since 22.0.0
+     */
+    public function setProperties(array $properties): IAccountPropertyCollection;
 
-	/**
-	 * @return IAccountProperty[]
-	 * @since 22.0.0
-	 */
-	public function getProperties(): array;
+    /**
+     * @return IAccountProperty[]
+     * @since 22.0.0
+     */
+    public function getProperties(): array;
 
-	/**
-	 * adds a property to this collection
-	 *
-	 * @throws InvalidArgumentException
-	 * @since 22.0.0
-	 */
-	public function addProperty(IAccountProperty $property): IAccountPropertyCollection;
+    /**
+     * adds a property to this collection
+     *
+     * @throws InvalidArgumentException
+     * @since 22.0.0
+     */
+    public function addProperty(IAccountProperty $property): IAccountPropertyCollection;
 
-	/**
-	 * removes a property of this collection
-	 *
-	 * @since 22.0.0
-	 */
-	public function removeProperty(IAccountProperty $property): IAccountPropertyCollection;
+    /**
+     * removes a property of this collection
+     *
+     * @since 22.0.0
+     */
+    public function removeProperty(IAccountProperty $property): IAccountPropertyCollection;
 
-	/**
-	 * removes a property identified by its value
-	 *
-	 * @since 22.0.0
-	 */
-	public function removePropertyByValue(string $value): IAccountPropertyCollection;
+    /**
+     * removes a property identified by its value
+     *
+     * @since 22.0.0
+     */
+    public function removePropertyByValue(string $value): IAccountPropertyCollection;
 }

lib/private/Accounts/AccountPropertyCollection.php

Indentation +46 added lines, -46 removed lines

@@ -32,59 +32,59 @@
 
 class AccountPropertyCollection implements IAccountPropertyCollection {
 
-	/** @var string */
-	protected $collectionName = '';
+    /** @var string */
+    protected $collectionName = '';
 
-	/** @var IAccountProperty[] */
-	protected $properties = [];
+    /** @var IAccountProperty[] */
+    protected $properties = [];
 
-	public function __construct(string $collectionName) {
-		$this->collectionName = $collectionName;
-	}
+    public function __construct(string $collectionName) {
+        $this->collectionName = $collectionName;
+    }
 
-	public function setProperties(array $properties): IAccountPropertyCollection {
-		/** @var IAccountProperty $property */
-		$this->properties = [];
-		foreach ($properties as $property) {
-			$this->addProperty($property);
-		}
-		return $this;
-	}
+    public function setProperties(array $properties): IAccountPropertyCollection {
+        /** @var IAccountProperty $property */
+        $this->properties = [];
+        foreach ($properties as $property) {
+            $this->addProperty($property);
+        }
+        return $this;
+    }
 
-	public function getProperties(): array {
-		return $this->properties;
-	}
+    public function getProperties(): array {
+        return $this->properties;
+    }
 
-	public function addProperty(IAccountProperty $property): IAccountPropertyCollection {
-		if ($property->getName() !== $this->collectionName) {
-			throw new InvalidArgumentException('Provided property does not match collection name');
-		}
-		$this->properties[] = $property;
-		return $this;
-	}
+    public function addProperty(IAccountProperty $property): IAccountPropertyCollection {
+        if ($property->getName() !== $this->collectionName) {
+            throw new InvalidArgumentException('Provided property does not match collection name');
+        }
+        $this->properties[] = $property;
+        return $this;
+    }
 
-	public function removeProperty(IAccountProperty $property): IAccountPropertyCollection {
-		$ref = array_search($property, $this->properties, true);
-		if ($ref !== false) {
-			unset($this->properties[$ref]);
-		}
-		return $this;
-	}
+    public function removeProperty(IAccountProperty $property): IAccountPropertyCollection {
+        $ref = array_search($property, $this->properties, true);
+        if ($ref !== false) {
+            unset($this->properties[$ref]);
+        }
+        return $this;
+    }
 
-	public function removePropertyByValue(string $value): IAccountPropertyCollection {
-		foreach ($this->properties as $i => $property) {
-			if ($property->getValue() === $value) {
-				unset($this->properties[$i]);
-			}
-		}
-		return $this;
-	}
+    public function removePropertyByValue(string $value): IAccountPropertyCollection {
+        foreach ($this->properties as $i => $property) {
+            if ($property->getValue() === $value) {
+                unset($this->properties[$i]);
+            }
+        }
+        return $this;
+    }
 
-	public function jsonSerialize() {
-		return [$this->collectionName => $this->properties];
-	}
+    public function jsonSerialize() {
+        return [$this->collectionName => $this->properties];
+    }
 
-	public function getName(): string {
-		return $this->collectionName;
-	}
+    public function getName(): string {
+        return $this->collectionName;
+    }
 }

lib/private/Accounts/Account.php

Indentation +90 added lines, -90 removed lines

@@ -35,94 +35,94 @@
 use OCP\IUser;
 
 class Account implements IAccount {
-	use TAccountsHelper;
-
-	/** @var IAccountPropertyCollection[]|IAccountProperty[] */
-	private $properties = [];
-
-	/** @var IUser */
-	private $user;
-
-	public function __construct(IUser $user) {
-		$this->user = $user;
-	}
-
-	public function setProperty(string $property, string $value, string $scope, string $verified, string $verificationData = ''): IAccount {
-		if ($this->isCollection($property)) {
-			throw new \InvalidArgumentException('setProperty cannot set an IAccountsPropertyCollection');
-		}
-		$this->properties[$property] = new AccountProperty($property, $value, $scope, $verified, $verificationData);
-		return $this;
-	}
-
-	public function getProperty(string $property): IAccountProperty {
-		if ($this->isCollection($property)) {
-			throw new \InvalidArgumentException('getProperty cannot retrieve an IAccountsPropertyCollection');
-		}
-		if (!array_key_exists($property, $this->properties) || !$this->properties[$property] instanceof IAccountProperty) {
-			throw new PropertyDoesNotExistException($property);
-		}
-		return $this->properties[$property];
-	}
-
-	public function getProperties(): array {
-		return array_filter($this->properties, function ($obj) {
-			return $obj instanceof IAccountProperty;
-		});
-	}
-
-	public function getAllProperties(): Generator {
-		foreach ($this->properties as $propertyObject) {
-			if ($propertyObject instanceof IAccountProperty) {
-				yield $propertyObject;
-			} elseif ($propertyObject instanceof IAccountPropertyCollection) {
-				foreach ($propertyObject->getProperties() as $property) {
-					yield $property;
-				}
-			}
-		}
-	}
-
-	public function getFilteredProperties(string $scope = null, string $verified = null): array {
-		$result = $incrementals = [];
-		/** @var IAccountProperty $obj */
-		foreach ($this->getAllProperties() as $obj) {
-			if ($scope !== null && $scope !== $obj->getScope()) {
-				continue;
-			}
-			if ($verified !== null && $verified !== $obj->getVerified()) {
-				continue;
-			}
-			$index = $obj->getName();
-			if ($this->isCollection($index)) {
-				$incrementals[$index] = ($incrementals[$index] ?? -1) + 1;
-				$index .= '#' . $incrementals[$index];
-			}
-			$result[$index] = $obj;
-		}
-		return $result;
-	}
-
-	public function jsonSerialize() {
-		return $this->properties;
-	}
-
-	public function getUser(): IUser {
-		return $this->user;
-	}
-
-	public function setPropertyCollection(IAccountPropertyCollection $propertyCollection): IAccount {
-		$this->properties[$propertyCollection->getName()] = $propertyCollection;
-		return $this;
-	}
-
-	public function getPropertyCollection(string $propertyCollection): IAccountPropertyCollection {
-		if (!array_key_exists($propertyCollection, $this->properties)) {
-			throw new PropertyDoesNotExistException($propertyCollection);
-		}
-		if (!$this->properties[$propertyCollection] instanceof IAccountPropertyCollection) {
-			throw new \RuntimeException('Requested collection is not an IAccountPropertyCollection');
-		}
-		return $this->properties[$propertyCollection];
-	}
+    use TAccountsHelper;
+
+    /** @var IAccountPropertyCollection[]|IAccountProperty[] */
+    private $properties = [];
+
+    /** @var IUser */
+    private $user;
+
+    public function __construct(IUser $user) {
+        $this->user = $user;
+    }
+
+    public function setProperty(string $property, string $value, string $scope, string $verified, string $verificationData = ''): IAccount {
+        if ($this->isCollection($property)) {
+            throw new \InvalidArgumentException('setProperty cannot set an IAccountsPropertyCollection');
+        }
+        $this->properties[$property] = new AccountProperty($property, $value, $scope, $verified, $verificationData);
+        return $this;
+    }
+
+    public function getProperty(string $property): IAccountProperty {
+        if ($this->isCollection($property)) {
+            throw new \InvalidArgumentException('getProperty cannot retrieve an IAccountsPropertyCollection');
+        }
+        if (!array_key_exists($property, $this->properties) || !$this->properties[$property] instanceof IAccountProperty) {
+            throw new PropertyDoesNotExistException($property);
+        }
+        return $this->properties[$property];
+    }
+
+    public function getProperties(): array {
+        return array_filter($this->properties, function ($obj) {
+            return $obj instanceof IAccountProperty;
+        });
+    }
+
+    public function getAllProperties(): Generator {
+        foreach ($this->properties as $propertyObject) {
+            if ($propertyObject instanceof IAccountProperty) {
+                yield $propertyObject;
+            } elseif ($propertyObject instanceof IAccountPropertyCollection) {
+                foreach ($propertyObject->getProperties() as $property) {
+                    yield $property;
+                }
+            }
+        }
+    }
+
+    public function getFilteredProperties(string $scope = null, string $verified = null): array {
+        $result = $incrementals = [];
+        /** @var IAccountProperty $obj */
+        foreach ($this->getAllProperties() as $obj) {
+            if ($scope !== null && $scope !== $obj->getScope()) {
+                continue;
+            }
+            if ($verified !== null && $verified !== $obj->getVerified()) {
+                continue;
+            }
+            $index = $obj->getName();
+            if ($this->isCollection($index)) {
+                $incrementals[$index] = ($incrementals[$index] ?? -1) + 1;
+                $index .= '#' . $incrementals[$index];
+            }
+            $result[$index] = $obj;
+        }
+        return $result;
+    }
+
+    public function jsonSerialize() {
+        return $this->properties;
+    }
+
+    public function getUser(): IUser {
+        return $this->user;
+    }
+
+    public function setPropertyCollection(IAccountPropertyCollection $propertyCollection): IAccount {
+        $this->properties[$propertyCollection->getName()] = $propertyCollection;
+        return $this;
+    }
+
+    public function getPropertyCollection(string $propertyCollection): IAccountPropertyCollection {
+        if (!array_key_exists($propertyCollection, $this->properties)) {
+            throw new PropertyDoesNotExistException($propertyCollection);
+        }
+        if (!$this->properties[$propertyCollection] instanceof IAccountPropertyCollection) {
+            throw new \RuntimeException('Requested collection is not an IAccountPropertyCollection');
+        }
+        return $this->properties[$propertyCollection];
+    }
 }

Spacing +2 added lines, -2 removed lines

@@ -66,7 +66,7 @@ 
 	}
 
 	public function getProperties(): array {
-		return array_filter($this->properties, function ($obj) {
+		return array_filter($this->properties, function($obj) {
 			return $obj instanceof IAccountProperty;
 		});
 	}
@@ -96,7 +96,7 @@ 
 			$index = $obj->getName();
 			if ($this->isCollection($index)) {
 				$incrementals[$index] = ($incrementals[$index] ?? -1) + 1;
-				$index .= '#' . $incrementals[$index];
+				$index .= '#'.$incrementals[$index];
 			}
 			$result[$index] = $obj;
 		}

lib/private/Accounts/TAccountsHelper.php

Indentation +8 added lines, -8 removed lines

@@ -29,12 +29,12 @@
 use OCP\Accounts\IAccountManager;
 
 trait TAccountsHelper {
-	protected function isCollection(string $propertyName): bool {
-		return in_array($propertyName,
-			[
-				IAccountManager::COLLECTION_EMAIL,
-			],
-			true
-		);
-	}
+    protected function isCollection(string $propertyName): bool {
+        return in_array($propertyName,
+            [
+                IAccountManager::COLLECTION_EMAIL,
+            ],
+            true
+        );
+    }
 }

lib/private/Accounts/AccountManager.php

Indentation +550 added lines, -550 removed lines

@@ -60,554 +60,554 @@
  * @package OC\Accounts
  */
 class AccountManager implements IAccountManager {
-	use TAccountsHelper;
-
-	/** @var  IDBConnection database connection */
-	private $connection;
-
-	/** @var IConfig */
-	private $config;
-
-	/** @var string table name */
-	private $table = 'accounts';
-
-	/** @var string table name */
-	private $dataTable = 'accounts_data';
-
-	/** @var EventDispatcherInterface */
-	private $eventDispatcher;
-
-	/** @var IJobList */
-	private $jobList;
-
-	/** @var LoggerInterface */
-	private $logger;
-
-	public function __construct(IDBConnection $connection,
-								IConfig $config,
-								EventDispatcherInterface $eventDispatcher,
-								IJobList $jobList,
-								LoggerInterface $logger) {
-		$this->connection = $connection;
-		$this->config = $config;
-		$this->eventDispatcher = $eventDispatcher;
-		$this->jobList = $jobList;
-		$this->logger = $logger;
-	}
-
-	/**
-	 * @param string $input
-	 * @return string Provided 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 parsePhoneNumber(string $input): string {
-		$defaultRegion = $this->config->getSystemValueString('default_phone_region', '');
-
-		if ($defaultRegion === '') {
-			// When no default region is set, only +49… numbers are valid
-			if (strpos($input, '+') !== 0) {
-				throw new \InvalidArgumentException(self::PROPERTY_PHONE);
-			}
-
-			$defaultRegion = 'EN';
-		}
-
-		$phoneUtil = PhoneNumberUtil::getInstance();
-		try {
-			$phoneNumber = $phoneUtil->parse($input, $defaultRegion);
-			if ($phoneNumber instanceof PhoneNumber && $phoneUtil->isValidNumber($phoneNumber)) {
-				return $phoneUtil->format($phoneNumber, PhoneNumberFormat::E164);
-			}
-		} catch (NumberParseException $e) {
-		}
-
-		throw new \InvalidArgumentException(self::PROPERTY_PHONE);
-	}
-
-	/**
-	 *
-	 * @param string $input
-	 * @return string
-	 * @throws \InvalidArgumentException When the website did not have http(s) as protocol or the host name was empty
-	 */
-	protected function parseWebsite(string $input): string {
-		$parts = parse_url($input);
-		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);
-		}
-
-		return $input;
-	}
-
-	protected function sanitizeLength(array &$propertyData, bool $throwOnData = false): void {
-		if (isset($propertyData['value']) && strlen($propertyData['value']) > 2048) {
-			if ($throwOnData) {
-				throw new \InvalidArgumentException();
-			} else {
-				$propertyData['value'] = '';
-			}
-		}
-	}
-
-	protected function testValueLengths(array &$data, bool $throwOnData = false): void {
-		try {
-			foreach ($data as $propertyName => &$propertyData) {
-				if ($this->isCollection($propertyName)) {
-					$this->testValueLengths($propertyData, $throwOnData);
-				} else {
-					$this->sanitizeLength($propertyData, $throwOnData);
-				}
-			}
-		} catch (\InvalidArgumentException $e) {
-			throw new \InvalidArgumentException($propertyName);
-		}
-	}
-
-	protected function testPropertyScopes(array &$data, array $allowedScopes, bool $throwOnData = false, string $parentPropertyName = null): void {
-		foreach ($data as $propertyNameOrIndex => &$propertyData) {
-			if ($this->isCollection($propertyNameOrIndex)) {
-				$this->testPropertyScopes($propertyData, $allowedScopes, $throwOnData);
-			} elseif (isset($propertyData['scope'])) {
-				$effectivePropertyName = $parentPropertyName ?? $propertyNameOrIndex;
-
-				if ($throwOnData && !in_array($propertyData['scope'], $allowedScopes, true)) {
-					throw new \InvalidArgumentException('scope');
-				}
-
-				if (
-					$propertyData['scope'] === self::SCOPE_PRIVATE
-					&& ($effectivePropertyName === self::PROPERTY_DISPLAYNAME || $effectivePropertyName === self::PROPERTY_EMAIL)
-				) {
-					if ($throwOnData) {
-						// v2-private is not available for these fields
-						throw new \InvalidArgumentException('scope');
-					} else {
-						// default to local
-						$data[$propertyNameOrIndex]['scope'] = self::SCOPE_LOCAL;
-					}
-				} else {
-					// migrate scope values to the new format
-					// invalid scopes are mapped to a default value
-					$data[$propertyNameOrIndex]['scope'] = AccountProperty::mapScopeToV2($propertyData['scope']);
-				}
-			}
-		}
-	}
-
-	/**
-	 * update user record
-	 *
-	 * @param IUser $user
-	 * @param array $data
-	 * @param bool $throwOnData Set to true if you can inform the user about invalid data
-	 * @return array The potentially modified data (e.g. phone numbers are converted to E.164 format)
-	 * @throws \InvalidArgumentException Message is the property that was invalid
-	 */
-	public function updateUser(IUser $user, array $data, bool $throwOnData = false): array {
-		$userData = $this->getUser($user);
-		$updated = true;
-
-		if (isset($data[self::PROPERTY_PHONE]) && $data[self::PROPERTY_PHONE]['value'] !== '') {
-			// Sanitize null value.
-			$data[self::PROPERTY_PHONE]['value'] = $data[self::PROPERTY_PHONE]['value'] ?? '';
-
-			try {
-				$data[self::PROPERTY_PHONE]['value'] = $this->parsePhoneNumber($data[self::PROPERTY_PHONE]['value']);
-			} catch (\InvalidArgumentException $e) {
-				if ($throwOnData) {
-					throw $e;
-				}
-				$data[self::PROPERTY_PHONE]['value'] = '';
-			}
-		}
-
-		$this->testValueLengths($data);
-
-		if (isset($data[self::PROPERTY_WEBSITE]) && $data[self::PROPERTY_WEBSITE]['value'] !== '') {
-			try {
-				$data[self::PROPERTY_WEBSITE]['value'] = $this->parseWebsite($data[self::PROPERTY_WEBSITE]['value']);
-			} catch (\InvalidArgumentException $e) {
-				if ($throwOnData) {
-					throw $e;
-				}
-				$data[self::PROPERTY_WEBSITE]['value'] = '';
-			}
-		}
-
-		$allowedScopes = [
-			self::SCOPE_PRIVATE,
-			self::SCOPE_LOCAL,
-			self::SCOPE_FEDERATED,
-			self::SCOPE_PUBLISHED,
-			self::VISIBILITY_PRIVATE,
-			self::VISIBILITY_CONTACTS_ONLY,
-			self::VISIBILITY_PUBLIC,
-		];
-
-		$this->testPropertyScopes($data, $allowedScopes, $throwOnData);
-
-		if (empty($userData)) {
-			$this->insertNewUser($user, $data);
-		} elseif ($userData !== $data) {
-			$data = $this->checkEmailVerification($userData, $data, $user);
-			$data = $this->updateVerifyStatus($userData, $data);
-			$this->updateExistingUser($user, $data);
-		} else {
-			// nothing needs to be done if new and old data set are the same
-			$updated = false;
-		}
-
-		if ($updated) {
-			$this->eventDispatcher->dispatch(
-				'OC\AccountManager::userUpdated',
-				new GenericEvent($user, $data)
-			);
-		}
-
-		return $data;
-	}
-
-	/**
-	 * delete user from accounts table
-	 *
-	 * @param IUser $user
-	 */
-	public function deleteUser(IUser $user) {
-		$uid = $user->getUID();
-		$query = $this->connection->getQueryBuilder();
-		$query->delete($this->table)
-			->where($query->expr()->eq('uid', $query->createNamedParameter($uid)))
-			->execute();
-
-		$this->deleteUserData($user);
-	}
-
-	/**
-	 * delete user from accounts table
-	 *
-	 * @param IUser $user
-	 */
-	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)))
-			->execute();
-	}
-
-	/**
-	 * get stored data from a given user
-	 *
-	 * @deprecated use getAccount instead to make sure migrated properties work correctly
-	 */
-	public 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->execute();
-		$accountData = $result->fetchAll();
-		$result->closeCursor();
-
-		if (empty($accountData)) {
-			$userData = $this->buildDefaultUserRecord($user);
-			if ($insertIfNotExists) {
-				$this->insertNewUser($user, $userData);
-			}
-			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");
-			return $this->buildDefaultUserRecord($user);
-		}
-
-		return $this->addMissingDefaultValues($userDataArray);
-	}
-
-	public function searchUsers(string $property, array $values): array {
-		$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->execute();
-
-			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 {
-		switch ($property) {
-			case IAccountManager::PROPERTY_EMAIL:
-				return array_flip($this->searchUsers(IAccountManager::COLLECTION_EMAIL, $values));
-			default:
-				return [];
-		}
-	}
-
-	/**
-	 * check if we need to ask the server for email verification, if yes we create a cronjob
-	 *
-	 * @param $oldData
-	 * @param $newData
-	 * @param IUser $user
-	 * @return array
-	 */
-	protected function checkEmailVerification($oldData, $newData, IUser $user): array {
-		if ($oldData[self::PROPERTY_EMAIL]['value'] !== $newData[self::PROPERTY_EMAIL]['value']) {
-			$this->jobList->add(VerifyUserData::class,
-				[
-					'verificationCode' => '',
-					'data' => $newData[self::PROPERTY_EMAIL]['value'],
-					'type' => self::PROPERTY_EMAIL,
-					'uid' => $user->getUID(),
-					'try' => 0,
-					'lastRun' => time()
-				]
-			);
-			$newData[self::PROPERTY_EMAIL]['verified'] = self::VERIFICATION_IN_PROGRESS;
-		}
-
-		return $newData;
-	}
-
-	/**
-	 * 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'])) {
-				$userData[$key]['verified'] = self::NOT_VERIFIED;
-			}
-		}
-
-		return $userData;
-	}
-
-	/**
-	 * reset verification status if personal data changed
-	 *
-	 * @param array $oldData
-	 * @param array $newData
-	 * @return array
-	 */
-	protected function updateVerifyStatus(array $oldData, array $newData): array {
-
-		// which account was already verified successfully?
-		$twitterVerified = isset($oldData[self::PROPERTY_TWITTER]['verified']) && $oldData[self::PROPERTY_TWITTER]['verified'] === self::VERIFIED;
-		$websiteVerified = isset($oldData[self::PROPERTY_WEBSITE]['verified']) && $oldData[self::PROPERTY_WEBSITE]['verified'] === self::VERIFIED;
-		$emailVerified = isset($oldData[self::PROPERTY_EMAIL]['verified']) && $oldData[self::PROPERTY_EMAIL]['verified'] === self::VERIFIED;
-
-		// keep old verification status if we don't have a new one
-		if (!isset($newData[self::PROPERTY_TWITTER]['verified'])) {
-			// keep old verification status if value didn't changed and an old value exists
-			$keepOldStatus = $newData[self::PROPERTY_TWITTER]['value'] === $oldData[self::PROPERTY_TWITTER]['value'] && isset($oldData[self::PROPERTY_TWITTER]['verified']);
-			$newData[self::PROPERTY_TWITTER]['verified'] = $keepOldStatus ? $oldData[self::PROPERTY_TWITTER]['verified'] : self::NOT_VERIFIED;
-		}
-
-		if (!isset($newData[self::PROPERTY_WEBSITE]['verified'])) {
-			// keep old verification status if value didn't changed and an old value exists
-			$keepOldStatus = $newData[self::PROPERTY_WEBSITE]['value'] === $oldData[self::PROPERTY_WEBSITE]['value'] && isset($oldData[self::PROPERTY_WEBSITE]['verified']);
-			$newData[self::PROPERTY_WEBSITE]['verified'] = $keepOldStatus ? $oldData[self::PROPERTY_WEBSITE]['verified'] : self::NOT_VERIFIED;
-		}
-
-		if (!isset($newData[self::PROPERTY_EMAIL]['verified'])) {
-			// keep old verification status if value didn't changed and an old value exists
-			$keepOldStatus = $newData[self::PROPERTY_EMAIL]['value'] === $oldData[self::PROPERTY_EMAIL]['value'] && isset($oldData[self::PROPERTY_EMAIL]['verified']);
-			$newData[self::PROPERTY_EMAIL]['verified'] = $keepOldStatus ? $oldData[self::PROPERTY_EMAIL]['verified'] : self::VERIFICATION_IN_PROGRESS;
-		}
-
-		// reset verification status if a value from a previously verified data was changed
-		if ($twitterVerified &&
-			$oldData[self::PROPERTY_TWITTER]['value'] !== $newData[self::PROPERTY_TWITTER]['value']
-		) {
-			$newData[self::PROPERTY_TWITTER]['verified'] = self::NOT_VERIFIED;
-		}
-
-		if ($websiteVerified &&
-			$oldData[self::PROPERTY_WEBSITE]['value'] !== $newData[self::PROPERTY_WEBSITE]['value']
-		) {
-			$newData[self::PROPERTY_WEBSITE]['verified'] = self::NOT_VERIFIED;
-		}
-
-		if ($emailVerified &&
-			$oldData[self::PROPERTY_EMAIL]['value'] !== $newData[self::PROPERTY_EMAIL]['value']
-		) {
-			$newData[self::PROPERTY_EMAIL]['verified'] = self::NOT_VERIFIED;
-		}
-
-		return $newData;
-	}
-
-	/**
-	 * add new user to accounts table
-	 *
-	 * @param IUser $user
-	 * @param array $data
-	 */
-	protected function insertNewUser(IUser $user, array $data): void {
-		$uid = $user->getUID();
-		$jsonEncodedData = json_encode($data);
-		$query = $this->connection->getQueryBuilder();
-		$query->insert($this->table)
-			->values(
-				[
-					'uid' => $query->createNamedParameter($uid),
-					'data' => $query->createNamedParameter($jsonEncodedData),
-				]
-			)
-			->execute();
-
-		$this->deleteUserData($user);
-		$this->writeUserData($user, $data);
-	}
-
-	/**
-	 * update existing user in accounts table
-	 *
-	 * @param IUser $user
-	 * @param array $data
-	 */
-	protected function updateExistingUser(IUser $user, array $data): void {
-		$uid = $user->getUID();
-		$jsonEncodedData = json_encode($data);
-		$query = $this->connection->getQueryBuilder();
-		$query->update($this->table)
-			->set('data', $query->createNamedParameter($jsonEncodedData))
-			->where($query->expr()->eq('uid', $query->createNamedParameter($uid)))
-			->execute();
-
-		$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, string $parentPropertyName = null): void {
-		foreach ($data as $propertyName => $property) {
-			if ($this->isCollection($propertyName)) {
-				$this->writeUserDataProperties($query, $property, $propertyName);
-				continue;
-			}
-			if (($parentPropertyName ?? $propertyName) === self::PROPERTY_AVATAR) {
-				continue;
-			}
-
-			$query->setParameter('name', $parentPropertyName ?? $propertyName)
-				->setParameter('value', $property['value'] ?? '');
-			$query->execute();
-		}
-	}
-
-	/**
-	 * build default user record in case not data set exists yet
-	 *
-	 * @param IUser $user
-	 * @return array
-	 */
-	protected function buildDefaultUserRecord(IUser $user) {
-		return [
-			self::PROPERTY_DISPLAYNAME =>
-				[
-					'value' => $user->getDisplayName(),
-					'scope' => self::SCOPE_FEDERATED,
-					'verified' => self::NOT_VERIFIED,
-				],
-			self::PROPERTY_ADDRESS =>
-				[
-					'value' => '',
-					'scope' => self::SCOPE_LOCAL,
-					'verified' => self::NOT_VERIFIED,
-				],
-			self::PROPERTY_WEBSITE =>
-				[
-					'value' => '',
-					'scope' => self::SCOPE_LOCAL,
-					'verified' => self::NOT_VERIFIED,
-				],
-			self::PROPERTY_EMAIL =>
-				[
-					'value' => $user->getEMailAddress(),
-					'scope' => self::SCOPE_FEDERATED,
-					'verified' => self::NOT_VERIFIED,
-				],
-			self::PROPERTY_AVATAR =>
-				[
-					'scope' => self::SCOPE_FEDERATED
-				],
-			self::PROPERTY_PHONE =>
-				[
-					'value' => '',
-					'scope' => self::SCOPE_LOCAL,
-					'verified' => self::NOT_VERIFIED,
-				],
-			self::PROPERTY_TWITTER =>
-				[
-					'value' => '',
-					'scope' => self::SCOPE_LOCAL,
-					'verified' => self::NOT_VERIFIED,
-				],
-		];
-	}
-
-	private function parseAccountData(IUser $user, $data): Account {
-		$account = new Account($user);
-		foreach ($data as $property => $accountData) {
-			$account->setProperty($property, $accountData['value'] ?? '', $accountData['scope'] ?? self::SCOPE_LOCAL, $accountData['verified'] ?? self::NOT_VERIFIED);
-		}
-		return $account;
-	}
-
-	public function getAccount(IUser $user): IAccount {
-		return $this->parseAccountData($user, $this->getUser($user));
-	}
-
-	public function updateAccount(IAccount $account): void {
-		$data = [];
-
-		foreach ($account->getProperties() as $property) {
-			$data[$property->getName()] = [
-				'value' => $property->getValue(),
-				'scope' => $property->getScope(),
-				'verified' => $property->getVerified(),
-			];
-		}
-
-		$this->updateUser($account->getUser(), $data, true);
-	}
+    use TAccountsHelper;
+
+    /** @var  IDBConnection database connection */
+    private $connection;
+
+    /** @var IConfig */
+    private $config;
+
+    /** @var string table name */
+    private $table = 'accounts';
+
+    /** @var string table name */
+    private $dataTable = 'accounts_data';
+
+    /** @var EventDispatcherInterface */
+    private $eventDispatcher;
+
+    /** @var IJobList */
+    private $jobList;
+
+    /** @var LoggerInterface */
+    private $logger;
+
+    public function __construct(IDBConnection $connection,
+                                IConfig $config,
+                                EventDispatcherInterface $eventDispatcher,
+                                IJobList $jobList,
+                                LoggerInterface $logger) {
+        $this->connection = $connection;
+        $this->config = $config;
+        $this->eventDispatcher = $eventDispatcher;
+        $this->jobList = $jobList;
+        $this->logger = $logger;
+    }
+
+    /**
+     * @param string $input
+     * @return string Provided 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 parsePhoneNumber(string $input): string {
+        $defaultRegion = $this->config->getSystemValueString('default_phone_region', '');
+
+        if ($defaultRegion === '') {
+            // When no default region is set, only +49… numbers are valid
+            if (strpos($input, '+') !== 0) {
+                throw new \InvalidArgumentException(self::PROPERTY_PHONE);
+            }
+
+            $defaultRegion = 'EN';
+        }
+
+        $phoneUtil = PhoneNumberUtil::getInstance();
+        try {
+            $phoneNumber = $phoneUtil->parse($input, $defaultRegion);
+            if ($phoneNumber instanceof PhoneNumber && $phoneUtil->isValidNumber($phoneNumber)) {
+                return $phoneUtil->format($phoneNumber, PhoneNumberFormat::E164);
+            }
+        } catch (NumberParseException $e) {
+        }
+
+        throw new \InvalidArgumentException(self::PROPERTY_PHONE);
+    }
+
+    /**
+     *
+     * @param string $input
+     * @return string
+     * @throws \InvalidArgumentException When the website did not have http(s) as protocol or the host name was empty
+     */
+    protected function parseWebsite(string $input): string {
+        $parts = parse_url($input);
+        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);
+        }
+
+        return $input;
+    }
+
+    protected function sanitizeLength(array &$propertyData, bool $throwOnData = false): void {
+        if (isset($propertyData['value']) && strlen($propertyData['value']) > 2048) {
+            if ($throwOnData) {
+                throw new \InvalidArgumentException();
+            } else {
+                $propertyData['value'] = '';
+            }
+        }
+    }
+
+    protected function testValueLengths(array &$data, bool $throwOnData = false): void {
+        try {
+            foreach ($data as $propertyName => &$propertyData) {
+                if ($this->isCollection($propertyName)) {
+                    $this->testValueLengths($propertyData, $throwOnData);
+                } else {
+                    $this->sanitizeLength($propertyData, $throwOnData);
+                }
+            }
+        } catch (\InvalidArgumentException $e) {
+            throw new \InvalidArgumentException($propertyName);
+        }
+    }
+
+    protected function testPropertyScopes(array &$data, array $allowedScopes, bool $throwOnData = false, string $parentPropertyName = null): void {
+        foreach ($data as $propertyNameOrIndex => &$propertyData) {
+            if ($this->isCollection($propertyNameOrIndex)) {
+                $this->testPropertyScopes($propertyData, $allowedScopes, $throwOnData);
+            } elseif (isset($propertyData['scope'])) {
+                $effectivePropertyName = $parentPropertyName ?? $propertyNameOrIndex;
+
+                if ($throwOnData && !in_array($propertyData['scope'], $allowedScopes, true)) {
+                    throw new \InvalidArgumentException('scope');
+                }
+
+                if (
+                    $propertyData['scope'] === self::SCOPE_PRIVATE
+                    && ($effectivePropertyName === self::PROPERTY_DISPLAYNAME || $effectivePropertyName === self::PROPERTY_EMAIL)
+                ) {
+                    if ($throwOnData) {
+                        // v2-private is not available for these fields
+                        throw new \InvalidArgumentException('scope');
+                    } else {
+                        // default to local
+                        $data[$propertyNameOrIndex]['scope'] = self::SCOPE_LOCAL;
+                    }
+                } else {
+                    // migrate scope values to the new format
+                    // invalid scopes are mapped to a default value
+                    $data[$propertyNameOrIndex]['scope'] = AccountProperty::mapScopeToV2($propertyData['scope']);
+                }
+            }
+        }
+    }
+
+    /**
+     * update user record
+     *
+     * @param IUser $user
+     * @param array $data
+     * @param bool $throwOnData Set to true if you can inform the user about invalid data
+     * @return array The potentially modified data (e.g. phone numbers are converted to E.164 format)
+     * @throws \InvalidArgumentException Message is the property that was invalid
+     */
+    public function updateUser(IUser $user, array $data, bool $throwOnData = false): array {
+        $userData = $this->getUser($user);
+        $updated = true;
+
+        if (isset($data[self::PROPERTY_PHONE]) && $data[self::PROPERTY_PHONE]['value'] !== '') {
+            // Sanitize null value.
+            $data[self::PROPERTY_PHONE]['value'] = $data[self::PROPERTY_PHONE]['value'] ?? '';
+
+            try {
+                $data[self::PROPERTY_PHONE]['value'] = $this->parsePhoneNumber($data[self::PROPERTY_PHONE]['value']);
+            } catch (\InvalidArgumentException $e) {
+                if ($throwOnData) {
+                    throw $e;
+                }
+                $data[self::PROPERTY_PHONE]['value'] = '';
+            }
+        }
+
+        $this->testValueLengths($data);
+
+        if (isset($data[self::PROPERTY_WEBSITE]) && $data[self::PROPERTY_WEBSITE]['value'] !== '') {
+            try {
+                $data[self::PROPERTY_WEBSITE]['value'] = $this->parseWebsite($data[self::PROPERTY_WEBSITE]['value']);
+            } catch (\InvalidArgumentException $e) {
+                if ($throwOnData) {
+                    throw $e;
+                }
+                $data[self::PROPERTY_WEBSITE]['value'] = '';
+            }
+        }
+
+        $allowedScopes = [
+            self::SCOPE_PRIVATE,
+            self::SCOPE_LOCAL,
+            self::SCOPE_FEDERATED,
+            self::SCOPE_PUBLISHED,
+            self::VISIBILITY_PRIVATE,
+            self::VISIBILITY_CONTACTS_ONLY,
+            self::VISIBILITY_PUBLIC,
+        ];
+
+        $this->testPropertyScopes($data, $allowedScopes, $throwOnData);
+
+        if (empty($userData)) {
+            $this->insertNewUser($user, $data);
+        } elseif ($userData !== $data) {
+            $data = $this->checkEmailVerification($userData, $data, $user);
+            $data = $this->updateVerifyStatus($userData, $data);
+            $this->updateExistingUser($user, $data);
+        } else {
+            // nothing needs to be done if new and old data set are the same
+            $updated = false;
+        }
+
+        if ($updated) {
+            $this->eventDispatcher->dispatch(
+                'OC\AccountManager::userUpdated',
+                new GenericEvent($user, $data)
+            );
+        }
+
+        return $data;
+    }
+
+    /**
+     * delete user from accounts table
+     *
+     * @param IUser $user
+     */
+    public function deleteUser(IUser $user) {
+        $uid = $user->getUID();
+        $query = $this->connection->getQueryBuilder();
+        $query->delete($this->table)
+            ->where($query->expr()->eq('uid', $query->createNamedParameter($uid)))
+            ->execute();
+
+        $this->deleteUserData($user);
+    }
+
+    /**
+     * delete user from accounts table
+     *
+     * @param IUser $user
+     */
+    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)))
+            ->execute();
+    }
+
+    /**
+     * get stored data from a given user
+     *
+     * @deprecated use getAccount instead to make sure migrated properties work correctly
+     */
+    public 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->execute();
+        $accountData = $result->fetchAll();
+        $result->closeCursor();
+
+        if (empty($accountData)) {
+            $userData = $this->buildDefaultUserRecord($user);
+            if ($insertIfNotExists) {
+                $this->insertNewUser($user, $userData);
+            }
+            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");
+            return $this->buildDefaultUserRecord($user);
+        }
+
+        return $this->addMissingDefaultValues($userDataArray);
+    }
+
+    public function searchUsers(string $property, array $values): array {
+        $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->execute();
+
+            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 {
+        switch ($property) {
+            case IAccountManager::PROPERTY_EMAIL:
+                return array_flip($this->searchUsers(IAccountManager::COLLECTION_EMAIL, $values));
+            default:
+                return [];
+        }
+    }
+
+    /**
+     * check if we need to ask the server for email verification, if yes we create a cronjob
+     *
+     * @param $oldData
+     * @param $newData
+     * @param IUser $user
+     * @return array
+     */
+    protected function checkEmailVerification($oldData, $newData, IUser $user): array {
+        if ($oldData[self::PROPERTY_EMAIL]['value'] !== $newData[self::PROPERTY_EMAIL]['value']) {
+            $this->jobList->add(VerifyUserData::class,
+                [
+                    'verificationCode' => '',
+                    'data' => $newData[self::PROPERTY_EMAIL]['value'],
+                    'type' => self::PROPERTY_EMAIL,
+                    'uid' => $user->getUID(),
+                    'try' => 0,
+                    'lastRun' => time()
+                ]
+            );
+            $newData[self::PROPERTY_EMAIL]['verified'] = self::VERIFICATION_IN_PROGRESS;
+        }
+
+        return $newData;
+    }
+
+    /**
+     * 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'])) {
+                $userData[$key]['verified'] = self::NOT_VERIFIED;
+            }
+        }
+
+        return $userData;
+    }
+
+    /**
+     * reset verification status if personal data changed
+     *
+     * @param array $oldData
+     * @param array $newData
+     * @return array
+     */
+    protected function updateVerifyStatus(array $oldData, array $newData): array {
+
+        // which account was already verified successfully?
+        $twitterVerified = isset($oldData[self::PROPERTY_TWITTER]['verified']) && $oldData[self::PROPERTY_TWITTER]['verified'] === self::VERIFIED;
+        $websiteVerified = isset($oldData[self::PROPERTY_WEBSITE]['verified']) && $oldData[self::PROPERTY_WEBSITE]['verified'] === self::VERIFIED;
+        $emailVerified = isset($oldData[self::PROPERTY_EMAIL]['verified']) && $oldData[self::PROPERTY_EMAIL]['verified'] === self::VERIFIED;
+
+        // keep old verification status if we don't have a new one
+        if (!isset($newData[self::PROPERTY_TWITTER]['verified'])) {
+            // keep old verification status if value didn't changed and an old value exists
+            $keepOldStatus = $newData[self::PROPERTY_TWITTER]['value'] === $oldData[self::PROPERTY_TWITTER]['value'] && isset($oldData[self::PROPERTY_TWITTER]['verified']);
+            $newData[self::PROPERTY_TWITTER]['verified'] = $keepOldStatus ? $oldData[self::PROPERTY_TWITTER]['verified'] : self::NOT_VERIFIED;
+        }
+
+        if (!isset($newData[self::PROPERTY_WEBSITE]['verified'])) {
+            // keep old verification status if value didn't changed and an old value exists
+            $keepOldStatus = $newData[self::PROPERTY_WEBSITE]['value'] === $oldData[self::PROPERTY_WEBSITE]['value'] && isset($oldData[self::PROPERTY_WEBSITE]['verified']);
+            $newData[self::PROPERTY_WEBSITE]['verified'] = $keepOldStatus ? $oldData[self::PROPERTY_WEBSITE]['verified'] : self::NOT_VERIFIED;
+        }
+
+        if (!isset($newData[self::PROPERTY_EMAIL]['verified'])) {
+            // keep old verification status if value didn't changed and an old value exists
+            $keepOldStatus = $newData[self::PROPERTY_EMAIL]['value'] === $oldData[self::PROPERTY_EMAIL]['value'] && isset($oldData[self::PROPERTY_EMAIL]['verified']);
+            $newData[self::PROPERTY_EMAIL]['verified'] = $keepOldStatus ? $oldData[self::PROPERTY_EMAIL]['verified'] : self::VERIFICATION_IN_PROGRESS;
+        }
+
+        // reset verification status if a value from a previously verified data was changed
+        if ($twitterVerified &&
+            $oldData[self::PROPERTY_TWITTER]['value'] !== $newData[self::PROPERTY_TWITTER]['value']
+        ) {
+            $newData[self::PROPERTY_TWITTER]['verified'] = self::NOT_VERIFIED;
+        }
+
+        if ($websiteVerified &&
+            $oldData[self::PROPERTY_WEBSITE]['value'] !== $newData[self::PROPERTY_WEBSITE]['value']
+        ) {
+            $newData[self::PROPERTY_WEBSITE]['verified'] = self::NOT_VERIFIED;
+        }
+
+        if ($emailVerified &&
+            $oldData[self::PROPERTY_EMAIL]['value'] !== $newData[self::PROPERTY_EMAIL]['value']
+        ) {
+            $newData[self::PROPERTY_EMAIL]['verified'] = self::NOT_VERIFIED;
+        }
+
+        return $newData;
+    }
+
+    /**
+     * add new user to accounts table
+     *
+     * @param IUser $user
+     * @param array $data
+     */
+    protected function insertNewUser(IUser $user, array $data): void {
+        $uid = $user->getUID();
+        $jsonEncodedData = json_encode($data);
+        $query = $this->connection->getQueryBuilder();
+        $query->insert($this->table)
+            ->values(
+                [
+                    'uid' => $query->createNamedParameter($uid),
+                    'data' => $query->createNamedParameter($jsonEncodedData),
+                ]
+            )
+            ->execute();
+
+        $this->deleteUserData($user);
+        $this->writeUserData($user, $data);
+    }
+
+    /**
+     * update existing user in accounts table
+     *
+     * @param IUser $user
+     * @param array $data
+     */
+    protected function updateExistingUser(IUser $user, array $data): void {
+        $uid = $user->getUID();
+        $jsonEncodedData = json_encode($data);
+        $query = $this->connection->getQueryBuilder();
+        $query->update($this->table)
+            ->set('data', $query->createNamedParameter($jsonEncodedData))
+            ->where($query->expr()->eq('uid', $query->createNamedParameter($uid)))
+            ->execute();
+
+        $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, string $parentPropertyName = null): void {
+        foreach ($data as $propertyName => $property) {
+            if ($this->isCollection($propertyName)) {
+                $this->writeUserDataProperties($query, $property, $propertyName);
+                continue;
+            }
+            if (($parentPropertyName ?? $propertyName) === self::PROPERTY_AVATAR) {
+                continue;
+            }
+
+            $query->setParameter('name', $parentPropertyName ?? $propertyName)
+                ->setParameter('value', $property['value'] ?? '');
+            $query->execute();
+        }
+    }
+
+    /**
+     * build default user record in case not data set exists yet
+     *
+     * @param IUser $user
+     * @return array
+     */
+    protected function buildDefaultUserRecord(IUser $user) {
+        return [
+            self::PROPERTY_DISPLAYNAME =>
+                [
+                    'value' => $user->getDisplayName(),
+                    'scope' => self::SCOPE_FEDERATED,
+                    'verified' => self::NOT_VERIFIED,
+                ],
+            self::PROPERTY_ADDRESS =>
+                [
+                    'value' => '',
+                    'scope' => self::SCOPE_LOCAL,
+                    'verified' => self::NOT_VERIFIED,
+                ],
+            self::PROPERTY_WEBSITE =>
+                [
+                    'value' => '',
+                    'scope' => self::SCOPE_LOCAL,
+                    'verified' => self::NOT_VERIFIED,
+                ],
+            self::PROPERTY_EMAIL =>
+                [
+                    'value' => $user->getEMailAddress(),
+                    'scope' => self::SCOPE_FEDERATED,
+                    'verified' => self::NOT_VERIFIED,
+                ],
+            self::PROPERTY_AVATAR =>
+                [
+                    'scope' => self::SCOPE_FEDERATED
+                ],
+            self::PROPERTY_PHONE =>
+                [
+                    'value' => '',
+                    'scope' => self::SCOPE_LOCAL,
+                    'verified' => self::NOT_VERIFIED,
+                ],
+            self::PROPERTY_TWITTER =>
+                [
+                    'value' => '',
+                    'scope' => self::SCOPE_LOCAL,
+                    'verified' => self::NOT_VERIFIED,
+                ],
+        ];
+    }
+
+    private function parseAccountData(IUser $user, $data): Account {
+        $account = new Account($user);
+        foreach ($data as $property => $accountData) {
+            $account->setProperty($property, $accountData['value'] ?? '', $accountData['scope'] ?? self::SCOPE_LOCAL, $accountData['verified'] ?? self::NOT_VERIFIED);
+        }
+        return $account;
+    }
+
+    public function getAccount(IUser $user): IAccount {
+        return $this->parseAccountData($user, $this->getUser($user));
+    }
+
+    public function updateAccount(IAccount $account): void {
+        $data = [];
+
+        foreach ($account->getProperties() as $property) {
+            $data[$property->getName()] = [
+                'value' => $property->getValue(),
+                'scope' => $property->getScope(),
+                'verified' => $property->getVerified(),
+            ];
+        }
+
+        $this->updateUser($account->getUser(), $data, true);
+    }
 }