nextcloud / server

lib/public/IUser.php

Indentation +226 added lines, -226 removed lines

@@ -35,256 +35,256 @@
  * @since 8.0.0
  */
 interface IUser {
-	/**
-	 * get the user id
-	 *
-	 * @return string
-	 * @since 8.0.0
-	 */
-	public function getUID();
+    /**
+     * get the user id
+     *
+     * @return string
+     * @since 8.0.0
+     */
+    public function getUID();
 
-	/**
-	 * get the display name for the user, if no specific display name is set it will fallback to the user id
-	 *
-	 * @return string
-	 * @since 8.0.0
-	 */
-	public function getDisplayName();
+    /**
+     * get the display name for the user, if no specific display name is set it will fallback to the user id
+     *
+     * @return string
+     * @since 8.0.0
+     */
+    public function getDisplayName();
 
-	/**
-	 * set the display name for the user
-	 *
-	 * @param string $displayName
-	 * @return bool
-	 * @since 8.0.0
-	 *
-	 * @since 25.0.0 Throw InvalidArgumentException
-	 * @throws \InvalidArgumentException
-	 */
-	public function setDisplayName($displayName);
+    /**
+     * set the display name for the user
+     *
+     * @param string $displayName
+     * @return bool
+     * @since 8.0.0
+     *
+     * @since 25.0.0 Throw InvalidArgumentException
+     * @throws \InvalidArgumentException
+     */
+    public function setDisplayName($displayName);
 
-	/**
-	 * returns the timestamp of the user's last login or 0 if the user did never
-	 * login
-	 *
-	 * @return int
-	 * @since 8.0.0
-	 */
-	public function getLastLogin();
+    /**
+     * returns the timestamp of the user's last login or 0 if the user did never
+     * login
+     *
+     * @return int
+     * @since 8.0.0
+     */
+    public function getLastLogin();
 
-	/**
-	 * updates the timestamp of the most recent login of this user
-	 * @since 8.0.0
-	 */
-	public function updateLastLoginTimestamp();
+    /**
+     * updates the timestamp of the most recent login of this user
+     * @since 8.0.0
+     */
+    public function updateLastLoginTimestamp();
 
-	/**
-	 * Delete the user
-	 *
-	 * @return bool
-	 * @since 8.0.0
-	 */
-	public function delete();
+    /**
+     * Delete the user
+     *
+     * @return bool
+     * @since 8.0.0
+     */
+    public function delete();
 
-	/**
-	 * Set the password of the user
-	 *
-	 * @param string $password
-	 * @param string $recoveryPassword for the encryption app to reset encryption keys
-	 * @return bool
-	 * @since 8.0.0
-	 */
-	public function setPassword($password, $recoveryPassword = null);
+    /**
+     * Set the password of the user
+     *
+     * @param string $password
+     * @param string $recoveryPassword for the encryption app to reset encryption keys
+     * @return bool
+     * @since 8.0.0
+     */
+    public function setPassword($password, $recoveryPassword = null);
 
-	/**
-	 * get the users home folder to mount
-	 *
-	 * @return string
-	 * @since 8.0.0
-	 */
-	public function getHome();
+    /**
+     * get the users home folder to mount
+     *
+     * @return string
+     * @since 8.0.0
+     */
+    public function getHome();
 
-	/**
-	 * Get the name of the backend class the user is connected with
-	 *
-	 * @return string
-	 * @since 8.0.0
-	 */
-	public function getBackendClassName();
+    /**
+     * Get the name of the backend class the user is connected with
+     *
+     * @return string
+     * @since 8.0.0
+     */
+    public function getBackendClassName();
 
-	/**
-	 * Get the backend for the current user object
-	 * @return ?UserInterface
-	 * @since 15.0.0
-	 */
-	public function getBackend();
+    /**
+     * Get the backend for the current user object
+     * @return ?UserInterface
+     * @since 15.0.0
+     */
+    public function getBackend();
 
-	/**
-	 * check if the backend allows the user to change his avatar on Personal page
-	 *
-	 * @return bool
-	 * @since 8.0.0
-	 */
-	public function canChangeAvatar();
+    /**
+     * check if the backend allows the user to change his avatar on Personal page
+     *
+     * @return bool
+     * @since 8.0.0
+     */
+    public function canChangeAvatar();
 
-	/**
-	 * check if the backend supports changing passwords
-	 *
-	 * @return bool
-	 * @since 8.0.0
-	 */
-	public function canChangePassword();
+    /**
+     * check if the backend supports changing passwords
+     *
+     * @return bool
+     * @since 8.0.0
+     */
+    public function canChangePassword();
 
-	/**
-	 * check if the backend supports changing display names
-	 *
-	 * @return bool
-	 * @since 8.0.0
-	 */
-	public function canChangeDisplayName();
+    /**
+     * check if the backend supports changing display names
+     *
+     * @return bool
+     * @since 8.0.0
+     */
+    public function canChangeDisplayName();
 
-	/**
-	 * check if the user is enabled
-	 *
-	 * @return bool
-	 * @since 8.0.0
-	 */
-	public function isEnabled();
+    /**
+     * check if the user is enabled
+     *
+     * @return bool
+     * @since 8.0.0
+     */
+    public function isEnabled();
 
-	/**
-	 * set the enabled status for the user
-	 *
-	 * @param bool $enabled
-	 * @since 8.0.0
-	 */
-	public function setEnabled(bool $enabled = true);
+    /**
+     * set the enabled status for the user
+     *
+     * @param bool $enabled
+     * @since 8.0.0
+     */
+    public function setEnabled(bool $enabled = true);
 
-	/**
-	 * get the user's email address
-	 *
-	 * @return string|null
-	 * @since 9.0.0
-	 */
-	public function getEMailAddress();
+    /**
+     * get the user's email address
+     *
+     * @return string|null
+     * @since 9.0.0
+     */
+    public function getEMailAddress();
 
-	/**
-	 * get the user's system email address
-	 *
-	 * The system mail address may be read only and may be set from different
-	 * sources like LDAP, SAML or simply the admin.
-	 *
-	 * Use this getter only when the system address is needed. For picking the
-	 * proper address to e.g. send a mail to, use getEMailAddress().
-	 *
-	 * @return string|null
-	 * @since 23.0.0
-	 */
-	public function getSystemEMailAddress(): ?string;
+    /**
+     * get the user's system email address
+     *
+     * The system mail address may be read only and may be set from different
+     * sources like LDAP, SAML or simply the admin.
+     *
+     * Use this getter only when the system address is needed. For picking the
+     * proper address to e.g. send a mail to, use getEMailAddress().
+     *
+     * @return string|null
+     * @since 23.0.0
+     */
+    public function getSystemEMailAddress(): ?string;
 
-	/**
-	 * get the user's preferred email address
-	 *
-	 * The primary mail address may be set be the user to specify a different
-	 * email address where mails by Nextcloud are sent to. It is not necessarily
-	 * set.
-	 *
-	 * Use this getter only when the primary address is needed. For picking the
-	 * proper address to e.g. send a mail to, use getEMailAddress().
-	 *
-	 * @return string|null
-	 * @since 23.0.0
-	 */
-	public function getPrimaryEMailAddress(): ?string;
+    /**
+     * get the user's preferred email address
+     *
+     * The primary mail address may be set be the user to specify a different
+     * email address where mails by Nextcloud are sent to. It is not necessarily
+     * set.
+     *
+     * Use this getter only when the primary address is needed. For picking the
+     * proper address to e.g. send a mail to, use getEMailAddress().
+     *
+     * @return string|null
+     * @since 23.0.0
+     */
+    public function getPrimaryEMailAddress(): ?string;
 
-	/**
-	 * get the avatar image if it exists
-	 *
-	 * @param int $size
-	 * @return IImage|null
-	 * @since 9.0.0
-	 */
-	public function getAvatarImage($size);
+    /**
+     * get the avatar image if it exists
+     *
+     * @param int $size
+     * @return IImage|null
+     * @since 9.0.0
+     */
+    public function getAvatarImage($size);
 
-	/**
-	 * get the federation cloud id
-	 *
-	 * @return string
-	 * @since 9.0.0
-	 */
-	public function getCloudId();
+    /**
+     * get the federation cloud id
+     *
+     * @return string
+     * @since 9.0.0
+     */
+    public function getCloudId();
 
-	/**
-	 * set the email address of the user
-	 *
-	 * It is an alias to setSystemEMailAddress()
-	 *
-	 * @param string|null $mailAddress
-	 * @return void
-	 * @since 9.0.0
-	 * @deprecated 23.0.0 use setSystemEMailAddress() or setPrimaryEMailAddress()
-	 */
-	public function setEMailAddress($mailAddress);
+    /**
+     * set the email address of the user
+     *
+     * It is an alias to setSystemEMailAddress()
+     *
+     * @param string|null $mailAddress
+     * @return void
+     * @since 9.0.0
+     * @deprecated 23.0.0 use setSystemEMailAddress() or setPrimaryEMailAddress()
+     */
+    public function setEMailAddress($mailAddress);
 
-	/**
-	 * Set the system email address of the user
-	 *
-	 * This is supposed to be used when the email is set from different sources
-	 * (i.e. other user backends, admin).
-	 *
-	 * @since 23.0.0
-	 */
-	public function setSystemEMailAddress(string $mailAddress): void;
+    /**
+     * Set the system email address of the user
+     *
+     * This is supposed to be used when the email is set from different sources
+     * (i.e. other user backends, admin).
+     *
+     * @since 23.0.0
+     */
+    public function setSystemEMailAddress(string $mailAddress): void;
 
-	/**
-	 * Set the primary email address of the user.
-	 *
-	 * This method should be typically called when the user is changing their
-	 * own primary address and is not allowed to change their system email.
-	 *
-	 * The mail address provided here must be already registered as an
-	 * additional mail in the user account and also be verified locally. Also
-	 * an empty string is allowed to delete this preference.
-	 *
-	 * @throws InvalidArgumentException when the provided email address does not
-	 *                                  satisfy constraints.
-	 *
-	 * @since 23.0.0
-	 */
-	public function setPrimaryEMailAddress(string $mailAddress): void;
+    /**
+     * Set the primary email address of the user.
+     *
+     * This method should be typically called when the user is changing their
+     * own primary address and is not allowed to change their system email.
+     *
+     * The mail address provided here must be already registered as an
+     * additional mail in the user account and also be verified locally. Also
+     * an empty string is allowed to delete this preference.
+     *
+     * @throws InvalidArgumentException when the provided email address does not
+     *                                  satisfy constraints.
+     *
+     * @since 23.0.0
+     */
+    public function setPrimaryEMailAddress(string $mailAddress): void;
 
-	/**
-	 * get the users' quota in human readable form. If a specific quota is not
-	 * set for the user, the default value is returned. If a default setting
-	 * was not set otherwise, it is return as 'none', i.e. quota is not limited.
-	 *
-	 * @return string
-	 * @since 9.0.0
-	 */
-	public function getQuota();
+    /**
+     * get the users' quota in human readable form. If a specific quota is not
+     * set for the user, the default value is returned. If a default setting
+     * was not set otherwise, it is return as 'none', i.e. quota is not limited.
+     *
+     * @return string
+     * @since 9.0.0
+     */
+    public function getQuota();
 
-	/**
-	 * set the users' quota
-	 *
-	 * @param string $quota
-	 * @return void
-	 * @since 9.0.0
-	 */
-	public function setQuota($quota);
+    /**
+     * set the users' quota
+     *
+     * @param string $quota
+     * @return void
+     * @since 9.0.0
+     */
+    public function setQuota($quota);
 
-	/**
-	 * Get the user's manager UIDs
-	 *
-	 * @since 27.0.0
-	 * @return string[]
-	 */
-	public function getManagerUids(): array;
+    /**
+     * Get the user's manager UIDs
+     *
+     * @since 27.0.0
+     * @return string[]
+     */
+    public function getManagerUids(): array;
 
-	/**
-	 * Set the user's manager UIDs
-	 *
-	 * @param string[] $uids UIDs of all managers
-	 * @return void
-	 * @since 27.0.0
-	 */
-	public function setManagerUids(array $uids): void;
+    /**
+     * Set the user's manager UIDs
+     *
+     * @param string[] $uids UIDs of all managers
+     * @return void
+     * @since 27.0.0
+     */
+    public function setManagerUids(array $uids): void;
 }

lib/private/User/User.php

Indentation +550 added lines, -550 removed lines

@@ -63,554 +63,554 @@
 use function json_encode;
 
 class User implements IUser {
-	private const CONFIG_KEY_MANAGERS = 'manager';
-
-	/** @var IAccountManager */
-	protected $accountManager;
-	/** @var string */
-	private $uid;
-
-	/** @var string|null */
-	private $displayName;
-
-	/** @var UserInterface|null */
-	private $backend;
-	/** @var EventDispatcherInterface */
-	private $legacyDispatcher;
-
-	/** @var IEventDispatcher */
-	private $dispatcher;
-
-	/** @var bool|null */
-	private $enabled;
-
-	/** @var Emitter|Manager */
-	private $emitter;
-
-	/** @var string */
-	private $home;
-
-	/** @var int|null */
-	private $lastLogin;
-
-	/** @var \OCP\IConfig */
-	private $config;
-
-	/** @var IAvatarManager */
-	private $avatarManager;
-
-	/** @var IURLGenerator */
-	private $urlGenerator;
-
-	public function __construct(string $uid, ?UserInterface $backend, EventDispatcherInterface $dispatcher, $emitter = null, IConfig $config = null, $urlGenerator = null) {
-		$this->uid = $uid;
-		$this->backend = $backend;
-		$this->legacyDispatcher = $dispatcher;
-		$this->emitter = $emitter;
-		if (is_null($config)) {
-			$config = \OC::$server->getConfig();
-		}
-		$this->config = $config;
-		$this->urlGenerator = $urlGenerator;
-		if (is_null($this->urlGenerator)) {
-			$this->urlGenerator = \OC::$server->getURLGenerator();
-		}
-		// TODO: inject
-		$this->dispatcher = \OC::$server->query(IEventDispatcher::class);
-	}
-
-	/**
-	 * get the user id
-	 *
-	 * @return string
-	 */
-	public function getUID() {
-		return $this->uid;
-	}
-
-	/**
-	 * get the display name for the user, if no specific display name is set it will fallback to the user id
-	 *
-	 * @return string
-	 */
-	public function getDisplayName() {
-		if ($this->displayName === null) {
-			$displayName = '';
-			if ($this->backend && $this->backend->implementsActions(Backend::GET_DISPLAYNAME)) {
-				// get display name and strip whitespace from the beginning and end of it
-				$backendDisplayName = $this->backend->getDisplayName($this->uid);
-				if (is_string($backendDisplayName)) {
-					$displayName = trim($backendDisplayName);
-				}
-			}
-
-			if (!empty($displayName)) {
-				$this->displayName = $displayName;
-			} else {
-				$this->displayName = $this->uid;
-			}
-		}
-		return $this->displayName;
-	}
-
-	/**
-	 * set the displayname for the user
-	 *
-	 * @param string $displayName
-	 * @return bool
-	 *
-	 * @since 25.0.0 Throw InvalidArgumentException
-	 * @throws \InvalidArgumentException
-	 */
-	public function setDisplayName($displayName) {
-		$displayName = trim($displayName);
-		$oldDisplayName = $this->getDisplayName();
-		if ($this->backend->implementsActions(Backend::SET_DISPLAYNAME) && !empty($displayName) && $displayName !== $oldDisplayName) {
-			/** @var ISetDisplayNameBackend $backend */
-			$backend = $this->backend;
-			$result = $backend->setDisplayName($this->uid, $displayName);
-			if ($result) {
-				$this->displayName = $displayName;
-				$this->triggerChange('displayName', $displayName, $oldDisplayName);
-			}
-			return $result !== false;
-		}
-		return false;
-	}
-
-	/**
-	 * @inheritDoc
-	 */
-	public function setEMailAddress($mailAddress) {
-		$this->setSystemEMailAddress($mailAddress);
-	}
-
-	/**
-	 * @inheritDoc
-	 */
-	public function setSystemEMailAddress(string $mailAddress): void {
-		$oldMailAddress = $this->getSystemEMailAddress();
-
-		if ($mailAddress === '') {
-			$this->config->deleteUserValue($this->uid, 'settings', 'email');
-		} else {
-			$this->config->setUserValue($this->uid, 'settings', 'email', $mailAddress);
-		}
-
-		$primaryAddress = $this->getPrimaryEMailAddress();
-		if ($primaryAddress === $mailAddress) {
-			// on match no dedicated primary settings is necessary
-			$this->setPrimaryEMailAddress('');
-		}
-
-		if ($oldMailAddress !== strtolower($mailAddress)) {
-			$this->triggerChange('eMailAddress', $mailAddress, $oldMailAddress);
-		}
-	}
-
-	/**
-	 * @inheritDoc
-	 */
-	public function setPrimaryEMailAddress(string $mailAddress): void {
-		if ($mailAddress === '') {
-			$this->config->deleteUserValue($this->uid, 'settings', 'primary_email');
-			return;
-		}
-
-		$this->ensureAccountManager();
-		$account = $this->accountManager->getAccount($this);
-		$property = $account->getPropertyCollection(IAccountManager::COLLECTION_EMAIL)
-			->getPropertyByValue($mailAddress);
-
-		if ($property === null || $property->getLocallyVerified() !== IAccountManager::VERIFIED) {
-			throw new InvalidArgumentException('Only verified emails can be set as primary');
-		}
-		$this->config->setUserValue($this->uid, 'settings', 'primary_email', $mailAddress);
-	}
-
-	private function ensureAccountManager() {
-		if (!$this->accountManager instanceof IAccountManager) {
-			$this->accountManager = \OC::$server->get(IAccountManager::class);
-		}
-	}
-
-	/**
-	 * returns the timestamp of the user's last login or 0 if the user did never
-	 * login
-	 *
-	 * @return int
-	 */
-	public function getLastLogin() {
-		if ($this->lastLogin === null) {
-			$this->lastLogin = (int) $this->config->getUserValue($this->uid, 'login', 'lastLogin', 0);
-		}
-		return (int) $this->lastLogin;
-	}
-
-	/**
-	 * updates the timestamp of the most recent login of this user
-	 */
-	public function updateLastLoginTimestamp() {
-		$previousLogin = $this->getLastLogin();
-		$now = time();
-		$firstTimeLogin = $previousLogin === 0;
-
-		if ($now - $previousLogin > 60) {
-			$this->lastLogin = time();
-			$this->config->setUserValue(
-				$this->uid, 'login', 'lastLogin', (string)$this->lastLogin);
-		}
-
-		return $firstTimeLogin;
-	}
-
-	/**
-	 * Delete the user
-	 *
-	 * @return bool
-	 */
-	public function delete() {
-		/** @deprecated 21.0.0 use BeforeUserDeletedEvent event with the IEventDispatcher instead */
-		$this->legacyDispatcher->dispatch(IUser::class . '::preDelete', new GenericEvent($this));
-		if ($this->emitter) {
-			/** @deprecated 21.0.0 use BeforeUserDeletedEvent event with the IEventDispatcher instead */
-			$this->emitter->emit('\OC\User', 'preDelete', [$this]);
-		}
-		$this->dispatcher->dispatchTyped(new BeforeUserDeletedEvent($this));
-		$result = $this->backend->deleteUser($this->uid);
-		if ($result) {
-			// FIXME: Feels like an hack - suggestions?
-
-			$groupManager = \OC::$server->getGroupManager();
-			// We have to delete the user from all groups
-			foreach ($groupManager->getUserGroupIds($this) as $groupId) {
-				$group = $groupManager->get($groupId);
-				if ($group) {
-					$this->dispatcher->dispatchTyped(new BeforeUserRemovedEvent($group, $this));
-					$group->removeUser($this);
-					$this->dispatcher->dispatchTyped(new UserRemovedEvent($group, $this));
-				}
-			}
-			// Delete the user's keys in preferences
-			\OC::$server->getConfig()->deleteAllUserValues($this->uid);
-
-			\OC::$server->getCommentsManager()->deleteReferencesOfActor('users', $this->uid);
-			\OC::$server->getCommentsManager()->deleteReadMarksFromUser($this);
-
-			/** @var AvatarManager $avatarManager */
-			$avatarManager = \OC::$server->query(AvatarManager::class);
-			$avatarManager->deleteUserAvatar($this->uid);
-
-			$notification = \OC::$server->getNotificationManager()->createNotification();
-			$notification->setUser($this->uid);
-			\OC::$server->getNotificationManager()->markProcessed($notification);
-
-			/** @var AccountManager $accountManager */
-			$accountManager = \OC::$server->query(AccountManager::class);
-			$accountManager->deleteUser($this);
-
-			/** @deprecated 21.0.0 use UserDeletedEvent event with the IEventDispatcher instead */
-			$this->legacyDispatcher->dispatch(IUser::class . '::postDelete', new GenericEvent($this));
-			if ($this->emitter) {
-				/** @deprecated 21.0.0 use UserDeletedEvent event with the IEventDispatcher instead */
-				$this->emitter->emit('\OC\User', 'postDelete', [$this]);
-			}
-			$this->dispatcher->dispatchTyped(new UserDeletedEvent($this));
-		}
-		return !($result === false);
-	}
-
-	/**
-	 * Set the password of the user
-	 *
-	 * @param string $password
-	 * @param string $recoveryPassword for the encryption app to reset encryption keys
-	 * @return bool
-	 */
-	public function setPassword($password, $recoveryPassword = null) {
-		$this->legacyDispatcher->dispatch(IUser::class . '::preSetPassword', new GenericEvent($this, [
-			'password' => $password,
-			'recoveryPassword' => $recoveryPassword,
-		]));
-		if ($this->emitter) {
-			$this->emitter->emit('\OC\User', 'preSetPassword', [$this, $password, $recoveryPassword]);
-		}
-		if ($this->backend->implementsActions(Backend::SET_PASSWORD)) {
-			/** @var ISetPasswordBackend $backend */
-			$backend = $this->backend;
-			$result = $backend->setPassword($this->uid, $password);
-
-			if ($result !== false) {
-				$this->legacyDispatcher->dispatch(IUser::class . '::postSetPassword', new GenericEvent($this, [
-					'password' => $password,
-					'recoveryPassword' => $recoveryPassword,
-				]));
-				if ($this->emitter) {
-					$this->emitter->emit('\OC\User', 'postSetPassword', [$this, $password, $recoveryPassword]);
-				}
-			}
-
-			return !($result === false);
-		} else {
-			return false;
-		}
-	}
-
-	/**
-	 * get the users home folder to mount
-	 *
-	 * @return string
-	 */
-	public function getHome() {
-		if (!$this->home) {
-			/** @psalm-suppress UndefinedInterfaceMethod Once we get rid of the legacy implementsActions, psalm won't complain anymore */
-			if (($this->backend instanceof IGetHomeBackend || $this->backend->implementsActions(Backend::GET_HOME)) && $home = $this->backend->getHome($this->uid)) {
-				$this->home = $home;
-			} elseif ($this->config) {
-				$this->home = $this->config->getSystemValueString('datadirectory', \OC::$SERVERROOT . '/data') . '/' . $this->uid;
-			} else {
-				$this->home = \OC::$SERVERROOT . '/data/' . $this->uid;
-			}
-		}
-		return $this->home;
-	}
-
-	/**
-	 * Get the name of the backend class the user is connected with
-	 *
-	 * @return string
-	 */
-	public function getBackendClassName() {
-		if ($this->backend instanceof IUserBackend) {
-			return $this->backend->getBackendName();
-		}
-		return get_class($this->backend);
-	}
-
-	public function getBackend(): ?UserInterface {
-		return $this->backend;
-	}
-
-	/**
-	 * Check if the backend allows the user to change his avatar on Personal page
-	 *
-	 * @return bool
-	 */
-	public function canChangeAvatar() {
-		if ($this->backend instanceof IProvideAvatarBackend || $this->backend->implementsActions(Backend::PROVIDE_AVATAR)) {
-			/** @var IProvideAvatarBackend $backend */
-			$backend = $this->backend;
-			return $backend->canChangeAvatar($this->uid);
-		}
-		return true;
-	}
-
-	/**
-	 * check if the backend supports changing passwords
-	 *
-	 * @return bool
-	 */
-	public function canChangePassword() {
-		return $this->backend->implementsActions(Backend::SET_PASSWORD);
-	}
-
-	/**
-	 * check if the backend supports changing display names
-	 *
-	 * @return bool
-	 */
-	public function canChangeDisplayName() {
-		if (!$this->config->getSystemValueBool('allow_user_to_change_display_name', true)) {
-			return false;
-		}
-		return $this->backend->implementsActions(Backend::SET_DISPLAYNAME);
-	}
-
-	/**
-	 * check if the user is enabled
-	 *
-	 * @return bool
-	 */
-	public function isEnabled() {
-		if ($this->enabled === null) {
-			$enabled = $this->config->getUserValue($this->uid, 'core', 'enabled', 'true');
-			$this->enabled = $enabled === 'true';
-		}
-		return (bool) $this->enabled;
-	}
-
-	/**
-	 * set the enabled status for the user
-	 *
-	 * @param bool $enabled
-	 */
-	public function setEnabled(bool $enabled = true) {
-		$oldStatus = $this->isEnabled();
-		$this->enabled = $enabled;
-		if ($oldStatus !== $this->enabled) {
-			// TODO: First change the value, then trigger the event as done for all other properties.
-			$this->triggerChange('enabled', $enabled, $oldStatus);
-			$this->config->setUserValue($this->uid, 'core', 'enabled', $enabled ? 'true' : 'false');
-		}
-	}
-
-	/**
-	 * get the users email address
-	 *
-	 * @return string|null
-	 * @since 9.0.0
-	 */
-	public function getEMailAddress() {
-		return $this->getPrimaryEMailAddress() ?? $this->getSystemEMailAddress();
-	}
-
-	/**
-	 * @inheritDoc
-	 */
-	public function getSystemEMailAddress(): ?string {
-		return $this->config->getUserValue($this->uid, 'settings', 'email', null);
-	}
-
-	/**
-	 * @inheritDoc
-	 */
-	public function getPrimaryEMailAddress(): ?string {
-		return $this->config->getUserValue($this->uid, 'settings', 'primary_email', null);
-	}
-
-	/**
-	 * get the users' quota
-	 *
-	 * @return string
-	 * @since 9.0.0
-	 */
-	public function getQuota() {
-		// allow apps to modify the user quota by hooking into the event
-		$event = new GetQuotaEvent($this);
-		$this->dispatcher->dispatchTyped($event);
-		$overwriteQuota = $event->getQuota();
-		if ($overwriteQuota) {
-			$quota = $overwriteQuota;
-		} else {
-			$quota = $this->config->getUserValue($this->uid, 'files', 'quota', 'default');
-		}
-		if ($quota === 'default') {
-			$quota = $this->config->getAppValue('files', 'default_quota', 'none');
-
-			// if unlimited quota is not allowed => avoid getting 'unlimited' as default_quota fallback value
-			// use the first preset instead
-			$allowUnlimitedQuota = $this->config->getAppValue('files', 'allow_unlimited_quota', '1') === '1';
-			if (!$allowUnlimitedQuota) {
-				$presets = $this->config->getAppValue('files', 'quota_preset', '1 GB, 5 GB, 10 GB');
-				$presets = array_filter(array_map('trim', explode(',', $presets)));
-				$quotaPreset = array_values(array_diff($presets, ['default', 'none']));
-				if (count($quotaPreset) > 0) {
-					$quota = $this->config->getAppValue('files', 'default_quota', $quotaPreset[0]);
-				}
-			}
-		}
-		return $quota;
-	}
-
-	/**
-	 * set the users' quota
-	 *
-	 * @param string $quota
-	 * @return void
-	 * @throws InvalidArgumentException
-	 * @since 9.0.0
-	 */
-	public function setQuota($quota) {
-		$oldQuota = $this->config->getUserValue($this->uid, 'files', 'quota', '');
-		if ($quota !== 'none' and $quota !== 'default') {
-			$bytesQuota = OC_Helper::computerFileSize($quota);
-			if ($bytesQuota === false) {
-				throw new InvalidArgumentException('Failed to set quota to invalid value '.$quota);
-			}
-			$quota = OC_Helper::humanFileSize($bytesQuota);
-		}
-		if ($quota !== $oldQuota) {
-			$this->config->setUserValue($this->uid, 'files', 'quota', $quota);
-			$this->triggerChange('quota', $quota, $oldQuota);
-		}
-		\OC_Helper::clearStorageInfo('/' . $this->uid . '/files');
-	}
-
-	public function getManagerUids(): array {
-		$encodedUids = $this->config->getUserValue(
-			$this->uid,
-			'settings',
-			self::CONFIG_KEY_MANAGERS,
-			'[]'
-		);
-		return json_decode($encodedUids, false, 512, JSON_THROW_ON_ERROR);
-	}
-
-	public function setManagerUids(array $uids): void {
-		$oldUids = $this->getManagerUids();
-		$this->config->setUserValue(
-			$this->uid,
-			'settings',
-			self::CONFIG_KEY_MANAGERS,
-			json_encode($uids, JSON_THROW_ON_ERROR)
-		);
-		$this->triggerChange('managers', $uids, $oldUids);
-	}
-
-	/**
-	 * get the avatar image if it exists
-	 *
-	 * @param int $size
-	 * @return IImage|null
-	 * @since 9.0.0
-	 */
-	public function getAvatarImage($size) {
-		// delay the initialization
-		if (is_null($this->avatarManager)) {
-			$this->avatarManager = \OC::$server->getAvatarManager();
-		}
-
-		$avatar = $this->avatarManager->getAvatar($this->uid);
-		$image = $avatar->get(-1);
-		if ($image) {
-			return $image;
-		}
-
-		return null;
-	}
-
-	/**
-	 * get the federation cloud id
-	 *
-	 * @return string
-	 * @since 9.0.0
-	 */
-	public function getCloudId() {
-		$uid = $this->getUID();
-		$server = rtrim($this->urlGenerator->getAbsoluteURL('/'), '/');
-		if (substr($server, -10) === '/index.php') {
-			$server = substr($server, 0, -10);
-		}
-		$server = $this->removeProtocolFromUrl($server);
-		return $uid . '@' . $server;
-	}
-
-	private function removeProtocolFromUrl(string $url): string {
-		if (strpos($url, 'https://') === 0) {
-			return substr($url, strlen('https://'));
-		}
-
-		return $url;
-	}
-
-	public function triggerChange($feature, $value = null, $oldValue = null) {
-		$this->legacyDispatcher->dispatch(IUser::class . '::changeUser', new GenericEvent($this, [
-			'feature' => $feature,
-			'value' => $value,
-			'oldValue' => $oldValue,
-		]));
-		if ($this->emitter) {
-			$this->emitter->emit('\OC\User', 'changeUser', [$this, $feature, $value, $oldValue]);
-		}
-	}
+    private const CONFIG_KEY_MANAGERS = 'manager';
+
+    /** @var IAccountManager */
+    protected $accountManager;
+    /** @var string */
+    private $uid;
+
+    /** @var string|null */
+    private $displayName;
+
+    /** @var UserInterface|null */
+    private $backend;
+    /** @var EventDispatcherInterface */
+    private $legacyDispatcher;
+
+    /** @var IEventDispatcher */
+    private $dispatcher;
+
+    /** @var bool|null */
+    private $enabled;
+
+    /** @var Emitter|Manager */
+    private $emitter;
+
+    /** @var string */
+    private $home;
+
+    /** @var int|null */
+    private $lastLogin;
+
+    /** @var \OCP\IConfig */
+    private $config;
+
+    /** @var IAvatarManager */
+    private $avatarManager;
+
+    /** @var IURLGenerator */
+    private $urlGenerator;
+
+    public function __construct(string $uid, ?UserInterface $backend, EventDispatcherInterface $dispatcher, $emitter = null, IConfig $config = null, $urlGenerator = null) {
+        $this->uid = $uid;
+        $this->backend = $backend;
+        $this->legacyDispatcher = $dispatcher;
+        $this->emitter = $emitter;
+        if (is_null($config)) {
+            $config = \OC::$server->getConfig();
+        }
+        $this->config = $config;
+        $this->urlGenerator = $urlGenerator;
+        if (is_null($this->urlGenerator)) {
+            $this->urlGenerator = \OC::$server->getURLGenerator();
+        }
+        // TODO: inject
+        $this->dispatcher = \OC::$server->query(IEventDispatcher::class);
+    }
+
+    /**
+     * get the user id
+     *
+     * @return string
+     */
+    public function getUID() {
+        return $this->uid;
+    }
+
+    /**
+     * get the display name for the user, if no specific display name is set it will fallback to the user id
+     *
+     * @return string
+     */
+    public function getDisplayName() {
+        if ($this->displayName === null) {
+            $displayName = '';
+            if ($this->backend && $this->backend->implementsActions(Backend::GET_DISPLAYNAME)) {
+                // get display name and strip whitespace from the beginning and end of it
+                $backendDisplayName = $this->backend->getDisplayName($this->uid);
+                if (is_string($backendDisplayName)) {
+                    $displayName = trim($backendDisplayName);
+                }
+            }
+
+            if (!empty($displayName)) {
+                $this->displayName = $displayName;
+            } else {
+                $this->displayName = $this->uid;
+            }
+        }
+        return $this->displayName;
+    }
+
+    /**
+     * set the displayname for the user
+     *
+     * @param string $displayName
+     * @return bool
+     *
+     * @since 25.0.0 Throw InvalidArgumentException
+     * @throws \InvalidArgumentException
+     */
+    public function setDisplayName($displayName) {
+        $displayName = trim($displayName);
+        $oldDisplayName = $this->getDisplayName();
+        if ($this->backend->implementsActions(Backend::SET_DISPLAYNAME) && !empty($displayName) && $displayName !== $oldDisplayName) {
+            /** @var ISetDisplayNameBackend $backend */
+            $backend = $this->backend;
+            $result = $backend->setDisplayName($this->uid, $displayName);
+            if ($result) {
+                $this->displayName = $displayName;
+                $this->triggerChange('displayName', $displayName, $oldDisplayName);
+            }
+            return $result !== false;
+        }
+        return false;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function setEMailAddress($mailAddress) {
+        $this->setSystemEMailAddress($mailAddress);
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function setSystemEMailAddress(string $mailAddress): void {
+        $oldMailAddress = $this->getSystemEMailAddress();
+
+        if ($mailAddress === '') {
+            $this->config->deleteUserValue($this->uid, 'settings', 'email');
+        } else {
+            $this->config->setUserValue($this->uid, 'settings', 'email', $mailAddress);
+        }
+
+        $primaryAddress = $this->getPrimaryEMailAddress();
+        if ($primaryAddress === $mailAddress) {
+            // on match no dedicated primary settings is necessary
+            $this->setPrimaryEMailAddress('');
+        }
+
+        if ($oldMailAddress !== strtolower($mailAddress)) {
+            $this->triggerChange('eMailAddress', $mailAddress, $oldMailAddress);
+        }
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function setPrimaryEMailAddress(string $mailAddress): void {
+        if ($mailAddress === '') {
+            $this->config->deleteUserValue($this->uid, 'settings', 'primary_email');
+            return;
+        }
+
+        $this->ensureAccountManager();
+        $account = $this->accountManager->getAccount($this);
+        $property = $account->getPropertyCollection(IAccountManager::COLLECTION_EMAIL)
+            ->getPropertyByValue($mailAddress);
+
+        if ($property === null || $property->getLocallyVerified() !== IAccountManager::VERIFIED) {
+            throw new InvalidArgumentException('Only verified emails can be set as primary');
+        }
+        $this->config->setUserValue($this->uid, 'settings', 'primary_email', $mailAddress);
+    }
+
+    private function ensureAccountManager() {
+        if (!$this->accountManager instanceof IAccountManager) {
+            $this->accountManager = \OC::$server->get(IAccountManager::class);
+        }
+    }
+
+    /**
+     * returns the timestamp of the user's last login or 0 if the user did never
+     * login
+     *
+     * @return int
+     */
+    public function getLastLogin() {
+        if ($this->lastLogin === null) {
+            $this->lastLogin = (int) $this->config->getUserValue($this->uid, 'login', 'lastLogin', 0);
+        }
+        return (int) $this->lastLogin;
+    }
+
+    /**
+     * updates the timestamp of the most recent login of this user
+     */
+    public function updateLastLoginTimestamp() {
+        $previousLogin = $this->getLastLogin();
+        $now = time();
+        $firstTimeLogin = $previousLogin === 0;
+
+        if ($now - $previousLogin > 60) {
+            $this->lastLogin = time();
+            $this->config->setUserValue(
+                $this->uid, 'login', 'lastLogin', (string)$this->lastLogin);
+        }
+
+        return $firstTimeLogin;
+    }
+
+    /**
+     * Delete the user
+     *
+     * @return bool
+     */
+    public function delete() {
+        /** @deprecated 21.0.0 use BeforeUserDeletedEvent event with the IEventDispatcher instead */
+        $this->legacyDispatcher->dispatch(IUser::class . '::preDelete', new GenericEvent($this));
+        if ($this->emitter) {
+            /** @deprecated 21.0.0 use BeforeUserDeletedEvent event with the IEventDispatcher instead */
+            $this->emitter->emit('\OC\User', 'preDelete', [$this]);
+        }
+        $this->dispatcher->dispatchTyped(new BeforeUserDeletedEvent($this));
+        $result = $this->backend->deleteUser($this->uid);
+        if ($result) {
+            // FIXME: Feels like an hack - suggestions?
+
+            $groupManager = \OC::$server->getGroupManager();
+            // We have to delete the user from all groups
+            foreach ($groupManager->getUserGroupIds($this) as $groupId) {
+                $group = $groupManager->get($groupId);
+                if ($group) {
+                    $this->dispatcher->dispatchTyped(new BeforeUserRemovedEvent($group, $this));
+                    $group->removeUser($this);
+                    $this->dispatcher->dispatchTyped(new UserRemovedEvent($group, $this));
+                }
+            }
+            // Delete the user's keys in preferences
+            \OC::$server->getConfig()->deleteAllUserValues($this->uid);
+
+            \OC::$server->getCommentsManager()->deleteReferencesOfActor('users', $this->uid);
+            \OC::$server->getCommentsManager()->deleteReadMarksFromUser($this);
+
+            /** @var AvatarManager $avatarManager */
+            $avatarManager = \OC::$server->query(AvatarManager::class);
+            $avatarManager->deleteUserAvatar($this->uid);
+
+            $notification = \OC::$server->getNotificationManager()->createNotification();
+            $notification->setUser($this->uid);
+            \OC::$server->getNotificationManager()->markProcessed($notification);
+
+            /** @var AccountManager $accountManager */
+            $accountManager = \OC::$server->query(AccountManager::class);
+            $accountManager->deleteUser($this);
+
+            /** @deprecated 21.0.0 use UserDeletedEvent event with the IEventDispatcher instead */
+            $this->legacyDispatcher->dispatch(IUser::class . '::postDelete', new GenericEvent($this));
+            if ($this->emitter) {
+                /** @deprecated 21.0.0 use UserDeletedEvent event with the IEventDispatcher instead */
+                $this->emitter->emit('\OC\User', 'postDelete', [$this]);
+            }
+            $this->dispatcher->dispatchTyped(new UserDeletedEvent($this));
+        }
+        return !($result === false);
+    }
+
+    /**
+     * Set the password of the user
+     *
+     * @param string $password
+     * @param string $recoveryPassword for the encryption app to reset encryption keys
+     * @return bool
+     */
+    public function setPassword($password, $recoveryPassword = null) {
+        $this->legacyDispatcher->dispatch(IUser::class . '::preSetPassword', new GenericEvent($this, [
+            'password' => $password,
+            'recoveryPassword' => $recoveryPassword,
+        ]));
+        if ($this->emitter) {
+            $this->emitter->emit('\OC\User', 'preSetPassword', [$this, $password, $recoveryPassword]);
+        }
+        if ($this->backend->implementsActions(Backend::SET_PASSWORD)) {
+            /** @var ISetPasswordBackend $backend */
+            $backend = $this->backend;
+            $result = $backend->setPassword($this->uid, $password);
+
+            if ($result !== false) {
+                $this->legacyDispatcher->dispatch(IUser::class . '::postSetPassword', new GenericEvent($this, [
+                    'password' => $password,
+                    'recoveryPassword' => $recoveryPassword,
+                ]));
+                if ($this->emitter) {
+                    $this->emitter->emit('\OC\User', 'postSetPassword', [$this, $password, $recoveryPassword]);
+                }
+            }
+
+            return !($result === false);
+        } else {
+            return false;
+        }
+    }
+
+    /**
+     * get the users home folder to mount
+     *
+     * @return string
+     */
+    public function getHome() {
+        if (!$this->home) {
+            /** @psalm-suppress UndefinedInterfaceMethod Once we get rid of the legacy implementsActions, psalm won't complain anymore */
+            if (($this->backend instanceof IGetHomeBackend || $this->backend->implementsActions(Backend::GET_HOME)) && $home = $this->backend->getHome($this->uid)) {
+                $this->home = $home;
+            } elseif ($this->config) {
+                $this->home = $this->config->getSystemValueString('datadirectory', \OC::$SERVERROOT . '/data') . '/' . $this->uid;
+            } else {
+                $this->home = \OC::$SERVERROOT . '/data/' . $this->uid;
+            }
+        }
+        return $this->home;
+    }
+
+    /**
+     * Get the name of the backend class the user is connected with
+     *
+     * @return string
+     */
+    public function getBackendClassName() {
+        if ($this->backend instanceof IUserBackend) {
+            return $this->backend->getBackendName();
+        }
+        return get_class($this->backend);
+    }
+
+    public function getBackend(): ?UserInterface {
+        return $this->backend;
+    }
+
+    /**
+     * Check if the backend allows the user to change his avatar on Personal page
+     *
+     * @return bool
+     */
+    public function canChangeAvatar() {
+        if ($this->backend instanceof IProvideAvatarBackend || $this->backend->implementsActions(Backend::PROVIDE_AVATAR)) {
+            /** @var IProvideAvatarBackend $backend */
+            $backend = $this->backend;
+            return $backend->canChangeAvatar($this->uid);
+        }
+        return true;
+    }
+
+    /**
+     * check if the backend supports changing passwords
+     *
+     * @return bool
+     */
+    public function canChangePassword() {
+        return $this->backend->implementsActions(Backend::SET_PASSWORD);
+    }
+
+    /**
+     * check if the backend supports changing display names
+     *
+     * @return bool
+     */
+    public function canChangeDisplayName() {
+        if (!$this->config->getSystemValueBool('allow_user_to_change_display_name', true)) {
+            return false;
+        }
+        return $this->backend->implementsActions(Backend::SET_DISPLAYNAME);
+    }
+
+    /**
+     * check if the user is enabled
+     *
+     * @return bool
+     */
+    public function isEnabled() {
+        if ($this->enabled === null) {
+            $enabled = $this->config->getUserValue($this->uid, 'core', 'enabled', 'true');
+            $this->enabled = $enabled === 'true';
+        }
+        return (bool) $this->enabled;
+    }
+
+    /**
+     * set the enabled status for the user
+     *
+     * @param bool $enabled
+     */
+    public function setEnabled(bool $enabled = true) {
+        $oldStatus = $this->isEnabled();
+        $this->enabled = $enabled;
+        if ($oldStatus !== $this->enabled) {
+            // TODO: First change the value, then trigger the event as done for all other properties.
+            $this->triggerChange('enabled', $enabled, $oldStatus);
+            $this->config->setUserValue($this->uid, 'core', 'enabled', $enabled ? 'true' : 'false');
+        }
+    }
+
+    /**
+     * get the users email address
+     *
+     * @return string|null
+     * @since 9.0.0
+     */
+    public function getEMailAddress() {
+        return $this->getPrimaryEMailAddress() ?? $this->getSystemEMailAddress();
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getSystemEMailAddress(): ?string {
+        return $this->config->getUserValue($this->uid, 'settings', 'email', null);
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getPrimaryEMailAddress(): ?string {
+        return $this->config->getUserValue($this->uid, 'settings', 'primary_email', null);
+    }
+
+    /**
+     * get the users' quota
+     *
+     * @return string
+     * @since 9.0.0
+     */
+    public function getQuota() {
+        // allow apps to modify the user quota by hooking into the event
+        $event = new GetQuotaEvent($this);
+        $this->dispatcher->dispatchTyped($event);
+        $overwriteQuota = $event->getQuota();
+        if ($overwriteQuota) {
+            $quota = $overwriteQuota;
+        } else {
+            $quota = $this->config->getUserValue($this->uid, 'files', 'quota', 'default');
+        }
+        if ($quota === 'default') {
+            $quota = $this->config->getAppValue('files', 'default_quota', 'none');
+
+            // if unlimited quota is not allowed => avoid getting 'unlimited' as default_quota fallback value
+            // use the first preset instead
+            $allowUnlimitedQuota = $this->config->getAppValue('files', 'allow_unlimited_quota', '1') === '1';
+            if (!$allowUnlimitedQuota) {
+                $presets = $this->config->getAppValue('files', 'quota_preset', '1 GB, 5 GB, 10 GB');
+                $presets = array_filter(array_map('trim', explode(',', $presets)));
+                $quotaPreset = array_values(array_diff($presets, ['default', 'none']));
+                if (count($quotaPreset) > 0) {
+                    $quota = $this->config->getAppValue('files', 'default_quota', $quotaPreset[0]);
+                }
+            }
+        }
+        return $quota;
+    }
+
+    /**
+     * set the users' quota
+     *
+     * @param string $quota
+     * @return void
+     * @throws InvalidArgumentException
+     * @since 9.0.0
+     */
+    public function setQuota($quota) {
+        $oldQuota = $this->config->getUserValue($this->uid, 'files', 'quota', '');
+        if ($quota !== 'none' and $quota !== 'default') {
+            $bytesQuota = OC_Helper::computerFileSize($quota);
+            if ($bytesQuota === false) {
+                throw new InvalidArgumentException('Failed to set quota to invalid value '.$quota);
+            }
+            $quota = OC_Helper::humanFileSize($bytesQuota);
+        }
+        if ($quota !== $oldQuota) {
+            $this->config->setUserValue($this->uid, 'files', 'quota', $quota);
+            $this->triggerChange('quota', $quota, $oldQuota);
+        }
+        \OC_Helper::clearStorageInfo('/' . $this->uid . '/files');
+    }
+
+    public function getManagerUids(): array {
+        $encodedUids = $this->config->getUserValue(
+            $this->uid,
+            'settings',
+            self::CONFIG_KEY_MANAGERS,
+            '[]'
+        );
+        return json_decode($encodedUids, false, 512, JSON_THROW_ON_ERROR);
+    }
+
+    public function setManagerUids(array $uids): void {
+        $oldUids = $this->getManagerUids();
+        $this->config->setUserValue(
+            $this->uid,
+            'settings',
+            self::CONFIG_KEY_MANAGERS,
+            json_encode($uids, JSON_THROW_ON_ERROR)
+        );
+        $this->triggerChange('managers', $uids, $oldUids);
+    }
+
+    /**
+     * get the avatar image if it exists
+     *
+     * @param int $size
+     * @return IImage|null
+     * @since 9.0.0
+     */
+    public function getAvatarImage($size) {
+        // delay the initialization
+        if (is_null($this->avatarManager)) {
+            $this->avatarManager = \OC::$server->getAvatarManager();
+        }
+
+        $avatar = $this->avatarManager->getAvatar($this->uid);
+        $image = $avatar->get(-1);
+        if ($image) {
+            return $image;
+        }
+
+        return null;
+    }
+
+    /**
+     * get the federation cloud id
+     *
+     * @return string
+     * @since 9.0.0
+     */
+    public function getCloudId() {
+        $uid = $this->getUID();
+        $server = rtrim($this->urlGenerator->getAbsoluteURL('/'), '/');
+        if (substr($server, -10) === '/index.php') {
+            $server = substr($server, 0, -10);
+        }
+        $server = $this->removeProtocolFromUrl($server);
+        return $uid . '@' . $server;
+    }
+
+    private function removeProtocolFromUrl(string $url): string {
+        if (strpos($url, 'https://') === 0) {
+            return substr($url, strlen('https://'));
+        }
+
+        return $url;
+    }
+
+    public function triggerChange($feature, $value = null, $oldValue = null) {
+        $this->legacyDispatcher->dispatch(IUser::class . '::changeUser', new GenericEvent($this, [
+            'feature' => $feature,
+            'value' => $value,
+            'oldValue' => $oldValue,
+        ]));
+        if ($this->emitter) {
+            $this->emitter->emit('\OC\User', 'changeUser', [$this, $feature, $value, $oldValue]);
+        }
+    }
 }

Spacing +10 added lines, -10 removed lines

@@ -258,7 +258,7 @@ 
 		if ($now - $previousLogin > 60) {
 			$this->lastLogin = time();
 			$this->config->setUserValue(
-				$this->uid, 'login', 'lastLogin', (string)$this->lastLogin);
+				$this->uid, 'login', 'lastLogin', (string) $this->lastLogin);
 		}
 
 		return $firstTimeLogin;
@@ -271,7 +271,7 @@ 
 	 */
 	public function delete() {
 		/** @deprecated 21.0.0 use BeforeUserDeletedEvent event with the IEventDispatcher instead */
-		$this->legacyDispatcher->dispatch(IUser::class . '::preDelete', new GenericEvent($this));
+		$this->legacyDispatcher->dispatch(IUser::class.'::preDelete', new GenericEvent($this));
 		if ($this->emitter) {
 			/** @deprecated 21.0.0 use BeforeUserDeletedEvent event with the IEventDispatcher instead */
 			$this->emitter->emit('\OC\User', 'preDelete', [$this]);
@@ -310,7 +310,7 @@ 
 			$accountManager->deleteUser($this);
 
 			/** @deprecated 21.0.0 use UserDeletedEvent event with the IEventDispatcher instead */
-			$this->legacyDispatcher->dispatch(IUser::class . '::postDelete', new GenericEvent($this));
+			$this->legacyDispatcher->dispatch(IUser::class.'::postDelete', new GenericEvent($this));
 			if ($this->emitter) {
 				/** @deprecated 21.0.0 use UserDeletedEvent event with the IEventDispatcher instead */
 				$this->emitter->emit('\OC\User', 'postDelete', [$this]);
@@ -328,7 +328,7 @@ 
 	 * @return bool
 	 */
 	public function setPassword($password, $recoveryPassword = null) {
-		$this->legacyDispatcher->dispatch(IUser::class . '::preSetPassword', new GenericEvent($this, [
+		$this->legacyDispatcher->dispatch(IUser::class.'::preSetPassword', new GenericEvent($this, [
 			'password' => $password,
 			'recoveryPassword' => $recoveryPassword,
 		]));
@@ -341,7 +341,7 @@ 
 			$result = $backend->setPassword($this->uid, $password);
 
 			if ($result !== false) {
-				$this->legacyDispatcher->dispatch(IUser::class . '::postSetPassword', new GenericEvent($this, [
+				$this->legacyDispatcher->dispatch(IUser::class.'::postSetPassword', new GenericEvent($this, [
 					'password' => $password,
 					'recoveryPassword' => $recoveryPassword,
 				]));
@@ -367,9 +367,9 @@ 
 			if (($this->backend instanceof IGetHomeBackend || $this->backend->implementsActions(Backend::GET_HOME)) && $home = $this->backend->getHome($this->uid)) {
 				$this->home = $home;
 			} elseif ($this->config) {
-				$this->home = $this->config->getSystemValueString('datadirectory', \OC::$SERVERROOT . '/data') . '/' . $this->uid;
+				$this->home = $this->config->getSystemValueString('datadirectory', \OC::$SERVERROOT.'/data').'/'.$this->uid;
 			} else {
-				$this->home = \OC::$SERVERROOT . '/data/' . $this->uid;
+				$this->home = \OC::$SERVERROOT.'/data/'.$this->uid;
 			}
 		}
 		return $this->home;
@@ -533,7 +533,7 @@ 
 			$this->config->setUserValue($this->uid, 'files', 'quota', $quota);
 			$this->triggerChange('quota', $quota, $oldQuota);
 		}
-		\OC_Helper::clearStorageInfo('/' . $this->uid . '/files');
+		\OC_Helper::clearStorageInfo('/'.$this->uid.'/files');
 	}
 
 	public function getManagerUids(): array {
@@ -592,7 +592,7 @@ 
 			$server = substr($server, 0, -10);
 		}
 		$server = $this->removeProtocolFromUrl($server);
-		return $uid . '@' . $server;
+		return $uid.'@'.$server;
 	}
 
 	private function removeProtocolFromUrl(string $url): string {
@@ -604,7 +604,7 @@ 
 	}
 
 	public function triggerChange($feature, $value = null, $oldValue = null) {
-		$this->legacyDispatcher->dispatch(IUser::class . '::changeUser', new GenericEvent($this, [
+		$this->legacyDispatcher->dispatch(IUser::class.'::changeUser', new GenericEvent($this, [
 			'feature' => $feature,
 			'value' => $value,
 			'oldValue' => $oldValue,

lib/private/User/LazyUser.php

Indentation +136 added lines, -136 removed lines

@@ -28,143 +28,143 @@
 use OCP\UserInterface;
 
 class LazyUser implements IUser {
-	private ?IUser $user = null;
-	private string $uid;
-	private ?string $displayName;
-	private IUserManager $userManager;
-	private ?UserInterface $backend;
-
-	public function __construct(string $uid, IUserManager $userManager, ?string $displayName = null, ?UserInterface $backend = null) {
-		$this->uid = $uid;
-		$this->userManager = $userManager;
-		$this->displayName = $displayName;
-		$this->backend = $backend;
-	}
-
-	private function getUser(): IUser {
-		if ($this->user === null) {
-			if ($this->backend) {
-				/** @var \OC\User\Manager $manager */
-				$manager = $this->userManager;
-				$this->user = $manager->getUserObject($this->uid, $this->backend);
-			} else {
-				$this->user = $this->userManager->get($this->uid);
-			}
-		}
-		/** @var IUser */
-		$user = $this->user;
-		return $user;
-	}
-
-	public function getUID() {
-		return $this->uid;
-	}
-
-	public function getDisplayName() {
-		if ($this->displayName) {
-			return $this->displayName;
-		}
-
-		return $this->userManager->getDisplayName($this->uid) ?? $this->uid;
-	}
-
-	public function setDisplayName($displayName) {
-		return $this->getUser()->setDisplayName($displayName);
-	}
-
-	public function getLastLogin() {
-		return $this->getUser()->getLastLogin();
-	}
-
-	public function updateLastLoginTimestamp() {
-		return $this->getUser()->updateLastLoginTimestamp();
-	}
-
-	public function delete() {
-		return $this->getUser()->delete();
-	}
-
-	public function setPassword($password, $recoveryPassword = null) {
-		return $this->getUser()->setPassword($password, $recoveryPassword);
-	}
-
-	public function getHome() {
-		return $this->getUser()->getHome();
-	}
-
-	public function getBackendClassName() {
-		return $this->getUser()->getBackendClassName();
-	}
-
-	public function getBackend(): ?UserInterface {
-		return $this->getUser()->getBackend();
-	}
-
-	public function canChangeAvatar() {
-		return $this->getUser()->canChangeAvatar();
-	}
-
-	public function canChangePassword() {
-		return $this->getUser()->canChangePassword();
-	}
-
-	public function canChangeDisplayName() {
-		return $this->getUser()->canChangeDisplayName();
-	}
-
-	public function isEnabled() {
-		return $this->getUser()->isEnabled();
-	}
-
-	public function setEnabled(bool $enabled = true) {
-		return $this->getUser()->setEnabled($enabled);
-	}
-
-	public function getEMailAddress() {
-		return $this->getUser()->getEMailAddress();
-	}
-
-	public function getSystemEMailAddress(): ?string {
-		return $this->getUser()->getSystemEMailAddress();
-	}
-
-	public function getPrimaryEMailAddress(): ?string {
-		return $this->getUser()->getPrimaryEMailAddress();
-	}
-
-	public function getAvatarImage($size) {
-		return $this->getUser()->getAvatarImage($size);
-	}
-
-	public function getCloudId() {
-		return $this->getUser()->getCloudId();
-	}
-
-	public function setEMailAddress($mailAddress) {
-		$this->getUser()->setEMailAddress($mailAddress);
-	}
-
-	public function setSystemEMailAddress(string $mailAddress): void {
-		$this->getUser()->setSystemEMailAddress($mailAddress);
-	}
-
-	public function setPrimaryEMailAddress(string $mailAddress): void {
-		$this->getUser()->setPrimaryEMailAddress($mailAddress);
-	}
-
-	public function getQuota() {
-		return $this->getUser()->getQuota();
-	}
+    private ?IUser $user = null;
+    private string $uid;
+    private ?string $displayName;
+    private IUserManager $userManager;
+    private ?UserInterface $backend;
+
+    public function __construct(string $uid, IUserManager $userManager, ?string $displayName = null, ?UserInterface $backend = null) {
+        $this->uid = $uid;
+        $this->userManager = $userManager;
+        $this->displayName = $displayName;
+        $this->backend = $backend;
+    }
+
+    private function getUser(): IUser {
+        if ($this->user === null) {
+            if ($this->backend) {
+                /** @var \OC\User\Manager $manager */
+                $manager = $this->userManager;
+                $this->user = $manager->getUserObject($this->uid, $this->backend);
+            } else {
+                $this->user = $this->userManager->get($this->uid);
+            }
+        }
+        /** @var IUser */
+        $user = $this->user;
+        return $user;
+    }
+
+    public function getUID() {
+        return $this->uid;
+    }
+
+    public function getDisplayName() {
+        if ($this->displayName) {
+            return $this->displayName;
+        }
+
+        return $this->userManager->getDisplayName($this->uid) ?? $this->uid;
+    }
+
+    public function setDisplayName($displayName) {
+        return $this->getUser()->setDisplayName($displayName);
+    }
+
+    public function getLastLogin() {
+        return $this->getUser()->getLastLogin();
+    }
+
+    public function updateLastLoginTimestamp() {
+        return $this->getUser()->updateLastLoginTimestamp();
+    }
+
+    public function delete() {
+        return $this->getUser()->delete();
+    }
+
+    public function setPassword($password, $recoveryPassword = null) {
+        return $this->getUser()->setPassword($password, $recoveryPassword);
+    }
+
+    public function getHome() {
+        return $this->getUser()->getHome();
+    }
+
+    public function getBackendClassName() {
+        return $this->getUser()->getBackendClassName();
+    }
+
+    public function getBackend(): ?UserInterface {
+        return $this->getUser()->getBackend();
+    }
+
+    public function canChangeAvatar() {
+        return $this->getUser()->canChangeAvatar();
+    }
+
+    public function canChangePassword() {
+        return $this->getUser()->canChangePassword();
+    }
+
+    public function canChangeDisplayName() {
+        return $this->getUser()->canChangeDisplayName();
+    }
+
+    public function isEnabled() {
+        return $this->getUser()->isEnabled();
+    }
+
+    public function setEnabled(bool $enabled = true) {
+        return $this->getUser()->setEnabled($enabled);
+    }
+
+    public function getEMailAddress() {
+        return $this->getUser()->getEMailAddress();
+    }
+
+    public function getSystemEMailAddress(): ?string {
+        return $this->getUser()->getSystemEMailAddress();
+    }
+
+    public function getPrimaryEMailAddress(): ?string {
+        return $this->getUser()->getPrimaryEMailAddress();
+    }
+
+    public function getAvatarImage($size) {
+        return $this->getUser()->getAvatarImage($size);
+    }
+
+    public function getCloudId() {
+        return $this->getUser()->getCloudId();
+    }
+
+    public function setEMailAddress($mailAddress) {
+        $this->getUser()->setEMailAddress($mailAddress);
+    }
+
+    public function setSystemEMailAddress(string $mailAddress): void {
+        $this->getUser()->setSystemEMailAddress($mailAddress);
+    }
+
+    public function setPrimaryEMailAddress(string $mailAddress): void {
+        $this->getUser()->setPrimaryEMailAddress($mailAddress);
+    }
+
+    public function getQuota() {
+        return $this->getUser()->getQuota();
+    }
 
-	public function setQuota($quota) {
-		$this->getUser()->setQuota($quota);
-	}
+    public function setQuota($quota) {
+        $this->getUser()->setQuota($quota);
+    }
 
-	public function getManagerUids(): array {
-		return $this->getUser()->getManagerUids();
-	}
+    public function getManagerUids(): array {
+        return $this->getUser()->getManagerUids();
+    }
 
-	public function setManagerUids(array $uids): void {
-		$this->getUser()->setManagerUids($uids);
-	}
+    public function setManagerUids(array $uids): void {
+        $this->getUser()->setManagerUids($uids);
+    }
 }

apps/dav/lib/CardDAV/Converter.php

Indentation +120 added lines, -120 removed lines

@@ -36,124 +36,124 @@
 use Sabre\VObject\Property\Text;
 
 class Converter {
-	/** @var IAccountManager */
-	private $accountManager;
-	private IUserManager $userManager;
-
-	public function __construct(IAccountManager $accountManager,
-		IUserManager $userManager) {
-		$this->accountManager = $accountManager;
-		$this->userManager = $userManager;
-	}
-
-	public function createCardFromUser(IUser $user): ?VCard {
-		$userProperties = $this->accountManager->getAccount($user)->getAllProperties();
-
-		$uid = $user->getUID();
-		$cloudId = $user->getCloudId();
-		$image = $this->getAvatarImage($user);
-
-		$vCard = new VCard();
-		$vCard->VERSION = '3.0';
-		$vCard->UID = $uid;
-
-		$publish = false;
-
-		foreach ($userProperties as $property) {
-			if (empty($property->getValue())) {
-				continue;
-			}
-
-			$scope = $property->getScope();
-			// Do not write private data to the system address book at all
-			if ($scope === IAccountManager::SCOPE_PRIVATE || empty($scope)) {
-				continue;
-			}
-
-			$publish = true;
-			switch ($property->getName()) {
-				case IAccountManager::PROPERTY_DISPLAYNAME:
-					$vCard->add(new Text($vCard, 'FN', $property->getValue(), ['X-NC-SCOPE' => $scope]));
-					$vCard->add(new Text($vCard, 'N', $this->splitFullName($property->getValue()), ['X-NC-SCOPE' => $scope]));
-					break;
-				case IAccountManager::PROPERTY_AVATAR:
-					if ($image !== null) {
-						$vCard->add('PHOTO', $image->data(), ['ENCODING' => 'b', 'TYPE' => $image->mimeType(), ['X-NC-SCOPE' => $scope]]);
-					}
-					break;
-				case IAccountManager::COLLECTION_EMAIL:
-				case IAccountManager::PROPERTY_EMAIL:
-					$vCard->add(new Text($vCard, 'EMAIL', $property->getValue(), ['TYPE' => 'OTHER', 'X-NC-SCOPE' => $scope]));
-					break;
-				case IAccountManager::PROPERTY_WEBSITE:
-					$vCard->add(new Text($vCard, 'URL', $property->getValue(), ['X-NC-SCOPE' => $scope]));
-					break;
-				case IAccountManager::PROPERTY_PHONE:
-					$vCard->add(new Text($vCard, 'TEL', $property->getValue(), ['TYPE' => 'OTHER', 'X-NC-SCOPE' => $scope]));
-					break;
-				case IAccountManager::PROPERTY_ADDRESS:
-					$vCard->add(new Text($vCard, 'ADR', $property->getValue(), ['TYPE' => 'OTHER', 'X-NC-SCOPE' => $scope]));
-					break;
-				case IAccountManager::PROPERTY_TWITTER:
-					$vCard->add(new Text($vCard, 'X-SOCIALPROFILE', $property->getValue(), ['TYPE' => 'TWITTER', 'X-NC-SCOPE' => $scope]));
-					break;
-				case IAccountManager::PROPERTY_ORGANISATION:
-					$vCard->add(new Text($vCard, 'ORG', $property->getValue(), ['X-NC-SCOPE' => $scope]));
-					break;
-				case IAccountManager::PROPERTY_ROLE:
-					$vCard->add(new Text($vCard, 'TITLE', $property->getValue(), ['X-NC-SCOPE' => $scope]));
-					break;
-			}
-		}
-
-		// Local properties
-		$managers = $user->getManagerUids();
-		// X-MANAGERSNAME only allows a single value, so we take the first manager
-		if (isset($managers[0])) {
-			$displayName = $this->userManager->getDisplayName($managers[0]);
-			// Only set the manager if a user object is found
-			if ($displayName !== null) {
-				$vCard->add(new Text($vCard, 'X-MANAGERSNAME', $displayName, [
-					'uid' => $managers[0],
-					'X-NC-SCOPE' => IAccountManager::SCOPE_LOCAL,
-				]));
-			}
-		}
-
-		if ($publish && !empty($cloudId)) {
-			$vCard->add(new Text($vCard, 'CLOUD', $cloudId));
-			$vCard->validate();
-			return $vCard;
-		}
-
-		return null;
-	}
-
-	public function splitFullName(string $fullName): array {
-		// Very basic western style parsing. I'm not gonna implement
-		// https://github.com/android/platform_packages_providers_contactsprovider/blob/master/src/com/android/providers/contacts/NameSplitter.java ;)
-
-		$elements = explode(' ', $fullName);
-		$result = ['', '', '', '', ''];
-		if (count($elements) > 2) {
-			$result[0] = implode(' ', array_slice($elements, count($elements) - 1));
-			$result[1] = $elements[0];
-			$result[2] = implode(' ', array_slice($elements, 1, count($elements) - 2));
-		} elseif (count($elements) === 2) {
-			$result[0] = $elements[1];
-			$result[1] = $elements[0];
-		} else {
-			$result[0] = $elements[0];
-		}
-
-		return $result;
-	}
-
-	private function getAvatarImage(IUser $user): ?IImage {
-		try {
-			return $user->getAvatarImage(-1);
-		} catch (Exception $ex) {
-			return null;
-		}
-	}
+    /** @var IAccountManager */
+    private $accountManager;
+    private IUserManager $userManager;
+
+    public function __construct(IAccountManager $accountManager,
+        IUserManager $userManager) {
+        $this->accountManager = $accountManager;
+        $this->userManager = $userManager;
+    }
+
+    public function createCardFromUser(IUser $user): ?VCard {
+        $userProperties = $this->accountManager->getAccount($user)->getAllProperties();
+
+        $uid = $user->getUID();
+        $cloudId = $user->getCloudId();
+        $image = $this->getAvatarImage($user);
+
+        $vCard = new VCard();
+        $vCard->VERSION = '3.0';
+        $vCard->UID = $uid;
+
+        $publish = false;
+
+        foreach ($userProperties as $property) {
+            if (empty($property->getValue())) {
+                continue;
+            }
+
+            $scope = $property->getScope();
+            // Do not write private data to the system address book at all
+            if ($scope === IAccountManager::SCOPE_PRIVATE || empty($scope)) {
+                continue;
+            }
+
+            $publish = true;
+            switch ($property->getName()) {
+                case IAccountManager::PROPERTY_DISPLAYNAME:
+                    $vCard->add(new Text($vCard, 'FN', $property->getValue(), ['X-NC-SCOPE' => $scope]));
+                    $vCard->add(new Text($vCard, 'N', $this->splitFullName($property->getValue()), ['X-NC-SCOPE' => $scope]));
+                    break;
+                case IAccountManager::PROPERTY_AVATAR:
+                    if ($image !== null) {
+                        $vCard->add('PHOTO', $image->data(), ['ENCODING' => 'b', 'TYPE' => $image->mimeType(), ['X-NC-SCOPE' => $scope]]);
+                    }
+                    break;
+                case IAccountManager::COLLECTION_EMAIL:
+                case IAccountManager::PROPERTY_EMAIL:
+                    $vCard->add(new Text($vCard, 'EMAIL', $property->getValue(), ['TYPE' => 'OTHER', 'X-NC-SCOPE' => $scope]));
+                    break;
+                case IAccountManager::PROPERTY_WEBSITE:
+                    $vCard->add(new Text($vCard, 'URL', $property->getValue(), ['X-NC-SCOPE' => $scope]));
+                    break;
+                case IAccountManager::PROPERTY_PHONE:
+                    $vCard->add(new Text($vCard, 'TEL', $property->getValue(), ['TYPE' => 'OTHER', 'X-NC-SCOPE' => $scope]));
+                    break;
+                case IAccountManager::PROPERTY_ADDRESS:
+                    $vCard->add(new Text($vCard, 'ADR', $property->getValue(), ['TYPE' => 'OTHER', 'X-NC-SCOPE' => $scope]));
+                    break;
+                case IAccountManager::PROPERTY_TWITTER:
+                    $vCard->add(new Text($vCard, 'X-SOCIALPROFILE', $property->getValue(), ['TYPE' => 'TWITTER', 'X-NC-SCOPE' => $scope]));
+                    break;
+                case IAccountManager::PROPERTY_ORGANISATION:
+                    $vCard->add(new Text($vCard, 'ORG', $property->getValue(), ['X-NC-SCOPE' => $scope]));
+                    break;
+                case IAccountManager::PROPERTY_ROLE:
+                    $vCard->add(new Text($vCard, 'TITLE', $property->getValue(), ['X-NC-SCOPE' => $scope]));
+                    break;
+            }
+        }
+
+        // Local properties
+        $managers = $user->getManagerUids();
+        // X-MANAGERSNAME only allows a single value, so we take the first manager
+        if (isset($managers[0])) {
+            $displayName = $this->userManager->getDisplayName($managers[0]);
+            // Only set the manager if a user object is found
+            if ($displayName !== null) {
+                $vCard->add(new Text($vCard, 'X-MANAGERSNAME', $displayName, [
+                    'uid' => $managers[0],
+                    'X-NC-SCOPE' => IAccountManager::SCOPE_LOCAL,
+                ]));
+            }
+        }
+
+        if ($publish && !empty($cloudId)) {
+            $vCard->add(new Text($vCard, 'CLOUD', $cloudId));
+            $vCard->validate();
+            return $vCard;
+        }
+
+        return null;
+    }
+
+    public function splitFullName(string $fullName): array {
+        // Very basic western style parsing. I'm not gonna implement
+        // https://github.com/android/platform_packages_providers_contactsprovider/blob/master/src/com/android/providers/contacts/NameSplitter.java ;)
+
+        $elements = explode(' ', $fullName);
+        $result = ['', '', '', '', ''];
+        if (count($elements) > 2) {
+            $result[0] = implode(' ', array_slice($elements, count($elements) - 1));
+            $result[1] = $elements[0];
+            $result[2] = implode(' ', array_slice($elements, 1, count($elements) - 2));
+        } elseif (count($elements) === 2) {
+            $result[0] = $elements[1];
+            $result[1] = $elements[0];
+        } else {
+            $result[0] = $elements[0];
+        }
+
+        return $result;
+    }
+
+    private function getAvatarImage(IUser $user): ?IImage {
+        try {
+            return $user->getAvatarImage(-1);
+        } catch (Exception $ex) {
+            return null;
+        }
+    }
 }

apps/provisioning_api/lib/Controller/AUserData.php

Indentation +215 added lines, -215 removed lines

@@ -53,242 +53,242 @@
 use OCP\User\Backend\ISetPasswordBackend;
 
 abstract class AUserData extends OCSController {
-	public const SCOPE_SUFFIX = 'Scope';
+    public const SCOPE_SUFFIX = 'Scope';
 
-	public const USER_FIELD_DISPLAYNAME = 'display';
-	public const USER_FIELD_LANGUAGE = 'language';
-	public const USER_FIELD_LOCALE = 'locale';
-	public const USER_FIELD_PASSWORD = 'password';
-	public const USER_FIELD_QUOTA = 'quota';
-	public const USER_FIELD_MANAGER = 'manager';
-	public const USER_FIELD_NOTIFICATION_EMAIL = 'notify_email';
+    public const USER_FIELD_DISPLAYNAME = 'display';
+    public const USER_FIELD_LANGUAGE = 'language';
+    public const USER_FIELD_LOCALE = 'locale';
+    public const USER_FIELD_PASSWORD = 'password';
+    public const USER_FIELD_QUOTA = 'quota';
+    public const USER_FIELD_MANAGER = 'manager';
+    public const USER_FIELD_NOTIFICATION_EMAIL = 'notify_email';
 
-	/** @var IUserManager */
-	protected $userManager;
-	/** @var IConfig */
-	protected $config;
-	/** @var Manager */
-	protected $groupManager;
-	/** @var IUserSession */
-	protected $userSession;
-	/** @var IAccountManager */
-	protected $accountManager;
-	/** @var IFactory */
-	protected $l10nFactory;
+    /** @var IUserManager */
+    protected $userManager;
+    /** @var IConfig */
+    protected $config;
+    /** @var Manager */
+    protected $groupManager;
+    /** @var IUserSession */
+    protected $userSession;
+    /** @var IAccountManager */
+    protected $accountManager;
+    /** @var IFactory */
+    protected $l10nFactory;
 
-	public function __construct(string $appName,
-								IRequest $request,
-								IUserManager $userManager,
-								IConfig $config,
-								IGroupManager $groupManager,
-								IUserSession $userSession,
-								IAccountManager $accountManager,
-								IFactory $l10nFactory) {
-		parent::__construct($appName, $request);
+    public function __construct(string $appName,
+                                IRequest $request,
+                                IUserManager $userManager,
+                                IConfig $config,
+                                IGroupManager $groupManager,
+                                IUserSession $userSession,
+                                IAccountManager $accountManager,
+                                IFactory $l10nFactory) {
+        parent::__construct($appName, $request);
 
-		$this->userManager = $userManager;
-		$this->config = $config;
-		$this->groupManager = $groupManager;
-		$this->userSession = $userSession;
-		$this->accountManager = $accountManager;
-		$this->l10nFactory = $l10nFactory;
-	}
+        $this->userManager = $userManager;
+        $this->config = $config;
+        $this->groupManager = $groupManager;
+        $this->userSession = $userSession;
+        $this->accountManager = $accountManager;
+        $this->l10nFactory = $l10nFactory;
+    }
 
-	/**
-	 * creates a array with all user data
-	 *
-	 * @param string $userId
-	 * @param bool $includeScopes
-	 * @return array
-	 * @throws NotFoundException
-	 * @throws OCSException
-	 * @throws OCSNotFoundException
-	 */
-	protected function getUserData(string $userId, bool $includeScopes = false): array {
-		$currentLoggedInUser = $this->userSession->getUser();
-		assert($currentLoggedInUser !== null, 'No user logged in');
+    /**
+     * creates a array with all user data
+     *
+     * @param string $userId
+     * @param bool $includeScopes
+     * @return array
+     * @throws NotFoundException
+     * @throws OCSException
+     * @throws OCSNotFoundException
+     */
+    protected function getUserData(string $userId, bool $includeScopes = false): array {
+        $currentLoggedInUser = $this->userSession->getUser();
+        assert($currentLoggedInUser !== null, 'No user logged in');
 
-		$data = [];
+        $data = [];
 
-		// Check if the target user exists
-		$targetUserObject = $this->userManager->get($userId);
-		if ($targetUserObject === null) {
-			throw new OCSNotFoundException('User does not exist');
-		}
+        // Check if the target user exists
+        $targetUserObject = $this->userManager->get($userId);
+        if ($targetUserObject === null) {
+            throw new OCSNotFoundException('User does not exist');
+        }
 
-		$isAdmin = $this->groupManager->isAdmin($currentLoggedInUser->getUID());
-		if ($isAdmin
-			|| $this->groupManager->getSubAdmin()->isUserAccessible($currentLoggedInUser, $targetUserObject)) {
-			$data['enabled'] = $this->config->getUserValue($targetUserObject->getUID(), 'core', 'enabled', 'true') === 'true';
-		} else {
-			// Check they are looking up themselves
-			if ($currentLoggedInUser->getUID() !== $targetUserObject->getUID()) {
-				return $data;
-			}
-		}
+        $isAdmin = $this->groupManager->isAdmin($currentLoggedInUser->getUID());
+        if ($isAdmin
+            || $this->groupManager->getSubAdmin()->isUserAccessible($currentLoggedInUser, $targetUserObject)) {
+            $data['enabled'] = $this->config->getUserValue($targetUserObject->getUID(), 'core', 'enabled', 'true') === 'true';
+        } else {
+            // Check they are looking up themselves
+            if ($currentLoggedInUser->getUID() !== $targetUserObject->getUID()) {
+                return $data;
+            }
+        }
 
-		// Get groups data
-		$userAccount = $this->accountManager->getAccount($targetUserObject);
-		$groups = $this->groupManager->getUserGroups($targetUserObject);
-		$gids = [];
-		foreach ($groups as $group) {
-			$gids[] = $group->getGID();
-		}
+        // Get groups data
+        $userAccount = $this->accountManager->getAccount($targetUserObject);
+        $groups = $this->groupManager->getUserGroups($targetUserObject);
+        $gids = [];
+        foreach ($groups as $group) {
+            $gids[] = $group->getGID();
+        }
 
-		if ($isAdmin) {
-			try {
-				# might be thrown by LDAP due to handling of users disappears
-				# from the external source (reasons unknown to us)
-				# cf. https://github.com/nextcloud/server/issues/12991
-				$data['storageLocation'] = $targetUserObject->getHome();
-			} catch (NoUserException $e) {
-				throw new OCSNotFoundException($e->getMessage(), $e);
-			}
-		}
+        if ($isAdmin) {
+            try {
+                # might be thrown by LDAP due to handling of users disappears
+                # from the external source (reasons unknown to us)
+                # cf. https://github.com/nextcloud/server/issues/12991
+                $data['storageLocation'] = $targetUserObject->getHome();
+            } catch (NoUserException $e) {
+                throw new OCSNotFoundException($e->getMessage(), $e);
+            }
+        }
 
-		// Find the data
-		$data['id'] = $targetUserObject->getUID();
-		$data['lastLogin'] = $targetUserObject->getLastLogin() * 1000;
-		$data['backend'] = $targetUserObject->getBackendClassName();
-		$data['subadmin'] = $this->getUserSubAdminGroupsData($targetUserObject->getUID());
-		$data[self::USER_FIELD_QUOTA] = $this->fillStorageInfo($targetUserObject->getUID());
-		$managerUids = $targetUserObject->getManagerUids();
-		$data[self::USER_FIELD_MANAGER] = empty($managerUids) ? '' : $managerUids[0];
+        // Find the data
+        $data['id'] = $targetUserObject->getUID();
+        $data['lastLogin'] = $targetUserObject->getLastLogin() * 1000;
+        $data['backend'] = $targetUserObject->getBackendClassName();
+        $data['subadmin'] = $this->getUserSubAdminGroupsData($targetUserObject->getUID());
+        $data[self::USER_FIELD_QUOTA] = $this->fillStorageInfo($targetUserObject->getUID());
+        $managerUids = $targetUserObject->getManagerUids();
+        $data[self::USER_FIELD_MANAGER] = empty($managerUids) ? '' : $managerUids[0];
 
-		try {
-			if ($includeScopes) {
-				$data[IAccountManager::PROPERTY_AVATAR . self::SCOPE_SUFFIX] = $userAccount->getProperty(IAccountManager::PROPERTY_AVATAR)->getScope();
-			}
+        try {
+            if ($includeScopes) {
+                $data[IAccountManager::PROPERTY_AVATAR . self::SCOPE_SUFFIX] = $userAccount->getProperty(IAccountManager::PROPERTY_AVATAR)->getScope();
+            }
 
-			$data[IAccountManager::PROPERTY_EMAIL] = $targetUserObject->getSystemEMailAddress();
-			if ($includeScopes) {
-				$data[IAccountManager::PROPERTY_EMAIL . self::SCOPE_SUFFIX] = $userAccount->getProperty(IAccountManager::PROPERTY_EMAIL)->getScope();
-			}
+            $data[IAccountManager::PROPERTY_EMAIL] = $targetUserObject->getSystemEMailAddress();
+            if ($includeScopes) {
+                $data[IAccountManager::PROPERTY_EMAIL . self::SCOPE_SUFFIX] = $userAccount->getProperty(IAccountManager::PROPERTY_EMAIL)->getScope();
+            }
 
-			$additionalEmails = $additionalEmailScopes = [];
-			$emailCollection = $userAccount->getPropertyCollection(IAccountManager::COLLECTION_EMAIL);
-			foreach ($emailCollection->getProperties() as $property) {
-				$additionalEmails[] = $property->getValue();
-				if ($includeScopes) {
-					$additionalEmailScopes[] = $property->getScope();
-				}
-			}
-			$data[IAccountManager::COLLECTION_EMAIL] = $additionalEmails;
-			if ($includeScopes) {
-				$data[IAccountManager::COLLECTION_EMAIL . self::SCOPE_SUFFIX] = $additionalEmailScopes;
-			}
+            $additionalEmails = $additionalEmailScopes = [];
+            $emailCollection = $userAccount->getPropertyCollection(IAccountManager::COLLECTION_EMAIL);
+            foreach ($emailCollection->getProperties() as $property) {
+                $additionalEmails[] = $property->getValue();
+                if ($includeScopes) {
+                    $additionalEmailScopes[] = $property->getScope();
+                }
+            }
+            $data[IAccountManager::COLLECTION_EMAIL] = $additionalEmails;
+            if ($includeScopes) {
+                $data[IAccountManager::COLLECTION_EMAIL . self::SCOPE_SUFFIX] = $additionalEmailScopes;
+            }
 
-			$data[IAccountManager::PROPERTY_DISPLAYNAME] = $targetUserObject->getDisplayName();
-			$data[IAccountManager::PROPERTY_DISPLAYNAME_LEGACY] = $data[IAccountManager::PROPERTY_DISPLAYNAME];
-			if ($includeScopes) {
-				$data[IAccountManager::PROPERTY_DISPLAYNAME . self::SCOPE_SUFFIX] = $userAccount->getProperty(IAccountManager::PROPERTY_DISPLAYNAME)->getScope();
-			}
+            $data[IAccountManager::PROPERTY_DISPLAYNAME] = $targetUserObject->getDisplayName();
+            $data[IAccountManager::PROPERTY_DISPLAYNAME_LEGACY] = $data[IAccountManager::PROPERTY_DISPLAYNAME];
+            if ($includeScopes) {
+                $data[IAccountManager::PROPERTY_DISPLAYNAME . self::SCOPE_SUFFIX] = $userAccount->getProperty(IAccountManager::PROPERTY_DISPLAYNAME)->getScope();
+            }
 
-			foreach ([
-				IAccountManager::PROPERTY_PHONE,
-				IAccountManager::PROPERTY_ADDRESS,
-				IAccountManager::PROPERTY_WEBSITE,
-				IAccountManager::PROPERTY_TWITTER,
-				IAccountManager::PROPERTY_FEDIVERSE,
-				IAccountManager::PROPERTY_ORGANISATION,
-				IAccountManager::PROPERTY_ROLE,
-				IAccountManager::PROPERTY_HEADLINE,
-				IAccountManager::PROPERTY_BIOGRAPHY,
-				IAccountManager::PROPERTY_PROFILE_ENABLED,
-			] as $propertyName) {
-				$property = $userAccount->getProperty($propertyName);
-				$data[$propertyName] = $property->getValue();
-				if ($includeScopes) {
-					$data[$propertyName . self::SCOPE_SUFFIX] = $property->getScope();
-				}
-			}
-		} catch (PropertyDoesNotExistException $e) {
-			// hard coded properties should exist
-			throw new OCSException($e->getMessage(), Http::STATUS_INTERNAL_SERVER_ERROR, $e);
-		}
+            foreach ([
+                IAccountManager::PROPERTY_PHONE,
+                IAccountManager::PROPERTY_ADDRESS,
+                IAccountManager::PROPERTY_WEBSITE,
+                IAccountManager::PROPERTY_TWITTER,
+                IAccountManager::PROPERTY_FEDIVERSE,
+                IAccountManager::PROPERTY_ORGANISATION,
+                IAccountManager::PROPERTY_ROLE,
+                IAccountManager::PROPERTY_HEADLINE,
+                IAccountManager::PROPERTY_BIOGRAPHY,
+                IAccountManager::PROPERTY_PROFILE_ENABLED,
+            ] as $propertyName) {
+                $property = $userAccount->getProperty($propertyName);
+                $data[$propertyName] = $property->getValue();
+                if ($includeScopes) {
+                    $data[$propertyName . self::SCOPE_SUFFIX] = $property->getScope();
+                }
+            }
+        } catch (PropertyDoesNotExistException $e) {
+            // hard coded properties should exist
+            throw new OCSException($e->getMessage(), Http::STATUS_INTERNAL_SERVER_ERROR, $e);
+        }
 
-		$data['groups'] = $gids;
-		$data[self::USER_FIELD_LANGUAGE] = $this->l10nFactory->getUserLanguage($targetUserObject);
-		$data[self::USER_FIELD_LOCALE] = $this->config->getUserValue($targetUserObject->getUID(), 'core', 'locale');
-		$data[self::USER_FIELD_NOTIFICATION_EMAIL] = $targetUserObject->getPrimaryEMailAddress();
+        $data['groups'] = $gids;
+        $data[self::USER_FIELD_LANGUAGE] = $this->l10nFactory->getUserLanguage($targetUserObject);
+        $data[self::USER_FIELD_LOCALE] = $this->config->getUserValue($targetUserObject->getUID(), 'core', 'locale');
+        $data[self::USER_FIELD_NOTIFICATION_EMAIL] = $targetUserObject->getPrimaryEMailAddress();
 
-		$backend = $targetUserObject->getBackend();
-		$data['backendCapabilities'] = [
-			'setDisplayName' => $backend instanceof ISetDisplayNameBackend || $backend->implementsActions(Backend::SET_DISPLAYNAME),
-			'setPassword' => $backend instanceof ISetPasswordBackend || $backend->implementsActions(Backend::SET_PASSWORD),
-		];
+        $backend = $targetUserObject->getBackend();
+        $data['backendCapabilities'] = [
+            'setDisplayName' => $backend instanceof ISetDisplayNameBackend || $backend->implementsActions(Backend::SET_DISPLAYNAME),
+            'setPassword' => $backend instanceof ISetPasswordBackend || $backend->implementsActions(Backend::SET_PASSWORD),
+        ];
 
-		return $data;
-	}
+        return $data;
+    }
 
-	/**
-	 * Get the groups a user is a subadmin of
-	 *
-	 * @param string $userId
-	 * @return array
-	 * @throws OCSException
-	 */
-	protected function getUserSubAdminGroupsData(string $userId): array {
-		$user = $this->userManager->get($userId);
-		// Check if the user exists
-		if ($user === null) {
-			throw new OCSNotFoundException('User does not exist');
-		}
+    /**
+     * Get the groups a user is a subadmin of
+     *
+     * @param string $userId
+     * @return array
+     * @throws OCSException
+     */
+    protected function getUserSubAdminGroupsData(string $userId): array {
+        $user = $this->userManager->get($userId);
+        // Check if the user exists
+        if ($user === null) {
+            throw new OCSNotFoundException('User does not exist');
+        }
 
-		// Get the subadmin groups
-		$subAdminGroups = $this->groupManager->getSubAdmin()->getSubAdminsGroups($user);
-		$groups = [];
-		foreach ($subAdminGroups as $key => $group) {
-			$groups[] = $group->getGID();
-		}
+        // Get the subadmin groups
+        $subAdminGroups = $this->groupManager->getSubAdmin()->getSubAdminsGroups($user);
+        $groups = [];
+        foreach ($subAdminGroups as $key => $group) {
+            $groups[] = $group->getGID();
+        }
 
-		return $groups;
-	}
+        return $groups;
+    }
 
-	/**
-	 * @param string $userId
-	 * @return array
-	 * @throws OCSException
-	 */
-	protected function fillStorageInfo(string $userId): array {
-		try {
-			\OC_Util::tearDownFS();
-			\OC_Util::setupFS($userId);
-			$storage = OC_Helper::getStorageInfo('/', null, true, false);
-			$data = [
-				'free' => $storage['free'],
-				'used' => $storage['used'],
-				'total' => $storage['total'],
-				'relative' => $storage['relative'],
-				self::USER_FIELD_QUOTA => $storage['quota'],
-			];
-		} catch (NotFoundException $ex) {
-			// User fs is not setup yet
-			$user = $this->userManager->get($userId);
-			if ($user === null) {
-				throw new OCSException('User does not exist', 101);
-			}
-			$quota = $user->getQuota();
-			if ($quota !== 'none') {
-				$quota = OC_Helper::computerFileSize($quota);
-			}
-			$data = [
-				self::USER_FIELD_QUOTA => $quota !== false ? $quota : 'none',
-				'used' => 0
-			];
-		} catch (\Exception $e) {
-			\OC::$server->get(\Psr\Log\LoggerInterface::class)->error(
-				"Could not load storage info for {user}",
-				[
-					'app' => 'provisioning_api',
-					'user' => $userId,
-					'exception' => $e,
-				]
-			);
-			/* In case the Exception left things in a bad state */
-			\OC_Util::tearDownFS();
-			return [];
-		}
-		return $data;
-	}
+    /**
+     * @param string $userId
+     * @return array
+     * @throws OCSException
+     */
+    protected function fillStorageInfo(string $userId): array {
+        try {
+            \OC_Util::tearDownFS();
+            \OC_Util::setupFS($userId);
+            $storage = OC_Helper::getStorageInfo('/', null, true, false);
+            $data = [
+                'free' => $storage['free'],
+                'used' => $storage['used'],
+                'total' => $storage['total'],
+                'relative' => $storage['relative'],
+                self::USER_FIELD_QUOTA => $storage['quota'],
+            ];
+        } catch (NotFoundException $ex) {
+            // User fs is not setup yet
+            $user = $this->userManager->get($userId);
+            if ($user === null) {
+                throw new OCSException('User does not exist', 101);
+            }
+            $quota = $user->getQuota();
+            if ($quota !== 'none') {
+                $quota = OC_Helper::computerFileSize($quota);
+            }
+            $data = [
+                self::USER_FIELD_QUOTA => $quota !== false ? $quota : 'none',
+                'used' => 0
+            ];
+        } catch (\Exception $e) {
+            \OC::$server->get(\Psr\Log\LoggerInterface::class)->error(
+                "Could not load storage info for {user}",
+                [
+                    'app' => 'provisioning_api',
+                    'user' => $userId,
+                    'exception' => $e,
+                ]
+            );
+            /* In case the Exception left things in a bad state */
+            \OC_Util::tearDownFS();
+            return [];
+        }
+        return $data;
+    }
 }

apps/provisioning_api/lib/Controller/UsersController.php

Indentation +1359 added lines, -1359 removed lines

@@ -78,1363 +78,1363 @@
 use Psr\Log\LoggerInterface;
 
 class UsersController extends AUserData {
-	/** @var IURLGenerator */
-	protected $urlGenerator;
-	/** @var LoggerInterface */
-	private $logger;
-	/** @var IFactory */
-	protected $l10nFactory;
-	/** @var NewUserMailHelper */
-	private $newUserMailHelper;
-	/** @var ISecureRandom */
-	private $secureRandom;
-	/** @var RemoteWipe */
-	private $remoteWipe;
-	/** @var KnownUserService */
-	private $knownUserService;
-	/** @var IEventDispatcher */
-	private $eventDispatcher;
-
-	public function __construct(
-		string $appName,
-		IRequest $request,
-		IUserManager $userManager,
-		IConfig $config,
-		IGroupManager $groupManager,
-		IUserSession $userSession,
-		IAccountManager $accountManager,
-		IURLGenerator $urlGenerator,
-		LoggerInterface $logger,
-		IFactory $l10nFactory,
-		NewUserMailHelper $newUserMailHelper,
-		ISecureRandom $secureRandom,
-		RemoteWipe $remoteWipe,
-		KnownUserService $knownUserService,
-		IEventDispatcher $eventDispatcher
-	) {
-		parent::__construct(
-			$appName,
-			$request,
-			$userManager,
-			$config,
-			$groupManager,
-			$userSession,
-			$accountManager,
-			$l10nFactory
-		);
-
-		$this->urlGenerator = $urlGenerator;
-		$this->logger = $logger;
-		$this->l10nFactory = $l10nFactory;
-		$this->newUserMailHelper = $newUserMailHelper;
-		$this->secureRandom = $secureRandom;
-		$this->remoteWipe = $remoteWipe;
-		$this->knownUserService = $knownUserService;
-		$this->eventDispatcher = $eventDispatcher;
-	}
-
-	/**
-	 * @NoAdminRequired
-	 *
-	 * returns a list of users
-	 *
-	 * @param string $search
-	 * @param int $limit
-	 * @param int $offset
-	 * @return DataResponse
-	 */
-	public function getUsers(string $search = '', int $limit = null, int $offset = 0): DataResponse {
-		$user = $this->userSession->getUser();
-		$users = [];
-
-		// Admin? Or SubAdmin?
-		$uid = $user->getUID();
-		$subAdminManager = $this->groupManager->getSubAdmin();
-		if ($this->groupManager->isAdmin($uid)) {
-			$users = $this->userManager->search($search, $limit, $offset);
-		} elseif ($subAdminManager->isSubAdmin($user)) {
-			$subAdminOfGroups = $subAdminManager->getSubAdminsGroups($user);
-			foreach ($subAdminOfGroups as $key => $group) {
-				$subAdminOfGroups[$key] = $group->getGID();
-			}
-
-			$users = [];
-			foreach ($subAdminOfGroups as $group) {
-				$users = array_merge($users, $this->groupManager->displayNamesInGroup($group, $search, $limit, $offset));
-			}
-		}
-
-		$users = array_keys($users);
-
-		return new DataResponse([
-			'users' => $users
-		]);
-	}
-
-	/**
-	 * @NoAdminRequired
-	 *
-	 * returns a list of users and their data
-	 */
-	public function getUsersDetails(string $search = '', int $limit = null, int $offset = 0): DataResponse {
-		$currentUser = $this->userSession->getUser();
-		$users = [];
-
-		// Admin? Or SubAdmin?
-		$uid = $currentUser->getUID();
-		$subAdminManager = $this->groupManager->getSubAdmin();
-		if ($this->groupManager->isAdmin($uid)) {
-			$users = $this->userManager->search($search, $limit, $offset);
-			$users = array_keys($users);
-		} elseif ($subAdminManager->isSubAdmin($currentUser)) {
-			$subAdminOfGroups = $subAdminManager->getSubAdminsGroups($currentUser);
-			foreach ($subAdminOfGroups as $key => $group) {
-				$subAdminOfGroups[$key] = $group->getGID();
-			}
-
-			$users = [];
-			foreach ($subAdminOfGroups as $group) {
-				$users[] = array_keys($this->groupManager->displayNamesInGroup($group, $search, $limit, $offset));
-			}
-			$users = array_merge(...$users);
-		}
-
-		$usersDetails = [];
-		foreach ($users as $userId) {
-			$userId = (string) $userId;
-			$userData = $this->getUserData($userId);
-			// Do not insert empty entry
-			if (!empty($userData)) {
-				$usersDetails[$userId] = $userData;
-			} else {
-				// Logged user does not have permissions to see this user
-				// only showing its id
-				$usersDetails[$userId] = ['id' => $userId];
-			}
-		}
-
-		return new DataResponse([
-			'users' => $usersDetails
-		]);
-	}
-
-
-	/**
-	 * @NoAdminRequired
-	 * @NoSubAdminRequired
-	 *
-	 * @param string $location
-	 * @param array $search
-	 * @return DataResponse
-	 */
-	public function searchByPhoneNumbers(string $location, array $search): DataResponse {
-		$phoneUtil = PhoneNumberUtil::getInstance();
-
-		if ($phoneUtil->getCountryCodeForRegion($location) === 0) {
-			// Not a valid region code
-			return new DataResponse([], Http::STATUS_BAD_REQUEST);
-		}
-
-		/** @var IUser $user */
-		$user = $this->userSession->getUser();
-		$knownTo = $user->getUID();
-		$defaultPhoneRegion = $this->config->getSystemValueString('default_phone_region');
-
-		$normalizedNumberToKey = [];
-		foreach ($search as $key => $phoneNumbers) {
-			foreach ($phoneNumbers as $phone) {
-				try {
-					$phoneNumber = $phoneUtil->parse($phone, $location);
-					if ($phoneNumber instanceof PhoneNumber && $phoneUtil->isValidNumber($phoneNumber)) {
-						$normalizedNumber = $phoneUtil->format($phoneNumber, PhoneNumberFormat::E164);
-						$normalizedNumberToKey[$normalizedNumber] = (string) $key;
-					}
-				} catch (NumberParseException $e) {
-				}
-
-				if ($defaultPhoneRegion !== '' && $defaultPhoneRegion !== $location && strpos($phone, '0') === 0) {
-					// If the number has a leading zero (no country code),
-					// we also check the default phone region of the instance,
-					// when it's different to the user's given region.
-					try {
-						$phoneNumber = $phoneUtil->parse($phone, $defaultPhoneRegion);
-						if ($phoneNumber instanceof PhoneNumber && $phoneUtil->isValidNumber($phoneNumber)) {
-							$normalizedNumber = $phoneUtil->format($phoneNumber, PhoneNumberFormat::E164);
-							$normalizedNumberToKey[$normalizedNumber] = (string) $key;
-						}
-					} catch (NumberParseException $e) {
-					}
-				}
-			}
-		}
-
-		$phoneNumbers = array_keys($normalizedNumberToKey);
-
-		if (empty($phoneNumbers)) {
-			return new DataResponse();
-		}
-
-		// Cleanup all previous entries and only allow new matches
-		$this->knownUserService->deleteKnownTo($knownTo);
-
-		$userMatches = $this->accountManager->searchUsers(IAccountManager::PROPERTY_PHONE, $phoneNumbers);
-
-		if (empty($userMatches)) {
-			return new DataResponse();
-		}
-
-		$cloudUrl = rtrim($this->urlGenerator->getAbsoluteURL('/'), '/');
-		if (strpos($cloudUrl, 'http://') === 0) {
-			$cloudUrl = substr($cloudUrl, strlen('http://'));
-		} elseif (strpos($cloudUrl, 'https://') === 0) {
-			$cloudUrl = substr($cloudUrl, strlen('https://'));
-		}
-
-		$matches = [];
-		foreach ($userMatches as $phone => $userId) {
-			// Not using the ICloudIdManager as that would run a search for each contact to find the display name in the address book
-			$matches[$normalizedNumberToKey[$phone]] = $userId . '@' . $cloudUrl;
-			$this->knownUserService->storeIsKnownToUser($knownTo, $userId);
-		}
-
-		return new DataResponse($matches);
-	}
-
-	/**
-	 * @throws OCSException
-	 */
-	private function createNewUserId(): string {
-		$attempts = 0;
-		do {
-			$uidCandidate = $this->secureRandom->generate(10, ISecureRandom::CHAR_HUMAN_READABLE);
-			if (!$this->userManager->userExists($uidCandidate)) {
-				return $uidCandidate;
-			}
-			$attempts++;
-		} while ($attempts < 10);
-		throw new OCSException('Could not create non-existing user id', 111);
-	}
-
-	/**
-	 * @PasswordConfirmationRequired
-	 * @NoAdminRequired
-	 *
-	 * @param string $userid
-	 * @param string $password
-	 * @param string $displayName
-	 * @param string $email
-	 * @param array $groups
-	 * @param array $subadmin
-	 * @param string $quota
-	 * @param string $language
-	 * @return DataResponse
-	 * @throws OCSException
-	 */
-	public function addUser(
-		string $userid,
-		string $password = '',
-		string $displayName = '',
-		string $email = '',
-		array $groups = [],
-		array $subadmin = [],
-		string $quota = '',
-		string $language = '',
-		?string $manager = null,
-	): DataResponse {
-		$user = $this->userSession->getUser();
-		$isAdmin = $this->groupManager->isAdmin($user->getUID());
-		$subAdminManager = $this->groupManager->getSubAdmin();
-
-		if (empty($userid) && $this->config->getAppValue('core', 'newUser.generateUserID', 'no') === 'yes') {
-			$userid = $this->createNewUserId();
-		}
-
-		if ($this->userManager->userExists($userid)) {
-			$this->logger->error('Failed addUser attempt: User already exists.', ['app' => 'ocs_api']);
-			throw new OCSException($this->l10nFactory->get('provisioning_api')->t('User already exists'), 102);
-		}
-
-		if ($groups !== []) {
-			foreach ($groups as $group) {
-				if (!$this->groupManager->groupExists($group)) {
-					throw new OCSException('group ' . $group . ' does not exist', 104);
-				}
-				if (!$isAdmin && !$subAdminManager->isSubAdminOfGroup($user, $this->groupManager->get($group))) {
-					throw new OCSException('insufficient privileges for group ' . $group, 105);
-				}
-			}
-		} else {
-			if (!$isAdmin) {
-				throw new OCSException('no group specified (required for subadmins)', 106);
-			}
-		}
-
-		$subadminGroups = [];
-		if ($subadmin !== []) {
-			foreach ($subadmin as $groupid) {
-				$group = $this->groupManager->get($groupid);
-				// Check if group exists
-				if ($group === null) {
-					throw new OCSException('Subadmin group does not exist', 102);
-				}
-				// Check if trying to make subadmin of admin group
-				if ($group->getGID() === 'admin') {
-					throw new OCSException('Cannot create subadmins for admin group', 103);
-				}
-				// Check if has permission to promote subadmins
-				if (!$subAdminManager->isSubAdminOfGroup($user, $group) && !$isAdmin) {
-					throw new OCSForbiddenException('No permissions to promote subadmins');
-				}
-				$subadminGroups[] = $group;
-			}
-		}
-
-		$generatePasswordResetToken = false;
-		if (strlen($password) > IUserManager::MAX_PASSWORD_LENGTH) {
-			throw new OCSException('Invalid password value', 101);
-		}
-		if ($password === '') {
-			if ($email === '') {
-				throw new OCSException('To send a password link to the user an email address is required.', 108);
-			}
-
-			$passwordEvent = new GenerateSecurePasswordEvent();
-			$this->eventDispatcher->dispatchTyped($passwordEvent);
-
-			$password = $passwordEvent->getPassword();
-			if ($password === null) {
-				// Fallback: ensure to pass password_policy in any case
-				$password = $this->secureRandom->generate(10)
-					. $this->secureRandom->generate(1, ISecureRandom::CHAR_UPPER)
-					. $this->secureRandom->generate(1, ISecureRandom::CHAR_LOWER)
-					. $this->secureRandom->generate(1, ISecureRandom::CHAR_DIGITS)
-					. $this->secureRandom->generate(1, ISecureRandom::CHAR_SYMBOLS);
-			}
-			$generatePasswordResetToken = true;
-		}
-
-		if ($email === '' && $this->config->getAppValue('core', 'newUser.requireEmail', 'no') === 'yes') {
-			throw new OCSException('Required email address was not provided', 110);
-		}
-
-		try {
-			$newUser = $this->userManager->createUser($userid, $password);
-			$this->logger->info('Successful addUser call with userid: ' . $userid, ['app' => 'ocs_api']);
-
-			foreach ($groups as $group) {
-				$this->groupManager->get($group)->addUser($newUser);
-				$this->logger->info('Added userid ' . $userid . ' to group ' . $group, ['app' => 'ocs_api']);
-			}
-			foreach ($subadminGroups as $group) {
-				$subAdminManager->createSubAdmin($newUser, $group);
-			}
-
-			if ($displayName !== '') {
-				try {
-					$this->editUser($userid, self::USER_FIELD_DISPLAYNAME, $displayName);
-				} catch (OCSException $e) {
-					if ($newUser instanceof IUser) {
-						$newUser->delete();
-					}
-					throw $e;
-				}
-			}
-
-			if ($quota !== '') {
-				$this->editUser($userid, self::USER_FIELD_QUOTA, $quota);
-			}
-
-			if ($language !== '') {
-				$this->editUser($userid, self::USER_FIELD_LANGUAGE, $language);
-			}
-
-			/**
-			 * null -> nothing sent
-			 * '' -> unset manager
-			 * else -> set manager
-			 */
-			if ($manager !== null) {
-				$this->editUser($userid, self::USER_FIELD_MANAGER, $manager);
-			}
-
-			// Send new user mail only if a mail is set
-			if ($email !== '') {
-				$newUser->setEMailAddress($email);
-				if ($this->config->getAppValue('core', 'newUser.sendEmail', 'yes') === 'yes') {
-					try {
-						$emailTemplate = $this->newUserMailHelper->generateTemplate($newUser, $generatePasswordResetToken);
-						$this->newUserMailHelper->sendMail($newUser, $emailTemplate);
-					} catch (\Exception $e) {
-						// Mail could be failing hard or just be plain not configured
-						// Logging error as it is the hardest of the two
-						$this->logger->error(
-							"Unable to send the invitation mail to $email",
-							[
-								'app' => 'ocs_api',
-								'exception' => $e,
-							]
-						);
-					}
-				}
-			}
-
-			return new DataResponse(['id' => $userid]);
-		} catch (HintException $e) {
-			$this->logger->warning(
-				'Failed addUser attempt with hint exception.',
-				[
-					'app' => 'ocs_api',
-					'exception' => $e,
-				]
-			);
-			throw new OCSException($e->getHint(), 107);
-		} catch (OCSException $e) {
-			$this->logger->warning(
-				'Failed addUser attempt with ocs exception.',
-				[
-					'app' => 'ocs_api',
-					'exception' => $e,
-				]
-			);
-			throw $e;
-		} catch (InvalidArgumentException $e) {
-			$this->logger->error(
-				'Failed addUser attempt with invalid argument exception.',
-				[
-					'app' => 'ocs_api',
-					'exception' => $e,
-				]
-			);
-			throw new OCSException($e->getMessage(), 101);
-		} catch (\Exception $e) {
-			$this->logger->error(
-				'Failed addUser attempt with exception.',
-				[
-					'app' => 'ocs_api',
-					'exception' => $e
-				]
-			);
-			throw new OCSException('Bad request', 101);
-		}
-	}
-
-	/**
-	 * @NoAdminRequired
-	 * @NoSubAdminRequired
-	 *
-	 * gets user info
-	 *
-	 * @param string $userId
-	 * @return DataResponse
-	 * @throws OCSException
-	 */
-	public function getUser(string $userId): DataResponse {
-		$includeScopes = false;
-		$currentUser = $this->userSession->getUser();
-		if ($currentUser && $currentUser->getUID() === $userId) {
-			$includeScopes = true;
-		}
-
-		$data = $this->getUserData($userId, $includeScopes);
-		// getUserData returns empty array if not enough permissions
-		if (empty($data)) {
-			throw new OCSException('', OCSController::RESPOND_NOT_FOUND);
-		}
-		return new DataResponse($data);
-	}
-
-	/**
-	 * @NoAdminRequired
-	 * @NoSubAdminRequired
-	 *
-	 * gets user info from the currently logged in user
-	 *
-	 * @return DataResponse
-	 * @throws OCSException
-	 */
-	public function getCurrentUser(): DataResponse {
-		$user = $this->userSession->getUser();
-		if ($user) {
-			$data = $this->getUserData($user->getUID(), true);
-			return new DataResponse($data);
-		}
-
-		throw new OCSException('', OCSController::RESPOND_UNAUTHORISED);
-	}
-
-	/**
-	 * @NoAdminRequired
-	 * @NoSubAdminRequired
-	 *
-	 * @return DataResponse
-	 * @throws OCSException
-	 */
-	public function getEditableFields(): DataResponse {
-		$currentLoggedInUser = $this->userSession->getUser();
-		if (!$currentLoggedInUser instanceof IUser) {
-			throw new OCSException('', OCSController::RESPOND_NOT_FOUND);
-		}
-
-		return $this->getEditableFieldsForUser($currentLoggedInUser->getUID());
-	}
-
-	/**
-	 * @NoAdminRequired
-	 * @NoSubAdminRequired
-	 *
-	 * @param string $userId
-	 * @return DataResponse
-	 * @throws OCSException
-	 */
-	public function getEditableFieldsForUser(string $userId): DataResponse {
-		$currentLoggedInUser = $this->userSession->getUser();
-		if (!$currentLoggedInUser instanceof IUser) {
-			throw new OCSException('', OCSController::RESPOND_NOT_FOUND);
-		}
-
-		$permittedFields = [];
-
-		if ($userId !== $currentLoggedInUser->getUID()) {
-			$targetUser = $this->userManager->get($userId);
-			if (!$targetUser instanceof IUser) {
-				throw new OCSException('', OCSController::RESPOND_NOT_FOUND);
-			}
-
-			$subAdminManager = $this->groupManager->getSubAdmin();
-			if (
-				!$this->groupManager->isAdmin($currentLoggedInUser->getUID())
-				&& !$subAdminManager->isUserAccessible($currentLoggedInUser, $targetUser)
-			) {
-				throw new OCSException('', OCSController::RESPOND_NOT_FOUND);
-			}
-		} else {
-			$targetUser = $currentLoggedInUser;
-		}
-
-		// Editing self (display, email)
-		if ($this->config->getSystemValue('allow_user_to_change_display_name', true) !== false) {
-			if (
-				$targetUser->getBackend() instanceof ISetDisplayNameBackend
-				|| $targetUser->getBackend()->implementsActions(Backend::SET_DISPLAYNAME)
-			) {
-				$permittedFields[] = IAccountManager::PROPERTY_DISPLAYNAME;
-			}
-			$permittedFields[] = IAccountManager::PROPERTY_EMAIL;
-		}
-
-		$permittedFields[] = IAccountManager::COLLECTION_EMAIL;
-		$permittedFields[] = IAccountManager::PROPERTY_PHONE;
-		$permittedFields[] = IAccountManager::PROPERTY_ADDRESS;
-		$permittedFields[] = IAccountManager::PROPERTY_WEBSITE;
-		$permittedFields[] = IAccountManager::PROPERTY_TWITTER;
-		$permittedFields[] = IAccountManager::PROPERTY_FEDIVERSE;
-		$permittedFields[] = IAccountManager::PROPERTY_ORGANISATION;
-		$permittedFields[] = IAccountManager::PROPERTY_ROLE;
-		$permittedFields[] = IAccountManager::PROPERTY_HEADLINE;
-		$permittedFields[] = IAccountManager::PROPERTY_BIOGRAPHY;
-		$permittedFields[] = IAccountManager::PROPERTY_PROFILE_ENABLED;
-
-		return new DataResponse($permittedFields);
-	}
-
-	/**
-	 * @NoAdminRequired
-	 * @NoSubAdminRequired
-	 * @PasswordConfirmationRequired
-	 * @UserRateThrottle(limit=5, period=60)
-	 *
-	 * @throws OCSException
-	 */
-	public function editUserMultiValue(
-		string $userId,
-		string $collectionName,
-		string $key,
-		string $value
-	): DataResponse {
-		$currentLoggedInUser = $this->userSession->getUser();
-		if ($currentLoggedInUser === null) {
-			throw new OCSException('', OCSController::RESPOND_UNAUTHORISED);
-		}
-
-		$targetUser = $this->userManager->get($userId);
-		if ($targetUser === null) {
-			throw new OCSException('', OCSController::RESPOND_NOT_FOUND);
-		}
-
-		$subAdminManager = $this->groupManager->getSubAdmin();
-		$isAdminOrSubadmin = $this->groupManager->isAdmin($currentLoggedInUser->getUID())
-			|| $subAdminManager->isUserAccessible($currentLoggedInUser, $targetUser);
-
-		$permittedFields = [];
-		if ($targetUser->getUID() === $currentLoggedInUser->getUID()) {
-			// Editing self (display, email)
-			$permittedFields[] = IAccountManager::COLLECTION_EMAIL;
-			$permittedFields[] = IAccountManager::COLLECTION_EMAIL . self::SCOPE_SUFFIX;
-		} else {
-			// Check if admin / subadmin
-			if ($isAdminOrSubadmin) {
-				// They have permissions over the user
-				$permittedFields[] = IAccountManager::COLLECTION_EMAIL;
-			} else {
-				// No rights
-				throw new OCSException('', OCSController::RESPOND_NOT_FOUND);
-			}
-		}
-
-		// Check if permitted to edit this field
-		if (!in_array($collectionName, $permittedFields)) {
-			throw new OCSException('', 103);
-		}
-
-		switch ($collectionName) {
-			case IAccountManager::COLLECTION_EMAIL:
-				$userAccount = $this->accountManager->getAccount($targetUser);
-				$mailCollection = $userAccount->getPropertyCollection(IAccountManager::COLLECTION_EMAIL);
-				$mailCollection->removePropertyByValue($key);
-				if ($value !== '') {
-					$mailCollection->addPropertyWithDefaults($value);
-					$property = $mailCollection->getPropertyByValue($key);
-					if ($isAdminOrSubadmin && $property) {
-						// admin set mails are auto-verified
-						$property->setLocallyVerified(IAccountManager::VERIFIED);
-					}
-				}
-				$this->accountManager->updateAccount($userAccount);
-				break;
-
-			case IAccountManager::COLLECTION_EMAIL . self::SCOPE_SUFFIX:
-				$userAccount = $this->accountManager->getAccount($targetUser);
-				$mailCollection = $userAccount->getPropertyCollection(IAccountManager::COLLECTION_EMAIL);
-				$targetProperty = null;
-				foreach ($mailCollection->getProperties() as $property) {
-					if ($property->getValue() === $key) {
-						$targetProperty = $property;
-						break;
-					}
-				}
-				if ($targetProperty instanceof IAccountProperty) {
-					try {
-						$targetProperty->setScope($value);
-						$this->accountManager->updateAccount($userAccount);
-					} catch (InvalidArgumentException $e) {
-						throw new OCSException('', 102);
-					}
-				} else {
-					throw new OCSException('', 102);
-				}
-				break;
-
-			default:
-				throw new OCSException('', 103);
-		}
-		return new DataResponse();
-	}
-
-	/**
-	 * @NoAdminRequired
-	 * @NoSubAdminRequired
-	 * @PasswordConfirmationRequired
-	 * @UserRateThrottle(limit=50, period=600)
-	 *
-	 * edit users
-	 *
-	 * @param string $userId
-	 * @param string $key
-	 * @param string $value
-	 * @return DataResponse
-	 * @throws OCSException
-	 */
-	public function editUser(string $userId, string $key, string $value): DataResponse {
-		$currentLoggedInUser = $this->userSession->getUser();
-
-		$targetUser = $this->userManager->get($userId);
-		if ($targetUser === null) {
-			throw new OCSException('', OCSController::RESPOND_NOT_FOUND);
-		}
-
-		$permittedFields = [];
-		if ($targetUser->getUID() === $currentLoggedInUser->getUID()) {
-			// Editing self (display, email)
-			if ($this->config->getSystemValue('allow_user_to_change_display_name', true) !== false) {
-				if (
-					$targetUser->getBackend() instanceof ISetDisplayNameBackend
-					|| $targetUser->getBackend()->implementsActions(Backend::SET_DISPLAYNAME)
-				) {
-					$permittedFields[] = self::USER_FIELD_DISPLAYNAME;
-					$permittedFields[] = IAccountManager::PROPERTY_DISPLAYNAME;
-				}
-				$permittedFields[] = IAccountManager::PROPERTY_EMAIL;
-			}
-
-			$permittedFields[] = IAccountManager::PROPERTY_DISPLAYNAME . self::SCOPE_SUFFIX;
-			$permittedFields[] = IAccountManager::PROPERTY_EMAIL . self::SCOPE_SUFFIX;
-
-			$permittedFields[] = IAccountManager::COLLECTION_EMAIL;
-
-			$permittedFields[] = self::USER_FIELD_PASSWORD;
-			$permittedFields[] = self::USER_FIELD_NOTIFICATION_EMAIL;
-			if (
-				$this->config->getSystemValue('force_language', false) === false ||
-				$this->groupManager->isAdmin($currentLoggedInUser->getUID())
-			) {
-				$permittedFields[] = self::USER_FIELD_LANGUAGE;
-			}
-
-			if (
-				$this->config->getSystemValue('force_locale', false) === false ||
-				$this->groupManager->isAdmin($currentLoggedInUser->getUID())
-			) {
-				$permittedFields[] = self::USER_FIELD_LOCALE;
-			}
-
-			$permittedFields[] = IAccountManager::PROPERTY_PHONE;
-			$permittedFields[] = IAccountManager::PROPERTY_ADDRESS;
-			$permittedFields[] = IAccountManager::PROPERTY_WEBSITE;
-			$permittedFields[] = IAccountManager::PROPERTY_TWITTER;
-			$permittedFields[] = IAccountManager::PROPERTY_FEDIVERSE;
-			$permittedFields[] = IAccountManager::PROPERTY_ORGANISATION;
-			$permittedFields[] = IAccountManager::PROPERTY_ROLE;
-			$permittedFields[] = IAccountManager::PROPERTY_HEADLINE;
-			$permittedFields[] = IAccountManager::PROPERTY_BIOGRAPHY;
-			$permittedFields[] = IAccountManager::PROPERTY_PROFILE_ENABLED;
-			$permittedFields[] = IAccountManager::PROPERTY_PHONE . self::SCOPE_SUFFIX;
-			$permittedFields[] = IAccountManager::PROPERTY_ADDRESS . self::SCOPE_SUFFIX;
-			$permittedFields[] = IAccountManager::PROPERTY_WEBSITE . self::SCOPE_SUFFIX;
-			$permittedFields[] = IAccountManager::PROPERTY_TWITTER . self::SCOPE_SUFFIX;
-			$permittedFields[] = IAccountManager::PROPERTY_FEDIVERSE . self::SCOPE_SUFFIX;
-			$permittedFields[] = IAccountManager::PROPERTY_ORGANISATION . self::SCOPE_SUFFIX;
-			$permittedFields[] = IAccountManager::PROPERTY_ROLE . self::SCOPE_SUFFIX;
-			$permittedFields[] = IAccountManager::PROPERTY_HEADLINE . self::SCOPE_SUFFIX;
-			$permittedFields[] = IAccountManager::PROPERTY_BIOGRAPHY . self::SCOPE_SUFFIX;
-			$permittedFields[] = IAccountManager::PROPERTY_PROFILE_ENABLED . self::SCOPE_SUFFIX;
-
-			$permittedFields[] = IAccountManager::PROPERTY_AVATAR . self::SCOPE_SUFFIX;
-
-			// If admin they can edit their own quota and manager
-			if ($this->groupManager->isAdmin($currentLoggedInUser->getUID())) {
-				$permittedFields[] = self::USER_FIELD_QUOTA;
-				$permittedFields[] = self::USER_FIELD_MANAGER;
-
-			}
-		} else {
-			// Check if admin / subadmin
-			$subAdminManager = $this->groupManager->getSubAdmin();
-			if (
-				$this->groupManager->isAdmin($currentLoggedInUser->getUID())
-				|| $subAdminManager->isUserAccessible($currentLoggedInUser, $targetUser)
-			) {
-				// They have permissions over the user
-				if (
-					$targetUser->getBackend() instanceof ISetDisplayNameBackend
-					|| $targetUser->getBackend()->implementsActions(Backend::SET_DISPLAYNAME)
-				) {
-					$permittedFields[] = self::USER_FIELD_DISPLAYNAME;
-					$permittedFields[] = IAccountManager::PROPERTY_DISPLAYNAME;
-				}
-				$permittedFields[] = IAccountManager::PROPERTY_EMAIL;
-				$permittedFields[] = IAccountManager::COLLECTION_EMAIL;
-				$permittedFields[] = self::USER_FIELD_PASSWORD;
-				$permittedFields[] = self::USER_FIELD_LANGUAGE;
-				$permittedFields[] = self::USER_FIELD_LOCALE;
-				$permittedFields[] = IAccountManager::PROPERTY_PHONE;
-				$permittedFields[] = IAccountManager::PROPERTY_ADDRESS;
-				$permittedFields[] = IAccountManager::PROPERTY_WEBSITE;
-				$permittedFields[] = IAccountManager::PROPERTY_TWITTER;
-				$permittedFields[] = IAccountManager::PROPERTY_FEDIVERSE;
-				$permittedFields[] = IAccountManager::PROPERTY_ORGANISATION;
-				$permittedFields[] = IAccountManager::PROPERTY_ROLE;
-				$permittedFields[] = IAccountManager::PROPERTY_HEADLINE;
-				$permittedFields[] = IAccountManager::PROPERTY_BIOGRAPHY;
-				$permittedFields[] = IAccountManager::PROPERTY_PROFILE_ENABLED;
-				$permittedFields[] = self::USER_FIELD_QUOTA;
-				$permittedFields[] = self::USER_FIELD_NOTIFICATION_EMAIL;
-				$permittedFields[] = self::USER_FIELD_MANAGER;
-			} else {
-				// No rights
-				throw new OCSException('', OCSController::RESPOND_NOT_FOUND);
-			}
-		}
-		// Check if permitted to edit this field
-		if (!in_array($key, $permittedFields)) {
-			throw new OCSException('', 103);
-		}
-		// Process the edit
-		switch ($key) {
-			case self::USER_FIELD_DISPLAYNAME:
-			case IAccountManager::PROPERTY_DISPLAYNAME:
-				try {
-					$targetUser->setDisplayName($value);
-				} catch (InvalidArgumentException $e) {
-					throw new OCSException($e->getMessage(), 101);
-				}
-				break;
-			case self::USER_FIELD_QUOTA:
-				$quota = $value;
-				if ($quota !== 'none' && $quota !== 'default') {
-					if (is_numeric($quota)) {
-						$quota = (float) $quota;
-					} else {
-						$quota = \OCP\Util::computerFileSize($quota);
-					}
-					if ($quota === false) {
-						throw new OCSException('Invalid quota value ' . $value, 102);
-					}
-					if ($quota === -1) {
-						$quota = 'none';
-					} else {
-						$maxQuota = (int) $this->config->getAppValue('files', 'max_quota', '-1');
-						if ($maxQuota !== -1 && $quota > $maxQuota) {
-							throw new OCSException('Invalid quota value. ' . $value . ' is exceeding the maximum quota', 102);
-						}
-						$quota = \OCP\Util::humanFileSize($quota);
-					}
-				}
-				// no else block because quota can be set to 'none' in previous if
-				if ($quota === 'none') {
-					$allowUnlimitedQuota = $this->config->getAppValue('files', 'allow_unlimited_quota', '1') === '1';
-					if (!$allowUnlimitedQuota) {
-						throw new OCSException('Unlimited quota is forbidden on this instance', 102);
-					}
-				}
-				$targetUser->setQuota($quota);
-				break;
-			case self::USER_FIELD_MANAGER:
-				$targetUser->setManagerUids([$value]);
-				break;
-			case self::USER_FIELD_PASSWORD:
-				try {
-					if (strlen($value) > IUserManager::MAX_PASSWORD_LENGTH) {
-						throw new OCSException('Invalid password value', 102);
-					}
-					if (!$targetUser->canChangePassword()) {
-						throw new OCSException('Setting the password is not supported by the users backend', 103);
-					}
-					$targetUser->setPassword($value);
-				} catch (HintException $e) { // password policy error
-					throw new OCSException($e->getMessage(), 103);
-				}
-				break;
-			case self::USER_FIELD_LANGUAGE:
-				$languagesCodes = $this->l10nFactory->findAvailableLanguages();
-				if (!in_array($value, $languagesCodes, true) && $value !== 'en') {
-					throw new OCSException('Invalid language', 102);
-				}
-				$this->config->setUserValue($targetUser->getUID(), 'core', 'lang', $value);
-				break;
-			case self::USER_FIELD_LOCALE:
-				if (!$this->l10nFactory->localeExists($value)) {
-					throw new OCSException('Invalid locale', 102);
-				}
-				$this->config->setUserValue($targetUser->getUID(), 'core', 'locale', $value);
-				break;
-			case self::USER_FIELD_NOTIFICATION_EMAIL:
-				$success = false;
-				if ($value === '' || filter_var($value, FILTER_VALIDATE_EMAIL)) {
-					try {
-						$targetUser->setPrimaryEMailAddress($value);
-						$success = true;
-					} catch (InvalidArgumentException $e) {
-						$this->logger->info(
-							'Cannot set primary email, because provided address is not verified',
-							[
-								'app' => 'provisioning_api',
-								'exception' => $e,
-							]
-						);
-					}
-				}
-				if (!$success) {
-					throw new OCSException('', 102);
-				}
-				break;
-			case IAccountManager::PROPERTY_EMAIL:
-				if (filter_var($value, FILTER_VALIDATE_EMAIL) || $value === '') {
-					$targetUser->setEMailAddress($value);
-				} else {
-					throw new OCSException('', 102);
-				}
-				break;
-			case IAccountManager::COLLECTION_EMAIL:
-				if (filter_var($value, FILTER_VALIDATE_EMAIL) && $value !== $targetUser->getSystemEMailAddress()) {
-					$userAccount = $this->accountManager->getAccount($targetUser);
-					$mailCollection = $userAccount->getPropertyCollection(IAccountManager::COLLECTION_EMAIL);
-
-					if ($mailCollection->getPropertyByValue($value)) {
-						throw new OCSException('', 102);
-					}
-
-					$mailCollection->addPropertyWithDefaults($value);
-					$this->accountManager->updateAccount($userAccount);
-				} else {
-					throw new OCSException('', 102);
-				}
-				break;
-			case IAccountManager::PROPERTY_PHONE:
-			case IAccountManager::PROPERTY_ADDRESS:
-			case IAccountManager::PROPERTY_WEBSITE:
-			case IAccountManager::PROPERTY_TWITTER:
-			case IAccountManager::PROPERTY_FEDIVERSE:
-			case IAccountManager::PROPERTY_ORGANISATION:
-			case IAccountManager::PROPERTY_ROLE:
-			case IAccountManager::PROPERTY_HEADLINE:
-			case IAccountManager::PROPERTY_BIOGRAPHY:
-				$userAccount = $this->accountManager->getAccount($targetUser);
-				try {
-					$userProperty = $userAccount->getProperty($key);
-					if ($userProperty->getValue() !== $value) {
-						try {
-							$userProperty->setValue($value);
-							if ($userProperty->getName() === IAccountManager::PROPERTY_PHONE) {
-								$this->knownUserService->deleteByContactUserId($targetUser->getUID());
-							}
-						} catch (InvalidArgumentException $e) {
-							throw new OCSException('Invalid ' . $e->getMessage(), 102);
-						}
-					}
-				} catch (PropertyDoesNotExistException $e) {
-					$userAccount->setProperty($key, $value, IAccountManager::SCOPE_PRIVATE, IAccountManager::NOT_VERIFIED);
-				}
-				try {
-					$this->accountManager->updateAccount($userAccount);
-				} catch (InvalidArgumentException $e) {
-					throw new OCSException('Invalid ' . $e->getMessage(), 102);
-				}
-				break;
-			case IAccountManager::PROPERTY_PROFILE_ENABLED:
-				$userAccount = $this->accountManager->getAccount($targetUser);
-				try {
-					$userProperty = $userAccount->getProperty($key);
-					if ($userProperty->getValue() !== $value) {
-						$userProperty->setValue($value);
-					}
-				} catch (PropertyDoesNotExistException $e) {
-					$userAccount->setProperty($key, $value, IAccountManager::SCOPE_LOCAL, IAccountManager::NOT_VERIFIED);
-				}
-				$this->accountManager->updateAccount($userAccount);
-				break;
-			case IAccountManager::PROPERTY_DISPLAYNAME . self::SCOPE_SUFFIX:
-			case IAccountManager::PROPERTY_EMAIL . self::SCOPE_SUFFIX:
-			case IAccountManager::PROPERTY_PHONE . self::SCOPE_SUFFIX:
-			case IAccountManager::PROPERTY_ADDRESS . self::SCOPE_SUFFIX:
-			case IAccountManager::PROPERTY_WEBSITE . self::SCOPE_SUFFIX:
-			case IAccountManager::PROPERTY_TWITTER . self::SCOPE_SUFFIX:
-			case IAccountManager::PROPERTY_FEDIVERSE . self::SCOPE_SUFFIX:
-			case IAccountManager::PROPERTY_ORGANISATION . self::SCOPE_SUFFIX:
-			case IAccountManager::PROPERTY_ROLE . self::SCOPE_SUFFIX:
-			case IAccountManager::PROPERTY_HEADLINE . self::SCOPE_SUFFIX:
-			case IAccountManager::PROPERTY_BIOGRAPHY . self::SCOPE_SUFFIX:
-			case IAccountManager::PROPERTY_PROFILE_ENABLED . self::SCOPE_SUFFIX:
-			case IAccountManager::PROPERTY_AVATAR . self::SCOPE_SUFFIX:
-				$propertyName = substr($key, 0, strlen($key) - strlen(self::SCOPE_SUFFIX));
-				$userAccount = $this->accountManager->getAccount($targetUser);
-				$userProperty = $userAccount->getProperty($propertyName);
-				if ($userProperty->getScope() !== $value) {
-					try {
-						$userProperty->setScope($value);
-						$this->accountManager->updateAccount($userAccount);
-					} catch (InvalidArgumentException $e) {
-						throw new OCSException('Invalid ' . $e->getMessage(), 102);
-					}
-				}
-				break;
-			default:
-				throw new OCSException('', 103);
-		}
-		return new DataResponse();
-	}
-
-	/**
-	 * @PasswordConfirmationRequired
-	 * @NoAdminRequired
-	 *
-	 * @param string $userId
-	 *
-	 * @return DataResponse
-	 *
-	 * @throws OCSException
-	 */
-	public function wipeUserDevices(string $userId): DataResponse {
-		/** @var IUser $currentLoggedInUser */
-		$currentLoggedInUser = $this->userSession->getUser();
-
-		$targetUser = $this->userManager->get($userId);
-
-		if ($targetUser === null) {
-			throw new OCSException('', OCSController::RESPOND_NOT_FOUND);
-		}
-
-		if ($targetUser->getUID() === $currentLoggedInUser->getUID()) {
-			throw new OCSException('', 101);
-		}
-
-		// If not permitted
-		$subAdminManager = $this->groupManager->getSubAdmin();
-		if (!$this->groupManager->isAdmin($currentLoggedInUser->getUID()) && !$subAdminManager->isUserAccessible($currentLoggedInUser, $targetUser)) {
-			throw new OCSException('', OCSController::RESPOND_NOT_FOUND);
-		}
-
-		$this->remoteWipe->markAllTokensForWipe($targetUser);
-
-		return new DataResponse();
-	}
-
-	/**
-	 * @PasswordConfirmationRequired
-	 * @NoAdminRequired
-	 *
-	 * @param string $userId
-	 * @return DataResponse
-	 * @throws OCSException
-	 */
-	public function deleteUser(string $userId): DataResponse {
-		$currentLoggedInUser = $this->userSession->getUser();
-
-		$targetUser = $this->userManager->get($userId);
-
-		if ($targetUser === null) {
-			throw new OCSException('', OCSController::RESPOND_NOT_FOUND);
-		}
-
-		if ($targetUser->getUID() === $currentLoggedInUser->getUID()) {
-			throw new OCSException('', 101);
-		}
-
-		// If not permitted
-		$subAdminManager = $this->groupManager->getSubAdmin();
-		if (!$this->groupManager->isAdmin($currentLoggedInUser->getUID()) && !$subAdminManager->isUserAccessible($currentLoggedInUser, $targetUser)) {
-			throw new OCSException('', OCSController::RESPOND_NOT_FOUND);
-		}
-
-		// Go ahead with the delete
-		if ($targetUser->delete()) {
-			return new DataResponse();
-		} else {
-			throw new OCSException('', 101);
-		}
-	}
-
-	/**
-	 * @PasswordConfirmationRequired
-	 * @NoAdminRequired
-	 *
-	 * @param string $userId
-	 * @return DataResponse
-	 * @throws OCSException
-	 * @throws OCSForbiddenException
-	 */
-	public function disableUser(string $userId): DataResponse {
-		return $this->setEnabled($userId, false);
-	}
-
-	/**
-	 * @PasswordConfirmationRequired
-	 * @NoAdminRequired
-	 *
-	 * @param string $userId
-	 * @return DataResponse
-	 * @throws OCSException
-	 * @throws OCSForbiddenException
-	 */
-	public function enableUser(string $userId): DataResponse {
-		return $this->setEnabled($userId, true);
-	}
-
-	/**
-	 * @param string $userId
-	 * @param bool $value
-	 * @return DataResponse
-	 * @throws OCSException
-	 */
-	private function setEnabled(string $userId, bool $value): DataResponse {
-		$currentLoggedInUser = $this->userSession->getUser();
-
-		$targetUser = $this->userManager->get($userId);
-		if ($targetUser === null || $targetUser->getUID() === $currentLoggedInUser->getUID()) {
-			throw new OCSException('', 101);
-		}
-
-		// If not permitted
-		$subAdminManager = $this->groupManager->getSubAdmin();
-		if (!$this->groupManager->isAdmin($currentLoggedInUser->getUID()) && !$subAdminManager->isUserAccessible($currentLoggedInUser, $targetUser)) {
-			throw new OCSException('', OCSController::RESPOND_NOT_FOUND);
-		}
-
-		// enable/disable the user now
-		$targetUser->setEnabled($value);
-		return new DataResponse();
-	}
-
-	/**
-	 * @NoAdminRequired
-	 * @NoSubAdminRequired
-	 *
-	 * @param string $userId
-	 * @return DataResponse
-	 * @throws OCSException
-	 */
-	public function getUsersGroups(string $userId): DataResponse {
-		$loggedInUser = $this->userSession->getUser();
-
-		$targetUser = $this->userManager->get($userId);
-		if ($targetUser === null) {
-			throw new OCSException('', OCSController::RESPOND_NOT_FOUND);
-		}
-
-		if ($targetUser->getUID() === $loggedInUser->getUID() || $this->groupManager->isAdmin($loggedInUser->getUID())) {
-			// Self lookup or admin lookup
-			return new DataResponse([
-				'groups' => $this->groupManager->getUserGroupIds($targetUser)
-			]);
-		} else {
-			$subAdminManager = $this->groupManager->getSubAdmin();
-
-			// Looking up someone else
-			if ($subAdminManager->isUserAccessible($loggedInUser, $targetUser)) {
-				// Return the group that the method caller is subadmin of for the user in question
-				/** @var IGroup[] $getSubAdminsGroups */
-				$getSubAdminsGroups = $subAdminManager->getSubAdminsGroups($loggedInUser);
-				foreach ($getSubAdminsGroups as $key => $group) {
-					$getSubAdminsGroups[$key] = $group->getGID();
-				}
-				$groups = array_intersect(
-					$getSubAdminsGroups,
-					$this->groupManager->getUserGroupIds($targetUser)
-				);
-				return new DataResponse(['groups' => $groups]);
-			} else {
-				// Not permitted
-				throw new OCSException('', OCSController::RESPOND_NOT_FOUND);
-			}
-		}
-	}
-
-	/**
-	 * @PasswordConfirmationRequired
-	 * @NoAdminRequired
-	 *
-	 * @param string $userId
-	 * @param string $groupid
-	 * @return DataResponse
-	 * @throws OCSException
-	 */
-	public function addToGroup(string $userId, string $groupid = ''): DataResponse {
-		if ($groupid === '') {
-			throw new OCSException('', 101);
-		}
-
-		$group = $this->groupManager->get($groupid);
-		$targetUser = $this->userManager->get($userId);
-		if ($group === null) {
-			throw new OCSException('', 102);
-		}
-		if ($targetUser === null) {
-			throw new OCSException('', 103);
-		}
-
-		// If they're not an admin, check they are a subadmin of the group in question
-		$loggedInUser = $this->userSession->getUser();
-		$subAdminManager = $this->groupManager->getSubAdmin();
-		if (!$this->groupManager->isAdmin($loggedInUser->getUID()) && !$subAdminManager->isSubAdminOfGroup($loggedInUser, $group)) {
-			throw new OCSException('', 104);
-		}
-
-		// Add user to group
-		$group->addUser($targetUser);
-		return new DataResponse();
-	}
-
-	/**
-	 * @PasswordConfirmationRequired
-	 * @NoAdminRequired
-	 *
-	 * @param string $userId
-	 * @param string $groupid
-	 * @return DataResponse
-	 * @throws OCSException
-	 */
-	public function removeFromGroup(string $userId, string $groupid): DataResponse {
-		$loggedInUser = $this->userSession->getUser();
-
-		if ($groupid === null || trim($groupid) === '') {
-			throw new OCSException('', 101);
-		}
-
-		$group = $this->groupManager->get($groupid);
-		if ($group === null) {
-			throw new OCSException('', 102);
-		}
-
-		$targetUser = $this->userManager->get($userId);
-		if ($targetUser === null) {
-			throw new OCSException('', 103);
-		}
-
-		// If they're not an admin, check they are a subadmin of the group in question
-		$subAdminManager = $this->groupManager->getSubAdmin();
-		if (!$this->groupManager->isAdmin($loggedInUser->getUID()) && !$subAdminManager->isSubAdminOfGroup($loggedInUser, $group)) {
-			throw new OCSException('', 104);
-		}
-
-		// Check they aren't removing themselves from 'admin' or their 'subadmin; group
-		if ($targetUser->getUID() === $loggedInUser->getUID()) {
-			if ($this->groupManager->isAdmin($loggedInUser->getUID())) {
-				if ($group->getGID() === 'admin') {
-					throw new OCSException('Cannot remove yourself from the admin group', 105);
-				}
-			} else {
-				// Not an admin, so the user must be a subadmin of this group, but that is not allowed.
-				throw new OCSException('Cannot remove yourself from this group as you are a SubAdmin', 105);
-			}
-		} elseif (!$this->groupManager->isAdmin($loggedInUser->getUID())) {
-			/** @var IGroup[] $subAdminGroups */
-			$subAdminGroups = $subAdminManager->getSubAdminsGroups($loggedInUser);
-			$subAdminGroups = array_map(function (IGroup $subAdminGroup) {
-				return $subAdminGroup->getGID();
-			}, $subAdminGroups);
-			$userGroups = $this->groupManager->getUserGroupIds($targetUser);
-			$userSubAdminGroups = array_intersect($subAdminGroups, $userGroups);
-
-			if (count($userSubAdminGroups) <= 1) {
-				// Subadmin must not be able to remove a user from all their subadmin groups.
-				throw new OCSException('Not viable to remove user from the last group you are SubAdmin of', 105);
-			}
-		}
-
-		// Remove user from group
-		$group->removeUser($targetUser);
-		return new DataResponse();
-	}
-
-	/**
-	 * Creates a subadmin
-	 *
-	 * @PasswordConfirmationRequired
-	 *
-	 * @param string $userId
-	 * @param string $groupid
-	 * @return DataResponse
-	 * @throws OCSException
-	 */
-	public function addSubAdmin(string $userId, string $groupid): DataResponse {
-		$group = $this->groupManager->get($groupid);
-		$user = $this->userManager->get($userId);
-
-		// Check if the user exists
-		if ($user === null) {
-			throw new OCSException('User does not exist', 101);
-		}
-		// Check if group exists
-		if ($group === null) {
-			throw new OCSException('Group does not exist', 102);
-		}
-		// Check if trying to make subadmin of admin group
-		if ($group->getGID() === 'admin') {
-			throw new OCSException('Cannot create subadmins for admin group', 103);
-		}
-
-		$subAdminManager = $this->groupManager->getSubAdmin();
-
-		// We cannot be subadmin twice
-		if ($subAdminManager->isSubAdminOfGroup($user, $group)) {
-			return new DataResponse();
-		}
-		// Go
-		$subAdminManager->createSubAdmin($user, $group);
-		return new DataResponse();
-	}
-
-	/**
-	 * Removes a subadmin from a group
-	 *
-	 * @PasswordConfirmationRequired
-	 *
-	 * @param string $userId
-	 * @param string $groupid
-	 * @return DataResponse
-	 * @throws OCSException
-	 */
-	public function removeSubAdmin(string $userId, string $groupid): DataResponse {
-		$group = $this->groupManager->get($groupid);
-		$user = $this->userManager->get($userId);
-		$subAdminManager = $this->groupManager->getSubAdmin();
-
-		// Check if the user exists
-		if ($user === null) {
-			throw new OCSException('User does not exist', 101);
-		}
-		// Check if the group exists
-		if ($group === null) {
-			throw new OCSException('Group does not exist', 101);
-		}
-		// Check if they are a subadmin of this said group
-		if (!$subAdminManager->isSubAdminOfGroup($user, $group)) {
-			throw new OCSException('User is not a subadmin of this group', 102);
-		}
-
-		// Go
-		$subAdminManager->deleteSubAdmin($user, $group);
-		return new DataResponse();
-	}
-
-	/**
-	 * Get the groups a user is a subadmin of
-	 *
-	 * @param string $userId
-	 * @return DataResponse
-	 * @throws OCSException
-	 */
-	public function getUserSubAdminGroups(string $userId): DataResponse {
-		$groups = $this->getUserSubAdminGroupsData($userId);
-		return new DataResponse($groups);
-	}
-
-	/**
-	 * @NoAdminRequired
-	 * @PasswordConfirmationRequired
-	 *
-	 * resend welcome message
-	 *
-	 * @param string $userId
-	 * @return DataResponse
-	 * @throws OCSException
-	 */
-	public function resendWelcomeMessage(string $userId): DataResponse {
-		$currentLoggedInUser = $this->userSession->getUser();
-
-		$targetUser = $this->userManager->get($userId);
-		if ($targetUser === null) {
-			throw new OCSException('', OCSController::RESPOND_NOT_FOUND);
-		}
-
-		// Check if admin / subadmin
-		$subAdminManager = $this->groupManager->getSubAdmin();
-		if (
-			!$subAdminManager->isUserAccessible($currentLoggedInUser, $targetUser)
-			&& !$this->groupManager->isAdmin($currentLoggedInUser->getUID())
-		) {
-			// No rights
-			throw new OCSException('', OCSController::RESPOND_NOT_FOUND);
-		}
-
-		$email = $targetUser->getEMailAddress();
-		if ($email === '' || $email === null) {
-			throw new OCSException('Email address not available', 101);
-		}
-
-		try {
-			$emailTemplate = $this->newUserMailHelper->generateTemplate($targetUser, false);
-			$this->newUserMailHelper->sendMail($targetUser, $emailTemplate);
-		} catch (\Exception $e) {
-			$this->logger->error(
-				"Can't send new user mail to $email",
-				[
-					'app' => 'settings',
-					'exception' => $e,
-				]
-			);
-			throw new OCSException('Sending email failed', 102);
-		}
-
-		return new DataResponse();
-	}
+    /** @var IURLGenerator */
+    protected $urlGenerator;
+    /** @var LoggerInterface */
+    private $logger;
+    /** @var IFactory */
+    protected $l10nFactory;
+    /** @var NewUserMailHelper */
+    private $newUserMailHelper;
+    /** @var ISecureRandom */
+    private $secureRandom;
+    /** @var RemoteWipe */
+    private $remoteWipe;
+    /** @var KnownUserService */
+    private $knownUserService;
+    /** @var IEventDispatcher */
+    private $eventDispatcher;
+
+    public function __construct(
+        string $appName,
+        IRequest $request,
+        IUserManager $userManager,
+        IConfig $config,
+        IGroupManager $groupManager,
+        IUserSession $userSession,
+        IAccountManager $accountManager,
+        IURLGenerator $urlGenerator,
+        LoggerInterface $logger,
+        IFactory $l10nFactory,
+        NewUserMailHelper $newUserMailHelper,
+        ISecureRandom $secureRandom,
+        RemoteWipe $remoteWipe,
+        KnownUserService $knownUserService,
+        IEventDispatcher $eventDispatcher
+    ) {
+        parent::__construct(
+            $appName,
+            $request,
+            $userManager,
+            $config,
+            $groupManager,
+            $userSession,
+            $accountManager,
+            $l10nFactory
+        );
+
+        $this->urlGenerator = $urlGenerator;
+        $this->logger = $logger;
+        $this->l10nFactory = $l10nFactory;
+        $this->newUserMailHelper = $newUserMailHelper;
+        $this->secureRandom = $secureRandom;
+        $this->remoteWipe = $remoteWipe;
+        $this->knownUserService = $knownUserService;
+        $this->eventDispatcher = $eventDispatcher;
+    }
+
+    /**
+     * @NoAdminRequired
+     *
+     * returns a list of users
+     *
+     * @param string $search
+     * @param int $limit
+     * @param int $offset
+     * @return DataResponse
+     */
+    public function getUsers(string $search = '', int $limit = null, int $offset = 0): DataResponse {
+        $user = $this->userSession->getUser();
+        $users = [];
+
+        // Admin? Or SubAdmin?
+        $uid = $user->getUID();
+        $subAdminManager = $this->groupManager->getSubAdmin();
+        if ($this->groupManager->isAdmin($uid)) {
+            $users = $this->userManager->search($search, $limit, $offset);
+        } elseif ($subAdminManager->isSubAdmin($user)) {
+            $subAdminOfGroups = $subAdminManager->getSubAdminsGroups($user);
+            foreach ($subAdminOfGroups as $key => $group) {
+                $subAdminOfGroups[$key] = $group->getGID();
+            }
+
+            $users = [];
+            foreach ($subAdminOfGroups as $group) {
+                $users = array_merge($users, $this->groupManager->displayNamesInGroup($group, $search, $limit, $offset));
+            }
+        }
+
+        $users = array_keys($users);
+
+        return new DataResponse([
+            'users' => $users
+        ]);
+    }
+
+    /**
+     * @NoAdminRequired
+     *
+     * returns a list of users and their data
+     */
+    public function getUsersDetails(string $search = '', int $limit = null, int $offset = 0): DataResponse {
+        $currentUser = $this->userSession->getUser();
+        $users = [];
+
+        // Admin? Or SubAdmin?
+        $uid = $currentUser->getUID();
+        $subAdminManager = $this->groupManager->getSubAdmin();
+        if ($this->groupManager->isAdmin($uid)) {
+            $users = $this->userManager->search($search, $limit, $offset);
+            $users = array_keys($users);
+        } elseif ($subAdminManager->isSubAdmin($currentUser)) {
+            $subAdminOfGroups = $subAdminManager->getSubAdminsGroups($currentUser);
+            foreach ($subAdminOfGroups as $key => $group) {
+                $subAdminOfGroups[$key] = $group->getGID();
+            }
+
+            $users = [];
+            foreach ($subAdminOfGroups as $group) {
+                $users[] = array_keys($this->groupManager->displayNamesInGroup($group, $search, $limit, $offset));
+            }
+            $users = array_merge(...$users);
+        }
+
+        $usersDetails = [];
+        foreach ($users as $userId) {
+            $userId = (string) $userId;
+            $userData = $this->getUserData($userId);
+            // Do not insert empty entry
+            if (!empty($userData)) {
+                $usersDetails[$userId] = $userData;
+            } else {
+                // Logged user does not have permissions to see this user
+                // only showing its id
+                $usersDetails[$userId] = ['id' => $userId];
+            }
+        }
+
+        return new DataResponse([
+            'users' => $usersDetails
+        ]);
+    }
+
+
+    /**
+     * @NoAdminRequired
+     * @NoSubAdminRequired
+     *
+     * @param string $location
+     * @param array $search
+     * @return DataResponse
+     */
+    public function searchByPhoneNumbers(string $location, array $search): DataResponse {
+        $phoneUtil = PhoneNumberUtil::getInstance();
+
+        if ($phoneUtil->getCountryCodeForRegion($location) === 0) {
+            // Not a valid region code
+            return new DataResponse([], Http::STATUS_BAD_REQUEST);
+        }
+
+        /** @var IUser $user */
+        $user = $this->userSession->getUser();
+        $knownTo = $user->getUID();
+        $defaultPhoneRegion = $this->config->getSystemValueString('default_phone_region');
+
+        $normalizedNumberToKey = [];
+        foreach ($search as $key => $phoneNumbers) {
+            foreach ($phoneNumbers as $phone) {
+                try {
+                    $phoneNumber = $phoneUtil->parse($phone, $location);
+                    if ($phoneNumber instanceof PhoneNumber && $phoneUtil->isValidNumber($phoneNumber)) {
+                        $normalizedNumber = $phoneUtil->format($phoneNumber, PhoneNumberFormat::E164);
+                        $normalizedNumberToKey[$normalizedNumber] = (string) $key;
+                    }
+                } catch (NumberParseException $e) {
+                }
+
+                if ($defaultPhoneRegion !== '' && $defaultPhoneRegion !== $location && strpos($phone, '0') === 0) {
+                    // If the number has a leading zero (no country code),
+                    // we also check the default phone region of the instance,
+                    // when it's different to the user's given region.
+                    try {
+                        $phoneNumber = $phoneUtil->parse($phone, $defaultPhoneRegion);
+                        if ($phoneNumber instanceof PhoneNumber && $phoneUtil->isValidNumber($phoneNumber)) {
+                            $normalizedNumber = $phoneUtil->format($phoneNumber, PhoneNumberFormat::E164);
+                            $normalizedNumberToKey[$normalizedNumber] = (string) $key;
+                        }
+                    } catch (NumberParseException $e) {
+                    }
+                }
+            }
+        }
+
+        $phoneNumbers = array_keys($normalizedNumberToKey);
+
+        if (empty($phoneNumbers)) {
+            return new DataResponse();
+        }
+
+        // Cleanup all previous entries and only allow new matches
+        $this->knownUserService->deleteKnownTo($knownTo);
+
+        $userMatches = $this->accountManager->searchUsers(IAccountManager::PROPERTY_PHONE, $phoneNumbers);
+
+        if (empty($userMatches)) {
+            return new DataResponse();
+        }
+
+        $cloudUrl = rtrim($this->urlGenerator->getAbsoluteURL('/'), '/');
+        if (strpos($cloudUrl, 'http://') === 0) {
+            $cloudUrl = substr($cloudUrl, strlen('http://'));
+        } elseif (strpos($cloudUrl, 'https://') === 0) {
+            $cloudUrl = substr($cloudUrl, strlen('https://'));
+        }
+
+        $matches = [];
+        foreach ($userMatches as $phone => $userId) {
+            // Not using the ICloudIdManager as that would run a search for each contact to find the display name in the address book
+            $matches[$normalizedNumberToKey[$phone]] = $userId . '@' . $cloudUrl;
+            $this->knownUserService->storeIsKnownToUser($knownTo, $userId);
+        }
+
+        return new DataResponse($matches);
+    }
+
+    /**
+     * @throws OCSException
+     */
+    private function createNewUserId(): string {
+        $attempts = 0;
+        do {
+            $uidCandidate = $this->secureRandom->generate(10, ISecureRandom::CHAR_HUMAN_READABLE);
+            if (!$this->userManager->userExists($uidCandidate)) {
+                return $uidCandidate;
+            }
+            $attempts++;
+        } while ($attempts < 10);
+        throw new OCSException('Could not create non-existing user id', 111);
+    }
+
+    /**
+     * @PasswordConfirmationRequired
+     * @NoAdminRequired
+     *
+     * @param string $userid
+     * @param string $password
+     * @param string $displayName
+     * @param string $email
+     * @param array $groups
+     * @param array $subadmin
+     * @param string $quota
+     * @param string $language
+     * @return DataResponse
+     * @throws OCSException
+     */
+    public function addUser(
+        string $userid,
+        string $password = '',
+        string $displayName = '',
+        string $email = '',
+        array $groups = [],
+        array $subadmin = [],
+        string $quota = '',
+        string $language = '',
+        ?string $manager = null,
+    ): DataResponse {
+        $user = $this->userSession->getUser();
+        $isAdmin = $this->groupManager->isAdmin($user->getUID());
+        $subAdminManager = $this->groupManager->getSubAdmin();
+
+        if (empty($userid) && $this->config->getAppValue('core', 'newUser.generateUserID', 'no') === 'yes') {
+            $userid = $this->createNewUserId();
+        }
+
+        if ($this->userManager->userExists($userid)) {
+            $this->logger->error('Failed addUser attempt: User already exists.', ['app' => 'ocs_api']);
+            throw new OCSException($this->l10nFactory->get('provisioning_api')->t('User already exists'), 102);
+        }
+
+        if ($groups !== []) {
+            foreach ($groups as $group) {
+                if (!$this->groupManager->groupExists($group)) {
+                    throw new OCSException('group ' . $group . ' does not exist', 104);
+                }
+                if (!$isAdmin && !$subAdminManager->isSubAdminOfGroup($user, $this->groupManager->get($group))) {
+                    throw new OCSException('insufficient privileges for group ' . $group, 105);
+                }
+            }
+        } else {
+            if (!$isAdmin) {
+                throw new OCSException('no group specified (required for subadmins)', 106);
+            }
+        }
+
+        $subadminGroups = [];
+        if ($subadmin !== []) {
+            foreach ($subadmin as $groupid) {
+                $group = $this->groupManager->get($groupid);
+                // Check if group exists
+                if ($group === null) {
+                    throw new OCSException('Subadmin group does not exist', 102);
+                }
+                // Check if trying to make subadmin of admin group
+                if ($group->getGID() === 'admin') {
+                    throw new OCSException('Cannot create subadmins for admin group', 103);
+                }
+                // Check if has permission to promote subadmins
+                if (!$subAdminManager->isSubAdminOfGroup($user, $group) && !$isAdmin) {
+                    throw new OCSForbiddenException('No permissions to promote subadmins');
+                }
+                $subadminGroups[] = $group;
+            }
+        }
+
+        $generatePasswordResetToken = false;
+        if (strlen($password) > IUserManager::MAX_PASSWORD_LENGTH) {
+            throw new OCSException('Invalid password value', 101);
+        }
+        if ($password === '') {
+            if ($email === '') {
+                throw new OCSException('To send a password link to the user an email address is required.', 108);
+            }
+
+            $passwordEvent = new GenerateSecurePasswordEvent();
+            $this->eventDispatcher->dispatchTyped($passwordEvent);
+
+            $password = $passwordEvent->getPassword();
+            if ($password === null) {
+                // Fallback: ensure to pass password_policy in any case
+                $password = $this->secureRandom->generate(10)
+                    . $this->secureRandom->generate(1, ISecureRandom::CHAR_UPPER)
+                    . $this->secureRandom->generate(1, ISecureRandom::CHAR_LOWER)
+                    . $this->secureRandom->generate(1, ISecureRandom::CHAR_DIGITS)
+                    . $this->secureRandom->generate(1, ISecureRandom::CHAR_SYMBOLS);
+            }
+            $generatePasswordResetToken = true;
+        }
+
+        if ($email === '' && $this->config->getAppValue('core', 'newUser.requireEmail', 'no') === 'yes') {
+            throw new OCSException('Required email address was not provided', 110);
+        }
+
+        try {
+            $newUser = $this->userManager->createUser($userid, $password);
+            $this->logger->info('Successful addUser call with userid: ' . $userid, ['app' => 'ocs_api']);
+
+            foreach ($groups as $group) {
+                $this->groupManager->get($group)->addUser($newUser);
+                $this->logger->info('Added userid ' . $userid . ' to group ' . $group, ['app' => 'ocs_api']);
+            }
+            foreach ($subadminGroups as $group) {
+                $subAdminManager->createSubAdmin($newUser, $group);
+            }
+
+            if ($displayName !== '') {
+                try {
+                    $this->editUser($userid, self::USER_FIELD_DISPLAYNAME, $displayName);
+                } catch (OCSException $e) {
+                    if ($newUser instanceof IUser) {
+                        $newUser->delete();
+                    }
+                    throw $e;
+                }
+            }
+
+            if ($quota !== '') {
+                $this->editUser($userid, self::USER_FIELD_QUOTA, $quota);
+            }
+
+            if ($language !== '') {
+                $this->editUser($userid, self::USER_FIELD_LANGUAGE, $language);
+            }
+
+            /**
+             * null -> nothing sent
+             * '' -> unset manager
+             * else -> set manager
+             */
+            if ($manager !== null) {
+                $this->editUser($userid, self::USER_FIELD_MANAGER, $manager);
+            }
+
+            // Send new user mail only if a mail is set
+            if ($email !== '') {
+                $newUser->setEMailAddress($email);
+                if ($this->config->getAppValue('core', 'newUser.sendEmail', 'yes') === 'yes') {
+                    try {
+                        $emailTemplate = $this->newUserMailHelper->generateTemplate($newUser, $generatePasswordResetToken);
+                        $this->newUserMailHelper->sendMail($newUser, $emailTemplate);
+                    } catch (\Exception $e) {
+                        // Mail could be failing hard or just be plain not configured
+                        // Logging error as it is the hardest of the two
+                        $this->logger->error(
+                            "Unable to send the invitation mail to $email",
+                            [
+                                'app' => 'ocs_api',
+                                'exception' => $e,
+                            ]
+                        );
+                    }
+                }
+            }
+
+            return new DataResponse(['id' => $userid]);
+        } catch (HintException $e) {
+            $this->logger->warning(
+                'Failed addUser attempt with hint exception.',
+                [
+                    'app' => 'ocs_api',
+                    'exception' => $e,
+                ]
+            );
+            throw new OCSException($e->getHint(), 107);
+        } catch (OCSException $e) {
+            $this->logger->warning(
+                'Failed addUser attempt with ocs exception.',
+                [
+                    'app' => 'ocs_api',
+                    'exception' => $e,
+                ]
+            );
+            throw $e;
+        } catch (InvalidArgumentException $e) {
+            $this->logger->error(
+                'Failed addUser attempt with invalid argument exception.',
+                [
+                    'app' => 'ocs_api',
+                    'exception' => $e,
+                ]
+            );
+            throw new OCSException($e->getMessage(), 101);
+        } catch (\Exception $e) {
+            $this->logger->error(
+                'Failed addUser attempt with exception.',
+                [
+                    'app' => 'ocs_api',
+                    'exception' => $e
+                ]
+            );
+            throw new OCSException('Bad request', 101);
+        }
+    }
+
+    /**
+     * @NoAdminRequired
+     * @NoSubAdminRequired
+     *
+     * gets user info
+     *
+     * @param string $userId
+     * @return DataResponse
+     * @throws OCSException
+     */
+    public function getUser(string $userId): DataResponse {
+        $includeScopes = false;
+        $currentUser = $this->userSession->getUser();
+        if ($currentUser && $currentUser->getUID() === $userId) {
+            $includeScopes = true;
+        }
+
+        $data = $this->getUserData($userId, $includeScopes);
+        // getUserData returns empty array if not enough permissions
+        if (empty($data)) {
+            throw new OCSException('', OCSController::RESPOND_NOT_FOUND);
+        }
+        return new DataResponse($data);
+    }
+
+    /**
+     * @NoAdminRequired
+     * @NoSubAdminRequired
+     *
+     * gets user info from the currently logged in user
+     *
+     * @return DataResponse
+     * @throws OCSException
+     */
+    public function getCurrentUser(): DataResponse {
+        $user = $this->userSession->getUser();
+        if ($user) {
+            $data = $this->getUserData($user->getUID(), true);
+            return new DataResponse($data);
+        }
+
+        throw new OCSException('', OCSController::RESPOND_UNAUTHORISED);
+    }
+
+    /**
+     * @NoAdminRequired
+     * @NoSubAdminRequired
+     *
+     * @return DataResponse
+     * @throws OCSException
+     */
+    public function getEditableFields(): DataResponse {
+        $currentLoggedInUser = $this->userSession->getUser();
+        if (!$currentLoggedInUser instanceof IUser) {
+            throw new OCSException('', OCSController::RESPOND_NOT_FOUND);
+        }
+
+        return $this->getEditableFieldsForUser($currentLoggedInUser->getUID());
+    }
+
+    /**
+     * @NoAdminRequired
+     * @NoSubAdminRequired
+     *
+     * @param string $userId
+     * @return DataResponse
+     * @throws OCSException
+     */
+    public function getEditableFieldsForUser(string $userId): DataResponse {
+        $currentLoggedInUser = $this->userSession->getUser();
+        if (!$currentLoggedInUser instanceof IUser) {
+            throw new OCSException('', OCSController::RESPOND_NOT_FOUND);
+        }
+
+        $permittedFields = [];
+
+        if ($userId !== $currentLoggedInUser->getUID()) {
+            $targetUser = $this->userManager->get($userId);
+            if (!$targetUser instanceof IUser) {
+                throw new OCSException('', OCSController::RESPOND_NOT_FOUND);
+            }
+
+            $subAdminManager = $this->groupManager->getSubAdmin();
+            if (
+                !$this->groupManager->isAdmin($currentLoggedInUser->getUID())
+                && !$subAdminManager->isUserAccessible($currentLoggedInUser, $targetUser)
+            ) {
+                throw new OCSException('', OCSController::RESPOND_NOT_FOUND);
+            }
+        } else {
+            $targetUser = $currentLoggedInUser;
+        }
+
+        // Editing self (display, email)
+        if ($this->config->getSystemValue('allow_user_to_change_display_name', true) !== false) {
+            if (
+                $targetUser->getBackend() instanceof ISetDisplayNameBackend
+                || $targetUser->getBackend()->implementsActions(Backend::SET_DISPLAYNAME)
+            ) {
+                $permittedFields[] = IAccountManager::PROPERTY_DISPLAYNAME;
+            }
+            $permittedFields[] = IAccountManager::PROPERTY_EMAIL;
+        }
+
+        $permittedFields[] = IAccountManager::COLLECTION_EMAIL;
+        $permittedFields[] = IAccountManager::PROPERTY_PHONE;
+        $permittedFields[] = IAccountManager::PROPERTY_ADDRESS;
+        $permittedFields[] = IAccountManager::PROPERTY_WEBSITE;
+        $permittedFields[] = IAccountManager::PROPERTY_TWITTER;
+        $permittedFields[] = IAccountManager::PROPERTY_FEDIVERSE;
+        $permittedFields[] = IAccountManager::PROPERTY_ORGANISATION;
+        $permittedFields[] = IAccountManager::PROPERTY_ROLE;
+        $permittedFields[] = IAccountManager::PROPERTY_HEADLINE;
+        $permittedFields[] = IAccountManager::PROPERTY_BIOGRAPHY;
+        $permittedFields[] = IAccountManager::PROPERTY_PROFILE_ENABLED;
+
+        return new DataResponse($permittedFields);
+    }
+
+    /**
+     * @NoAdminRequired
+     * @NoSubAdminRequired
+     * @PasswordConfirmationRequired
+     * @UserRateThrottle(limit=5, period=60)
+     *
+     * @throws OCSException
+     */
+    public function editUserMultiValue(
+        string $userId,
+        string $collectionName,
+        string $key,
+        string $value
+    ): DataResponse {
+        $currentLoggedInUser = $this->userSession->getUser();
+        if ($currentLoggedInUser === null) {
+            throw new OCSException('', OCSController::RESPOND_UNAUTHORISED);
+        }
+
+        $targetUser = $this->userManager->get($userId);
+        if ($targetUser === null) {
+            throw new OCSException('', OCSController::RESPOND_NOT_FOUND);
+        }
+
+        $subAdminManager = $this->groupManager->getSubAdmin();
+        $isAdminOrSubadmin = $this->groupManager->isAdmin($currentLoggedInUser->getUID())
+            || $subAdminManager->isUserAccessible($currentLoggedInUser, $targetUser);
+
+        $permittedFields = [];
+        if ($targetUser->getUID() === $currentLoggedInUser->getUID()) {
+            // Editing self (display, email)
+            $permittedFields[] = IAccountManager::COLLECTION_EMAIL;
+            $permittedFields[] = IAccountManager::COLLECTION_EMAIL . self::SCOPE_SUFFIX;
+        } else {
+            // Check if admin / subadmin
+            if ($isAdminOrSubadmin) {
+                // They have permissions over the user
+                $permittedFields[] = IAccountManager::COLLECTION_EMAIL;
+            } else {
+                // No rights
+                throw new OCSException('', OCSController::RESPOND_NOT_FOUND);
+            }
+        }
+
+        // Check if permitted to edit this field
+        if (!in_array($collectionName, $permittedFields)) {
+            throw new OCSException('', 103);
+        }
+
+        switch ($collectionName) {
+            case IAccountManager::COLLECTION_EMAIL:
+                $userAccount = $this->accountManager->getAccount($targetUser);
+                $mailCollection = $userAccount->getPropertyCollection(IAccountManager::COLLECTION_EMAIL);
+                $mailCollection->removePropertyByValue($key);
+                if ($value !== '') {
+                    $mailCollection->addPropertyWithDefaults($value);
+                    $property = $mailCollection->getPropertyByValue($key);
+                    if ($isAdminOrSubadmin && $property) {
+                        // admin set mails are auto-verified
+                        $property->setLocallyVerified(IAccountManager::VERIFIED);
+                    }
+                }
+                $this->accountManager->updateAccount($userAccount);
+                break;
+
+            case IAccountManager::COLLECTION_EMAIL . self::SCOPE_SUFFIX:
+                $userAccount = $this->accountManager->getAccount($targetUser);
+                $mailCollection = $userAccount->getPropertyCollection(IAccountManager::COLLECTION_EMAIL);
+                $targetProperty = null;
+                foreach ($mailCollection->getProperties() as $property) {
+                    if ($property->getValue() === $key) {
+                        $targetProperty = $property;
+                        break;
+                    }
+                }
+                if ($targetProperty instanceof IAccountProperty) {
+                    try {
+                        $targetProperty->setScope($value);
+                        $this->accountManager->updateAccount($userAccount);
+                    } catch (InvalidArgumentException $e) {
+                        throw new OCSException('', 102);
+                    }
+                } else {
+                    throw new OCSException('', 102);
+                }
+                break;
+
+            default:
+                throw new OCSException('', 103);
+        }
+        return new DataResponse();
+    }
+
+    /**
+     * @NoAdminRequired
+     * @NoSubAdminRequired
+     * @PasswordConfirmationRequired
+     * @UserRateThrottle(limit=50, period=600)
+     *
+     * edit users
+     *
+     * @param string $userId
+     * @param string $key
+     * @param string $value
+     * @return DataResponse
+     * @throws OCSException
+     */
+    public function editUser(string $userId, string $key, string $value): DataResponse {
+        $currentLoggedInUser = $this->userSession->getUser();
+
+        $targetUser = $this->userManager->get($userId);
+        if ($targetUser === null) {
+            throw new OCSException('', OCSController::RESPOND_NOT_FOUND);
+        }
+
+        $permittedFields = [];
+        if ($targetUser->getUID() === $currentLoggedInUser->getUID()) {
+            // Editing self (display, email)
+            if ($this->config->getSystemValue('allow_user_to_change_display_name', true) !== false) {
+                if (
+                    $targetUser->getBackend() instanceof ISetDisplayNameBackend
+                    || $targetUser->getBackend()->implementsActions(Backend::SET_DISPLAYNAME)
+                ) {
+                    $permittedFields[] = self::USER_FIELD_DISPLAYNAME;
+                    $permittedFields[] = IAccountManager::PROPERTY_DISPLAYNAME;
+                }
+                $permittedFields[] = IAccountManager::PROPERTY_EMAIL;
+            }
+
+            $permittedFields[] = IAccountManager::PROPERTY_DISPLAYNAME . self::SCOPE_SUFFIX;
+            $permittedFields[] = IAccountManager::PROPERTY_EMAIL . self::SCOPE_SUFFIX;
+
+            $permittedFields[] = IAccountManager::COLLECTION_EMAIL;
+
+            $permittedFields[] = self::USER_FIELD_PASSWORD;
+            $permittedFields[] = self::USER_FIELD_NOTIFICATION_EMAIL;
+            if (
+                $this->config->getSystemValue('force_language', false) === false ||
+                $this->groupManager->isAdmin($currentLoggedInUser->getUID())
+            ) {
+                $permittedFields[] = self::USER_FIELD_LANGUAGE;
+            }
+
+            if (
+                $this->config->getSystemValue('force_locale', false) === false ||
+                $this->groupManager->isAdmin($currentLoggedInUser->getUID())
+            ) {
+                $permittedFields[] = self::USER_FIELD_LOCALE;
+            }
+
+            $permittedFields[] = IAccountManager::PROPERTY_PHONE;
+            $permittedFields[] = IAccountManager::PROPERTY_ADDRESS;
+            $permittedFields[] = IAccountManager::PROPERTY_WEBSITE;
+            $permittedFields[] = IAccountManager::PROPERTY_TWITTER;
+            $permittedFields[] = IAccountManager::PROPERTY_FEDIVERSE;
+            $permittedFields[] = IAccountManager::PROPERTY_ORGANISATION;
+            $permittedFields[] = IAccountManager::PROPERTY_ROLE;
+            $permittedFields[] = IAccountManager::PROPERTY_HEADLINE;
+            $permittedFields[] = IAccountManager::PROPERTY_BIOGRAPHY;
+            $permittedFields[] = IAccountManager::PROPERTY_PROFILE_ENABLED;
+            $permittedFields[] = IAccountManager::PROPERTY_PHONE . self::SCOPE_SUFFIX;
+            $permittedFields[] = IAccountManager::PROPERTY_ADDRESS . self::SCOPE_SUFFIX;
+            $permittedFields[] = IAccountManager::PROPERTY_WEBSITE . self::SCOPE_SUFFIX;
+            $permittedFields[] = IAccountManager::PROPERTY_TWITTER . self::SCOPE_SUFFIX;
+            $permittedFields[] = IAccountManager::PROPERTY_FEDIVERSE . self::SCOPE_SUFFIX;
+            $permittedFields[] = IAccountManager::PROPERTY_ORGANISATION . self::SCOPE_SUFFIX;
+            $permittedFields[] = IAccountManager::PROPERTY_ROLE . self::SCOPE_SUFFIX;
+            $permittedFields[] = IAccountManager::PROPERTY_HEADLINE . self::SCOPE_SUFFIX;
+            $permittedFields[] = IAccountManager::PROPERTY_BIOGRAPHY . self::SCOPE_SUFFIX;
+            $permittedFields[] = IAccountManager::PROPERTY_PROFILE_ENABLED . self::SCOPE_SUFFIX;
+
+            $permittedFields[] = IAccountManager::PROPERTY_AVATAR . self::SCOPE_SUFFIX;
+
+            // If admin they can edit their own quota and manager
+            if ($this->groupManager->isAdmin($currentLoggedInUser->getUID())) {
+                $permittedFields[] = self::USER_FIELD_QUOTA;
+                $permittedFields[] = self::USER_FIELD_MANAGER;
+
+            }
+        } else {
+            // Check if admin / subadmin
+            $subAdminManager = $this->groupManager->getSubAdmin();
+            if (
+                $this->groupManager->isAdmin($currentLoggedInUser->getUID())
+                || $subAdminManager->isUserAccessible($currentLoggedInUser, $targetUser)
+            ) {
+                // They have permissions over the user
+                if (
+                    $targetUser->getBackend() instanceof ISetDisplayNameBackend
+                    || $targetUser->getBackend()->implementsActions(Backend::SET_DISPLAYNAME)
+                ) {
+                    $permittedFields[] = self::USER_FIELD_DISPLAYNAME;
+                    $permittedFields[] = IAccountManager::PROPERTY_DISPLAYNAME;
+                }
+                $permittedFields[] = IAccountManager::PROPERTY_EMAIL;
+                $permittedFields[] = IAccountManager::COLLECTION_EMAIL;
+                $permittedFields[] = self::USER_FIELD_PASSWORD;
+                $permittedFields[] = self::USER_FIELD_LANGUAGE;
+                $permittedFields[] = self::USER_FIELD_LOCALE;
+                $permittedFields[] = IAccountManager::PROPERTY_PHONE;
+                $permittedFields[] = IAccountManager::PROPERTY_ADDRESS;
+                $permittedFields[] = IAccountManager::PROPERTY_WEBSITE;
+                $permittedFields[] = IAccountManager::PROPERTY_TWITTER;
+                $permittedFields[] = IAccountManager::PROPERTY_FEDIVERSE;
+                $permittedFields[] = IAccountManager::PROPERTY_ORGANISATION;
+                $permittedFields[] = IAccountManager::PROPERTY_ROLE;
+                $permittedFields[] = IAccountManager::PROPERTY_HEADLINE;
+                $permittedFields[] = IAccountManager::PROPERTY_BIOGRAPHY;
+                $permittedFields[] = IAccountManager::PROPERTY_PROFILE_ENABLED;
+                $permittedFields[] = self::USER_FIELD_QUOTA;
+                $permittedFields[] = self::USER_FIELD_NOTIFICATION_EMAIL;
+                $permittedFields[] = self::USER_FIELD_MANAGER;
+            } else {
+                // No rights
+                throw new OCSException('', OCSController::RESPOND_NOT_FOUND);
+            }
+        }
+        // Check if permitted to edit this field
+        if (!in_array($key, $permittedFields)) {
+            throw new OCSException('', 103);
+        }
+        // Process the edit
+        switch ($key) {
+            case self::USER_FIELD_DISPLAYNAME:
+            case IAccountManager::PROPERTY_DISPLAYNAME:
+                try {
+                    $targetUser->setDisplayName($value);
+                } catch (InvalidArgumentException $e) {
+                    throw new OCSException($e->getMessage(), 101);
+                }
+                break;
+            case self::USER_FIELD_QUOTA:
+                $quota = $value;
+                if ($quota !== 'none' && $quota !== 'default') {
+                    if (is_numeric($quota)) {
+                        $quota = (float) $quota;
+                    } else {
+                        $quota = \OCP\Util::computerFileSize($quota);
+                    }
+                    if ($quota === false) {
+                        throw new OCSException('Invalid quota value ' . $value, 102);
+                    }
+                    if ($quota === -1) {
+                        $quota = 'none';
+                    } else {
+                        $maxQuota = (int) $this->config->getAppValue('files', 'max_quota', '-1');
+                        if ($maxQuota !== -1 && $quota > $maxQuota) {
+                            throw new OCSException('Invalid quota value. ' . $value . ' is exceeding the maximum quota', 102);
+                        }
+                        $quota = \OCP\Util::humanFileSize($quota);
+                    }
+                }
+                // no else block because quota can be set to 'none' in previous if
+                if ($quota === 'none') {
+                    $allowUnlimitedQuota = $this->config->getAppValue('files', 'allow_unlimited_quota', '1') === '1';
+                    if (!$allowUnlimitedQuota) {
+                        throw new OCSException('Unlimited quota is forbidden on this instance', 102);
+                    }
+                }
+                $targetUser->setQuota($quota);
+                break;
+            case self::USER_FIELD_MANAGER:
+                $targetUser->setManagerUids([$value]);
+                break;
+            case self::USER_FIELD_PASSWORD:
+                try {
+                    if (strlen($value) > IUserManager::MAX_PASSWORD_LENGTH) {
+                        throw new OCSException('Invalid password value', 102);
+                    }
+                    if (!$targetUser->canChangePassword()) {
+                        throw new OCSException('Setting the password is not supported by the users backend', 103);
+                    }
+                    $targetUser->setPassword($value);
+                } catch (HintException $e) { // password policy error
+                    throw new OCSException($e->getMessage(), 103);
+                }
+                break;
+            case self::USER_FIELD_LANGUAGE:
+                $languagesCodes = $this->l10nFactory->findAvailableLanguages();
+                if (!in_array($value, $languagesCodes, true) && $value !== 'en') {
+                    throw new OCSException('Invalid language', 102);
+                }
+                $this->config->setUserValue($targetUser->getUID(), 'core', 'lang', $value);
+                break;
+            case self::USER_FIELD_LOCALE:
+                if (!$this->l10nFactory->localeExists($value)) {
+                    throw new OCSException('Invalid locale', 102);
+                }
+                $this->config->setUserValue($targetUser->getUID(), 'core', 'locale', $value);
+                break;
+            case self::USER_FIELD_NOTIFICATION_EMAIL:
+                $success = false;
+                if ($value === '' || filter_var($value, FILTER_VALIDATE_EMAIL)) {
+                    try {
+                        $targetUser->setPrimaryEMailAddress($value);
+                        $success = true;
+                    } catch (InvalidArgumentException $e) {
+                        $this->logger->info(
+                            'Cannot set primary email, because provided address is not verified',
+                            [
+                                'app' => 'provisioning_api',
+                                'exception' => $e,
+                            ]
+                        );
+                    }
+                }
+                if (!$success) {
+                    throw new OCSException('', 102);
+                }
+                break;
+            case IAccountManager::PROPERTY_EMAIL:
+                if (filter_var($value, FILTER_VALIDATE_EMAIL) || $value === '') {
+                    $targetUser->setEMailAddress($value);
+                } else {
+                    throw new OCSException('', 102);
+                }
+                break;
+            case IAccountManager::COLLECTION_EMAIL:
+                if (filter_var($value, FILTER_VALIDATE_EMAIL) && $value !== $targetUser->getSystemEMailAddress()) {
+                    $userAccount = $this->accountManager->getAccount($targetUser);
+                    $mailCollection = $userAccount->getPropertyCollection(IAccountManager::COLLECTION_EMAIL);
+
+                    if ($mailCollection->getPropertyByValue($value)) {
+                        throw new OCSException('', 102);
+                    }
+
+                    $mailCollection->addPropertyWithDefaults($value);
+                    $this->accountManager->updateAccount($userAccount);
+                } else {
+                    throw new OCSException('', 102);
+                }
+                break;
+            case IAccountManager::PROPERTY_PHONE:
+            case IAccountManager::PROPERTY_ADDRESS:
+            case IAccountManager::PROPERTY_WEBSITE:
+            case IAccountManager::PROPERTY_TWITTER:
+            case IAccountManager::PROPERTY_FEDIVERSE:
+            case IAccountManager::PROPERTY_ORGANISATION:
+            case IAccountManager::PROPERTY_ROLE:
+            case IAccountManager::PROPERTY_HEADLINE:
+            case IAccountManager::PROPERTY_BIOGRAPHY:
+                $userAccount = $this->accountManager->getAccount($targetUser);
+                try {
+                    $userProperty = $userAccount->getProperty($key);
+                    if ($userProperty->getValue() !== $value) {
+                        try {
+                            $userProperty->setValue($value);
+                            if ($userProperty->getName() === IAccountManager::PROPERTY_PHONE) {
+                                $this->knownUserService->deleteByContactUserId($targetUser->getUID());
+                            }
+                        } catch (InvalidArgumentException $e) {
+                            throw new OCSException('Invalid ' . $e->getMessage(), 102);
+                        }
+                    }
+                } catch (PropertyDoesNotExistException $e) {
+                    $userAccount->setProperty($key, $value, IAccountManager::SCOPE_PRIVATE, IAccountManager::NOT_VERIFIED);
+                }
+                try {
+                    $this->accountManager->updateAccount($userAccount);
+                } catch (InvalidArgumentException $e) {
+                    throw new OCSException('Invalid ' . $e->getMessage(), 102);
+                }
+                break;
+            case IAccountManager::PROPERTY_PROFILE_ENABLED:
+                $userAccount = $this->accountManager->getAccount($targetUser);
+                try {
+                    $userProperty = $userAccount->getProperty($key);
+                    if ($userProperty->getValue() !== $value) {
+                        $userProperty->setValue($value);
+                    }
+                } catch (PropertyDoesNotExistException $e) {
+                    $userAccount->setProperty($key, $value, IAccountManager::SCOPE_LOCAL, IAccountManager::NOT_VERIFIED);
+                }
+                $this->accountManager->updateAccount($userAccount);
+                break;
+            case IAccountManager::PROPERTY_DISPLAYNAME . self::SCOPE_SUFFIX:
+            case IAccountManager::PROPERTY_EMAIL . self::SCOPE_SUFFIX:
+            case IAccountManager::PROPERTY_PHONE . self::SCOPE_SUFFIX:
+            case IAccountManager::PROPERTY_ADDRESS . self::SCOPE_SUFFIX:
+            case IAccountManager::PROPERTY_WEBSITE . self::SCOPE_SUFFIX:
+            case IAccountManager::PROPERTY_TWITTER . self::SCOPE_SUFFIX:
+            case IAccountManager::PROPERTY_FEDIVERSE . self::SCOPE_SUFFIX:
+            case IAccountManager::PROPERTY_ORGANISATION . self::SCOPE_SUFFIX:
+            case IAccountManager::PROPERTY_ROLE . self::SCOPE_SUFFIX:
+            case IAccountManager::PROPERTY_HEADLINE . self::SCOPE_SUFFIX:
+            case IAccountManager::PROPERTY_BIOGRAPHY . self::SCOPE_SUFFIX:
+            case IAccountManager::PROPERTY_PROFILE_ENABLED . self::SCOPE_SUFFIX:
+            case IAccountManager::PROPERTY_AVATAR . self::SCOPE_SUFFIX:
+                $propertyName = substr($key, 0, strlen($key) - strlen(self::SCOPE_SUFFIX));
+                $userAccount = $this->accountManager->getAccount($targetUser);
+                $userProperty = $userAccount->getProperty($propertyName);
+                if ($userProperty->getScope() !== $value) {
+                    try {
+                        $userProperty->setScope($value);
+                        $this->accountManager->updateAccount($userAccount);
+                    } catch (InvalidArgumentException $e) {
+                        throw new OCSException('Invalid ' . $e->getMessage(), 102);
+                    }
+                }
+                break;
+            default:
+                throw new OCSException('', 103);
+        }
+        return new DataResponse();
+    }
+
+    /**
+     * @PasswordConfirmationRequired
+     * @NoAdminRequired
+     *
+     * @param string $userId
+     *
+     * @return DataResponse
+     *
+     * @throws OCSException
+     */
+    public function wipeUserDevices(string $userId): DataResponse {
+        /** @var IUser $currentLoggedInUser */
+        $currentLoggedInUser = $this->userSession->getUser();
+
+        $targetUser = $this->userManager->get($userId);
+
+        if ($targetUser === null) {
+            throw new OCSException('', OCSController::RESPOND_NOT_FOUND);
+        }
+
+        if ($targetUser->getUID() === $currentLoggedInUser->getUID()) {
+            throw new OCSException('', 101);
+        }
+
+        // If not permitted
+        $subAdminManager = $this->groupManager->getSubAdmin();
+        if (!$this->groupManager->isAdmin($currentLoggedInUser->getUID()) && !$subAdminManager->isUserAccessible($currentLoggedInUser, $targetUser)) {
+            throw new OCSException('', OCSController::RESPOND_NOT_FOUND);
+        }
+
+        $this->remoteWipe->markAllTokensForWipe($targetUser);
+
+        return new DataResponse();
+    }
+
+    /**
+     * @PasswordConfirmationRequired
+     * @NoAdminRequired
+     *
+     * @param string $userId
+     * @return DataResponse
+     * @throws OCSException
+     */
+    public function deleteUser(string $userId): DataResponse {
+        $currentLoggedInUser = $this->userSession->getUser();
+
+        $targetUser = $this->userManager->get($userId);
+
+        if ($targetUser === null) {
+            throw new OCSException('', OCSController::RESPOND_NOT_FOUND);
+        }
+
+        if ($targetUser->getUID() === $currentLoggedInUser->getUID()) {
+            throw new OCSException('', 101);
+        }
+
+        // If not permitted
+        $subAdminManager = $this->groupManager->getSubAdmin();
+        if (!$this->groupManager->isAdmin($currentLoggedInUser->getUID()) && !$subAdminManager->isUserAccessible($currentLoggedInUser, $targetUser)) {
+            throw new OCSException('', OCSController::RESPOND_NOT_FOUND);
+        }
+
+        // Go ahead with the delete
+        if ($targetUser->delete()) {
+            return new DataResponse();
+        } else {
+            throw new OCSException('', 101);
+        }
+    }
+
+    /**
+     * @PasswordConfirmationRequired
+     * @NoAdminRequired
+     *
+     * @param string $userId
+     * @return DataResponse
+     * @throws OCSException
+     * @throws OCSForbiddenException
+     */
+    public function disableUser(string $userId): DataResponse {
+        return $this->setEnabled($userId, false);
+    }
+
+    /**
+     * @PasswordConfirmationRequired
+     * @NoAdminRequired
+     *
+     * @param string $userId
+     * @return DataResponse
+     * @throws OCSException
+     * @throws OCSForbiddenException
+     */
+    public function enableUser(string $userId): DataResponse {
+        return $this->setEnabled($userId, true);
+    }
+
+    /**
+     * @param string $userId
+     * @param bool $value
+     * @return DataResponse
+     * @throws OCSException
+     */
+    private function setEnabled(string $userId, bool $value): DataResponse {
+        $currentLoggedInUser = $this->userSession->getUser();
+
+        $targetUser = $this->userManager->get($userId);
+        if ($targetUser === null || $targetUser->getUID() === $currentLoggedInUser->getUID()) {
+            throw new OCSException('', 101);
+        }
+
+        // If not permitted
+        $subAdminManager = $this->groupManager->getSubAdmin();
+        if (!$this->groupManager->isAdmin($currentLoggedInUser->getUID()) && !$subAdminManager->isUserAccessible($currentLoggedInUser, $targetUser)) {
+            throw new OCSException('', OCSController::RESPOND_NOT_FOUND);
+        }
+
+        // enable/disable the user now
+        $targetUser->setEnabled($value);
+        return new DataResponse();
+    }
+
+    /**
+     * @NoAdminRequired
+     * @NoSubAdminRequired
+     *
+     * @param string $userId
+     * @return DataResponse
+     * @throws OCSException
+     */
+    public function getUsersGroups(string $userId): DataResponse {
+        $loggedInUser = $this->userSession->getUser();
+
+        $targetUser = $this->userManager->get($userId);
+        if ($targetUser === null) {
+            throw new OCSException('', OCSController::RESPOND_NOT_FOUND);
+        }
+
+        if ($targetUser->getUID() === $loggedInUser->getUID() || $this->groupManager->isAdmin($loggedInUser->getUID())) {
+            // Self lookup or admin lookup
+            return new DataResponse([
+                'groups' => $this->groupManager->getUserGroupIds($targetUser)
+            ]);
+        } else {
+            $subAdminManager = $this->groupManager->getSubAdmin();
+
+            // Looking up someone else
+            if ($subAdminManager->isUserAccessible($loggedInUser, $targetUser)) {
+                // Return the group that the method caller is subadmin of for the user in question
+                /** @var IGroup[] $getSubAdminsGroups */
+                $getSubAdminsGroups = $subAdminManager->getSubAdminsGroups($loggedInUser);
+                foreach ($getSubAdminsGroups as $key => $group) {
+                    $getSubAdminsGroups[$key] = $group->getGID();
+                }
+                $groups = array_intersect(
+                    $getSubAdminsGroups,
+                    $this->groupManager->getUserGroupIds($targetUser)
+                );
+                return new DataResponse(['groups' => $groups]);
+            } else {
+                // Not permitted
+                throw new OCSException('', OCSController::RESPOND_NOT_FOUND);
+            }
+        }
+    }
+
+    /**
+     * @PasswordConfirmationRequired
+     * @NoAdminRequired
+     *
+     * @param string $userId
+     * @param string $groupid
+     * @return DataResponse
+     * @throws OCSException
+     */
+    public function addToGroup(string $userId, string $groupid = ''): DataResponse {
+        if ($groupid === '') {
+            throw new OCSException('', 101);
+        }
+
+        $group = $this->groupManager->get($groupid);
+        $targetUser = $this->userManager->get($userId);
+        if ($group === null) {
+            throw new OCSException('', 102);
+        }
+        if ($targetUser === null) {
+            throw new OCSException('', 103);
+        }
+
+        // If they're not an admin, check they are a subadmin of the group in question
+        $loggedInUser = $this->userSession->getUser();
+        $subAdminManager = $this->groupManager->getSubAdmin();
+        if (!$this->groupManager->isAdmin($loggedInUser->getUID()) && !$subAdminManager->isSubAdminOfGroup($loggedInUser, $group)) {
+            throw new OCSException('', 104);
+        }
+
+        // Add user to group
+        $group->addUser($targetUser);
+        return new DataResponse();
+    }
+
+    /**
+     * @PasswordConfirmationRequired
+     * @NoAdminRequired
+     *
+     * @param string $userId
+     * @param string $groupid
+     * @return DataResponse
+     * @throws OCSException
+     */
+    public function removeFromGroup(string $userId, string $groupid): DataResponse {
+        $loggedInUser = $this->userSession->getUser();
+
+        if ($groupid === null || trim($groupid) === '') {
+            throw new OCSException('', 101);
+        }
+
+        $group = $this->groupManager->get($groupid);
+        if ($group === null) {
+            throw new OCSException('', 102);
+        }
+
+        $targetUser = $this->userManager->get($userId);
+        if ($targetUser === null) {
+            throw new OCSException('', 103);
+        }
+
+        // If they're not an admin, check they are a subadmin of the group in question
+        $subAdminManager = $this->groupManager->getSubAdmin();
+        if (!$this->groupManager->isAdmin($loggedInUser->getUID()) && !$subAdminManager->isSubAdminOfGroup($loggedInUser, $group)) {
+            throw new OCSException('', 104);
+        }
+
+        // Check they aren't removing themselves from 'admin' or their 'subadmin; group
+        if ($targetUser->getUID() === $loggedInUser->getUID()) {
+            if ($this->groupManager->isAdmin($loggedInUser->getUID())) {
+                if ($group->getGID() === 'admin') {
+                    throw new OCSException('Cannot remove yourself from the admin group', 105);
+                }
+            } else {
+                // Not an admin, so the user must be a subadmin of this group, but that is not allowed.
+                throw new OCSException('Cannot remove yourself from this group as you are a SubAdmin', 105);
+            }
+        } elseif (!$this->groupManager->isAdmin($loggedInUser->getUID())) {
+            /** @var IGroup[] $subAdminGroups */
+            $subAdminGroups = $subAdminManager->getSubAdminsGroups($loggedInUser);
+            $subAdminGroups = array_map(function (IGroup $subAdminGroup) {
+                return $subAdminGroup->getGID();
+            }, $subAdminGroups);
+            $userGroups = $this->groupManager->getUserGroupIds($targetUser);
+            $userSubAdminGroups = array_intersect($subAdminGroups, $userGroups);
+
+            if (count($userSubAdminGroups) <= 1) {
+                // Subadmin must not be able to remove a user from all their subadmin groups.
+                throw new OCSException('Not viable to remove user from the last group you are SubAdmin of', 105);
+            }
+        }
+
+        // Remove user from group
+        $group->removeUser($targetUser);
+        return new DataResponse();
+    }
+
+    /**
+     * Creates a subadmin
+     *
+     * @PasswordConfirmationRequired
+     *
+     * @param string $userId
+     * @param string $groupid
+     * @return DataResponse
+     * @throws OCSException
+     */
+    public function addSubAdmin(string $userId, string $groupid): DataResponse {
+        $group = $this->groupManager->get($groupid);
+        $user = $this->userManager->get($userId);
+
+        // Check if the user exists
+        if ($user === null) {
+            throw new OCSException('User does not exist', 101);
+        }
+        // Check if group exists
+        if ($group === null) {
+            throw new OCSException('Group does not exist', 102);
+        }
+        // Check if trying to make subadmin of admin group
+        if ($group->getGID() === 'admin') {
+            throw new OCSException('Cannot create subadmins for admin group', 103);
+        }
+
+        $subAdminManager = $this->groupManager->getSubAdmin();
+
+        // We cannot be subadmin twice
+        if ($subAdminManager->isSubAdminOfGroup($user, $group)) {
+            return new DataResponse();
+        }
+        // Go
+        $subAdminManager->createSubAdmin($user, $group);
+        return new DataResponse();
+    }
+
+    /**
+     * Removes a subadmin from a group
+     *
+     * @PasswordConfirmationRequired
+     *
+     * @param string $userId
+     * @param string $groupid
+     * @return DataResponse
+     * @throws OCSException
+     */
+    public function removeSubAdmin(string $userId, string $groupid): DataResponse {
+        $group = $this->groupManager->get($groupid);
+        $user = $this->userManager->get($userId);
+        $subAdminManager = $this->groupManager->getSubAdmin();
+
+        // Check if the user exists
+        if ($user === null) {
+            throw new OCSException('User does not exist', 101);
+        }
+        // Check if the group exists
+        if ($group === null) {
+            throw new OCSException('Group does not exist', 101);
+        }
+        // Check if they are a subadmin of this said group
+        if (!$subAdminManager->isSubAdminOfGroup($user, $group)) {
+            throw new OCSException('User is not a subadmin of this group', 102);
+        }
+
+        // Go
+        $subAdminManager->deleteSubAdmin($user, $group);
+        return new DataResponse();
+    }
+
+    /**
+     * Get the groups a user is a subadmin of
+     *
+     * @param string $userId
+     * @return DataResponse
+     * @throws OCSException
+     */
+    public function getUserSubAdminGroups(string $userId): DataResponse {
+        $groups = $this->getUserSubAdminGroupsData($userId);
+        return new DataResponse($groups);
+    }
+
+    /**
+     * @NoAdminRequired
+     * @PasswordConfirmationRequired
+     *
+     * resend welcome message
+     *
+     * @param string $userId
+     * @return DataResponse
+     * @throws OCSException
+     */
+    public function resendWelcomeMessage(string $userId): DataResponse {
+        $currentLoggedInUser = $this->userSession->getUser();
+
+        $targetUser = $this->userManager->get($userId);
+        if ($targetUser === null) {
+            throw new OCSException('', OCSController::RESPOND_NOT_FOUND);
+        }
+
+        // Check if admin / subadmin
+        $subAdminManager = $this->groupManager->getSubAdmin();
+        if (
+            !$subAdminManager->isUserAccessible($currentLoggedInUser, $targetUser)
+            && !$this->groupManager->isAdmin($currentLoggedInUser->getUID())
+        ) {
+            // No rights
+            throw new OCSException('', OCSController::RESPOND_NOT_FOUND);
+        }
+
+        $email = $targetUser->getEMailAddress();
+        if ($email === '' || $email === null) {
+            throw new OCSException('Email address not available', 101);
+        }
+
+        try {
+            $emailTemplate = $this->newUserMailHelper->generateTemplate($targetUser, false);
+            $this->newUserMailHelper->sendMail($targetUser, $emailTemplate);
+        } catch (\Exception $e) {
+            $this->logger->error(
+                "Can't send new user mail to $email",
+                [
+                    'app' => 'settings',
+                    'exception' => $e,
+                ]
+            );
+            throw new OCSException('Sending email failed', 102);
+        }
+
+        return new DataResponse();
+    }
 }

Spacing +40 added lines, -40 removed lines

@@ -293,7 +293,7 @@ 
 		$matches = [];
 		foreach ($userMatches as $phone => $userId) {
 			// Not using the ICloudIdManager as that would run a search for each contact to find the display name in the address book
-			$matches[$normalizedNumberToKey[$phone]] = $userId . '@' . $cloudUrl;
+			$matches[$normalizedNumberToKey[$phone]] = $userId.'@'.$cloudUrl;
 			$this->knownUserService->storeIsKnownToUser($knownTo, $userId);
 		}
 
@@ -357,10 +357,10 @@ 
 		if ($groups !== []) {
 			foreach ($groups as $group) {
 				if (!$this->groupManager->groupExists($group)) {
-					throw new OCSException('group ' . $group . ' does not exist', 104);
+					throw new OCSException('group '.$group.' does not exist', 104);
 				}
 				if (!$isAdmin && !$subAdminManager->isSubAdminOfGroup($user, $this->groupManager->get($group))) {
-					throw new OCSException('insufficient privileges for group ' . $group, 105);
+					throw new OCSException('insufficient privileges for group '.$group, 105);
 				}
 			}
 		} else {
@@ -419,11 +419,11 @@ 
 
 		try {
 			$newUser = $this->userManager->createUser($userid, $password);
-			$this->logger->info('Successful addUser call with userid: ' . $userid, ['app' => 'ocs_api']);
+			$this->logger->info('Successful addUser call with userid: '.$userid, ['app' => 'ocs_api']);
 
 			foreach ($groups as $group) {
 				$this->groupManager->get($group)->addUser($newUser);
-				$this->logger->info('Added userid ' . $userid . ' to group ' . $group, ['app' => 'ocs_api']);
+				$this->logger->info('Added userid '.$userid.' to group '.$group, ['app' => 'ocs_api']);
 			}
 			foreach ($subadminGroups as $group) {
 				$subAdminManager->createSubAdmin($newUser, $group);
@@ -669,7 +669,7 @@ 
 		if ($targetUser->getUID() === $currentLoggedInUser->getUID()) {
 			// Editing self (display, email)
 			$permittedFields[] = IAccountManager::COLLECTION_EMAIL;
-			$permittedFields[] = IAccountManager::COLLECTION_EMAIL . self::SCOPE_SUFFIX;
+			$permittedFields[] = IAccountManager::COLLECTION_EMAIL.self::SCOPE_SUFFIX;
 		} else {
 			// Check if admin / subadmin
 			if ($isAdminOrSubadmin) {
@@ -702,7 +702,7 @@ 
 				$this->accountManager->updateAccount($userAccount);
 				break;
 
-			case IAccountManager::COLLECTION_EMAIL . self::SCOPE_SUFFIX:
+			case IAccountManager::COLLECTION_EMAIL.self::SCOPE_SUFFIX:
 				$userAccount = $this->accountManager->getAccount($targetUser);
 				$mailCollection = $userAccount->getPropertyCollection(IAccountManager::COLLECTION_EMAIL);
 				$targetProperty = null;
@@ -766,8 +766,8 @@ 
 				$permittedFields[] = IAccountManager::PROPERTY_EMAIL;
 			}
 
-			$permittedFields[] = IAccountManager::PROPERTY_DISPLAYNAME . self::SCOPE_SUFFIX;
-			$permittedFields[] = IAccountManager::PROPERTY_EMAIL . self::SCOPE_SUFFIX;
+			$permittedFields[] = IAccountManager::PROPERTY_DISPLAYNAME.self::SCOPE_SUFFIX;
+			$permittedFields[] = IAccountManager::PROPERTY_EMAIL.self::SCOPE_SUFFIX;
 
 			$permittedFields[] = IAccountManager::COLLECTION_EMAIL;
 
@@ -797,18 +797,18 @@ 
 			$permittedFields[] = IAccountManager::PROPERTY_HEADLINE;
 			$permittedFields[] = IAccountManager::PROPERTY_BIOGRAPHY;
 			$permittedFields[] = IAccountManager::PROPERTY_PROFILE_ENABLED;
-			$permittedFields[] = IAccountManager::PROPERTY_PHONE . self::SCOPE_SUFFIX;
-			$permittedFields[] = IAccountManager::PROPERTY_ADDRESS . self::SCOPE_SUFFIX;
-			$permittedFields[] = IAccountManager::PROPERTY_WEBSITE . self::SCOPE_SUFFIX;
-			$permittedFields[] = IAccountManager::PROPERTY_TWITTER . self::SCOPE_SUFFIX;
-			$permittedFields[] = IAccountManager::PROPERTY_FEDIVERSE . self::SCOPE_SUFFIX;
-			$permittedFields[] = IAccountManager::PROPERTY_ORGANISATION . self::SCOPE_SUFFIX;
-			$permittedFields[] = IAccountManager::PROPERTY_ROLE . self::SCOPE_SUFFIX;
-			$permittedFields[] = IAccountManager::PROPERTY_HEADLINE . self::SCOPE_SUFFIX;
-			$permittedFields[] = IAccountManager::PROPERTY_BIOGRAPHY . self::SCOPE_SUFFIX;
-			$permittedFields[] = IAccountManager::PROPERTY_PROFILE_ENABLED . self::SCOPE_SUFFIX;
-
-			$permittedFields[] = IAccountManager::PROPERTY_AVATAR . self::SCOPE_SUFFIX;
+			$permittedFields[] = IAccountManager::PROPERTY_PHONE.self::SCOPE_SUFFIX;
+			$permittedFields[] = IAccountManager::PROPERTY_ADDRESS.self::SCOPE_SUFFIX;
+			$permittedFields[] = IAccountManager::PROPERTY_WEBSITE.self::SCOPE_SUFFIX;
+			$permittedFields[] = IAccountManager::PROPERTY_TWITTER.self::SCOPE_SUFFIX;
+			$permittedFields[] = IAccountManager::PROPERTY_FEDIVERSE.self::SCOPE_SUFFIX;
+			$permittedFields[] = IAccountManager::PROPERTY_ORGANISATION.self::SCOPE_SUFFIX;
+			$permittedFields[] = IAccountManager::PROPERTY_ROLE.self::SCOPE_SUFFIX;
+			$permittedFields[] = IAccountManager::PROPERTY_HEADLINE.self::SCOPE_SUFFIX;
+			$permittedFields[] = IAccountManager::PROPERTY_BIOGRAPHY.self::SCOPE_SUFFIX;
+			$permittedFields[] = IAccountManager::PROPERTY_PROFILE_ENABLED.self::SCOPE_SUFFIX;
+
+			$permittedFields[] = IAccountManager::PROPERTY_AVATAR.self::SCOPE_SUFFIX;
 
 			// If admin they can edit their own quota and manager
 			if ($this->groupManager->isAdmin($currentLoggedInUser->getUID())) {
@@ -877,14 +877,14 @@ 
 						$quota = \OCP\Util::computerFileSize($quota);
 					}
 					if ($quota === false) {
-						throw new OCSException('Invalid quota value ' . $value, 102);
+						throw new OCSException('Invalid quota value '.$value, 102);
 					}
 					if ($quota === -1) {
 						$quota = 'none';
 					} else {
 						$maxQuota = (int) $this->config->getAppValue('files', 'max_quota', '-1');
 						if ($maxQuota !== -1 && $quota > $maxQuota) {
-							throw new OCSException('Invalid quota value. ' . $value . ' is exceeding the maximum quota', 102);
+							throw new OCSException('Invalid quota value. '.$value.' is exceeding the maximum quota', 102);
 						}
 						$quota = \OCP\Util::humanFileSize($quota);
 					}
@@ -988,7 +988,7 @@ 
 								$this->knownUserService->deleteByContactUserId($targetUser->getUID());
 							}
 						} catch (InvalidArgumentException $e) {
-							throw new OCSException('Invalid ' . $e->getMessage(), 102);
+							throw new OCSException('Invalid '.$e->getMessage(), 102);
 						}
 					}
 				} catch (PropertyDoesNotExistException $e) {
@@ -997,7 +997,7 @@ 
 				try {
 					$this->accountManager->updateAccount($userAccount);
 				} catch (InvalidArgumentException $e) {
-					throw new OCSException('Invalid ' . $e->getMessage(), 102);
+					throw new OCSException('Invalid '.$e->getMessage(), 102);
 				}
 				break;
 			case IAccountManager::PROPERTY_PROFILE_ENABLED:
@@ -1012,19 +1012,19 @@ 
 				}
 				$this->accountManager->updateAccount($userAccount);
 				break;
-			case IAccountManager::PROPERTY_DISPLAYNAME . self::SCOPE_SUFFIX:
-			case IAccountManager::PROPERTY_EMAIL . self::SCOPE_SUFFIX:
-			case IAccountManager::PROPERTY_PHONE . self::SCOPE_SUFFIX:
-			case IAccountManager::PROPERTY_ADDRESS . self::SCOPE_SUFFIX:
-			case IAccountManager::PROPERTY_WEBSITE . self::SCOPE_SUFFIX:
-			case IAccountManager::PROPERTY_TWITTER . self::SCOPE_SUFFIX:
-			case IAccountManager::PROPERTY_FEDIVERSE . self::SCOPE_SUFFIX:
-			case IAccountManager::PROPERTY_ORGANISATION . self::SCOPE_SUFFIX:
-			case IAccountManager::PROPERTY_ROLE . self::SCOPE_SUFFIX:
-			case IAccountManager::PROPERTY_HEADLINE . self::SCOPE_SUFFIX:
-			case IAccountManager::PROPERTY_BIOGRAPHY . self::SCOPE_SUFFIX:
-			case IAccountManager::PROPERTY_PROFILE_ENABLED . self::SCOPE_SUFFIX:
-			case IAccountManager::PROPERTY_AVATAR . self::SCOPE_SUFFIX:
+			case IAccountManager::PROPERTY_DISPLAYNAME.self::SCOPE_SUFFIX:
+			case IAccountManager::PROPERTY_EMAIL.self::SCOPE_SUFFIX:
+			case IAccountManager::PROPERTY_PHONE.self::SCOPE_SUFFIX:
+			case IAccountManager::PROPERTY_ADDRESS.self::SCOPE_SUFFIX:
+			case IAccountManager::PROPERTY_WEBSITE.self::SCOPE_SUFFIX:
+			case IAccountManager::PROPERTY_TWITTER.self::SCOPE_SUFFIX:
+			case IAccountManager::PROPERTY_FEDIVERSE.self::SCOPE_SUFFIX:
+			case IAccountManager::PROPERTY_ORGANISATION.self::SCOPE_SUFFIX:
+			case IAccountManager::PROPERTY_ROLE.self::SCOPE_SUFFIX:
+			case IAccountManager::PROPERTY_HEADLINE.self::SCOPE_SUFFIX:
+			case IAccountManager::PROPERTY_BIOGRAPHY.self::SCOPE_SUFFIX:
+			case IAccountManager::PROPERTY_PROFILE_ENABLED.self::SCOPE_SUFFIX:
+			case IAccountManager::PROPERTY_AVATAR.self::SCOPE_SUFFIX:
 				$propertyName = substr($key, 0, strlen($key) - strlen(self::SCOPE_SUFFIX));
 				$userAccount = $this->accountManager->getAccount($targetUser);
 				$userProperty = $userAccount->getProperty($propertyName);
@@ -1033,7 +1033,7 @@ 
 						$userProperty->setScope($value);
 						$this->accountManager->updateAccount($userAccount);
 					} catch (InvalidArgumentException $e) {
-						throw new OCSException('Invalid ' . $e->getMessage(), 102);
+						throw new OCSException('Invalid '.$e->getMessage(), 102);
 					}
 				}
 				break;
@@ -1288,7 +1288,7 @@ 
 		} elseif (!$this->groupManager->isAdmin($loggedInUser->getUID())) {
 			/** @var IGroup[] $subAdminGroups */
 			$subAdminGroups = $subAdminManager->getSubAdminsGroups($loggedInUser);
-			$subAdminGroups = array_map(function (IGroup $subAdminGroup) {
+			$subAdminGroups = array_map(function(IGroup $subAdminGroup) {
 				return $subAdminGroup->getGID();
 			}, $subAdminGroups);
 			$userGroups = $this->groupManager->getUserGroupIds($targetUser);