nextcloud / server

lib/public/Accounts/PropertyDoesNotExistException.php

Doc Comments +1 added lines, -1 removed lines

@@ -34,8 +34,8 @@
 
 	/**
 	 * Constructor
-	 * @param string $msg the error message
 	 * @since 15.0.0
+	 * @param string $property
 	 */
 	public function __construct($property){
 		parent::__construct('Property ' . $property . ' does not exist.');

Indentation +8 added lines, -8 removed lines

@@ -32,13 +32,13 @@
  */
 class PropertyDoesNotExistException extends \Exception {
 
-	/**
-	 * Constructor
-	 * @param string $msg the error message
-	 * @since 15.0.0
-	 */
-	public function __construct($property){
-		parent::__construct('Property ' . $property . ' does not exist.');
-	}
+    /**
+     * Constructor
+     * @param string $msg the error message
+     * @since 15.0.0
+     */
+    public function __construct($property){
+        parent::__construct('Property ' . $property . ' does not exist.');
+    }
 
 }

Spacing +2 added lines, -2 removed lines

@@ -37,8 +37,8 @@
 	 * @param string $msg the error message
 	 * @since 15.0.0
 	 */
-	public function __construct($property){
-		parent::__construct('Property ' . $property . ' does not exist.');
+	public function __construct($property) {
+		parent::__construct('Property '.$property.' does not exist.');
 	}
 
 }

lib/public/Accounts/IAccountManager.php

Indentation +25 added lines, -25 removed lines

@@ -37,33 +37,33 @@
  */
 interface IAccountManager {
 
-	/** nobody can see my account details */
-	const VISIBILITY_PRIVATE = 'private';
-	/** only contacts, especially trusted servers can see my contact details */
-	const VISIBILITY_CONTACTS_ONLY = 'contacts';
-	/** every body ca see my contact detail, will be published to the lookup server */
-	const VISIBILITY_PUBLIC = 'public';
+    /** nobody can see my account details */
+    const VISIBILITY_PRIVATE = 'private';
+    /** only contacts, especially trusted servers can see my contact details */
+    const VISIBILITY_CONTACTS_ONLY = 'contacts';
+    /** every body ca see my contact detail, will be published to the lookup server */
+    const VISIBILITY_PUBLIC = 'public';
 
-	const PROPERTY_AVATAR = 'avatar';
-	const PROPERTY_DISPLAYNAME = 'displayname';
-	const PROPERTY_PHONE = 'phone';
-	const PROPERTY_EMAIL = 'email';
-	const PROPERTY_WEBSITE = 'website';
-	const PROPERTY_ADDRESS = 'address';
-	const PROPERTY_TWITTER = 'twitter';
+    const PROPERTY_AVATAR = 'avatar';
+    const PROPERTY_DISPLAYNAME = 'displayname';
+    const PROPERTY_PHONE = 'phone';
+    const PROPERTY_EMAIL = 'email';
+    const PROPERTY_WEBSITE = 'website';
+    const PROPERTY_ADDRESS = 'address';
+    const PROPERTY_TWITTER = 'twitter';
 
-	const NOT_VERIFIED = '0';
-	const VERIFICATION_IN_PROGRESS = '1';
-	const VERIFIED = '2';
+    const NOT_VERIFIED = '0';
+    const VERIFICATION_IN_PROGRESS = '1';
+    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;
+    /**
+     * Get the account data for a given user
+     *
+     * @since 15.0.0
+     *
+     * @param IUser $user
+     * @return IAccount
+     */
+    public function getAccount(IUser $user): IAccount;
 
 }

lib/public/Accounts/IAccountProperty.php

Indentation +59 added lines, -59 removed lines

@@ -34,71 +34,71 @@
  */
 interface IAccountProperty extends \JsonSerializable {
 
-	/**
-	 * Set the value of a property
-	 *
-	 * @since 15.0.0
-	 *
-	 * @param string $value
-	 * @return IAccountProperty
-	 */
-	public function setValue(string $value): IAccountProperty;
+    /**
+     * Set the value of a property
+     *
+     * @since 15.0.0
+     *
+     * @param string $value
+     * @return IAccountProperty
+     */
+    public function setValue(string $value): IAccountProperty;
 
-	/**
-	 * Set the scope of a property
-	 *
-	 * @since 15.0.0
-	 *
-	 * @param string $scope
-	 * @return IAccountProperty
-	 */
-	public function setScope(string $scope): IAccountProperty;
+    /**
+     * Set the scope of a property
+     *
+     * @since 15.0.0
+     *
+     * @param string $scope
+     * @return IAccountProperty
+     */
+    public function setScope(string $scope): IAccountProperty;
 
-	/**
-	 * Set the verification status of a property
-	 *
-	 * @since 15.0.0
-	 *
-	 * @param string $verified
-	 * @return IAccountProperty
-	 */
-	public function setVerified(string $verified): IAccountProperty;
+    /**
+     * Set the verification status of a property
+     *
+     * @since 15.0.0
+     *
+     * @param string $verified
+     * @return IAccountProperty
+     */
+    public function setVerified(string $verified): IAccountProperty;
 
-	/**
-	 * Get the name of a property
-	 *
-	 * @since 15.0.0
-	 *
-	 * @return string
-	 */
-	public function getName(): string;
+    /**
+     * Get the name of a property
+     *
+     * @since 15.0.0
+     *
+     * @return string
+     */
+    public function getName(): string;
 
-	/**
-	 * Get the value of a property
-	 *
-	 * @since 15.0.0
-	 *
-	 * @return string
-	 */
-	public function getValue(): string;
+    /**
+     * Get the value of a property
+     *
+     * @since 15.0.0
+     *
+     * @return string
+     */
+    public function getValue(): string;
 
-	/**
-	 * Get the scope of a property
-	 *
-	 * @since 15.0.0
-	 *
-	 * @return string
-	 */
-	public function getScope(): string;
+    /**
+     * Get the scope of a property
+     *
+     * @since 15.0.0
+     *
+     * @return string
+     */
+    public function getScope(): string;
 
-	/**
-	 * Get the verification status of a property
-	 *
-	 * @since 15.0.0
-	 *
-	 * @return string
-	 */
-	public function getVerified(): string;
+    /**
+     * Get the verification status of a property
+     *
+     * @since 15.0.0
+     *
+     * @return string
+     */
+    public function getVerified(): string;
 
 }
 

lib/public/Accounts/IAccount.php

Indentation +48 added lines, -48 removed lines

@@ -36,57 +36,57 @@
  */
 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
-	 * @return IAccount
-	 */
-	public function setProperty(string $property, string $value, string $scope, string $verified): 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
+     * @return IAccount
+     */
+    public function setProperty(string $property, string $value, string $scope, string $verified): 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
-	 *
-	 * @since 15.0.0
-	 *
-	 * @return IAccountProperty[]
-	 */
-	public function getProperties(): array;
+    /**
+     * Get all properties of an account
+     *
+     * @since 15.0.0
+     *
+     * @return IAccountProperty[]
+     */
+    public function getProperties(): array;
 
-	/**
-	 * Get all properties that match the provided filters for scope and verification status
-	 *
-	 * @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, string $verified): array;
+    /**
+     * Get all properties that match the provided filters for scope and verification status
+     *
+     * @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, string $verified): 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/private/Accounts/Account.php

Indentation +37 added lines, -37 removed lines

@@ -33,49 +33,49 @@
 
 class Account implements IAccount {
 
-	/** @var IAccountProperty[] */
-	private $properties = [];
+    /** @var IAccountProperty[] */
+    private $properties = [];
 
-	/** @var IUser */
-	private $user;
+    /** @var IUser */
+    private $user;
 
-	public function __construct(IUser $user) {
-		$this->user = $user;
-	}
+    public function __construct(IUser $user) {
+        $this->user = $user;
+    }
 
-	public function setProperty(string $property, string $value, string $scope, string $verified): IAccount {
-		$this->properties[$property] = new AccountProperty($property, $value, $scope, $verified);
-		return $this;
-	}
+    public function setProperty(string $property, string $value, string $scope, string $verified): IAccount {
+        $this->properties[$property] = new AccountProperty($property, $value, $scope, $verified);
+        return $this;
+    }
 
-	public function getProperty(string $property): IAccountProperty {
-		if (!array_key_exists($property, $this->properties)) {
-			throw new PropertyDoesNotExistException($property);
-		}
-		return $this->properties[$property];
-	}
+    public function getProperty(string $property): IAccountProperty {
+        if (!array_key_exists($property, $this->properties)) {
+            throw new PropertyDoesNotExistException($property);
+        }
+        return $this->properties[$property];
+    }
 
-	public function getProperties(): array {
-		return $this->properties;
-	}
+    public function getProperties(): array {
+        return $this->properties;
+    }
 
-	public function getFilteredProperties(string $scope = null, string $verified = null): array {
-		return \array_filter($this->properties, function(IAccountProperty $obj) use ($scope, $verified){
-			if ($scope !== null && $scope !== $obj->getScope()) {
-				return false;
-			}
-			if ($verified !== null && $verified !== $obj->getVerified()) {
-				return false;
-			}
-			return true;
-		});
-	}
+    public function getFilteredProperties(string $scope = null, string $verified = null): array {
+        return \array_filter($this->properties, function(IAccountProperty $obj) use ($scope, $verified){
+            if ($scope !== null && $scope !== $obj->getScope()) {
+                return false;
+            }
+            if ($verified !== null && $verified !== $obj->getVerified()) {
+                return false;
+            }
+            return true;
+        });
+    }
 
-	public function jsonSerialize() {
-		return $this->properties;
-	}
+    public function jsonSerialize() {
+        return $this->properties;
+    }
 
-	public function getUser(): IUser {
-		return $this->user;
-	}
+    public function getUser(): IUser {
+        return $this->user;
+    }
 }

lib/private/Accounts/AccountProperty.php

Indentation +98 added lines, -98 removed lines

@@ -30,111 +30,111 @@
 
 class AccountProperty implements IAccountProperty {
 
-	/** @var string */
-	private $name;
-	/** @var string */
-	private $value;
-	/** @var string */
-	private $scope;
-	/** @var string */
-	private $verified;
+    /** @var string */
+    private $name;
+    /** @var string */
+    private $value;
+    /** @var string */
+    private $scope;
+    /** @var string */
+    private $verified;
 
-	public function __construct(string $name, string $value, string $scope, string $verified) {
-		$this->name = $name;
-		$this->value = $value;
-		$this->scope = $scope;
-		$this->verified = $verified;
-	}
+    public function __construct(string $name, string $value, string $scope, string $verified) {
+        $this->name = $name;
+        $this->value = $value;
+        $this->scope = $scope;
+        $this->verified = $verified;
+    }
 
-	public function jsonSerialize() {
-		return [
-			'name' => $this->getName(),
-			'value' => $this->getValue(),
-			'scope' => $this->getScope(),
-			'verified' => $this->getVerified()
-		];
-	}
+    public function jsonSerialize() {
+        return [
+            'name' => $this->getName(),
+            'value' => $this->getValue(),
+            'scope' => $this->getScope(),
+            'verified' => $this->getVerified()
+        ];
+    }
 
-	/**
-	 * Set the value of a property
-	 *
-	 * @since 15.0.0
-	 *
-	 * @param string $value
-	 * @return IAccountProperty
-	 */
-	public function setValue(string $value): IAccountProperty {
-		$this->value = $value;
-		return $this;
-	}
+    /**
+     * Set the value of a property
+     *
+     * @since 15.0.0
+     *
+     * @param string $value
+     * @return IAccountProperty
+     */
+    public function setValue(string $value): IAccountProperty {
+        $this->value = $value;
+        return $this;
+    }
 
-	/**
-	 * Set the scope of a property
-	 *
-	 * @since 15.0.0
-	 *
-	 * @param string $scope
-	 * @return IAccountProperty
-	 */
-	public function setScope(string $scope): IAccountProperty {
-		$this->scope = $scope;
-		return $this;
-	}
+    /**
+     * Set the scope of a property
+     *
+     * @since 15.0.0
+     *
+     * @param string $scope
+     * @return IAccountProperty
+     */
+    public function setScope(string $scope): IAccountProperty {
+        $this->scope = $scope;
+        return $this;
+    }
 
-	/**
-	 * Set the verification status of a property
-	 *
-	 * @since 15.0.0
-	 *
-	 * @param string $verified
-	 * @return IAccountProperty
-	 */
-	public function setVerified(string $verified): IAccountProperty {
-		$this->verified = $verified;
-		return $this;
-	}
+    /**
+     * Set the verification status of a property
+     *
+     * @since 15.0.0
+     *
+     * @param string $verified
+     * @return IAccountProperty
+     */
+    public function setVerified(string $verified): IAccountProperty {
+        $this->verified = $verified;
+        return $this;
+    }
 
-	/**
-	 * Get the name of a property
-	 *
-	 * @since 15.0.0
-	 *
-	 * @return string
-	 */
-	public function getName(): string {
-		return $this->name;
-	}
+    /**
+     * Get the name of a property
+     *
+     * @since 15.0.0
+     *
+     * @return string
+     */
+    public function getName(): string {
+        return $this->name;
+    }
 
-	/**
-	 * Get the value of a property
-	 *
-	 * @since 15.0.0
-	 *
-	 * @return string
-	 */
-	public function getValue(): string {
-		return $this->value;
-	}
+    /**
+     * Get the value of a property
+     *
+     * @since 15.0.0
+     *
+     * @return string
+     */
+    public function getValue(): string {
+        return $this->value;
+    }
 
-	/**
-	 * Get the scope of a property
-	 *
-	 * @since 15.0.0
-	 *
-	 * @return string
-	 */
-	public function getScope(): string {
-		return $this->scope;
-	}
+    /**
+     * Get the scope of a property
+     *
+     * @since 15.0.0
+     *
+     * @return string
+     */
+    public function getScope(): string {
+        return $this->scope;
+    }
 
-	/**
-	 * Get the verification status of a property
-	 *
-	 * @since 15.0.0
-	 *
-	 * @return string
-	 */
-	public function getVerified(): string {
-		return $this->verified;
-	}
+    /**
+     * Get the verification status of a property
+     *
+     * @since 15.0.0
+     *
+     * @return string
+     */
+    public function getVerified(): string {
+        return $this->verified;
+    }
 }

lib/private/Accounts/AccountManager.php

Indentation +293 added lines, -293 removed lines

@@ -45,298 +45,298 @@
  */
 class AccountManager implements IAccountManager {
 
-	/** @var  IDBConnection database connection */
-	private $connection;
-
-	/** @var string table name */
-	private $table = 'accounts';
-
-	/** @var EventDispatcherInterface */
-	private $eventDispatcher;
-
-	/** @var IJobList */
-	private $jobList;
-
-	/**
-	 * AccountManager constructor.
-	 *
-	 * @param IDBConnection $connection
-	 * @param EventDispatcherInterface $eventDispatcher
-	 * @param IJobList $jobList
-	 */
-	public function __construct(IDBConnection $connection,
-								EventDispatcherInterface $eventDispatcher,
-								IJobList $jobList) {
-		$this->connection = $connection;
-		$this->eventDispatcher = $eventDispatcher;
-		$this->jobList = $jobList;
-	}
-
-	/**
-	 * update user record
-	 *
-	 * @param IUser $user
-	 * @param $data
-	 */
-	public function updateUser(IUser $user, $data) {
-		$userData = $this->getUser($user);
-		$updated = true;
-		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)
-			);
-		}
-	}
-
-	/**
-	 * 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();
-	}
-
-	/**
-	 * get stored data from a given user
-	 *
-	 * @param IUser $user
-	 * @return array
-	 */
-	public function getUser(IUser $user) {
-		$uid = $user->getUID();
-		$query = $this->connection->getQueryBuilder();
-		$query->select('data')->from($this->table)
-			->where($query->expr()->eq('uid', $query->createParameter('uid')))
-			->setParameter('uid', $uid);
-		$query->execute();
-		$result = $query->execute()->fetchAll();
-
-		if (empty($result)) {
-			$userData = $this->buildDefaultUserRecord($user);
-			$this->insertNewUser($user, $userData);
-			return $userData;
-		}
-
-		$userDataArray = json_decode($result[0]['data'], true);
-
-		$userDataArray = $this->addMissingDefaultValues($userDataArray);
-
-		return $userDataArray;
-	}
-
-	/**
-	 * 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) {
-		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[AccountManager::PROPERTY_EMAIL]['verified'] = AccountManager::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($oldData, $newData) {
-
-		// 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, $data) {
-		$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();
-	}
-
-	/**
-	 * update existing user in accounts table
-	 *
-	 * @param IUser $user
-	 * @param array $data
-	 */
-	protected function updateExistingUser(IUser $user, $data) {
-		$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();
-	}
-
-	/**
-	 * 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::VISIBILITY_CONTACTS_ONLY,
-					'verified' => self::NOT_VERIFIED,
-				],
-			self::PROPERTY_ADDRESS =>
-				[
-					'value' => '',
-					'scope' => self::VISIBILITY_PRIVATE,
-					'verified' => self::NOT_VERIFIED,
-				],
-			self::PROPERTY_WEBSITE =>
-				[
-					'value' => '',
-					'scope' => self::VISIBILITY_PRIVATE,
-					'verified' => self::NOT_VERIFIED,
-				],
-			self::PROPERTY_EMAIL =>
-				[
-					'value' => $user->getEMailAddress(),
-					'scope' => self::VISIBILITY_CONTACTS_ONLY,
-					'verified' => self::NOT_VERIFIED,
-				],
-			self::PROPERTY_AVATAR =>
-				[
-					'scope' => self::VISIBILITY_CONTACTS_ONLY
-				],
-			self::PROPERTY_PHONE =>
-				[
-					'value' => '',
-					'scope' => self::VISIBILITY_PRIVATE,
-					'verified' => self::NOT_VERIFIED,
-				],
-			self::PROPERTY_TWITTER =>
-				[
-					'value' => '',
-					'scope' => self::VISIBILITY_PRIVATE,
-					'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'], $accountData['verified']);
-		}
-		return $account;
-	}
-
-	public function getAccount(IUser $user): IAccount {
-		return $this->parseAccountData($user, $this->getUser($user));
-	}
+    /** @var  IDBConnection database connection */
+    private $connection;
+
+    /** @var string table name */
+    private $table = 'accounts';
+
+    /** @var EventDispatcherInterface */
+    private $eventDispatcher;
+
+    /** @var IJobList */
+    private $jobList;
+
+    /**
+     * AccountManager constructor.
+     *
+     * @param IDBConnection $connection
+     * @param EventDispatcherInterface $eventDispatcher
+     * @param IJobList $jobList
+     */
+    public function __construct(IDBConnection $connection,
+                                EventDispatcherInterface $eventDispatcher,
+                                IJobList $jobList) {
+        $this->connection = $connection;
+        $this->eventDispatcher = $eventDispatcher;
+        $this->jobList = $jobList;
+    }
+
+    /**
+     * update user record
+     *
+     * @param IUser $user
+     * @param $data
+     */
+    public function updateUser(IUser $user, $data) {
+        $userData = $this->getUser($user);
+        $updated = true;
+        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)
+            );
+        }
+    }
+
+    /**
+     * 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();
+    }
+
+    /**
+     * get stored data from a given user
+     *
+     * @param IUser $user
+     * @return array
+     */
+    public function getUser(IUser $user) {
+        $uid = $user->getUID();
+        $query = $this->connection->getQueryBuilder();
+        $query->select('data')->from($this->table)
+            ->where($query->expr()->eq('uid', $query->createParameter('uid')))
+            ->setParameter('uid', $uid);
+        $query->execute();
+        $result = $query->execute()->fetchAll();
+
+        if (empty($result)) {
+            $userData = $this->buildDefaultUserRecord($user);
+            $this->insertNewUser($user, $userData);
+            return $userData;
+        }
+
+        $userDataArray = json_decode($result[0]['data'], true);
+
+        $userDataArray = $this->addMissingDefaultValues($userDataArray);
+
+        return $userDataArray;
+    }
+
+    /**
+     * 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) {
+        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[AccountManager::PROPERTY_EMAIL]['verified'] = AccountManager::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($oldData, $newData) {
+
+        // 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, $data) {
+        $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();
+    }
+
+    /**
+     * update existing user in accounts table
+     *
+     * @param IUser $user
+     * @param array $data
+     */
+    protected function updateExistingUser(IUser $user, $data) {
+        $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();
+    }
+
+    /**
+     * 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::VISIBILITY_CONTACTS_ONLY,
+                    'verified' => self::NOT_VERIFIED,
+                ],
+            self::PROPERTY_ADDRESS =>
+                [
+                    'value' => '',
+                    'scope' => self::VISIBILITY_PRIVATE,
+                    'verified' => self::NOT_VERIFIED,
+                ],
+            self::PROPERTY_WEBSITE =>
+                [
+                    'value' => '',
+                    'scope' => self::VISIBILITY_PRIVATE,
+                    'verified' => self::NOT_VERIFIED,
+                ],
+            self::PROPERTY_EMAIL =>
+                [
+                    'value' => $user->getEMailAddress(),
+                    'scope' => self::VISIBILITY_CONTACTS_ONLY,
+                    'verified' => self::NOT_VERIFIED,
+                ],
+            self::PROPERTY_AVATAR =>
+                [
+                    'scope' => self::VISIBILITY_CONTACTS_ONLY
+                ],
+            self::PROPERTY_PHONE =>
+                [
+                    'value' => '',
+                    'scope' => self::VISIBILITY_PRIVATE,
+                    'verified' => self::NOT_VERIFIED,
+                ],
+            self::PROPERTY_TWITTER =>
+                [
+                    'value' => '',
+                    'scope' => self::VISIBILITY_PRIVATE,
+                    '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'], $accountData['verified']);
+        }
+        return $account;
+    }
+
+    public function getAccount(IUser $user): IAccount {
+        return $this->parseAccountData($user, $this->getUser($user));
+    }
 
 }

Spacing +7 added lines, -7 removed lines

@@ -199,38 +199,38 @@ 
 		$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'])) {
+		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'])) {
+		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'])) {
+		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 &&
+		if ($twitterVerified &&
 			$oldData[self::PROPERTY_TWITTER]['value'] !== $newData[self::PROPERTY_TWITTER]['value']
 		) {
 			$newData[self::PROPERTY_TWITTER]['verified'] = self::NOT_VERIFIED;
 		}
 
-		if($websiteVerified &&
+		if ($websiteVerified &&
 			$oldData[self::PROPERTY_WEBSITE]['value'] !== $newData[self::PROPERTY_WEBSITE]['value']
 		) {
 			$newData[self::PROPERTY_WEBSITE]['verified'] = self::NOT_VERIFIED;
 		}
 
-		if($emailVerified &&
+		if ($emailVerified &&
 			$oldData[self::PROPERTY_EMAIL]['value'] !== $newData[self::PROPERTY_EMAIL]['value']
 		) {
 			$newData[self::PROPERTY_EMAIL]['verified'] = self::NOT_VERIFIED;
@@ -329,7 +329,7 @@ 
 
 	private function parseAccountData(IUser $user, $data): Account {
 		$account = new Account($user);
-		foreach($data as $property => $accountData) {
+		foreach ($data as $property => $accountData) {
 			$account->setProperty($property, $accountData['value'], $accountData['scope'], $accountData['verified']);
 		}
 		return $account;