nextcloud / server

apps/dav/lib/CardDAV/Converter.php

Indentation +115 added lines, -115 removed lines

@@ -36,119 +36,119 @@
 
 class Converter {
 
-	/** @var AccountManager */
-	private $accountManager;
-
-	/**
-	 * Converter constructor.
-	 *
-	 * @param AccountManager $accountManager
-	 */
-	public function __construct(AccountManager $accountManager) {
-		$this->accountManager = $accountManager;
-	}
-
-	/**
-	 * @param IUser $user
-	 * @return VCard|null
-	 */
-	public function createCardFromUser(IUser $user) {
-		$userData = $this->accountManager->getUser($user);
-
-		$uid = $user->getUID();
-		$cloudId = $user->getCloudId();
-		$image = $this->getAvatarImage($user);
-
-		$vCard = new VCard();
-		$vCard->VERSION = '3.0';
-		$vCard->UID = $uid;
-
-		$publish = false;
-
-		if ($image !== null && isset($userData[IAccountManager::PROPERTY_AVATAR])) {
-			$userData[IAccountManager::PROPERTY_AVATAR]['value'] = true;
-		}
-
-		foreach ($userData as $property => $value) {
-			$shareWithTrustedServers =
-				$value['scope'] === AccountManager::SCOPE_FEDERATED ||
-				$value['scope'] === AccountManager::SCOPE_PUBLISHED;
-
-			$emptyValue = !isset($value['value']) || $value['value'] === '';
-
-			if ($shareWithTrustedServers && !$emptyValue) {
-				$publish = true;
-				switch ($property) {
-					case IAccountManager::PROPERTY_DISPLAYNAME:
-						$vCard->add(new Text($vCard, 'FN', $value['value']));
-						$vCard->add(new Text($vCard, 'N', $this->splitFullName($value['value'])));
-						break;
-					case IAccountManager::PROPERTY_AVATAR:
-						if ($image !== null) {
-							$vCard->add('PHOTO', $image->data(), ['ENCODING' => 'b', 'TYPE' => $image->mimeType()]);
-						}
-						break;
-					case IAccountManager::PROPERTY_EMAIL:
-						$vCard->add(new Text($vCard, 'EMAIL', $value['value'], ['TYPE' => 'OTHER']));
-						break;
-					case IAccountManager::PROPERTY_WEBSITE:
-						$vCard->add(new Text($vCard, 'URL', $value['value']));
-						break;
-					case IAccountManager::PROPERTY_PHONE:
-						$vCard->add(new Text($vCard, 'TEL', $value['value'], ['TYPE' => 'OTHER']));
-						break;
-					case IAccountManager::PROPERTY_ADDRESS:
-						$vCard->add(new Text($vCard, 'ADR', $value['value'], ['TYPE' => 'OTHER']));
-						break;
-					case IAccountManager::PROPERTY_TWITTER:
-						$vCard->add(new Text($vCard, 'X-SOCIALPROFILE', $value['value'], ['TYPE' => 'TWITTER']));
-						break;
-				}
-			}
-		}
-
-		if ($publish && !empty($cloudId)) {
-			$vCard->add(new Text($vCard, 'CLOUD', $cloudId));
-			$vCard->validate();
-			return $vCard;
-		}
-
-		return null;
-	}
-
-	/**
-	 * @param string $fullName
-	 * @return string[]
-	 */
-	public function splitFullName($fullName) {
-		// 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;
-	}
-
-	/**
-	 * @param IUser $user
-	 * @return null|IImage
-	 */
-	private function getAvatarImage(IUser $user) {
-		try {
-			return $user->getAvatarImage(-1);
-		} catch (\Exception $ex) {
-			return null;
-		}
-	}
+    /** @var AccountManager */
+    private $accountManager;
+
+    /**
+     * Converter constructor.
+     *
+     * @param AccountManager $accountManager
+     */
+    public function __construct(AccountManager $accountManager) {
+        $this->accountManager = $accountManager;
+    }
+
+    /**
+     * @param IUser $user
+     * @return VCard|null
+     */
+    public function createCardFromUser(IUser $user) {
+        $userData = $this->accountManager->getUser($user);
+
+        $uid = $user->getUID();
+        $cloudId = $user->getCloudId();
+        $image = $this->getAvatarImage($user);
+
+        $vCard = new VCard();
+        $vCard->VERSION = '3.0';
+        $vCard->UID = $uid;
+
+        $publish = false;
+
+        if ($image !== null && isset($userData[IAccountManager::PROPERTY_AVATAR])) {
+            $userData[IAccountManager::PROPERTY_AVATAR]['value'] = true;
+        }
+
+        foreach ($userData as $property => $value) {
+            $shareWithTrustedServers =
+                $value['scope'] === AccountManager::SCOPE_FEDERATED ||
+                $value['scope'] === AccountManager::SCOPE_PUBLISHED;
+
+            $emptyValue = !isset($value['value']) || $value['value'] === '';
+
+            if ($shareWithTrustedServers && !$emptyValue) {
+                $publish = true;
+                switch ($property) {
+                    case IAccountManager::PROPERTY_DISPLAYNAME:
+                        $vCard->add(new Text($vCard, 'FN', $value['value']));
+                        $vCard->add(new Text($vCard, 'N', $this->splitFullName($value['value'])));
+                        break;
+                    case IAccountManager::PROPERTY_AVATAR:
+                        if ($image !== null) {
+                            $vCard->add('PHOTO', $image->data(), ['ENCODING' => 'b', 'TYPE' => $image->mimeType()]);
+                        }
+                        break;
+                    case IAccountManager::PROPERTY_EMAIL:
+                        $vCard->add(new Text($vCard, 'EMAIL', $value['value'], ['TYPE' => 'OTHER']));
+                        break;
+                    case IAccountManager::PROPERTY_WEBSITE:
+                        $vCard->add(new Text($vCard, 'URL', $value['value']));
+                        break;
+                    case IAccountManager::PROPERTY_PHONE:
+                        $vCard->add(new Text($vCard, 'TEL', $value['value'], ['TYPE' => 'OTHER']));
+                        break;
+                    case IAccountManager::PROPERTY_ADDRESS:
+                        $vCard->add(new Text($vCard, 'ADR', $value['value'], ['TYPE' => 'OTHER']));
+                        break;
+                    case IAccountManager::PROPERTY_TWITTER:
+                        $vCard->add(new Text($vCard, 'X-SOCIALPROFILE', $value['value'], ['TYPE' => 'TWITTER']));
+                        break;
+                }
+            }
+        }
+
+        if ($publish && !empty($cloudId)) {
+            $vCard->add(new Text($vCard, 'CLOUD', $cloudId));
+            $vCard->validate();
+            return $vCard;
+        }
+
+        return null;
+    }
+
+    /**
+     * @param string $fullName
+     * @return string[]
+     */
+    public function splitFullName($fullName) {
+        // 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;
+    }
+
+    /**
+     * @param IUser $user
+     * @return null|IImage
+     */
+    private function getAvatarImage(IUser $user) {
+        try {
+            return $user->getAvatarImage(-1);
+        } catch (\Exception $ex) {
+            return null;
+        }
+    }
 }

apps/settings/templates/settings/personal/personal.info.php

Indentation +62 added lines, -62 removed lines

@@ -26,11 +26,11 @@ 
 /** @var array $_ */
 
 script('settings', [
-	'usersettings',
-	'templates',
-	'federationsettingsview',
-	'federationscopemenu',
-	'settings/personalInfo',
+    'usersettings',
+    'templates',
+    'federationsettingsview',
+    'federationscopemenu',
+    'settings/personalInfo',
 ]);
 ?>
 
@@ -84,10 +84,10 @@ 
 					<p class="quotatext">
 						<?php if ($_['quota'] === \OCP\Files\FileInfo::SPACE_UNLIMITED): ?>
 							<?php print_unescaped($l->t('You are using <strong>%s</strong>',
-								[$_['usage']]));?>
+                                [$_['usage']]));?>
 						<?php else: ?>
 							<?php print_unescaped($l->t('You are using <strong>%1$s</strong> of <strong>%2$s</strong> (<strong>%3$s %%</strong>)',
-								[$_['usage'], $_['total_space'],  $_['usage_relative']]));?>
+                                [$_['usage'], $_['total_space'],  $_['usage_relative']]));?>
 						<?php endif ?>
 					</p>
 				</div>
@@ -109,16 +109,16 @@ 
 				</h3>
 				<input type="text" id="displayname" name="displayname"
 					<?php if (!$_['displayNameChangeSupported']) {
-									print_unescaped('class="hidden"');
-								} ?>
+                                    print_unescaped('class="hidden"');
+                                } ?>
 					   value="<?php p($_['displayName']) ?>"
 					   autocomplete="on" autocapitalize="none" autocorrect="off" />
 				<?php if (!$_['displayNameChangeSupported']) { ?>
 					<span><?php if (isset($_['displayName']) && !empty($_['displayName'])) {
-									p($_['displayName']);
-								} else {
-									p($l->t('No display name set'));
-								} ?></span>
+                                    p($_['displayName']);
+                                } else {
+                                    p($l->t('No display name set'));
+                                } ?></span>
 				<?php } ?>
 				<span class="icon-checkmark hidden"></span>
 				<span class="icon-error hidden" ></span>
@@ -138,36 +138,36 @@ 
 					</div>
 				</h3>
 				<div class="verify <?php if ($_['email'] === '' || $_['emailScope'] !== 'public') {
-									p('hidden');
-								} ?>">
+                                    p('hidden');
+                                } ?>">
 					<img id="verify-email" title="<?php p($_['emailMessage']); ?>" data-status="<?php p($_['emailVerification']) ?>" src="
 				<?php
-					switch ($_['emailVerification']) {
-						case \OC\Accounts\AccountManager::VERIFICATION_IN_PROGRESS:
-							p(image_path('core', 'actions/verifying.svg'));
-							break;
-						case \OC\Accounts\AccountManager::VERIFIED:
-							p(image_path('core', 'actions/verified.svg'));
-							break;
-						default:
-							p(image_path('core', 'actions/verify.svg'));
-					}
-					?>">
+                    switch ($_['emailVerification']) {
+                        case \OC\Accounts\AccountManager::VERIFICATION_IN_PROGRESS:
+                            p(image_path('core', 'actions/verifying.svg'));
+                            break;
+                        case \OC\Accounts\AccountManager::VERIFIED:
+                            p(image_path('core', 'actions/verified.svg'));
+                            break;
+                        default:
+                            p(image_path('core', 'actions/verify.svg'));
+                    }
+                    ?>">
 				</div>
 				<input type="email" name="email" id="email" value="<?php p($_['email']); ?>"
 					<?php if (!$_['displayNameChangeSupported']) {
-						print_unescaped('class="hidden"');
-					} ?>
+                        print_unescaped('class="hidden"');
+                    } ?>
 					   placeholder="<?php p($l->t('Your email address')); ?>"
 					   autocomplete="on" autocapitalize="none" autocorrect="off" />
 				<span class="icon-checkmark hidden"></span>
 				<span class="icon-error hidden" ></span>
 				<?php if (!$_['displayNameChangeSupported']) { ?>
 					<span><?php if (isset($_['email']) && !empty($_['email'])) {
-						p($_['email']);
-					} else {
-						p($l->t('No email address set'));
-					}?></span>
+                        p($_['email']);
+                    } else {
+                        p($l->t('No email address set'));
+                    }?></span>
 				<?php } ?>
 				<?php if ($_['displayNameChangeSupported']) { ?>
 					<em><?php p($l->t('For password reset and notifications')); ?></em>
@@ -227,24 +227,24 @@ 
 				</h3>
 				<?php if ($_['lookupServerUploadEnabled']) { ?>
 				<div class="verify <?php if ($_['website'] === '' || $_['websiteScope'] !== 'public') {
-						p('hidden');
-					} ?>">
+                        p('hidden');
+                    } ?>">
 					<img id="verify-website" title="<?php p($_['websiteMessage']); ?>" data-status="<?php p($_['websiteVerification']) ?>" src="
 					<?php
-					switch ($_['websiteVerification']) {
-						case \OC\Accounts\AccountManager::VERIFICATION_IN_PROGRESS:
-							p(image_path('core', 'actions/verifying.svg'));
-							break;
-						case \OC\Accounts\AccountManager::VERIFIED:
-							p(image_path('core', 'actions/verified.svg'));
-							break;
-						default:
-							p(image_path('core', 'actions/verify.svg'));
-					}
-					?>"
+                    switch ($_['websiteVerification']) {
+                        case \OC\Accounts\AccountManager::VERIFICATION_IN_PROGRESS:
+                            p(image_path('core', 'actions/verifying.svg'));
+                            break;
+                        case \OC\Accounts\AccountManager::VERIFIED:
+                            p(image_path('core', 'actions/verified.svg'));
+                            break;
+                        default:
+                            p(image_path('core', 'actions/verify.svg'));
+                    }
+                    ?>"
 					<?php if ($_['websiteVerification'] === \OC\Accounts\AccountManager::VERIFICATION_IN_PROGRESS || $_['websiteVerification'] === \OC\Accounts\AccountManager::NOT_VERIFIED) {
-						print_unescaped(' class="verify-action"');
-					} ?>
+                        print_unescaped(' class="verify-action"');
+                    } ?>
 					>
 					<div class="verification-dialog popovermenu bubble menu">
 						<div class="verification-dialog-content">
@@ -276,24 +276,24 @@ 
 				</h3>
 				<?php if ($_['lookupServerUploadEnabled']) { ?>
 				<div class="verify <?php if ($_['twitter'] === '' || $_['twitterScope'] !== 'public') {
-						p('hidden');
-					} ?>">
+                        p('hidden');
+                    } ?>">
 					<img id="verify-twitter" title="<?php p($_['twitterMessage']); ?>" data-status="<?php p($_['twitterVerification']) ?>" src="
 					<?php
-					switch ($_['twitterVerification']) {
-						case \OC\Accounts\AccountManager::VERIFICATION_IN_PROGRESS:
-							p(image_path('core', 'actions/verifying.svg'));
-							break;
-						case \OC\Accounts\AccountManager::VERIFIED:
-							p(image_path('core', 'actions/verified.svg'));
-							break;
-						default:
-							p(image_path('core', 'actions/verify.svg'));
-					}
-					?>"
+                    switch ($_['twitterVerification']) {
+                        case \OC\Accounts\AccountManager::VERIFICATION_IN_PROGRESS:
+                            p(image_path('core', 'actions/verifying.svg'));
+                            break;
+                        case \OC\Accounts\AccountManager::VERIFIED:
+                            p(image_path('core', 'actions/verified.svg'));
+                            break;
+                        default:
+                            p(image_path('core', 'actions/verify.svg'));
+                    }
+                    ?>"
 					<?php if ($_['twitterVerification'] === \OC\Accounts\AccountManager::VERIFICATION_IN_PROGRESS || $_['twitterVerification'] === \OC\Accounts\AccountManager::NOT_VERIFIED) {
-						print_unescaped(' class="verify-action"');
-					} ?>
+                        print_unescaped(' class="verify-action"');
+                    } ?>
 					>
 					<div class="verification-dialog popovermenu bubble menu">
 						<div class="verification-dialog-content">

apps/settings/lib/Settings/Personal/PersonalInfo.php

Indentation +232 added lines, -232 removed lines

@@ -53,236 +53,236 @@
 
 class PersonalInfo implements ISettings {
 
-	/** @var IConfig */
-	private $config;
-	/** @var IUserManager */
-	private $userManager;
-	/** @var AccountManager */
-	private $accountManager;
-	/** @var IGroupManager */
-	private $groupManager;
-	/** @var IAppManager */
-	private $appManager;
-	/** @var IFactory */
-	private $l10nFactory;
-	/** @var IL10N */
-	private $l;
-
-	public function __construct(
-		IConfig $config,
-		IUserManager $userManager,
-		IGroupManager $groupManager,
-		AccountManager $accountManager,
-		IAppManager $appManager,
-		IFactory $l10nFactory,
-		IL10N $l
-	) {
-		$this->config = $config;
-		$this->userManager = $userManager;
-		$this->accountManager = $accountManager;
-		$this->groupManager = $groupManager;
-		$this->appManager = $appManager;
-		$this->l10nFactory = $l10nFactory;
-		$this->l = $l;
-	}
-
-	public function getForm(): TemplateResponse {
-		$federatedFileSharingEnabled = $this->appManager->isEnabledForUser('federatedfilesharing');
-		$lookupServerUploadEnabled = false;
-		if ($federatedFileSharingEnabled) {
-			/** @var FederatedShareProvider $shareProvider */
-			$shareProvider = \OC::$server->query(FederatedShareProvider::class);
-			$lookupServerUploadEnabled = $shareProvider->isLookupServerUploadEnabled();
-		}
-
-		$uid = \OC_User::getUser();
-		$user = $this->userManager->get($uid);
-		$account = $this->accountManager->getAccount($user);
-
-		// make sure FS is setup before querying storage related stuff...
-		\OC_Util::setupFS($user->getUID());
-
-		$storageInfo = \OC_Helper::getStorageInfo('/');
-		if ($storageInfo['quota'] === FileInfo::SPACE_UNLIMITED) {
-			$totalSpace = $this->l->t('Unlimited');
-		} else {
-			$totalSpace = \OC_Helper::humanFileSize($storageInfo['total']);
-		}
-
-		$languageParameters = $this->getLanguages($user);
-		$localeParameters = $this->getLocales($user);
-		$messageParameters = $this->getMessageParameters($account);
-
-		$parameters = [
-			'total_space' => $totalSpace,
-			'usage' => \OC_Helper::humanFileSize($storageInfo['used']),
-			'usage_relative' => round($storageInfo['relative']),
-			'quota' => $storageInfo['quota'],
-			'avatarChangeSupported' => $user->canChangeAvatar(),
-			'lookupServerUploadEnabled' => $lookupServerUploadEnabled,
-			'avatarScope' => $account->getProperty(IAccountManager::PROPERTY_AVATAR)->getScope(),
-			'displayNameChangeSupported' => $user->canChangeDisplayName(),
-			'displayName' => $account->getProperty(IAccountManager::PROPERTY_DISPLAYNAME)->getValue(),
-			'displayNameScope' => $account->getProperty(IAccountManager::PROPERTY_DISPLAYNAME)->getScope(),
-			'email' => $account->getProperty(IAccountManager::PROPERTY_EMAIL)->getValue(),
-			'emailScope' => $account->getProperty(IAccountManager::PROPERTY_EMAIL)->getScope(),
-			'emailVerification' => $account->getProperty(IAccountManager::PROPERTY_EMAIL)->getVerified(),
-			'phone' => $account->getProperty(IAccountManager::PROPERTY_PHONE)->getValue(),
-			'phoneScope' => $account->getProperty(IAccountManager::PROPERTY_PHONE)->getScope(),
-			'address' => $account->getProperty(IAccountManager::PROPERTY_ADDRESS)->getValue(),
-			'addressScope' => $account->getProperty(IAccountManager::PROPERTY_ADDRESS)->getScope(),
-			'website' => $account->getProperty(IAccountManager::PROPERTY_WEBSITE)->getValue(),
-			'websiteScope' => $account->getProperty(IAccountManager::PROPERTY_WEBSITE)->getScope(),
-			'websiteVerification' => $account->getProperty(IAccountManager::PROPERTY_WEBSITE)->getVerified(),
-			'twitter' => $account->getProperty(IAccountManager::PROPERTY_TWITTER)->getValue(),
-			'twitterScope' => $account->getProperty(IAccountManager::PROPERTY_TWITTER)->getScope(),
-			'twitterVerification' => $account->getProperty(IAccountManager::PROPERTY_TWITTER)->getVerified(),
-			'groups' => $this->getGroups($user),
-		] + $messageParameters + $languageParameters + $localeParameters;
-
-
-		return new TemplateResponse('settings', 'settings/personal/personal.info', $parameters, '');
-	}
-
-	/**
-	 * @return string the section ID, e.g. 'sharing'
-	 * @since 9.1
-	 */
-	public function getSection(): string {
-		return 'personal-info';
-	}
-
-	/**
-	 * @return int whether the form should be rather on the top or bottom of
-	 * the admin section. The forms are arranged in ascending order of the
-	 * priority values. It is required to return a value between 0 and 100.
-	 *
-	 * E.g.: 70
-	 * @since 9.1
-	 */
-	public function getPriority(): int {
-		return 10;
-	}
-
-	/**
-	 * returns a sorted list of the user's group GIDs
-	 *
-	 * @param IUser $user
-	 * @return array
-	 */
-	private function getGroups(IUser $user): array {
-		$groups = array_map(
-			static function (IGroup $group) {
-				return $group->getDisplayName();
-			},
-			$this->groupManager->getUserGroups($user)
-		);
-		sort($groups);
-
-		return $groups;
-	}
-
-	/**
-	 * returns the user language, common language and other languages in an
-	 * associative array
-	 *
-	 * @param IUser $user
-	 * @return array
-	 */
-	private function getLanguages(IUser $user): array {
-		$forceLanguage = $this->config->getSystemValue('force_language', false);
-		if ($forceLanguage !== false) {
-			return [];
-		}
-
-		$uid = $user->getUID();
-
-		$userConfLang = $this->config->getUserValue($uid, 'core', 'lang', $this->l10nFactory->findLanguage());
-		$languages = $this->l10nFactory->getLanguages();
-
-		// associate the user language with the proper array
-		$userLangIndex = array_search($userConfLang, array_column($languages['commonlanguages'], 'code'));
-		$userLang = $languages['commonlanguages'][$userLangIndex];
-		// search in the other languages
-		if ($userLangIndex === false) {
-			$userLangIndex = array_search($userConfLang, array_column($languages['languages'], 'code'));
-			$userLang = $languages['languages'][$userLangIndex];
-		}
-		// if user language is not available but set somehow: show the actual code as name
-		if (!is_array($userLang)) {
-			$userLang = [
-				'code' => $userConfLang,
-				'name' => $userConfLang,
-			];
-		}
-
-		return array_merge(
-			['activelanguage' => $userLang],
-			$languages
-		);
-	}
-
-	private function getLocales(IUser $user): array {
-		$forceLanguage = $this->config->getSystemValue('force_locale', false);
-		if ($forceLanguage !== false) {
-			return [];
-		}
-
-		$uid = $user->getUID();
-
-		$userLocaleString = $this->config->getUserValue($uid, 'core', 'locale', $this->l10nFactory->findLocale());
-
-		$userLang = $this->config->getUserValue($uid, 'core', 'lang', $this->l10nFactory->findLanguage());
-
-		$localeCodes = $this->l10nFactory->findAvailableLocales();
-
-		$userLocale = array_filter($localeCodes, function ($value) use ($userLocaleString) {
-			return $userLocaleString === $value['code'];
-		});
-
-		if (!empty($userLocale)) {
-			$userLocale = reset($userLocale);
-		}
-
-		$localesForLanguage = array_filter($localeCodes, function ($localeCode) use ($userLang) {
-			return 0 === strpos($localeCode['code'], $userLang);
-		});
-
-		if (!$userLocale) {
-			$userLocale = [
-				'code' => 'en',
-				'name' => 'English'
-			];
-		}
-
-		return [
-			'activelocaleLang' => $userLocaleString,
-			'activelocale' => $userLocale,
-			'locales' => $localeCodes,
-			'localesForLanguage' => $localesForLanguage,
-		];
-	}
-
-	/**
-	 * @param IAccount $account
-	 * @return array
-	 */
-	private function getMessageParameters(IAccount $account): array {
-		$needVerifyMessage = [IAccountManager::PROPERTY_EMAIL, IAccountManager::PROPERTY_WEBSITE, IAccountManager::PROPERTY_TWITTER];
-		$messageParameters = [];
-		foreach ($needVerifyMessage as $property) {
-			switch ($account->getProperty($property)->getVerified()) {
-				case AccountManager::VERIFIED:
-					$message = $this->l->t('Verifying');
-					break;
-				case AccountManager::VERIFICATION_IN_PROGRESS:
-					$message = $this->l->t('Verifying …');
-					break;
-				default:
-					$message = $this->l->t('Verify');
-			}
-			$messageParameters[$property . 'Message'] = $message;
-		}
-		return $messageParameters;
-	}
+    /** @var IConfig */
+    private $config;
+    /** @var IUserManager */
+    private $userManager;
+    /** @var AccountManager */
+    private $accountManager;
+    /** @var IGroupManager */
+    private $groupManager;
+    /** @var IAppManager */
+    private $appManager;
+    /** @var IFactory */
+    private $l10nFactory;
+    /** @var IL10N */
+    private $l;
+
+    public function __construct(
+        IConfig $config,
+        IUserManager $userManager,
+        IGroupManager $groupManager,
+        AccountManager $accountManager,
+        IAppManager $appManager,
+        IFactory $l10nFactory,
+        IL10N $l
+    ) {
+        $this->config = $config;
+        $this->userManager = $userManager;
+        $this->accountManager = $accountManager;
+        $this->groupManager = $groupManager;
+        $this->appManager = $appManager;
+        $this->l10nFactory = $l10nFactory;
+        $this->l = $l;
+    }
+
+    public function getForm(): TemplateResponse {
+        $federatedFileSharingEnabled = $this->appManager->isEnabledForUser('federatedfilesharing');
+        $lookupServerUploadEnabled = false;
+        if ($federatedFileSharingEnabled) {
+            /** @var FederatedShareProvider $shareProvider */
+            $shareProvider = \OC::$server->query(FederatedShareProvider::class);
+            $lookupServerUploadEnabled = $shareProvider->isLookupServerUploadEnabled();
+        }
+
+        $uid = \OC_User::getUser();
+        $user = $this->userManager->get($uid);
+        $account = $this->accountManager->getAccount($user);
+
+        // make sure FS is setup before querying storage related stuff...
+        \OC_Util::setupFS($user->getUID());
+
+        $storageInfo = \OC_Helper::getStorageInfo('/');
+        if ($storageInfo['quota'] === FileInfo::SPACE_UNLIMITED) {
+            $totalSpace = $this->l->t('Unlimited');
+        } else {
+            $totalSpace = \OC_Helper::humanFileSize($storageInfo['total']);
+        }
+
+        $languageParameters = $this->getLanguages($user);
+        $localeParameters = $this->getLocales($user);
+        $messageParameters = $this->getMessageParameters($account);
+
+        $parameters = [
+            'total_space' => $totalSpace,
+            'usage' => \OC_Helper::humanFileSize($storageInfo['used']),
+            'usage_relative' => round($storageInfo['relative']),
+            'quota' => $storageInfo['quota'],
+            'avatarChangeSupported' => $user->canChangeAvatar(),
+            'lookupServerUploadEnabled' => $lookupServerUploadEnabled,
+            'avatarScope' => $account->getProperty(IAccountManager::PROPERTY_AVATAR)->getScope(),
+            'displayNameChangeSupported' => $user->canChangeDisplayName(),
+            'displayName' => $account->getProperty(IAccountManager::PROPERTY_DISPLAYNAME)->getValue(),
+            'displayNameScope' => $account->getProperty(IAccountManager::PROPERTY_DISPLAYNAME)->getScope(),
+            'email' => $account->getProperty(IAccountManager::PROPERTY_EMAIL)->getValue(),
+            'emailScope' => $account->getProperty(IAccountManager::PROPERTY_EMAIL)->getScope(),
+            'emailVerification' => $account->getProperty(IAccountManager::PROPERTY_EMAIL)->getVerified(),
+            'phone' => $account->getProperty(IAccountManager::PROPERTY_PHONE)->getValue(),
+            'phoneScope' => $account->getProperty(IAccountManager::PROPERTY_PHONE)->getScope(),
+            'address' => $account->getProperty(IAccountManager::PROPERTY_ADDRESS)->getValue(),
+            'addressScope' => $account->getProperty(IAccountManager::PROPERTY_ADDRESS)->getScope(),
+            'website' => $account->getProperty(IAccountManager::PROPERTY_WEBSITE)->getValue(),
+            'websiteScope' => $account->getProperty(IAccountManager::PROPERTY_WEBSITE)->getScope(),
+            'websiteVerification' => $account->getProperty(IAccountManager::PROPERTY_WEBSITE)->getVerified(),
+            'twitter' => $account->getProperty(IAccountManager::PROPERTY_TWITTER)->getValue(),
+            'twitterScope' => $account->getProperty(IAccountManager::PROPERTY_TWITTER)->getScope(),
+            'twitterVerification' => $account->getProperty(IAccountManager::PROPERTY_TWITTER)->getVerified(),
+            'groups' => $this->getGroups($user),
+        ] + $messageParameters + $languageParameters + $localeParameters;
+
+
+        return new TemplateResponse('settings', 'settings/personal/personal.info', $parameters, '');
+    }
+
+    /**
+     * @return string the section ID, e.g. 'sharing'
+     * @since 9.1
+     */
+    public function getSection(): string {
+        return 'personal-info';
+    }
+
+    /**
+     * @return int whether the form should be rather on the top or bottom of
+     * the admin section. The forms are arranged in ascending order of the
+     * priority values. It is required to return a value between 0 and 100.
+     *
+     * E.g.: 70
+     * @since 9.1
+     */
+    public function getPriority(): int {
+        return 10;
+    }
+
+    /**
+     * returns a sorted list of the user's group GIDs
+     *
+     * @param IUser $user
+     * @return array
+     */
+    private function getGroups(IUser $user): array {
+        $groups = array_map(
+            static function (IGroup $group) {
+                return $group->getDisplayName();
+            },
+            $this->groupManager->getUserGroups($user)
+        );
+        sort($groups);
+
+        return $groups;
+    }
+
+    /**
+     * returns the user language, common language and other languages in an
+     * associative array
+     *
+     * @param IUser $user
+     * @return array
+     */
+    private function getLanguages(IUser $user): array {
+        $forceLanguage = $this->config->getSystemValue('force_language', false);
+        if ($forceLanguage !== false) {
+            return [];
+        }
+
+        $uid = $user->getUID();
+
+        $userConfLang = $this->config->getUserValue($uid, 'core', 'lang', $this->l10nFactory->findLanguage());
+        $languages = $this->l10nFactory->getLanguages();
+
+        // associate the user language with the proper array
+        $userLangIndex = array_search($userConfLang, array_column($languages['commonlanguages'], 'code'));
+        $userLang = $languages['commonlanguages'][$userLangIndex];
+        // search in the other languages
+        if ($userLangIndex === false) {
+            $userLangIndex = array_search($userConfLang, array_column($languages['languages'], 'code'));
+            $userLang = $languages['languages'][$userLangIndex];
+        }
+        // if user language is not available but set somehow: show the actual code as name
+        if (!is_array($userLang)) {
+            $userLang = [
+                'code' => $userConfLang,
+                'name' => $userConfLang,
+            ];
+        }
+
+        return array_merge(
+            ['activelanguage' => $userLang],
+            $languages
+        );
+    }
+
+    private function getLocales(IUser $user): array {
+        $forceLanguage = $this->config->getSystemValue('force_locale', false);
+        if ($forceLanguage !== false) {
+            return [];
+        }
+
+        $uid = $user->getUID();
+
+        $userLocaleString = $this->config->getUserValue($uid, 'core', 'locale', $this->l10nFactory->findLocale());
+
+        $userLang = $this->config->getUserValue($uid, 'core', 'lang', $this->l10nFactory->findLanguage());
+
+        $localeCodes = $this->l10nFactory->findAvailableLocales();
+
+        $userLocale = array_filter($localeCodes, function ($value) use ($userLocaleString) {
+            return $userLocaleString === $value['code'];
+        });
+
+        if (!empty($userLocale)) {
+            $userLocale = reset($userLocale);
+        }
+
+        $localesForLanguage = array_filter($localeCodes, function ($localeCode) use ($userLang) {
+            return 0 === strpos($localeCode['code'], $userLang);
+        });
+
+        if (!$userLocale) {
+            $userLocale = [
+                'code' => 'en',
+                'name' => 'English'
+            ];
+        }
+
+        return [
+            'activelocaleLang' => $userLocaleString,
+            'activelocale' => $userLocale,
+            'locales' => $localeCodes,
+            'localesForLanguage' => $localesForLanguage,
+        ];
+    }
+
+    /**
+     * @param IAccount $account
+     * @return array
+     */
+    private function getMessageParameters(IAccount $account): array {
+        $needVerifyMessage = [IAccountManager::PROPERTY_EMAIL, IAccountManager::PROPERTY_WEBSITE, IAccountManager::PROPERTY_TWITTER];
+        $messageParameters = [];
+        foreach ($needVerifyMessage as $property) {
+            switch ($account->getProperty($property)->getVerified()) {
+                case AccountManager::VERIFIED:
+                    $message = $this->l->t('Verifying');
+                    break;
+                case AccountManager::VERIFICATION_IN_PROGRESS:
+                    $message = $this->l->t('Verifying …');
+                    break;
+                default:
+                    $message = $this->l->t('Verify');
+            }
+            $messageParameters[$property . 'Message'] = $message;
+        }
+        return $messageParameters;
+    }
 }

apps/settings/lib/Controller/UsersController.php

Indentation +510 added lines, -510 removed lines

@@ -70,514 +70,514 @@
 use function in_array;
 
 class UsersController extends Controller {
-	/** @var UserManager */
-	private $userManager;
-	/** @var GroupManager */
-	private $groupManager;
-	/** @var IUserSession */
-	private $userSession;
-	/** @var IConfig */
-	private $config;
-	/** @var bool */
-	private $isAdmin;
-	/** @var IL10N */
-	private $l10n;
-	/** @var IMailer */
-	private $mailer;
-	/** @var Factory */
-	private $l10nFactory;
-	/** @var IAppManager */
-	private $appManager;
-	/** @var AccountManager */
-	private $accountManager;
-	/** @var Manager */
-	private $keyManager;
-	/** @var IJobList */
-	private $jobList;
-	/** @var IManager */
-	private $encryptionManager;
-	/** @var KnownUserService */
-	private $knownUserService;
-	/** @var IEventDispatcher */
-	private $dispatcher;
-
-
-	public function __construct(
-		string $appName,
-		IRequest $request,
-		IUserManager $userManager,
-		IGroupManager $groupManager,
-		IUserSession $userSession,
-		IConfig $config,
-		bool $isAdmin,
-		IL10N $l10n,
-		IMailer $mailer,
-		IFactory $l10nFactory,
-		IAppManager $appManager,
-		AccountManager $accountManager,
-		Manager $keyManager,
-		IJobList $jobList,
-		IManager $encryptionManager,
-		KnownUserService $knownUserService,
-		IEventDispatcher $dispatcher
-	) {
-		parent::__construct($appName, $request);
-		$this->userManager = $userManager;
-		$this->groupManager = $groupManager;
-		$this->userSession = $userSession;
-		$this->config = $config;
-		$this->isAdmin = $isAdmin;
-		$this->l10n = $l10n;
-		$this->mailer = $mailer;
-		$this->l10nFactory = $l10nFactory;
-		$this->appManager = $appManager;
-		$this->accountManager = $accountManager;
-		$this->keyManager = $keyManager;
-		$this->jobList = $jobList;
-		$this->encryptionManager = $encryptionManager;
-		$this->knownUserService = $knownUserService;
-		$this->dispatcher = $dispatcher;
-	}
-
-
-	/**
-	 * @NoCSRFRequired
-	 * @NoAdminRequired
-	 *
-	 * Display users list template
-	 *
-	 * @return TemplateResponse
-	 */
-	public function usersListByGroup(): TemplateResponse {
-		return $this->usersList();
-	}
-
-	/**
-	 * @NoCSRFRequired
-	 * @NoAdminRequired
-	 *
-	 * Display users list template
-	 *
-	 * @return TemplateResponse
-	 */
-	public function usersList(): TemplateResponse {
-		$user = $this->userSession->getUser();
-		$uid = $user->getUID();
-
-		\OC::$server->getNavigationManager()->setActiveEntry('core_users');
-
-		/* SORT OPTION: SORT_USERCOUNT or SORT_GROUPNAME */
-		$sortGroupsBy = \OC\Group\MetaData::SORT_USERCOUNT;
-		$isLDAPUsed = false;
-		if ($this->config->getSystemValue('sort_groups_by_name', false)) {
-			$sortGroupsBy = \OC\Group\MetaData::SORT_GROUPNAME;
-		} else {
-			if ($this->appManager->isEnabledForUser('user_ldap')) {
-				$isLDAPUsed =
-					$this->groupManager->isBackendUsed('\OCA\User_LDAP\Group_Proxy');
-				if ($isLDAPUsed) {
-					// LDAP user count can be slow, so we sort by group name here
-					$sortGroupsBy = \OC\Group\MetaData::SORT_GROUPNAME;
-				}
-			}
-		}
-
-		$canChangePassword = $this->canAdminChangeUserPasswords();
-
-		/* GROUPS */
-		$groupsInfo = new \OC\Group\MetaData(
-			$uid,
-			$this->isAdmin,
-			$this->groupManager,
-			$this->userSession
-		);
-
-		$groupsInfo->setSorting($sortGroupsBy);
-		[$adminGroup, $groups] = $groupsInfo->get();
-
-		if (!$isLDAPUsed && $this->appManager->isEnabledForUser('user_ldap')) {
-			$isLDAPUsed = (bool)array_reduce($this->userManager->getBackends(), function ($ldapFound, $backend) {
-				return $ldapFound || $backend instanceof User_Proxy;
-			});
-		}
-
-		$disabledUsers = -1;
-		$userCount = 0;
-
-		if (!$isLDAPUsed) {
-			if ($this->isAdmin) {
-				$disabledUsers = $this->userManager->countDisabledUsers();
-				$userCount = array_reduce($this->userManager->countUsers(), function ($v, $w) {
-					return $v + (int)$w;
-				}, 0);
-			} else {
-				// User is subadmin !
-				// Map group list to names to retrieve the countDisabledUsersOfGroups
-				$userGroups = $this->groupManager->getUserGroups($user);
-				$groupsNames = [];
-
-				foreach ($groups as $key => $group) {
-					// $userCount += (int)$group['usercount'];
-					array_push($groupsNames, $group['name']);
-					// we prevent subadmins from looking up themselves
-					// so we lower the count of the groups he belongs to
-					if (array_key_exists($group['id'], $userGroups)) {
-						$groups[$key]['usercount']--;
-						$userCount -= 1; // we also lower from one the total count
-					}
-				}
-				$userCount += $this->userManager->countUsersOfGroups($groupsInfo->getGroups());
-				$disabledUsers = $this->userManager->countDisabledUsersOfGroups($groupsNames);
-			}
-
-			$userCount -= $disabledUsers;
-		}
-
-		$disabledUsersGroup = [
-			'id' => 'disabled',
-			'name' => 'Disabled users',
-			'usercount' => $disabledUsers
-		];
-
-		/* QUOTAS PRESETS */
-		$quotaPreset = $this->parseQuotaPreset($this->config->getAppValue('files', 'quota_preset', '1 GB, 5 GB, 10 GB'));
-		$defaultQuota = $this->config->getAppValue('files', 'default_quota', 'none');
-
-		$event = new BeforeTemplateRenderedEvent();
-		$this->dispatcher->dispatch('OC\Settings\Users::loadAdditionalScripts', $event);
-		$this->dispatcher->dispatchTyped($event);
-
-		/* LANGUAGES */
-		$languages = $this->l10nFactory->getLanguages();
-
-		/* FINAL DATA */
-		$serverData = [];
-		// groups
-		$serverData['groups'] = array_merge_recursive($adminGroup, [$disabledUsersGroup], $groups);
-		// Various data
-		$serverData['isAdmin'] = $this->isAdmin;
-		$serverData['sortGroups'] = $sortGroupsBy;
-		$serverData['quotaPreset'] = $quotaPreset;
-		$serverData['userCount'] = $userCount;
-		$serverData['languages'] = $languages;
-		$serverData['defaultLanguage'] = $this->config->getSystemValue('default_language', 'en');
-		$serverData['forceLanguage'] = $this->config->getSystemValue('force_language', false);
-		// Settings
-		$serverData['defaultQuota'] = $defaultQuota;
-		$serverData['canChangePassword'] = $canChangePassword;
-		$serverData['newUserGenerateUserID'] = $this->config->getAppValue('core', 'newUser.generateUserID', 'no') === 'yes';
-		$serverData['newUserRequireEmail'] = $this->config->getAppValue('core', 'newUser.requireEmail', 'no') === 'yes';
-		$serverData['newUserSendEmail'] = $this->config->getAppValue('core', 'newUser.sendEmail', 'yes') === 'yes';
-
-		return new TemplateResponse('settings', 'settings-vue', ['serverData' => $serverData]);
-	}
-
-	/**
-	 * @param string $key
-	 * @param string $value
-	 *
-	 * @return JSONResponse
-	 */
-	public function setPreference(string $key, string $value): JSONResponse {
-		$allowed = ['newUser.sendEmail'];
-		if (!in_array($key, $allowed, true)) {
-			return new JSONResponse([], Http::STATUS_FORBIDDEN);
-		}
-
-		$this->config->setAppValue('core', $key, $value);
-
-		return new JSONResponse([]);
-	}
-
-	/**
-	 * Parse the app value for quota_present
-	 *
-	 * @param string $quotaPreset
-	 * @return array
-	 */
-	protected function parseQuotaPreset(string $quotaPreset): array {
-		// 1 GB, 5 GB, 10 GB => [1 GB, 5 GB, 10 GB]
-		$presets = array_filter(array_map('trim', explode(',', $quotaPreset)));
-		// Drop default and none, Make array indexes numerically
-		return array_values(array_diff($presets, ['default', 'none']));
-	}
-
-	/**
-	 * check if the admin can change the users password
-	 *
-	 * The admin can change the passwords if:
-	 *
-	 *   - no encryption module is loaded and encryption is disabled
-	 *   - encryption module is loaded but it doesn't require per user keys
-	 *
-	 * The admin can not change the passwords if:
-	 *
-	 *   - an encryption module is loaded and it uses per-user keys
-	 *   - encryption is enabled but no encryption modules are loaded
-	 *
-	 * @return bool
-	 */
-	protected function canAdminChangeUserPasswords(): bool {
-		$isEncryptionEnabled = $this->encryptionManager->isEnabled();
-		try {
-			$noUserSpecificEncryptionKeys = !$this->encryptionManager->getEncryptionModule()->needDetailedAccessList();
-			$isEncryptionModuleLoaded = true;
-		} catch (ModuleDoesNotExistsException $e) {
-			$noUserSpecificEncryptionKeys = true;
-			$isEncryptionModuleLoaded = false;
-		}
-		$canChangePassword = ($isEncryptionModuleLoaded && $noUserSpecificEncryptionKeys)
-			|| (!$isEncryptionModuleLoaded && !$isEncryptionEnabled);
-
-		return $canChangePassword;
-	}
-
-	/**
-	 * @NoAdminRequired
-	 * @NoSubAdminRequired
-	 * @PasswordConfirmationRequired
-	 *
-	 * @param string|null $avatarScope
-	 * @param string|null $displayname
-	 * @param string|null $displaynameScope
-	 * @param string|null $phone
-	 * @param string|null $phoneScope
-	 * @param string|null $email
-	 * @param string|null $emailScope
-	 * @param string|null $website
-	 * @param string|null $websiteScope
-	 * @param string|null $address
-	 * @param string|null $addressScope
-	 * @param string|null $twitter
-	 * @param string|null $twitterScope
-	 *
-	 * @return DataResponse
-	 */
-	public function setUserSettings(?string $avatarScope = null,
-									?string $displayname = null,
-									?string $displaynameScope = null,
-									?string $phone = null,
-									?string $phoneScope = null,
-									?string $email = null,
-									?string $emailScope = null,
-									?string $website = null,
-									?string $websiteScope = null,
-									?string $address = null,
-									?string $addressScope = null,
-									?string $twitter = null,
-									?string $twitterScope = null
-	) {
-		$user = $this->userSession->getUser();
-		if (!$user instanceof IUser) {
-			return new DataResponse(
-				[
-					'status' => 'error',
-					'data' => [
-						'message' => $this->l10n->t('Invalid user')
-					]
-				],
-				Http::STATUS_UNAUTHORIZED
-			);
-		}
-
-		$email = strtolower($email);
-		if (!empty($email) && !$this->mailer->validateMailAddress($email)) {
-			return new DataResponse(
-				[
-					'status' => 'error',
-					'data' => [
-						'message' => $this->l10n->t('Invalid mail address')
-					]
-				],
-				Http::STATUS_UNPROCESSABLE_ENTITY
-			);
-		}
-
-		$data = $this->accountManager->getUser($user);
-		$beforeData = $data;
-		$data[IAccountManager::PROPERTY_AVATAR] = ['scope' => $avatarScope];
-		if ($this->config->getSystemValue('allow_user_to_change_display_name', true) !== false) {
-			$data[IAccountManager::PROPERTY_DISPLAYNAME] = ['value' => $displayname, 'scope' => $displaynameScope];
-			$data[IAccountManager::PROPERTY_EMAIL] = ['value' => $email, 'scope' => $emailScope];
-		}
-		$data[IAccountManager::PROPERTY_WEBSITE] = ['value' => $website, 'scope' => $websiteScope];
-		$data[IAccountManager::PROPERTY_ADDRESS] = ['value' => $address, 'scope' => $addressScope];
-		$data[IAccountManager::PROPERTY_PHONE] = ['value' => $phone, 'scope' => $phoneScope];
-		$data[IAccountManager::PROPERTY_TWITTER] = ['value' => $twitter, 'scope' => $twitterScope];
-
-		try {
-			$data = $this->saveUserSettings($user, $data);
-			if ($beforeData[IAccountManager::PROPERTY_PHONE]['value'] !== $data[IAccountManager::PROPERTY_PHONE]['value']) {
-				$this->knownUserService->deleteByContactUserId($user->getUID());
-			}
-			return new DataResponse(
-				[
-					'status' => 'success',
-					'data' => [
-						'userId' => $user->getUID(),
-						'avatarScope' => $data[IAccountManager::PROPERTY_AVATAR]['scope'],
-						'displayname' => $data[IAccountManager::PROPERTY_DISPLAYNAME]['value'],
-						'displaynameScope' => $data[IAccountManager::PROPERTY_DISPLAYNAME]['scope'],
-						'phone' => $data[IAccountManager::PROPERTY_PHONE]['value'],
-						'phoneScope' => $data[IAccountManager::PROPERTY_PHONE]['scope'],
-						'email' => $data[IAccountManager::PROPERTY_EMAIL]['value'],
-						'emailScope' => $data[IAccountManager::PROPERTY_EMAIL]['scope'],
-						'website' => $data[IAccountManager::PROPERTY_WEBSITE]['value'],
-						'websiteScope' => $data[IAccountManager::PROPERTY_WEBSITE]['scope'],
-						'address' => $data[IAccountManager::PROPERTY_ADDRESS]['value'],
-						'addressScope' => $data[IAccountManager::PROPERTY_ADDRESS]['scope'],
-						'twitter' => $data[IAccountManager::PROPERTY_TWITTER]['value'],
-						'twitterScope' => $data[IAccountManager::PROPERTY_TWITTER]['scope'],
-						'message' => $this->l10n->t('Settings saved')
-					]
-				],
-				Http::STATUS_OK
-			);
-		} catch (ForbiddenException $e) {
-			return new DataResponse([
-				'status' => 'error',
-				'data' => [
-					'message' => $e->getMessage()
-				],
-			]);
-		} catch (\InvalidArgumentException $e) {
-			return new DataResponse([
-				'status' => 'error',
-				'data' => [
-					'message' => $e->getMessage()
-				],
-			]);
-		}
-	}
-	/**
-	 * update account manager with new user data
-	 *
-	 * @param IUser $user
-	 * @param array $data
-	 * @return array
-	 * @throws ForbiddenException
-	 * @throws \InvalidArgumentException
-	 */
-	protected function saveUserSettings(IUser $user, array $data): array {
-		// keep the user back-end up-to-date with the latest display name and email
-		// address
-		$oldDisplayName = $user->getDisplayName();
-		$oldDisplayName = is_null($oldDisplayName) ? '' : $oldDisplayName;
-		if (isset($data[IAccountManager::PROPERTY_DISPLAYNAME]['value'])
-			&& $oldDisplayName !== $data[IAccountManager::PROPERTY_DISPLAYNAME]['value']
-		) {
-			$result = $user->setDisplayName($data[IAccountManager::PROPERTY_DISPLAYNAME]['value']);
-			if ($result === false) {
-				throw new ForbiddenException($this->l10n->t('Unable to change full name'));
-			}
-		}
-
-		$oldEmailAddress = $user->getEMailAddress();
-		$oldEmailAddress = is_null($oldEmailAddress) ? '' : strtolower($oldEmailAddress);
-		if (isset($data[IAccountManager::PROPERTY_EMAIL]['value'])
-			&& $oldEmailAddress !== $data[IAccountManager::PROPERTY_EMAIL]['value']
-		) {
-			// this is the only permission a backend provides and is also used
-			// for the permission of setting a email address
-			if (!$user->canChangeDisplayName()) {
-				throw new ForbiddenException($this->l10n->t('Unable to change email address'));
-			}
-			$user->setEMailAddress($data[IAccountManager::PROPERTY_EMAIL]['value']);
-		}
-
-		try {
-			return $this->accountManager->updateUser($user, $data, true);
-		} catch (\InvalidArgumentException $e) {
-			if ($e->getMessage() === IAccountManager::PROPERTY_PHONE) {
-				throw new \InvalidArgumentException($this->l10n->t('Unable to set invalid phone number'));
-			}
-			throw new \InvalidArgumentException($this->l10n->t('Some account data was invalid'));
-		}
-	}
-
-	/**
-	 * Set the mail address of a user
-	 *
-	 * @NoAdminRequired
-	 * @NoSubAdminRequired
-	 * @PasswordConfirmationRequired
-	 *
-	 * @param string $account
-	 * @param bool $onlyVerificationCode only return verification code without updating the data
-	 * @return DataResponse
-	 */
-	public function getVerificationCode(string $account, bool $onlyVerificationCode): DataResponse {
-		$user = $this->userSession->getUser();
-
-		if ($user === null) {
-			return new DataResponse([], Http::STATUS_BAD_REQUEST);
-		}
-
-		$accountData = $this->accountManager->getUser($user);
-		$cloudId = $user->getCloudId();
-		$message = 'Use my Federated Cloud ID to share with me: ' . $cloudId;
-		$signature = $this->signMessage($user, $message);
-
-		$code = $message . ' ' . $signature;
-		$codeMd5 = $message . ' ' . md5($signature);
-
-		switch ($account) {
-			case 'verify-twitter':
-				$accountData[IAccountManager::PROPERTY_TWITTER]['verified'] = AccountManager::VERIFICATION_IN_PROGRESS;
-				$msg = $this->l10n->t('In order to verify your Twitter account, post the following tweet on Twitter (please make sure to post it without any line breaks):');
-				$code = $codeMd5;
-				$type = IAccountManager::PROPERTY_TWITTER;
-				$accountData[IAccountManager::PROPERTY_TWITTER]['signature'] = $signature;
-				break;
-			case 'verify-website':
-				$accountData[IAccountManager::PROPERTY_WEBSITE]['verified'] = AccountManager::VERIFICATION_IN_PROGRESS;
-				$msg = $this->l10n->t('In order to verify your Website, store the following content in your web-root at \'.well-known/CloudIdVerificationCode.txt\' (please make sure that the complete text is in one line):');
-				$type = IAccountManager::PROPERTY_WEBSITE;
-				$accountData[IAccountManager::PROPERTY_WEBSITE]['signature'] = $signature;
-				break;
-			default:
-				return new DataResponse([], Http::STATUS_BAD_REQUEST);
-		}
-
-		if ($onlyVerificationCode === false) {
-			$accountData = $this->accountManager->updateUser($user, $accountData);
-			$data = $accountData[$type]['value'];
-
-			$this->jobList->add(VerifyUserData::class,
-				[
-					'verificationCode' => $code,
-					'data' => $data,
-					'type' => $type,
-					'uid' => $user->getUID(),
-					'try' => 0,
-					'lastRun' => $this->getCurrentTime()
-				]
-			);
-		}
-
-		return new DataResponse(['msg' => $msg, 'code' => $code]);
-	}
-
-	/**
-	 * get current timestamp
-	 *
-	 * @return int
-	 */
-	protected function getCurrentTime(): int {
-		return time();
-	}
-
-	/**
-	 * sign message with users private key
-	 *
-	 * @param IUser $user
-	 * @param string $message
-	 *
-	 * @return string base64 encoded signature
-	 */
-	protected function signMessage(IUser $user, string $message): string {
-		$privateKey = $this->keyManager->getKey($user)->getPrivate();
-		openssl_sign(json_encode($message), $signature, $privateKey, OPENSSL_ALGO_SHA512);
-		return base64_encode($signature);
-	}
+    /** @var UserManager */
+    private $userManager;
+    /** @var GroupManager */
+    private $groupManager;
+    /** @var IUserSession */
+    private $userSession;
+    /** @var IConfig */
+    private $config;
+    /** @var bool */
+    private $isAdmin;
+    /** @var IL10N */
+    private $l10n;
+    /** @var IMailer */
+    private $mailer;
+    /** @var Factory */
+    private $l10nFactory;
+    /** @var IAppManager */
+    private $appManager;
+    /** @var AccountManager */
+    private $accountManager;
+    /** @var Manager */
+    private $keyManager;
+    /** @var IJobList */
+    private $jobList;
+    /** @var IManager */
+    private $encryptionManager;
+    /** @var KnownUserService */
+    private $knownUserService;
+    /** @var IEventDispatcher */
+    private $dispatcher;
+
+
+    public function __construct(
+        string $appName,
+        IRequest $request,
+        IUserManager $userManager,
+        IGroupManager $groupManager,
+        IUserSession $userSession,
+        IConfig $config,
+        bool $isAdmin,
+        IL10N $l10n,
+        IMailer $mailer,
+        IFactory $l10nFactory,
+        IAppManager $appManager,
+        AccountManager $accountManager,
+        Manager $keyManager,
+        IJobList $jobList,
+        IManager $encryptionManager,
+        KnownUserService $knownUserService,
+        IEventDispatcher $dispatcher
+    ) {
+        parent::__construct($appName, $request);
+        $this->userManager = $userManager;
+        $this->groupManager = $groupManager;
+        $this->userSession = $userSession;
+        $this->config = $config;
+        $this->isAdmin = $isAdmin;
+        $this->l10n = $l10n;
+        $this->mailer = $mailer;
+        $this->l10nFactory = $l10nFactory;
+        $this->appManager = $appManager;
+        $this->accountManager = $accountManager;
+        $this->keyManager = $keyManager;
+        $this->jobList = $jobList;
+        $this->encryptionManager = $encryptionManager;
+        $this->knownUserService = $knownUserService;
+        $this->dispatcher = $dispatcher;
+    }
+
+
+    /**
+     * @NoCSRFRequired
+     * @NoAdminRequired
+     *
+     * Display users list template
+     *
+     * @return TemplateResponse
+     */
+    public function usersListByGroup(): TemplateResponse {
+        return $this->usersList();
+    }
+
+    /**
+     * @NoCSRFRequired
+     * @NoAdminRequired
+     *
+     * Display users list template
+     *
+     * @return TemplateResponse
+     */
+    public function usersList(): TemplateResponse {
+        $user = $this->userSession->getUser();
+        $uid = $user->getUID();
+
+        \OC::$server->getNavigationManager()->setActiveEntry('core_users');
+
+        /* SORT OPTION: SORT_USERCOUNT or SORT_GROUPNAME */
+        $sortGroupsBy = \OC\Group\MetaData::SORT_USERCOUNT;
+        $isLDAPUsed = false;
+        if ($this->config->getSystemValue('sort_groups_by_name', false)) {
+            $sortGroupsBy = \OC\Group\MetaData::SORT_GROUPNAME;
+        } else {
+            if ($this->appManager->isEnabledForUser('user_ldap')) {
+                $isLDAPUsed =
+                    $this->groupManager->isBackendUsed('\OCA\User_LDAP\Group_Proxy');
+                if ($isLDAPUsed) {
+                    // LDAP user count can be slow, so we sort by group name here
+                    $sortGroupsBy = \OC\Group\MetaData::SORT_GROUPNAME;
+                }
+            }
+        }
+
+        $canChangePassword = $this->canAdminChangeUserPasswords();
+
+        /* GROUPS */
+        $groupsInfo = new \OC\Group\MetaData(
+            $uid,
+            $this->isAdmin,
+            $this->groupManager,
+            $this->userSession
+        );
+
+        $groupsInfo->setSorting($sortGroupsBy);
+        [$adminGroup, $groups] = $groupsInfo->get();
+
+        if (!$isLDAPUsed && $this->appManager->isEnabledForUser('user_ldap')) {
+            $isLDAPUsed = (bool)array_reduce($this->userManager->getBackends(), function ($ldapFound, $backend) {
+                return $ldapFound || $backend instanceof User_Proxy;
+            });
+        }
+
+        $disabledUsers = -1;
+        $userCount = 0;
+
+        if (!$isLDAPUsed) {
+            if ($this->isAdmin) {
+                $disabledUsers = $this->userManager->countDisabledUsers();
+                $userCount = array_reduce($this->userManager->countUsers(), function ($v, $w) {
+                    return $v + (int)$w;
+                }, 0);
+            } else {
+                // User is subadmin !
+                // Map group list to names to retrieve the countDisabledUsersOfGroups
+                $userGroups = $this->groupManager->getUserGroups($user);
+                $groupsNames = [];
+
+                foreach ($groups as $key => $group) {
+                    // $userCount += (int)$group['usercount'];
+                    array_push($groupsNames, $group['name']);
+                    // we prevent subadmins from looking up themselves
+                    // so we lower the count of the groups he belongs to
+                    if (array_key_exists($group['id'], $userGroups)) {
+                        $groups[$key]['usercount']--;
+                        $userCount -= 1; // we also lower from one the total count
+                    }
+                }
+                $userCount += $this->userManager->countUsersOfGroups($groupsInfo->getGroups());
+                $disabledUsers = $this->userManager->countDisabledUsersOfGroups($groupsNames);
+            }
+
+            $userCount -= $disabledUsers;
+        }
+
+        $disabledUsersGroup = [
+            'id' => 'disabled',
+            'name' => 'Disabled users',
+            'usercount' => $disabledUsers
+        ];
+
+        /* QUOTAS PRESETS */
+        $quotaPreset = $this->parseQuotaPreset($this->config->getAppValue('files', 'quota_preset', '1 GB, 5 GB, 10 GB'));
+        $defaultQuota = $this->config->getAppValue('files', 'default_quota', 'none');
+
+        $event = new BeforeTemplateRenderedEvent();
+        $this->dispatcher->dispatch('OC\Settings\Users::loadAdditionalScripts', $event);
+        $this->dispatcher->dispatchTyped($event);
+
+        /* LANGUAGES */
+        $languages = $this->l10nFactory->getLanguages();
+
+        /* FINAL DATA */
+        $serverData = [];
+        // groups
+        $serverData['groups'] = array_merge_recursive($adminGroup, [$disabledUsersGroup], $groups);
+        // Various data
+        $serverData['isAdmin'] = $this->isAdmin;
+        $serverData['sortGroups'] = $sortGroupsBy;
+        $serverData['quotaPreset'] = $quotaPreset;
+        $serverData['userCount'] = $userCount;
+        $serverData['languages'] = $languages;
+        $serverData['defaultLanguage'] = $this->config->getSystemValue('default_language', 'en');
+        $serverData['forceLanguage'] = $this->config->getSystemValue('force_language', false);
+        // Settings
+        $serverData['defaultQuota'] = $defaultQuota;
+        $serverData['canChangePassword'] = $canChangePassword;
+        $serverData['newUserGenerateUserID'] = $this->config->getAppValue('core', 'newUser.generateUserID', 'no') === 'yes';
+        $serverData['newUserRequireEmail'] = $this->config->getAppValue('core', 'newUser.requireEmail', 'no') === 'yes';
+        $serverData['newUserSendEmail'] = $this->config->getAppValue('core', 'newUser.sendEmail', 'yes') === 'yes';
+
+        return new TemplateResponse('settings', 'settings-vue', ['serverData' => $serverData]);
+    }
+
+    /**
+     * @param string $key
+     * @param string $value
+     *
+     * @return JSONResponse
+     */
+    public function setPreference(string $key, string $value): JSONResponse {
+        $allowed = ['newUser.sendEmail'];
+        if (!in_array($key, $allowed, true)) {
+            return new JSONResponse([], Http::STATUS_FORBIDDEN);
+        }
+
+        $this->config->setAppValue('core', $key, $value);
+
+        return new JSONResponse([]);
+    }
+
+    /**
+     * Parse the app value for quota_present
+     *
+     * @param string $quotaPreset
+     * @return array
+     */
+    protected function parseQuotaPreset(string $quotaPreset): array {
+        // 1 GB, 5 GB, 10 GB => [1 GB, 5 GB, 10 GB]
+        $presets = array_filter(array_map('trim', explode(',', $quotaPreset)));
+        // Drop default and none, Make array indexes numerically
+        return array_values(array_diff($presets, ['default', 'none']));
+    }
+
+    /**
+     * check if the admin can change the users password
+     *
+     * The admin can change the passwords if:
+     *
+     *   - no encryption module is loaded and encryption is disabled
+     *   - encryption module is loaded but it doesn't require per user keys
+     *
+     * The admin can not change the passwords if:
+     *
+     *   - an encryption module is loaded and it uses per-user keys
+     *   - encryption is enabled but no encryption modules are loaded
+     *
+     * @return bool
+     */
+    protected function canAdminChangeUserPasswords(): bool {
+        $isEncryptionEnabled = $this->encryptionManager->isEnabled();
+        try {
+            $noUserSpecificEncryptionKeys = !$this->encryptionManager->getEncryptionModule()->needDetailedAccessList();
+            $isEncryptionModuleLoaded = true;
+        } catch (ModuleDoesNotExistsException $e) {
+            $noUserSpecificEncryptionKeys = true;
+            $isEncryptionModuleLoaded = false;
+        }
+        $canChangePassword = ($isEncryptionModuleLoaded && $noUserSpecificEncryptionKeys)
+            || (!$isEncryptionModuleLoaded && !$isEncryptionEnabled);
+
+        return $canChangePassword;
+    }
+
+    /**
+     * @NoAdminRequired
+     * @NoSubAdminRequired
+     * @PasswordConfirmationRequired
+     *
+     * @param string|null $avatarScope
+     * @param string|null $displayname
+     * @param string|null $displaynameScope
+     * @param string|null $phone
+     * @param string|null $phoneScope
+     * @param string|null $email
+     * @param string|null $emailScope
+     * @param string|null $website
+     * @param string|null $websiteScope
+     * @param string|null $address
+     * @param string|null $addressScope
+     * @param string|null $twitter
+     * @param string|null $twitterScope
+     *
+     * @return DataResponse
+     */
+    public function setUserSettings(?string $avatarScope = null,
+                                    ?string $displayname = null,
+                                    ?string $displaynameScope = null,
+                                    ?string $phone = null,
+                                    ?string $phoneScope = null,
+                                    ?string $email = null,
+                                    ?string $emailScope = null,
+                                    ?string $website = null,
+                                    ?string $websiteScope = null,
+                                    ?string $address = null,
+                                    ?string $addressScope = null,
+                                    ?string $twitter = null,
+                                    ?string $twitterScope = null
+    ) {
+        $user = $this->userSession->getUser();
+        if (!$user instanceof IUser) {
+            return new DataResponse(
+                [
+                    'status' => 'error',
+                    'data' => [
+                        'message' => $this->l10n->t('Invalid user')
+                    ]
+                ],
+                Http::STATUS_UNAUTHORIZED
+            );
+        }
+
+        $email = strtolower($email);
+        if (!empty($email) && !$this->mailer->validateMailAddress($email)) {
+            return new DataResponse(
+                [
+                    'status' => 'error',
+                    'data' => [
+                        'message' => $this->l10n->t('Invalid mail address')
+                    ]
+                ],
+                Http::STATUS_UNPROCESSABLE_ENTITY
+            );
+        }
+
+        $data = $this->accountManager->getUser($user);
+        $beforeData = $data;
+        $data[IAccountManager::PROPERTY_AVATAR] = ['scope' => $avatarScope];
+        if ($this->config->getSystemValue('allow_user_to_change_display_name', true) !== false) {
+            $data[IAccountManager::PROPERTY_DISPLAYNAME] = ['value' => $displayname, 'scope' => $displaynameScope];
+            $data[IAccountManager::PROPERTY_EMAIL] = ['value' => $email, 'scope' => $emailScope];
+        }
+        $data[IAccountManager::PROPERTY_WEBSITE] = ['value' => $website, 'scope' => $websiteScope];
+        $data[IAccountManager::PROPERTY_ADDRESS] = ['value' => $address, 'scope' => $addressScope];
+        $data[IAccountManager::PROPERTY_PHONE] = ['value' => $phone, 'scope' => $phoneScope];
+        $data[IAccountManager::PROPERTY_TWITTER] = ['value' => $twitter, 'scope' => $twitterScope];
+
+        try {
+            $data = $this->saveUserSettings($user, $data);
+            if ($beforeData[IAccountManager::PROPERTY_PHONE]['value'] !== $data[IAccountManager::PROPERTY_PHONE]['value']) {
+                $this->knownUserService->deleteByContactUserId($user->getUID());
+            }
+            return new DataResponse(
+                [
+                    'status' => 'success',
+                    'data' => [
+                        'userId' => $user->getUID(),
+                        'avatarScope' => $data[IAccountManager::PROPERTY_AVATAR]['scope'],
+                        'displayname' => $data[IAccountManager::PROPERTY_DISPLAYNAME]['value'],
+                        'displaynameScope' => $data[IAccountManager::PROPERTY_DISPLAYNAME]['scope'],
+                        'phone' => $data[IAccountManager::PROPERTY_PHONE]['value'],
+                        'phoneScope' => $data[IAccountManager::PROPERTY_PHONE]['scope'],
+                        'email' => $data[IAccountManager::PROPERTY_EMAIL]['value'],
+                        'emailScope' => $data[IAccountManager::PROPERTY_EMAIL]['scope'],
+                        'website' => $data[IAccountManager::PROPERTY_WEBSITE]['value'],
+                        'websiteScope' => $data[IAccountManager::PROPERTY_WEBSITE]['scope'],
+                        'address' => $data[IAccountManager::PROPERTY_ADDRESS]['value'],
+                        'addressScope' => $data[IAccountManager::PROPERTY_ADDRESS]['scope'],
+                        'twitter' => $data[IAccountManager::PROPERTY_TWITTER]['value'],
+                        'twitterScope' => $data[IAccountManager::PROPERTY_TWITTER]['scope'],
+                        'message' => $this->l10n->t('Settings saved')
+                    ]
+                ],
+                Http::STATUS_OK
+            );
+        } catch (ForbiddenException $e) {
+            return new DataResponse([
+                'status' => 'error',
+                'data' => [
+                    'message' => $e->getMessage()
+                ],
+            ]);
+        } catch (\InvalidArgumentException $e) {
+            return new DataResponse([
+                'status' => 'error',
+                'data' => [
+                    'message' => $e->getMessage()
+                ],
+            ]);
+        }
+    }
+    /**
+     * update account manager with new user data
+     *
+     * @param IUser $user
+     * @param array $data
+     * @return array
+     * @throws ForbiddenException
+     * @throws \InvalidArgumentException
+     */
+    protected function saveUserSettings(IUser $user, array $data): array {
+        // keep the user back-end up-to-date with the latest display name and email
+        // address
+        $oldDisplayName = $user->getDisplayName();
+        $oldDisplayName = is_null($oldDisplayName) ? '' : $oldDisplayName;
+        if (isset($data[IAccountManager::PROPERTY_DISPLAYNAME]['value'])
+            && $oldDisplayName !== $data[IAccountManager::PROPERTY_DISPLAYNAME]['value']
+        ) {
+            $result = $user->setDisplayName($data[IAccountManager::PROPERTY_DISPLAYNAME]['value']);
+            if ($result === false) {
+                throw new ForbiddenException($this->l10n->t('Unable to change full name'));
+            }
+        }
+
+        $oldEmailAddress = $user->getEMailAddress();
+        $oldEmailAddress = is_null($oldEmailAddress) ? '' : strtolower($oldEmailAddress);
+        if (isset($data[IAccountManager::PROPERTY_EMAIL]['value'])
+            && $oldEmailAddress !== $data[IAccountManager::PROPERTY_EMAIL]['value']
+        ) {
+            // this is the only permission a backend provides and is also used
+            // for the permission of setting a email address
+            if (!$user->canChangeDisplayName()) {
+                throw new ForbiddenException($this->l10n->t('Unable to change email address'));
+            }
+            $user->setEMailAddress($data[IAccountManager::PROPERTY_EMAIL]['value']);
+        }
+
+        try {
+            return $this->accountManager->updateUser($user, $data, true);
+        } catch (\InvalidArgumentException $e) {
+            if ($e->getMessage() === IAccountManager::PROPERTY_PHONE) {
+                throw new \InvalidArgumentException($this->l10n->t('Unable to set invalid phone number'));
+            }
+            throw new \InvalidArgumentException($this->l10n->t('Some account data was invalid'));
+        }
+    }
+
+    /**
+     * Set the mail address of a user
+     *
+     * @NoAdminRequired
+     * @NoSubAdminRequired
+     * @PasswordConfirmationRequired
+     *
+     * @param string $account
+     * @param bool $onlyVerificationCode only return verification code without updating the data
+     * @return DataResponse
+     */
+    public function getVerificationCode(string $account, bool $onlyVerificationCode): DataResponse {
+        $user = $this->userSession->getUser();
+
+        if ($user === null) {
+            return new DataResponse([], Http::STATUS_BAD_REQUEST);
+        }
+
+        $accountData = $this->accountManager->getUser($user);
+        $cloudId = $user->getCloudId();
+        $message = 'Use my Federated Cloud ID to share with me: ' . $cloudId;
+        $signature = $this->signMessage($user, $message);
+
+        $code = $message . ' ' . $signature;
+        $codeMd5 = $message . ' ' . md5($signature);
+
+        switch ($account) {
+            case 'verify-twitter':
+                $accountData[IAccountManager::PROPERTY_TWITTER]['verified'] = AccountManager::VERIFICATION_IN_PROGRESS;
+                $msg = $this->l10n->t('In order to verify your Twitter account, post the following tweet on Twitter (please make sure to post it without any line breaks):');
+                $code = $codeMd5;
+                $type = IAccountManager::PROPERTY_TWITTER;
+                $accountData[IAccountManager::PROPERTY_TWITTER]['signature'] = $signature;
+                break;
+            case 'verify-website':
+                $accountData[IAccountManager::PROPERTY_WEBSITE]['verified'] = AccountManager::VERIFICATION_IN_PROGRESS;
+                $msg = $this->l10n->t('In order to verify your Website, store the following content in your web-root at \'.well-known/CloudIdVerificationCode.txt\' (please make sure that the complete text is in one line):');
+                $type = IAccountManager::PROPERTY_WEBSITE;
+                $accountData[IAccountManager::PROPERTY_WEBSITE]['signature'] = $signature;
+                break;
+            default:
+                return new DataResponse([], Http::STATUS_BAD_REQUEST);
+        }
+
+        if ($onlyVerificationCode === false) {
+            $accountData = $this->accountManager->updateUser($user, $accountData);
+            $data = $accountData[$type]['value'];
+
+            $this->jobList->add(VerifyUserData::class,
+                [
+                    'verificationCode' => $code,
+                    'data' => $data,
+                    'type' => $type,
+                    'uid' => $user->getUID(),
+                    'try' => 0,
+                    'lastRun' => $this->getCurrentTime()
+                ]
+            );
+        }
+
+        return new DataResponse(['msg' => $msg, 'code' => $code]);
+    }
+
+    /**
+     * get current timestamp
+     *
+     * @return int
+     */
+    protected function getCurrentTime(): int {
+        return time();
+    }
+
+    /**
+     * sign message with users private key
+     *
+     * @param IUser $user
+     * @param string $message
+     *
+     * @return string base64 encoded signature
+     */
+    protected function signMessage(IUser $user, string $message): string {
+        $privateKey = $this->keyManager->getKey($user)->getPrivate();
+        openssl_sign(json_encode($message), $signature, $privateKey, OPENSSL_ALGO_SHA512);
+        return base64_encode($signature);
+    }
 }

apps/lookup_server_connector/lib/BackgroundJobs/RetryJob.php

Indentation +172 added lines, -172 removed lines

@@ -44,176 +44,176 @@
 use OCP\IUserManager;
 
 class RetryJob extends Job {
-	/** @var IClientService */
-	private $clientService;
-	/** @var string */
-	private $lookupServer;
-	/** @var IConfig */
-	private $config;
-	/** @var IUserManager */
-	private $userManager;
-	/** @var IAccountManager */
-	private $accountManager;
-	/** @var Signer */
-	private $signer;
-	/** @var int */
-	protected $retries = 0;
-	/** @var bool */
-	protected $retainJob = false;
-
-	/**
-	 * @param ITimeFactory $time
-	 * @param IClientService $clientService
-	 * @param IConfig $config
-	 * @param IUserManager $userManager
-	 * @param IAccountManager $accountManager
-	 * @param Signer $signer
-	 */
-	public function __construct(ITimeFactory $time,
-								IClientService $clientService,
-								IConfig $config,
-								IUserManager $userManager,
-								IAccountManager $accountManager,
-								Signer $signer) {
-		parent::__construct($time);
-		$this->clientService = $clientService;
-		$this->config = $config;
-		$this->userManager = $userManager;
-		$this->accountManager = $accountManager;
-		$this->signer = $signer;
-
-		$this->lookupServer = $config->getSystemValue('lookup_server', 'https://lookup.nextcloud.com');
-		if (!empty($this->lookupServer)) {
-			$this->lookupServer = rtrim($this->lookupServer, '/');
-			$this->lookupServer .= '/users';
-		}
-	}
-
-	/**
-	 * run the job, then remove it from the jobList
-	 *
-	 * @param IJobList $jobList
-	 * @param ILogger|null $logger
-	 */
-	public function execute(IJobList $jobList, ILogger $logger = null): void {
-		if (!isset($this->argument['userId'])) {
-			// Old background job without user id, just drop it.
-			$jobList->remove($this, $this->argument);
-			return;
-		}
-
-		$this->retries = (int) $this->config->getUserValue($this->argument['userId'], 'lookup_server_connector', 'update_retries', 0);
-
-		if ($this->shouldRemoveBackgroundJob()) {
-			$jobList->remove($this, $this->argument);
-			return;
-		}
-
-		if ($this->shouldRun()) {
-			parent::execute($jobList, $logger);
-			if (!$this->retainJob) {
-				$jobList->remove($this, $this->argument);
-			}
-		}
-	}
-
-	/**
-	 * Check if we should kill the background job:
-	 *
-	 * - internet connection is disabled
-	 * - no valid lookup server URL given
-	 * - lookup server was disabled by the admin
-	 * - max retries are reached (set to 5)
-	 *
-	 * @return bool
-	 */
-	protected function shouldRemoveBackgroundJob(): bool {
-		return $this->config->getSystemValueBool('has_internet_connection', true) === false ||
-			$this->config->getSystemValueString('lookup_server', 'https://lookup.nextcloud.com') === '' ||
-			$this->config->getAppValue('files_sharing', 'lookupServerUploadEnabled', 'yes') !== 'yes' ||
-			$this->retries >= 5;
-	}
-
-	protected function shouldRun(): bool {
-		$delay = 100 * 6 ** $this->retries;
-		return ($this->time->getTime() - $this->lastRun) > $delay;
-	}
-
-	protected function run($argument): void {
-		$user = $this->userManager->get($this->argument['userId']);
-		if (!$user instanceof IUser) {
-			// User does not exist anymore
-			return;
-		}
-
-		$data = $this->getUserAccountData($user);
-		$signedData = $this->signer->sign('lookupserver', $data, $user);
-		$client = $this->clientService->newClient();
-
-		try {
-			if (count($data) === 1) {
-				// No public data, just the federation Id
-				$client->delete($this->lookupServer,
-					[
-						'body' => json_encode($signedData),
-						'timeout' => 10,
-						'connect_timeout' => 3,
-					]
-				);
-			} else {
-				$client->post($this->lookupServer,
-					[
-						'body' => json_encode($signedData),
-						'timeout' => 10,
-						'connect_timeout' => 3,
-					]
-				);
-			}
-
-			// Reset retry counter
-			$this->config->deleteUserValue(
-				$user->getUID(),
-				'lookup_server_connector',
-				'update_retries'
-			);
-		} catch (\Exception $e) {
-			// An error occurred, retry later
-			$this->retainJob = true;
-			$this->config->setUserValue(
-				$user->getUID(),
-				'lookup_server_connector',
-				'update_retries',
-				$this->retries + 1
-			);
-		}
-	}
-
-	protected function getUserAccountData(IUser $user): array {
-		$account = $this->accountManager->getAccount($user);
-
-		$publicData = [];
-		foreach ($account->getProperties() as $property) {
-			if ($property->getScope() === IAccountManager::SCOPE_PUBLISHED) {
-				$publicData[$property->getName()] = $property->getValue();
-			}
-		}
-
-		$data = ['federationId' => $user->getCloudId()];
-		if (!empty($publicData)) {
-			$data['name'] = $publicData[IAccountManager::PROPERTY_DISPLAYNAME]['value'] ?? '';
-			$data['email'] = $publicData[IAccountManager::PROPERTY_EMAIL]['value'] ?? '';
-			$data['address'] = $publicData[IAccountManager::PROPERTY_ADDRESS]['value'] ?? '';
-			$data['website'] = $publicData[IAccountManager::PROPERTY_WEBSITE]['value'] ?? '';
-			$data['twitter'] = $publicData[IAccountManager::PROPERTY_TWITTER]['value'] ?? '';
-			$data['phone'] = $publicData[IAccountManager::PROPERTY_PHONE]['value'] ?? '';
-			$data['twitter_signature'] = $publicData[IAccountManager::PROPERTY_TWITTER]['signature'] ?? '';
-			$data['website_signature'] = $publicData[IAccountManager::PROPERTY_WEBSITE]['signature'] ?? '';
-			$data['verificationStatus'] = [
-				IAccountManager::PROPERTY_WEBSITE => $publicData[IAccountManager::PROPERTY_WEBSITE]['verified'] ?? '',
-				IAccountManager::PROPERTY_TWITTER => $publicData[IAccountManager::PROPERTY_TWITTER]['verified'] ?? '',
-			];
-		}
-
-		return $data;
-	}
+    /** @var IClientService */
+    private $clientService;
+    /** @var string */
+    private $lookupServer;
+    /** @var IConfig */
+    private $config;
+    /** @var IUserManager */
+    private $userManager;
+    /** @var IAccountManager */
+    private $accountManager;
+    /** @var Signer */
+    private $signer;
+    /** @var int */
+    protected $retries = 0;
+    /** @var bool */
+    protected $retainJob = false;
+
+    /**
+     * @param ITimeFactory $time
+     * @param IClientService $clientService
+     * @param IConfig $config
+     * @param IUserManager $userManager
+     * @param IAccountManager $accountManager
+     * @param Signer $signer
+     */
+    public function __construct(ITimeFactory $time,
+                                IClientService $clientService,
+                                IConfig $config,
+                                IUserManager $userManager,
+                                IAccountManager $accountManager,
+                                Signer $signer) {
+        parent::__construct($time);
+        $this->clientService = $clientService;
+        $this->config = $config;
+        $this->userManager = $userManager;
+        $this->accountManager = $accountManager;
+        $this->signer = $signer;
+
+        $this->lookupServer = $config->getSystemValue('lookup_server', 'https://lookup.nextcloud.com');
+        if (!empty($this->lookupServer)) {
+            $this->lookupServer = rtrim($this->lookupServer, '/');
+            $this->lookupServer .= '/users';
+        }
+    }
+
+    /**
+     * run the job, then remove it from the jobList
+     *
+     * @param IJobList $jobList
+     * @param ILogger|null $logger
+     */
+    public function execute(IJobList $jobList, ILogger $logger = null): void {
+        if (!isset($this->argument['userId'])) {
+            // Old background job without user id, just drop it.
+            $jobList->remove($this, $this->argument);
+            return;
+        }
+
+        $this->retries = (int) $this->config->getUserValue($this->argument['userId'], 'lookup_server_connector', 'update_retries', 0);
+
+        if ($this->shouldRemoveBackgroundJob()) {
+            $jobList->remove($this, $this->argument);
+            return;
+        }
+
+        if ($this->shouldRun()) {
+            parent::execute($jobList, $logger);
+            if (!$this->retainJob) {
+                $jobList->remove($this, $this->argument);
+            }
+        }
+    }
+
+    /**
+     * Check if we should kill the background job:
+     *
+     * - internet connection is disabled
+     * - no valid lookup server URL given
+     * - lookup server was disabled by the admin
+     * - max retries are reached (set to 5)
+     *
+     * @return bool
+     */
+    protected function shouldRemoveBackgroundJob(): bool {
+        return $this->config->getSystemValueBool('has_internet_connection', true) === false ||
+            $this->config->getSystemValueString('lookup_server', 'https://lookup.nextcloud.com') === '' ||
+            $this->config->getAppValue('files_sharing', 'lookupServerUploadEnabled', 'yes') !== 'yes' ||
+            $this->retries >= 5;
+    }
+
+    protected function shouldRun(): bool {
+        $delay = 100 * 6 ** $this->retries;
+        return ($this->time->getTime() - $this->lastRun) > $delay;
+    }
+
+    protected function run($argument): void {
+        $user = $this->userManager->get($this->argument['userId']);
+        if (!$user instanceof IUser) {
+            // User does not exist anymore
+            return;
+        }
+
+        $data = $this->getUserAccountData($user);
+        $signedData = $this->signer->sign('lookupserver', $data, $user);
+        $client = $this->clientService->newClient();
+
+        try {
+            if (count($data) === 1) {
+                // No public data, just the federation Id
+                $client->delete($this->lookupServer,
+                    [
+                        'body' => json_encode($signedData),
+                        'timeout' => 10,
+                        'connect_timeout' => 3,
+                    ]
+                );
+            } else {
+                $client->post($this->lookupServer,
+                    [
+                        'body' => json_encode($signedData),
+                        'timeout' => 10,
+                        'connect_timeout' => 3,
+                    ]
+                );
+            }
+
+            // Reset retry counter
+            $this->config->deleteUserValue(
+                $user->getUID(),
+                'lookup_server_connector',
+                'update_retries'
+            );
+        } catch (\Exception $e) {
+            // An error occurred, retry later
+            $this->retainJob = true;
+            $this->config->setUserValue(
+                $user->getUID(),
+                'lookup_server_connector',
+                'update_retries',
+                $this->retries + 1
+            );
+        }
+    }
+
+    protected function getUserAccountData(IUser $user): array {
+        $account = $this->accountManager->getAccount($user);
+
+        $publicData = [];
+        foreach ($account->getProperties() as $property) {
+            if ($property->getScope() === IAccountManager::SCOPE_PUBLISHED) {
+                $publicData[$property->getName()] = $property->getValue();
+            }
+        }
+
+        $data = ['federationId' => $user->getCloudId()];
+        if (!empty($publicData)) {
+            $data['name'] = $publicData[IAccountManager::PROPERTY_DISPLAYNAME]['value'] ?? '';
+            $data['email'] = $publicData[IAccountManager::PROPERTY_EMAIL]['value'] ?? '';
+            $data['address'] = $publicData[IAccountManager::PROPERTY_ADDRESS]['value'] ?? '';
+            $data['website'] = $publicData[IAccountManager::PROPERTY_WEBSITE]['value'] ?? '';
+            $data['twitter'] = $publicData[IAccountManager::PROPERTY_TWITTER]['value'] ?? '';
+            $data['phone'] = $publicData[IAccountManager::PROPERTY_PHONE]['value'] ?? '';
+            $data['twitter_signature'] = $publicData[IAccountManager::PROPERTY_TWITTER]['signature'] ?? '';
+            $data['website_signature'] = $publicData[IAccountManager::PROPERTY_WEBSITE]['signature'] ?? '';
+            $data['verificationStatus'] = [
+                IAccountManager::PROPERTY_WEBSITE => $publicData[IAccountManager::PROPERTY_WEBSITE]['verified'] ?? '',
+                IAccountManager::PROPERTY_TWITTER => $publicData[IAccountManager::PROPERTY_TWITTER]['verified'] ?? '',
+            ];
+        }
+
+        return $data;
+    }
 }

apps/files_sharing/lib/Controller/ShareController.php

Indentation +660 added lines, -660 removed lines

@@ -85,666 +85,666 @@
  */
 class ShareController extends AuthPublicShareController {
 
-	/** @var IConfig */
-	protected $config;
-	/** @var IUserManager */
-	protected $userManager;
-	/** @var ILogger */
-	protected $logger;
-	/** @var \OCP\Activity\IManager */
-	protected $activityManager;
-	/** @var IPreview */
-	protected $previewManager;
-	/** @var IRootFolder */
-	protected $rootFolder;
-	/** @var FederatedShareProvider */
-	protected $federatedShareProvider;
-	/** @var IAccountManager */
-	protected $accountManager;
-	/** @var IEventDispatcher */
-	protected $eventDispatcher;
-	/** @var IL10N */
-	protected $l10n;
-	/** @var Defaults */
-	protected $defaults;
-	/** @var ShareManager */
-	protected $shareManager;
-
-	/** @var Share\IShare */
-	protected $share;
-
-	/**
-	 * @param string $appName
-	 * @param IRequest $request
-	 * @param IConfig $config
-	 * @param IURLGenerator $urlGenerator
-	 * @param IUserManager $userManager
-	 * @param ILogger $logger
-	 * @param \OCP\Activity\IManager $activityManager
-	 * @param \OCP\Share\IManager $shareManager
-	 * @param ISession $session
-	 * @param IPreview $previewManager
-	 * @param IRootFolder $rootFolder
-	 * @param FederatedShareProvider $federatedShareProvider
-	 * @param IAccountManager $accountManager
-	 * @param IEventDispatcher $eventDispatcher
-	 * @param IL10N $l10n
-	 * @param Defaults $defaults
-	 */
-	public function __construct(string $appName,
-								IRequest $request,
-								IConfig $config,
-								IURLGenerator $urlGenerator,
-								IUserManager $userManager,
-								ILogger $logger,
-								\OCP\Activity\IManager $activityManager,
-								ShareManager $shareManager,
-								ISession $session,
-								IPreview $previewManager,
-								IRootFolder $rootFolder,
-								FederatedShareProvider $federatedShareProvider,
-								IAccountManager $accountManager,
-								IEventDispatcher $eventDispatcher,
-								IL10N $l10n,
-								Defaults $defaults) {
-		parent::__construct($appName, $request, $session, $urlGenerator);
-
-		$this->config = $config;
-		$this->userManager = $userManager;
-		$this->logger = $logger;
-		$this->activityManager = $activityManager;
-		$this->previewManager = $previewManager;
-		$this->rootFolder = $rootFolder;
-		$this->federatedShareProvider = $federatedShareProvider;
-		$this->accountManager = $accountManager;
-		$this->eventDispatcher = $eventDispatcher;
-		$this->l10n = $l10n;
-		$this->defaults = $defaults;
-		$this->shareManager = $shareManager;
-	}
-
-	/**
-	 * @PublicPage
-	 * @NoCSRFRequired
-	 *
-	 * Show the authentication page
-	 * The form has to submit to the authenticate method route
-	 */
-	public function showAuthenticate(): TemplateResponse {
-		$templateParameters = ['share' => $this->share];
-
-		$this->eventDispatcher->dispatchTyped(new BeforeTemplateRenderedEvent($this->share, BeforeTemplateRenderedEvent::SCOPE_PUBLIC_SHARE_AUTH));
-
-		$response = new TemplateResponse('core', 'publicshareauth', $templateParameters, 'guest');
-		if ($this->share->getSendPasswordByTalk()) {
-			$csp = new ContentSecurityPolicy();
-			$csp->addAllowedConnectDomain('*');
-			$csp->addAllowedMediaDomain('blob:');
-			$response->setContentSecurityPolicy($csp);
-		}
-
-		return $response;
-	}
-
-	/**
-	 * The template to show when authentication failed
-	 */
-	protected function showAuthFailed(): TemplateResponse {
-		$templateParameters = ['share' => $this->share, 'wrongpw' => true];
-
-		$this->eventDispatcher->dispatchTyped(new BeforeTemplateRenderedEvent($this->share, BeforeTemplateRenderedEvent::SCOPE_PUBLIC_SHARE_AUTH));
-
-		$response = new TemplateResponse('core', 'publicshareauth', $templateParameters, 'guest');
-		if ($this->share->getSendPasswordByTalk()) {
-			$csp = new ContentSecurityPolicy();
-			$csp->addAllowedConnectDomain('*');
-			$csp->addAllowedMediaDomain('blob:');
-			$response->setContentSecurityPolicy($csp);
-		}
-
-		return $response;
-	}
-
-	protected function verifyPassword(string $password): bool {
-		return $this->shareManager->checkPassword($this->share, $password);
-	}
-
-	protected function getPasswordHash(): string {
-		return $this->share->getPassword();
-	}
-
-	public function isValidToken(): bool {
-		try {
-			$this->share = $this->shareManager->getShareByToken($this->getToken());
-		} catch (ShareNotFound $e) {
-			return false;
-		}
-
-		return true;
-	}
-
-	protected function isPasswordProtected(): bool {
-		return $this->share->getPassword() !== null;
-	}
-
-	protected function authSucceeded() {
-		// For share this was always set so it is still used in other apps
-		$this->session->set('public_link_authenticated', (string)$this->share->getId());
-	}
-
-	protected function authFailed() {
-		$this->emitAccessShareHook($this->share, 403, 'Wrong password');
-	}
-
-	/**
-	 * throws hooks when a share is attempted to be accessed
-	 *
-	 * @param \OCP\Share\IShare|string $share the Share instance if available,
-	 * otherwise token
-	 * @param int $errorCode
-	 * @param string $errorMessage
-	 * @throws \OC\HintException
-	 * @throws \OC\ServerNotAvailableException
-	 */
-	protected function emitAccessShareHook($share, $errorCode = 200, $errorMessage = '') {
-		$itemType = $itemSource = $uidOwner = '';
-		$token = $share;
-		$exception = null;
-		if ($share instanceof \OCP\Share\IShare) {
-			try {
-				$token = $share->getToken();
-				$uidOwner = $share->getSharedBy();
-				$itemType = $share->getNodeType();
-				$itemSource = $share->getNodeId();
-			} catch (\Exception $e) {
-				// we log what we know and pass on the exception afterwards
-				$exception = $e;
-			}
-		}
-		\OC_Hook::emit(Share::class, 'share_link_access', [
-			'itemType' => $itemType,
-			'itemSource' => $itemSource,
-			'uidOwner' => $uidOwner,
-			'token' => $token,
-			'errorCode' => $errorCode,
-			'errorMessage' => $errorMessage,
-		]);
-		if (!is_null($exception)) {
-			throw $exception;
-		}
-	}
-
-	/**
-	 * Validate the permissions of the share
-	 *
-	 * @param Share\IShare $share
-	 * @return bool
-	 */
-	private function validateShare(\OCP\Share\IShare $share) {
-		// If the owner is disabled no access to the linke is granted
-		$owner = $this->userManager->get($share->getShareOwner());
-		if ($owner === null || !$owner->isEnabled()) {
-			return false;
-		}
-
-		// If the initiator of the share is disabled no access is granted
-		$initiator = $this->userManager->get($share->getSharedBy());
-		if ($initiator === null || !$initiator->isEnabled()) {
-			return false;
-		}
-
-		return $share->getNode()->isReadable() && $share->getNode()->isShareable();
-	}
-
-	/**
-	 * @PublicPage
-	 * @NoCSRFRequired
-	 *
-	 *
-	 * @param string $path
-	 * @return TemplateResponse
-	 * @throws NotFoundException
-	 * @throws \Exception
-	 */
-	public function showShare($path = ''): TemplateResponse {
-		\OC_User::setIncognitoMode(true);
-
-		// Check whether share exists
-		try {
-			$share = $this->shareManager->getShareByToken($this->getToken());
-		} catch (ShareNotFound $e) {
-			$this->emitAccessShareHook($this->getToken(), 404, 'Share not found');
-			throw new NotFoundException();
-		}
-
-		if (!$this->validateShare($share)) {
-			throw new NotFoundException();
-		}
-
-		$shareNode = $share->getNode();
-
-		// We can't get the path of a file share
-		try {
-			if ($shareNode instanceof \OCP\Files\File && $path !== '') {
-				$this->emitAccessShareHook($share, 404, 'Share not found');
-				throw new NotFoundException();
-			}
-		} catch (\Exception $e) {
-			$this->emitAccessShareHook($share, 404, 'Share not found');
-			throw $e;
-		}
-
-		$shareTmpl = [];
-		$shareTmpl['owner'] = '';
-		$shareTmpl['shareOwner'] = '';
-
-		$owner = $this->userManager->get($share->getShareOwner());
-		if ($owner instanceof IUser) {
-			$ownerAccount = $this->accountManager->getAccount($owner);
-
-			$ownerName = $ownerAccount->getProperty(IAccountManager::PROPERTY_DISPLAYNAME);
-			if ($ownerName->getScope() === IAccountManager::SCOPE_PUBLISHED) {
-				$shareTmpl['owner'] = $owner->getUID();
-				$shareTmpl['shareOwner'] = $owner->getDisplayName();
-			}
-		}
-
-		$shareTmpl['filename'] = $shareNode->getName();
-		$shareTmpl['directory_path'] = $share->getTarget();
-		$shareTmpl['note'] = $share->getNote();
-		$shareTmpl['mimetype'] = $shareNode->getMimetype();
-		$shareTmpl['previewSupported'] = $this->previewManager->isMimeSupported($shareNode->getMimetype());
-		$shareTmpl['dirToken'] = $this->getToken();
-		$shareTmpl['sharingToken'] = $this->getToken();
-		$shareTmpl['server2serversharing'] = $this->federatedShareProvider->isOutgoingServer2serverShareEnabled();
-		$shareTmpl['protected'] = $share->getPassword() !== null ? 'true' : 'false';
-		$shareTmpl['dir'] = '';
-		$shareTmpl['nonHumanFileSize'] = $shareNode->getSize();
-		$shareTmpl['fileSize'] = \OCP\Util::humanFileSize($shareNode->getSize());
-		$shareTmpl['hideDownload'] = $share->getHideDownload();
-
-		$hideFileList = false;
-
-		if ($shareNode instanceof \OCP\Files\Folder) {
-			$shareIsFolder = true;
-
-			try {
-				$folderNode = $shareNode->get($path);
-			} catch (\OCP\Files\NotFoundException $e) {
-				$this->emitAccessShareHook($share, 404, 'Share not found');
-				throw new NotFoundException();
-			}
-
-			$shareTmpl['dir'] = $shareNode->getRelativePath($folderNode->getPath());
-
-			/*
+    /** @var IConfig */
+    protected $config;
+    /** @var IUserManager */
+    protected $userManager;
+    /** @var ILogger */
+    protected $logger;
+    /** @var \OCP\Activity\IManager */
+    protected $activityManager;
+    /** @var IPreview */
+    protected $previewManager;
+    /** @var IRootFolder */
+    protected $rootFolder;
+    /** @var FederatedShareProvider */
+    protected $federatedShareProvider;
+    /** @var IAccountManager */
+    protected $accountManager;
+    /** @var IEventDispatcher */
+    protected $eventDispatcher;
+    /** @var IL10N */
+    protected $l10n;
+    /** @var Defaults */
+    protected $defaults;
+    /** @var ShareManager */
+    protected $shareManager;
+
+    /** @var Share\IShare */
+    protected $share;
+
+    /**
+     * @param string $appName
+     * @param IRequest $request
+     * @param IConfig $config
+     * @param IURLGenerator $urlGenerator
+     * @param IUserManager $userManager
+     * @param ILogger $logger
+     * @param \OCP\Activity\IManager $activityManager
+     * @param \OCP\Share\IManager $shareManager
+     * @param ISession $session
+     * @param IPreview $previewManager
+     * @param IRootFolder $rootFolder
+     * @param FederatedShareProvider $federatedShareProvider
+     * @param IAccountManager $accountManager
+     * @param IEventDispatcher $eventDispatcher
+     * @param IL10N $l10n
+     * @param Defaults $defaults
+     */
+    public function __construct(string $appName,
+                                IRequest $request,
+                                IConfig $config,
+                                IURLGenerator $urlGenerator,
+                                IUserManager $userManager,
+                                ILogger $logger,
+                                \OCP\Activity\IManager $activityManager,
+                                ShareManager $shareManager,
+                                ISession $session,
+                                IPreview $previewManager,
+                                IRootFolder $rootFolder,
+                                FederatedShareProvider $federatedShareProvider,
+                                IAccountManager $accountManager,
+                                IEventDispatcher $eventDispatcher,
+                                IL10N $l10n,
+                                Defaults $defaults) {
+        parent::__construct($appName, $request, $session, $urlGenerator);
+
+        $this->config = $config;
+        $this->userManager = $userManager;
+        $this->logger = $logger;
+        $this->activityManager = $activityManager;
+        $this->previewManager = $previewManager;
+        $this->rootFolder = $rootFolder;
+        $this->federatedShareProvider = $federatedShareProvider;
+        $this->accountManager = $accountManager;
+        $this->eventDispatcher = $eventDispatcher;
+        $this->l10n = $l10n;
+        $this->defaults = $defaults;
+        $this->shareManager = $shareManager;
+    }
+
+    /**
+     * @PublicPage
+     * @NoCSRFRequired
+     *
+     * Show the authentication page
+     * The form has to submit to the authenticate method route
+     */
+    public function showAuthenticate(): TemplateResponse {
+        $templateParameters = ['share' => $this->share];
+
+        $this->eventDispatcher->dispatchTyped(new BeforeTemplateRenderedEvent($this->share, BeforeTemplateRenderedEvent::SCOPE_PUBLIC_SHARE_AUTH));
+
+        $response = new TemplateResponse('core', 'publicshareauth', $templateParameters, 'guest');
+        if ($this->share->getSendPasswordByTalk()) {
+            $csp = new ContentSecurityPolicy();
+            $csp->addAllowedConnectDomain('*');
+            $csp->addAllowedMediaDomain('blob:');
+            $response->setContentSecurityPolicy($csp);
+        }
+
+        return $response;
+    }
+
+    /**
+     * The template to show when authentication failed
+     */
+    protected function showAuthFailed(): TemplateResponse {
+        $templateParameters = ['share' => $this->share, 'wrongpw' => true];
+
+        $this->eventDispatcher->dispatchTyped(new BeforeTemplateRenderedEvent($this->share, BeforeTemplateRenderedEvent::SCOPE_PUBLIC_SHARE_AUTH));
+
+        $response = new TemplateResponse('core', 'publicshareauth', $templateParameters, 'guest');
+        if ($this->share->getSendPasswordByTalk()) {
+            $csp = new ContentSecurityPolicy();
+            $csp->addAllowedConnectDomain('*');
+            $csp->addAllowedMediaDomain('blob:');
+            $response->setContentSecurityPolicy($csp);
+        }
+
+        return $response;
+    }
+
+    protected function verifyPassword(string $password): bool {
+        return $this->shareManager->checkPassword($this->share, $password);
+    }
+
+    protected function getPasswordHash(): string {
+        return $this->share->getPassword();
+    }
+
+    public function isValidToken(): bool {
+        try {
+            $this->share = $this->shareManager->getShareByToken($this->getToken());
+        } catch (ShareNotFound $e) {
+            return false;
+        }
+
+        return true;
+    }
+
+    protected function isPasswordProtected(): bool {
+        return $this->share->getPassword() !== null;
+    }
+
+    protected function authSucceeded() {
+        // For share this was always set so it is still used in other apps
+        $this->session->set('public_link_authenticated', (string)$this->share->getId());
+    }
+
+    protected function authFailed() {
+        $this->emitAccessShareHook($this->share, 403, 'Wrong password');
+    }
+
+    /**
+     * throws hooks when a share is attempted to be accessed
+     *
+     * @param \OCP\Share\IShare|string $share the Share instance if available,
+     * otherwise token
+     * @param int $errorCode
+     * @param string $errorMessage
+     * @throws \OC\HintException
+     * @throws \OC\ServerNotAvailableException
+     */
+    protected function emitAccessShareHook($share, $errorCode = 200, $errorMessage = '') {
+        $itemType = $itemSource = $uidOwner = '';
+        $token = $share;
+        $exception = null;
+        if ($share instanceof \OCP\Share\IShare) {
+            try {
+                $token = $share->getToken();
+                $uidOwner = $share->getSharedBy();
+                $itemType = $share->getNodeType();
+                $itemSource = $share->getNodeId();
+            } catch (\Exception $e) {
+                // we log what we know and pass on the exception afterwards
+                $exception = $e;
+            }
+        }
+        \OC_Hook::emit(Share::class, 'share_link_access', [
+            'itemType' => $itemType,
+            'itemSource' => $itemSource,
+            'uidOwner' => $uidOwner,
+            'token' => $token,
+            'errorCode' => $errorCode,
+            'errorMessage' => $errorMessage,
+        ]);
+        if (!is_null($exception)) {
+            throw $exception;
+        }
+    }
+
+    /**
+     * Validate the permissions of the share
+     *
+     * @param Share\IShare $share
+     * @return bool
+     */
+    private function validateShare(\OCP\Share\IShare $share) {
+        // If the owner is disabled no access to the linke is granted
+        $owner = $this->userManager->get($share->getShareOwner());
+        if ($owner === null || !$owner->isEnabled()) {
+            return false;
+        }
+
+        // If the initiator of the share is disabled no access is granted
+        $initiator = $this->userManager->get($share->getSharedBy());
+        if ($initiator === null || !$initiator->isEnabled()) {
+            return false;
+        }
+
+        return $share->getNode()->isReadable() && $share->getNode()->isShareable();
+    }
+
+    /**
+     * @PublicPage
+     * @NoCSRFRequired
+     *
+     *
+     * @param string $path
+     * @return TemplateResponse
+     * @throws NotFoundException
+     * @throws \Exception
+     */
+    public function showShare($path = ''): TemplateResponse {
+        \OC_User::setIncognitoMode(true);
+
+        // Check whether share exists
+        try {
+            $share = $this->shareManager->getShareByToken($this->getToken());
+        } catch (ShareNotFound $e) {
+            $this->emitAccessShareHook($this->getToken(), 404, 'Share not found');
+            throw new NotFoundException();
+        }
+
+        if (!$this->validateShare($share)) {
+            throw new NotFoundException();
+        }
+
+        $shareNode = $share->getNode();
+
+        // We can't get the path of a file share
+        try {
+            if ($shareNode instanceof \OCP\Files\File && $path !== '') {
+                $this->emitAccessShareHook($share, 404, 'Share not found');
+                throw new NotFoundException();
+            }
+        } catch (\Exception $e) {
+            $this->emitAccessShareHook($share, 404, 'Share not found');
+            throw $e;
+        }
+
+        $shareTmpl = [];
+        $shareTmpl['owner'] = '';
+        $shareTmpl['shareOwner'] = '';
+
+        $owner = $this->userManager->get($share->getShareOwner());
+        if ($owner instanceof IUser) {
+            $ownerAccount = $this->accountManager->getAccount($owner);
+
+            $ownerName = $ownerAccount->getProperty(IAccountManager::PROPERTY_DISPLAYNAME);
+            if ($ownerName->getScope() === IAccountManager::SCOPE_PUBLISHED) {
+                $shareTmpl['owner'] = $owner->getUID();
+                $shareTmpl['shareOwner'] = $owner->getDisplayName();
+            }
+        }
+
+        $shareTmpl['filename'] = $shareNode->getName();
+        $shareTmpl['directory_path'] = $share->getTarget();
+        $shareTmpl['note'] = $share->getNote();
+        $shareTmpl['mimetype'] = $shareNode->getMimetype();
+        $shareTmpl['previewSupported'] = $this->previewManager->isMimeSupported($shareNode->getMimetype());
+        $shareTmpl['dirToken'] = $this->getToken();
+        $shareTmpl['sharingToken'] = $this->getToken();
+        $shareTmpl['server2serversharing'] = $this->federatedShareProvider->isOutgoingServer2serverShareEnabled();
+        $shareTmpl['protected'] = $share->getPassword() !== null ? 'true' : 'false';
+        $shareTmpl['dir'] = '';
+        $shareTmpl['nonHumanFileSize'] = $shareNode->getSize();
+        $shareTmpl['fileSize'] = \OCP\Util::humanFileSize($shareNode->getSize());
+        $shareTmpl['hideDownload'] = $share->getHideDownload();
+
+        $hideFileList = false;
+
+        if ($shareNode instanceof \OCP\Files\Folder) {
+            $shareIsFolder = true;
+
+            try {
+                $folderNode = $shareNode->get($path);
+            } catch (\OCP\Files\NotFoundException $e) {
+                $this->emitAccessShareHook($share, 404, 'Share not found');
+                throw new NotFoundException();
+            }
+
+            $shareTmpl['dir'] = $shareNode->getRelativePath($folderNode->getPath());
+
+            /*
 			 * The OC_Util methods require a view. This just uses the node API
 			 */
-			$freeSpace = $share->getNode()->getStorage()->free_space($share->getNode()->getInternalPath());
-			if ($freeSpace < \OCP\Files\FileInfo::SPACE_UNLIMITED) {
-				$freeSpace = max($freeSpace, 0);
-			} else {
-				$freeSpace = (INF > 0) ? INF: PHP_INT_MAX; // work around https://bugs.php.net/bug.php?id=69188
-			}
-
-			$hideFileList = !($share->getPermissions() & \OCP\Constants::PERMISSION_READ);
-			$maxUploadFilesize = $freeSpace;
-
-			$folder = new Template('files', 'list', '');
-
-			$folder->assign('dir', $shareNode->getRelativePath($folderNode->getPath()));
-			$folder->assign('dirToken', $this->getToken());
-			$folder->assign('permissions', \OCP\Constants::PERMISSION_READ);
-			$folder->assign('isPublic', true);
-			$folder->assign('hideFileList', $hideFileList);
-			$folder->assign('publicUploadEnabled', 'no');
-			// default to list view
-			$folder->assign('showgridview', false);
-			$folder->assign('uploadMaxFilesize', $maxUploadFilesize);
-			$folder->assign('uploadMaxHumanFilesize', \OCP\Util::humanFileSize($maxUploadFilesize));
-			$folder->assign('freeSpace', $freeSpace);
-			$folder->assign('usedSpacePercent', 0);
-			$folder->assign('trash', false);
-			$shareTmpl['folder'] = $folder->fetchPage();
-		} else {
-			$shareIsFolder = false;
-		}
-
-		// default to list view
-		$shareTmpl['showgridview'] = false;
-
-		$shareTmpl['hideFileList'] = $hideFileList;
-		$shareTmpl['downloadURL'] = $this->urlGenerator->linkToRouteAbsolute('files_sharing.sharecontroller.downloadShare', [
-			'token' => $this->getToken(),
-			'filename' => $shareIsFolder ? null : $shareNode->getName()
-		]);
-		$shareTmpl['shareUrl'] = $this->urlGenerator->linkToRouteAbsolute('files_sharing.sharecontroller.showShare', ['token' => $this->getToken()]);
-		$shareTmpl['maxSizeAnimateGif'] = $this->config->getSystemValue('max_filesize_animated_gifs_public_sharing', 10);
-		$shareTmpl['previewEnabled'] = $this->config->getSystemValue('enable_previews', true);
-		$shareTmpl['previewMaxX'] = $this->config->getSystemValue('preview_max_x', 1024);
-		$shareTmpl['previewMaxY'] = $this->config->getSystemValue('preview_max_y', 1024);
-		$shareTmpl['disclaimer'] = $this->config->getAppValue('core', 'shareapi_public_link_disclaimertext', null);
-		$shareTmpl['previewURL'] = $shareTmpl['downloadURL'];
-
-		if ($shareTmpl['previewSupported']) {
-			$shareTmpl['previewImage'] = $this->urlGenerator->linkToRouteAbsolute('files_sharing.PublicPreview.getPreview',
-				['x' => 200, 'y' => 200, 'file' => $shareTmpl['directory_path'], 'token' => $shareTmpl['dirToken']]);
-			$ogPreview = $shareTmpl['previewImage'];
-
-			// We just have direct previews for image files
-			if ($shareNode->getMimePart() === 'image') {
-				$shareTmpl['previewURL'] = $this->urlGenerator->linkToRouteAbsolute('files_sharing.publicpreview.directLink', ['token' => $this->getToken()]);
-
-				$ogPreview = $shareTmpl['previewURL'];
-
-				//Whatapp is kind of picky about their size requirements
-				if ($this->request->isUserAgent(['/^WhatsApp/'])) {
-					$ogPreview = $this->urlGenerator->linkToRouteAbsolute('files_sharing.PublicPreview.getPreview', [
-						'token' => $this->getToken(),
-						'x' => 256,
-						'y' => 256,
-						'a' => true,
-					]);
-				}
-			}
-		} else {
-			$shareTmpl['previewImage'] = $this->urlGenerator->getAbsoluteURL($this->urlGenerator->imagePath('core', 'favicon-fb.png'));
-			$ogPreview = $shareTmpl['previewImage'];
-		}
-
-		// Load files we need
-		\OCP\Util::addScript('files', 'semaphore');
-		\OCP\Util::addScript('files', 'file-upload');
-		\OCP\Util::addStyle('files_sharing', 'publicView');
-		\OCP\Util::addScript('files_sharing', 'public');
-		\OCP\Util::addScript('files_sharing', 'templates');
-		\OCP\Util::addScript('files', 'fileactions');
-		\OCP\Util::addScript('files', 'fileactionsmenu');
-		\OCP\Util::addScript('files', 'jquery.fileupload');
-		\OCP\Util::addScript('files_sharing', 'files_drop');
-
-		if (isset($shareTmpl['folder'])) {
-			// JS required for folders
-			\OCP\Util::addStyle('files', 'merged');
-			\OCP\Util::addScript('files', 'filesummary');
-			\OCP\Util::addScript('files', 'templates');
-			\OCP\Util::addScript('files', 'breadcrumb');
-			\OCP\Util::addScript('files', 'fileinfomodel');
-			\OCP\Util::addScript('files', 'newfilemenu');
-			\OCP\Util::addScript('files', 'files');
-			\OCP\Util::addScript('files', 'filemultiselectmenu');
-			\OCP\Util::addScript('files', 'filelist');
-			\OCP\Util::addScript('files', 'keyboardshortcuts');
-			\OCP\Util::addScript('files', 'operationprogressbar');
-
-			// Load Viewer scripts
-			if (class_exists(LoadViewer::class)) {
-				$this->eventDispatcher->dispatchTyped(new LoadViewer());
-			}
-		}
-
-		// OpenGraph Support: http://ogp.me/
-		\OCP\Util::addHeader('meta', ['property' => "og:title", 'content' => $shareTmpl['filename']]);
-		\OCP\Util::addHeader('meta', ['property' => "og:description", 'content' => $this->defaults->getName() . ($this->defaults->getSlogan() !== '' ? ' - ' . $this->defaults->getSlogan() : '')]);
-		\OCP\Util::addHeader('meta', ['property' => "og:site_name", 'content' => $this->defaults->getName()]);
-		\OCP\Util::addHeader('meta', ['property' => "og:url", 'content' => $shareTmpl['shareUrl']]);
-		\OCP\Util::addHeader('meta', ['property' => "og:type", 'content' => "object"]);
-		\OCP\Util::addHeader('meta', ['property' => "og:image", 'content' => $ogPreview]);
-
-		$this->eventDispatcher->dispatchTyped(new BeforeTemplateRenderedEvent($share));
-
-		$csp = new \OCP\AppFramework\Http\ContentSecurityPolicy();
-		$csp->addAllowedFrameDomain('\'self\'');
-
-		$response = new PublicTemplateResponse($this->appName, 'public', $shareTmpl);
-		$response->setHeaderTitle($shareTmpl['filename']);
-		if ($shareTmpl['shareOwner'] !== '') {
-			$response->setHeaderDetails($this->l10n->t('shared by %s', [$shareTmpl['shareOwner']]));
-		}
-
-		$isNoneFileDropFolder = $shareIsFolder === false || $share->getPermissions() !== \OCP\Constants::PERMISSION_CREATE;
-
-		if ($isNoneFileDropFolder && !$share->getHideDownload()) {
-			\OCP\Util::addScript('files_sharing', 'public_note');
-
-			$downloadWhite = new SimpleMenuAction('download', $this->l10n->t('Download'), 'icon-download-white', $shareTmpl['downloadURL'], 0);
-			$downloadAllWhite = new SimpleMenuAction('download', $this->l10n->t('Download all files'), 'icon-download-white', $shareTmpl['downloadURL'], 0);
-			$download = new SimpleMenuAction('download', $this->l10n->t('Download'), 'icon-download', $shareTmpl['downloadURL'], 10, $shareTmpl['fileSize']);
-			$downloadAll = new SimpleMenuAction('download', $this->l10n->t('Download all files'), 'icon-download', $shareTmpl['downloadURL'], 10, $shareTmpl['fileSize']);
-			$directLink = new LinkMenuAction($this->l10n->t('Direct link'), 'icon-public', $shareTmpl['previewURL']);
-			$externalShare = new ExternalShareMenuAction($this->l10n->t('Add to your Nextcloud'), 'icon-external', $shareTmpl['owner'], $shareTmpl['shareOwner'], $shareTmpl['filename']);
-
-			$responseComposer = [];
-
-			if ($shareIsFolder) {
-				$responseComposer[] = $downloadAllWhite;
-				$responseComposer[] = $downloadAll;
-			} else {
-				$responseComposer[] = $downloadWhite;
-				$responseComposer[] = $download;
-			}
-			$responseComposer[] = $directLink;
-			if ($this->federatedShareProvider->isOutgoingServer2serverShareEnabled()) {
-				$responseComposer[] = $externalShare;
-			}
-
-			$response->setHeaderActions($responseComposer);
-		}
-
-		$response->setContentSecurityPolicy($csp);
-
-		$this->emitAccessShareHook($share);
-
-		return $response;
-	}
-
-	/**
-	 * @PublicPage
-	 * @NoCSRFRequired
-	 * @NoSameSiteCookieRequired
-	 *
-	 * @param string $token
-	 * @param string $files
-	 * @param string $path
-	 * @param string $downloadStartSecret
-	 * @return void|\OCP\AppFramework\Http\Response
-	 * @throws NotFoundException
-	 */
-	public function downloadShare($token, $files = null, $path = '', $downloadStartSecret = '') {
-		\OC_User::setIncognitoMode(true);
-
-		$share = $this->shareManager->getShareByToken($token);
-
-		if (!($share->getPermissions() & \OCP\Constants::PERMISSION_READ)) {
-			return new \OCP\AppFramework\Http\DataResponse('Share has no read permission');
-		}
-
-		$files_list = null;
-		if (!is_null($files)) { // download selected files
-			$files_list = json_decode($files);
-			// in case we get only a single file
-			if ($files_list === null) {
-				$files_list = [$files];
-			}
-			// Just in case $files is a single int like '1234'
-			if (!is_array($files_list)) {
-				$files_list = [$files_list];
-			}
-		}
-
-		if (!$this->validateShare($share)) {
-			throw new NotFoundException();
-		}
-
-		$userFolder = $this->rootFolder->getUserFolder($share->getShareOwner());
-		$originalSharePath = $userFolder->getRelativePath($share->getNode()->getPath());
-
-
-		// Single file share
-		if ($share->getNode() instanceof \OCP\Files\File) {
-			// Single file download
-			$this->singleFileDownloaded($share, $share->getNode());
-		}
-		// Directory share
-		else {
-			/** @var \OCP\Files\Folder $node */
-			$node = $share->getNode();
-
-			// Try to get the path
-			if ($path !== '') {
-				try {
-					$node = $node->get($path);
-				} catch (NotFoundException $e) {
-					$this->emitAccessShareHook($share, 404, 'Share not found');
-					return new NotFoundResponse();
-				}
-			}
-
-			$originalSharePath = $userFolder->getRelativePath($node->getPath());
-
-			if ($node instanceof \OCP\Files\File) {
-				// Single file download
-				$this->singleFileDownloaded($share, $share->getNode());
-			} else {
-				try {
-					if (!empty($files_list)) {
-						$this->fileListDownloaded($share, $files_list, $node);
-					} else {
-						// The folder is downloaded
-						$this->singleFileDownloaded($share, $share->getNode());
-					}
-				} catch (NotFoundException $e) {
-					return new NotFoundResponse();
-				}
-			}
-		}
-
-		/* FIXME: We should do this all nicely in OCP */
-		OC_Util::tearDownFS();
-		OC_Util::setupFS($share->getShareOwner());
-
-		/**
-		 * this sets a cookie to be able to recognize the start of the download
-		 * the content must not be longer than 32 characters and must only contain
-		 * alphanumeric characters
-		 */
-		if (!empty($downloadStartSecret)
-			&& !isset($downloadStartSecret[32])
-			&& preg_match('!^[a-zA-Z0-9]+$!', $downloadStartSecret) === 1) {
-
-			// FIXME: set on the response once we use an actual app framework response
-			setcookie('ocDownloadStarted', $downloadStartSecret, time() + 20, '/');
-		}
-
-		$this->emitAccessShareHook($share);
-
-		$server_params = [ 'head' => $this->request->getMethod() === 'HEAD' ];
-
-		/**
-		 * Http range requests support
-		 */
-		if (isset($_SERVER['HTTP_RANGE'])) {
-			$server_params['range'] = $this->request->getHeader('Range');
-		}
-
-		// download selected files
-		if (!is_null($files) && $files !== '') {
-			// FIXME: The exit is required here because otherwise the AppFramework is trying to add headers as well
-			// after dispatching the request which results in a "Cannot modify header information" notice.
-			OC_Files::get($originalSharePath, $files_list, $server_params);
-			exit();
-		} else {
-			// FIXME: The exit is required here because otherwise the AppFramework is trying to add headers as well
-			// after dispatching the request which results in a "Cannot modify header information" notice.
-			OC_Files::get(dirname($originalSharePath), basename($originalSharePath), $server_params);
-			exit();
-		}
-	}
-
-	/**
-	 * create activity for every downloaded file
-	 *
-	 * @param Share\IShare $share
-	 * @param array $files_list
-	 * @param \OCP\Files\Folder $node
-	 * @throws NotFoundException when trying to download a folder or multiple files of a "hide download" share
-	 */
-	protected function fileListDownloaded(Share\IShare $share, array $files_list, \OCP\Files\Folder $node) {
-		if ($share->getHideDownload() && count($files_list) > 1) {
-			throw new NotFoundException('Downloading more than 1 file');
-		}
-
-		foreach ($files_list as $file) {
-			$subNode = $node->get($file);
-			$this->singleFileDownloaded($share, $subNode);
-		}
-	}
-
-	/**
-	 * create activity if a single file was downloaded from a link share
-	 *
-	 * @param Share\IShare $share
-	 * @throws NotFoundException when trying to download a folder of a "hide download" share
-	 */
-	protected function singleFileDownloaded(Share\IShare $share, \OCP\Files\Node $node) {
-		if ($share->getHideDownload() && $node instanceof Folder) {
-			throw new NotFoundException('Downloading a folder');
-		}
-
-		$fileId = $node->getId();
-
-		$userFolder = $this->rootFolder->getUserFolder($share->getSharedBy());
-		$userNodeList = $userFolder->getById($fileId);
-		$userNode = $userNodeList[0];
-		$ownerFolder = $this->rootFolder->getUserFolder($share->getShareOwner());
-		$userPath = $userFolder->getRelativePath($userNode->getPath());
-		$ownerPath = $ownerFolder->getRelativePath($node->getPath());
-
-		$parameters = [$userPath];
-
-		if ($share->getShareType() === IShare::TYPE_EMAIL) {
-			if ($node instanceof \OCP\Files\File) {
-				$subject = Downloads::SUBJECT_SHARED_FILE_BY_EMAIL_DOWNLOADED;
-			} else {
-				$subject = Downloads::SUBJECT_SHARED_FOLDER_BY_EMAIL_DOWNLOADED;
-			}
-			$parameters[] = $share->getSharedWith();
-		} else {
-			if ($node instanceof \OCP\Files\File) {
-				$subject = Downloads::SUBJECT_PUBLIC_SHARED_FILE_DOWNLOADED;
-			} else {
-				$subject = Downloads::SUBJECT_PUBLIC_SHARED_FOLDER_DOWNLOADED;
-			}
-		}
-
-		$this->publishActivity($subject, $parameters, $share->getSharedBy(), $fileId, $userPath);
-
-		if ($share->getShareOwner() !== $share->getSharedBy()) {
-			$parameters[0] = $ownerPath;
-			$this->publishActivity($subject, $parameters, $share->getShareOwner(), $fileId, $ownerPath);
-		}
-	}
-
-	/**
-	 * publish activity
-	 *
-	 * @param string $subject
-	 * @param array $parameters
-	 * @param string $affectedUser
-	 * @param int $fileId
-	 * @param string $filePath
-	 */
-	protected function publishActivity($subject,
-										array $parameters,
-										$affectedUser,
-										$fileId,
-										$filePath) {
-		$event = $this->activityManager->generateEvent();
-		$event->setApp('files_sharing')
-			->setType('public_links')
-			->setSubject($subject, $parameters)
-			->setAffectedUser($affectedUser)
-			->setObject('files', $fileId, $filePath);
-		$this->activityManager->publish($event);
-	}
+            $freeSpace = $share->getNode()->getStorage()->free_space($share->getNode()->getInternalPath());
+            if ($freeSpace < \OCP\Files\FileInfo::SPACE_UNLIMITED) {
+                $freeSpace = max($freeSpace, 0);
+            } else {
+                $freeSpace = (INF > 0) ? INF: PHP_INT_MAX; // work around https://bugs.php.net/bug.php?id=69188
+            }
+
+            $hideFileList = !($share->getPermissions() & \OCP\Constants::PERMISSION_READ);
+            $maxUploadFilesize = $freeSpace;
+
+            $folder = new Template('files', 'list', '');
+
+            $folder->assign('dir', $shareNode->getRelativePath($folderNode->getPath()));
+            $folder->assign('dirToken', $this->getToken());
+            $folder->assign('permissions', \OCP\Constants::PERMISSION_READ);
+            $folder->assign('isPublic', true);
+            $folder->assign('hideFileList', $hideFileList);
+            $folder->assign('publicUploadEnabled', 'no');
+            // default to list view
+            $folder->assign('showgridview', false);
+            $folder->assign('uploadMaxFilesize', $maxUploadFilesize);
+            $folder->assign('uploadMaxHumanFilesize', \OCP\Util::humanFileSize($maxUploadFilesize));
+            $folder->assign('freeSpace', $freeSpace);
+            $folder->assign('usedSpacePercent', 0);
+            $folder->assign('trash', false);
+            $shareTmpl['folder'] = $folder->fetchPage();
+        } else {
+            $shareIsFolder = false;
+        }
+
+        // default to list view
+        $shareTmpl['showgridview'] = false;
+
+        $shareTmpl['hideFileList'] = $hideFileList;
+        $shareTmpl['downloadURL'] = $this->urlGenerator->linkToRouteAbsolute('files_sharing.sharecontroller.downloadShare', [
+            'token' => $this->getToken(),
+            'filename' => $shareIsFolder ? null : $shareNode->getName()
+        ]);
+        $shareTmpl['shareUrl'] = $this->urlGenerator->linkToRouteAbsolute('files_sharing.sharecontroller.showShare', ['token' => $this->getToken()]);
+        $shareTmpl['maxSizeAnimateGif'] = $this->config->getSystemValue('max_filesize_animated_gifs_public_sharing', 10);
+        $shareTmpl['previewEnabled'] = $this->config->getSystemValue('enable_previews', true);
+        $shareTmpl['previewMaxX'] = $this->config->getSystemValue('preview_max_x', 1024);
+        $shareTmpl['previewMaxY'] = $this->config->getSystemValue('preview_max_y', 1024);
+        $shareTmpl['disclaimer'] = $this->config->getAppValue('core', 'shareapi_public_link_disclaimertext', null);
+        $shareTmpl['previewURL'] = $shareTmpl['downloadURL'];
+
+        if ($shareTmpl['previewSupported']) {
+            $shareTmpl['previewImage'] = $this->urlGenerator->linkToRouteAbsolute('files_sharing.PublicPreview.getPreview',
+                ['x' => 200, 'y' => 200, 'file' => $shareTmpl['directory_path'], 'token' => $shareTmpl['dirToken']]);
+            $ogPreview = $shareTmpl['previewImage'];
+
+            // We just have direct previews for image files
+            if ($shareNode->getMimePart() === 'image') {
+                $shareTmpl['previewURL'] = $this->urlGenerator->linkToRouteAbsolute('files_sharing.publicpreview.directLink', ['token' => $this->getToken()]);
+
+                $ogPreview = $shareTmpl['previewURL'];
+
+                //Whatapp is kind of picky about their size requirements
+                if ($this->request->isUserAgent(['/^WhatsApp/'])) {
+                    $ogPreview = $this->urlGenerator->linkToRouteAbsolute('files_sharing.PublicPreview.getPreview', [
+                        'token' => $this->getToken(),
+                        'x' => 256,
+                        'y' => 256,
+                        'a' => true,
+                    ]);
+                }
+            }
+        } else {
+            $shareTmpl['previewImage'] = $this->urlGenerator->getAbsoluteURL($this->urlGenerator->imagePath('core', 'favicon-fb.png'));
+            $ogPreview = $shareTmpl['previewImage'];
+        }
+
+        // Load files we need
+        \OCP\Util::addScript('files', 'semaphore');
+        \OCP\Util::addScript('files', 'file-upload');
+        \OCP\Util::addStyle('files_sharing', 'publicView');
+        \OCP\Util::addScript('files_sharing', 'public');
+        \OCP\Util::addScript('files_sharing', 'templates');
+        \OCP\Util::addScript('files', 'fileactions');
+        \OCP\Util::addScript('files', 'fileactionsmenu');
+        \OCP\Util::addScript('files', 'jquery.fileupload');
+        \OCP\Util::addScript('files_sharing', 'files_drop');
+
+        if (isset($shareTmpl['folder'])) {
+            // JS required for folders
+            \OCP\Util::addStyle('files', 'merged');
+            \OCP\Util::addScript('files', 'filesummary');
+            \OCP\Util::addScript('files', 'templates');
+            \OCP\Util::addScript('files', 'breadcrumb');
+            \OCP\Util::addScript('files', 'fileinfomodel');
+            \OCP\Util::addScript('files', 'newfilemenu');
+            \OCP\Util::addScript('files', 'files');
+            \OCP\Util::addScript('files', 'filemultiselectmenu');
+            \OCP\Util::addScript('files', 'filelist');
+            \OCP\Util::addScript('files', 'keyboardshortcuts');
+            \OCP\Util::addScript('files', 'operationprogressbar');
+
+            // Load Viewer scripts
+            if (class_exists(LoadViewer::class)) {
+                $this->eventDispatcher->dispatchTyped(new LoadViewer());
+            }
+        }
+
+        // OpenGraph Support: http://ogp.me/
+        \OCP\Util::addHeader('meta', ['property' => "og:title", 'content' => $shareTmpl['filename']]);
+        \OCP\Util::addHeader('meta', ['property' => "og:description", 'content' => $this->defaults->getName() . ($this->defaults->getSlogan() !== '' ? ' - ' . $this->defaults->getSlogan() : '')]);
+        \OCP\Util::addHeader('meta', ['property' => "og:site_name", 'content' => $this->defaults->getName()]);
+        \OCP\Util::addHeader('meta', ['property' => "og:url", 'content' => $shareTmpl['shareUrl']]);
+        \OCP\Util::addHeader('meta', ['property' => "og:type", 'content' => "object"]);
+        \OCP\Util::addHeader('meta', ['property' => "og:image", 'content' => $ogPreview]);
+
+        $this->eventDispatcher->dispatchTyped(new BeforeTemplateRenderedEvent($share));
+
+        $csp = new \OCP\AppFramework\Http\ContentSecurityPolicy();
+        $csp->addAllowedFrameDomain('\'self\'');
+
+        $response = new PublicTemplateResponse($this->appName, 'public', $shareTmpl);
+        $response->setHeaderTitle($shareTmpl['filename']);
+        if ($shareTmpl['shareOwner'] !== '') {
+            $response->setHeaderDetails($this->l10n->t('shared by %s', [$shareTmpl['shareOwner']]));
+        }
+
+        $isNoneFileDropFolder = $shareIsFolder === false || $share->getPermissions() !== \OCP\Constants::PERMISSION_CREATE;
+
+        if ($isNoneFileDropFolder && !$share->getHideDownload()) {
+            \OCP\Util::addScript('files_sharing', 'public_note');
+
+            $downloadWhite = new SimpleMenuAction('download', $this->l10n->t('Download'), 'icon-download-white', $shareTmpl['downloadURL'], 0);
+            $downloadAllWhite = new SimpleMenuAction('download', $this->l10n->t('Download all files'), 'icon-download-white', $shareTmpl['downloadURL'], 0);
+            $download = new SimpleMenuAction('download', $this->l10n->t('Download'), 'icon-download', $shareTmpl['downloadURL'], 10, $shareTmpl['fileSize']);
+            $downloadAll = new SimpleMenuAction('download', $this->l10n->t('Download all files'), 'icon-download', $shareTmpl['downloadURL'], 10, $shareTmpl['fileSize']);
+            $directLink = new LinkMenuAction($this->l10n->t('Direct link'), 'icon-public', $shareTmpl['previewURL']);
+            $externalShare = new ExternalShareMenuAction($this->l10n->t('Add to your Nextcloud'), 'icon-external', $shareTmpl['owner'], $shareTmpl['shareOwner'], $shareTmpl['filename']);
+
+            $responseComposer = [];
+
+            if ($shareIsFolder) {
+                $responseComposer[] = $downloadAllWhite;
+                $responseComposer[] = $downloadAll;
+            } else {
+                $responseComposer[] = $downloadWhite;
+                $responseComposer[] = $download;
+            }
+            $responseComposer[] = $directLink;
+            if ($this->federatedShareProvider->isOutgoingServer2serverShareEnabled()) {
+                $responseComposer[] = $externalShare;
+            }
+
+            $response->setHeaderActions($responseComposer);
+        }
+
+        $response->setContentSecurityPolicy($csp);
+
+        $this->emitAccessShareHook($share);
+
+        return $response;
+    }
+
+    /**
+     * @PublicPage
+     * @NoCSRFRequired
+     * @NoSameSiteCookieRequired
+     *
+     * @param string $token
+     * @param string $files
+     * @param string $path
+     * @param string $downloadStartSecret
+     * @return void|\OCP\AppFramework\Http\Response
+     * @throws NotFoundException
+     */
+    public function downloadShare($token, $files = null, $path = '', $downloadStartSecret = '') {
+        \OC_User::setIncognitoMode(true);
+
+        $share = $this->shareManager->getShareByToken($token);
+
+        if (!($share->getPermissions() & \OCP\Constants::PERMISSION_READ)) {
+            return new \OCP\AppFramework\Http\DataResponse('Share has no read permission');
+        }
+
+        $files_list = null;
+        if (!is_null($files)) { // download selected files
+            $files_list = json_decode($files);
+            // in case we get only a single file
+            if ($files_list === null) {
+                $files_list = [$files];
+            }
+            // Just in case $files is a single int like '1234'
+            if (!is_array($files_list)) {
+                $files_list = [$files_list];
+            }
+        }
+
+        if (!$this->validateShare($share)) {
+            throw new NotFoundException();
+        }
+
+        $userFolder = $this->rootFolder->getUserFolder($share->getShareOwner());
+        $originalSharePath = $userFolder->getRelativePath($share->getNode()->getPath());
+
+
+        // Single file share
+        if ($share->getNode() instanceof \OCP\Files\File) {
+            // Single file download
+            $this->singleFileDownloaded($share, $share->getNode());
+        }
+        // Directory share
+        else {
+            /** @var \OCP\Files\Folder $node */
+            $node = $share->getNode();
+
+            // Try to get the path
+            if ($path !== '') {
+                try {
+                    $node = $node->get($path);
+                } catch (NotFoundException $e) {
+                    $this->emitAccessShareHook($share, 404, 'Share not found');
+                    return new NotFoundResponse();
+                }
+            }
+
+            $originalSharePath = $userFolder->getRelativePath($node->getPath());
+
+            if ($node instanceof \OCP\Files\File) {
+                // Single file download
+                $this->singleFileDownloaded($share, $share->getNode());
+            } else {
+                try {
+                    if (!empty($files_list)) {
+                        $this->fileListDownloaded($share, $files_list, $node);
+                    } else {
+                        // The folder is downloaded
+                        $this->singleFileDownloaded($share, $share->getNode());
+                    }
+                } catch (NotFoundException $e) {
+                    return new NotFoundResponse();
+                }
+            }
+        }
+
+        /* FIXME: We should do this all nicely in OCP */
+        OC_Util::tearDownFS();
+        OC_Util::setupFS($share->getShareOwner());
+
+        /**
+         * this sets a cookie to be able to recognize the start of the download
+         * the content must not be longer than 32 characters and must only contain
+         * alphanumeric characters
+         */
+        if (!empty($downloadStartSecret)
+            && !isset($downloadStartSecret[32])
+            && preg_match('!^[a-zA-Z0-9]+$!', $downloadStartSecret) === 1) {
+
+            // FIXME: set on the response once we use an actual app framework response
+            setcookie('ocDownloadStarted', $downloadStartSecret, time() + 20, '/');
+        }
+
+        $this->emitAccessShareHook($share);
+
+        $server_params = [ 'head' => $this->request->getMethod() === 'HEAD' ];
+
+        /**
+         * Http range requests support
+         */
+        if (isset($_SERVER['HTTP_RANGE'])) {
+            $server_params['range'] = $this->request->getHeader('Range');
+        }
+
+        // download selected files
+        if (!is_null($files) && $files !== '') {
+            // FIXME: The exit is required here because otherwise the AppFramework is trying to add headers as well
+            // after dispatching the request which results in a "Cannot modify header information" notice.
+            OC_Files::get($originalSharePath, $files_list, $server_params);
+            exit();
+        } else {
+            // FIXME: The exit is required here because otherwise the AppFramework is trying to add headers as well
+            // after dispatching the request which results in a "Cannot modify header information" notice.
+            OC_Files::get(dirname($originalSharePath), basename($originalSharePath), $server_params);
+            exit();
+        }
+    }
+
+    /**
+     * create activity for every downloaded file
+     *
+     * @param Share\IShare $share
+     * @param array $files_list
+     * @param \OCP\Files\Folder $node
+     * @throws NotFoundException when trying to download a folder or multiple files of a "hide download" share
+     */
+    protected function fileListDownloaded(Share\IShare $share, array $files_list, \OCP\Files\Folder $node) {
+        if ($share->getHideDownload() && count($files_list) > 1) {
+            throw new NotFoundException('Downloading more than 1 file');
+        }
+
+        foreach ($files_list as $file) {
+            $subNode = $node->get($file);
+            $this->singleFileDownloaded($share, $subNode);
+        }
+    }
+
+    /**
+     * create activity if a single file was downloaded from a link share
+     *
+     * @param Share\IShare $share
+     * @throws NotFoundException when trying to download a folder of a "hide download" share
+     */
+    protected function singleFileDownloaded(Share\IShare $share, \OCP\Files\Node $node) {
+        if ($share->getHideDownload() && $node instanceof Folder) {
+            throw new NotFoundException('Downloading a folder');
+        }
+
+        $fileId = $node->getId();
+
+        $userFolder = $this->rootFolder->getUserFolder($share->getSharedBy());
+        $userNodeList = $userFolder->getById($fileId);
+        $userNode = $userNodeList[0];
+        $ownerFolder = $this->rootFolder->getUserFolder($share->getShareOwner());
+        $userPath = $userFolder->getRelativePath($userNode->getPath());
+        $ownerPath = $ownerFolder->getRelativePath($node->getPath());
+
+        $parameters = [$userPath];
+
+        if ($share->getShareType() === IShare::TYPE_EMAIL) {
+            if ($node instanceof \OCP\Files\File) {
+                $subject = Downloads::SUBJECT_SHARED_FILE_BY_EMAIL_DOWNLOADED;
+            } else {
+                $subject = Downloads::SUBJECT_SHARED_FOLDER_BY_EMAIL_DOWNLOADED;
+            }
+            $parameters[] = $share->getSharedWith();
+        } else {
+            if ($node instanceof \OCP\Files\File) {
+                $subject = Downloads::SUBJECT_PUBLIC_SHARED_FILE_DOWNLOADED;
+            } else {
+                $subject = Downloads::SUBJECT_PUBLIC_SHARED_FOLDER_DOWNLOADED;
+            }
+        }
+
+        $this->publishActivity($subject, $parameters, $share->getSharedBy(), $fileId, $userPath);
+
+        if ($share->getShareOwner() !== $share->getSharedBy()) {
+            $parameters[0] = $ownerPath;
+            $this->publishActivity($subject, $parameters, $share->getShareOwner(), $fileId, $ownerPath);
+        }
+    }
+
+    /**
+     * publish activity
+     *
+     * @param string $subject
+     * @param array $parameters
+     * @param string $affectedUser
+     * @param int $fileId
+     * @param string $filePath
+     */
+    protected function publishActivity($subject,
+                                        array $parameters,
+                                        $affectedUser,
+                                        $fileId,
+                                        $filePath) {
+        $event = $this->activityManager->generateEvent();
+        $event->setApp('files_sharing')
+            ->setType('public_links')
+            ->setSubject($subject, $parameters)
+            ->setAffectedUser($affectedUser)
+            ->setObject('files', $fileId, $filePath);
+        $this->activityManager->publish($event);
+    }
 }

apps/provisioning_api/lib/Capabilities.php

Indentation +30 added lines, -30 removed lines

@@ -29,34 +29,34 @@
 
 class Capabilities implements ICapability {
 
-	/** @var IAppManager */
-	private $appManager;
-
-	public function __construct(IAppManager $appManager) {
-		$this->appManager = $appManager;
-	}
-
-	/**
-	 * Function an app uses to return the capabilities
-	 *
-	 * @return array Array containing the apps capabilities
-	 */
-	public function getCapabilities() {
-		$federationScopesEnabled = false;
-
-		$federatedFileSharingEnabled = $this->appManager->isEnabledForUser('federatedfilesharing');
-		if ($federatedFileSharingEnabled) {
-			/** @var FederatedShareProvider $shareProvider */
-			$shareProvider = \OC::$server->query(FederatedShareProvider::class);
-			$federationScopesEnabled = $shareProvider->isLookupServerUploadEnabled();
-		}
-
-		return [
-			'provisioning_api' => [
-				'version' => $this->appManager->getAppVersion('provisioning_api'),
-				'AccountPropertyScopesVersion' => 2,
-				'AccountPropertyScopesFederationEnabled' => $federationScopesEnabled,
-			]
-		];
-	}
+    /** @var IAppManager */
+    private $appManager;
+
+    public function __construct(IAppManager $appManager) {
+        $this->appManager = $appManager;
+    }
+
+    /**
+     * Function an app uses to return the capabilities
+     *
+     * @return array Array containing the apps capabilities
+     */
+    public function getCapabilities() {
+        $federationScopesEnabled = false;
+
+        $federatedFileSharingEnabled = $this->appManager->isEnabledForUser('federatedfilesharing');
+        if ($federatedFileSharingEnabled) {
+            /** @var FederatedShareProvider $shareProvider */
+            $shareProvider = \OC::$server->query(FederatedShareProvider::class);
+            $federationScopesEnabled = $shareProvider->isLookupServerUploadEnabled();
+        }
+
+        return [
+            'provisioning_api' => [
+                'version' => $this->appManager->getAppVersion('provisioning_api'),
+                'AccountPropertyScopesVersion' => 2,
+                'AccountPropertyScopesFederationEnabled' => $federationScopesEnabled,
+            ]
+        ];
+    }
 }

apps/provisioning_api/lib/AppInfo/Application.php

Indentation +39 added lines, -39 removed lines

@@ -54,48 +54,48 @@
 use Psr\Container\ContainerInterface;
 
 class Application extends App implements IBootstrap {
-	public function __construct(array $urlParams = []) {
-		parent::__construct('provisioning_api', $urlParams);
-	}
+    public function __construct(array $urlParams = []) {
+        parent::__construct('provisioning_api', $urlParams);
+    }
 
-	public function register(IRegistrationContext $context): void {
-		$context->registerEventListener(UserDeletedEvent::class, UserDeletedListener::class);
+    public function register(IRegistrationContext $context): void {
+        $context->registerEventListener(UserDeletedEvent::class, UserDeletedListener::class);
 
-		$context->registerService(NewUserMailHelper::class, function (ContainerInterface $c) {
-			return new NewUserMailHelper(
-				$c->get(Defaults::class),
-				$c->get(IURLGenerator::class),
-				$c->get(IFactory::class),
-				$c->get(IMailer::class),
-				$c->get(ISecureRandom::class),
-				$c->get(ITimeFactory::class),
-				$c->get(IConfig::class),
-				$c->get(ICrypto::class),
-				Util::getDefaultEmailAddress('no-reply')
-			);
-		});
-		$context->registerService(ProvisioningApiMiddleware::class, function (ContainerInterface $c) {
-			$user = $c->get(IUserManager::class)->get($c->get('UserId'));
-			$isAdmin = false;
-			$isSubAdmin = false;
+        $context->registerService(NewUserMailHelper::class, function (ContainerInterface $c) {
+            return new NewUserMailHelper(
+                $c->get(Defaults::class),
+                $c->get(IURLGenerator::class),
+                $c->get(IFactory::class),
+                $c->get(IMailer::class),
+                $c->get(ISecureRandom::class),
+                $c->get(ITimeFactory::class),
+                $c->get(IConfig::class),
+                $c->get(ICrypto::class),
+                Util::getDefaultEmailAddress('no-reply')
+            );
+        });
+        $context->registerService(ProvisioningApiMiddleware::class, function (ContainerInterface $c) {
+            $user = $c->get(IUserManager::class)->get($c->get('UserId'));
+            $isAdmin = false;
+            $isSubAdmin = false;
 
-			if ($user instanceof IUser) {
-				$groupManager = $c->get(IGroupManager::class);
-				assert($groupManager instanceof GroupManager);
-				$isAdmin = $groupManager->isAdmin($user->getUID());
-				$isSubAdmin = $groupManager->getSubAdmin()->isSubAdmin($user);
-			}
+            if ($user instanceof IUser) {
+                $groupManager = $c->get(IGroupManager::class);
+                assert($groupManager instanceof GroupManager);
+                $isAdmin = $groupManager->isAdmin($user->getUID());
+                $isSubAdmin = $groupManager->getSubAdmin()->isSubAdmin($user);
+            }
 
-			return new ProvisioningApiMiddleware(
-				$c->get(IControllerMethodReflector::class),
-				$isAdmin,
-				$isSubAdmin
-			);
-		});
-		$context->registerMiddleware(ProvisioningApiMiddleware::class);
-		$context->registerCapability(Capabilities::class);
-	}
+            return new ProvisioningApiMiddleware(
+                $c->get(IControllerMethodReflector::class),
+                $isAdmin,
+                $isSubAdmin
+            );
+        });
+        $context->registerMiddleware(ProvisioningApiMiddleware::class);
+        $context->registerCapability(Capabilities::class);
+    }
 
-	public function boot(IBootContext $context): void {
-	}
+    public function boot(IBootContext $context): void {
+    }
 }

apps/provisioning_api/lib/Controller/UsersController.php

Indentation +1032 added lines, -1032 removed lines

@@ -74,1036 +74,1036 @@
 
 class UsersController extends AUserData {
 
-	/** @var IAppManager */
-	private $appManager;
-	/** @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,
-								IAppManager $appManager,
-								IGroupManager $groupManager,
-								IUserSession $userSession,
-								AccountManager $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->appManager = $appManager;
-		$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();
-
-		$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) {
-				}
-			}
-		}
-
-		$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 = ''): 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('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 ($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 !== '') {
-				$this->editUser($userid, 'display', $displayName);
-			}
-
-			if ($quota !== '') {
-				$this->editUser($userid, 'quota', $quota);
-			}
-
-			if ($language !== '') {
-				$this->editUser($userid, 'language', $language);
-			}
-
-			// 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 exeption.',
-				[
-					'app' => 'ocs_api',
-					'exception' => $e,
-				]
-			);
-			throw $e;
-		} catch (\InvalidArgumentException $e) {
-			$this->logger->error('Failed addUser attempt with invalid argument exeption.',
-				[
-					'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_UNAUTHORISED);
-		}
-		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);
-			// rename "displayname" to "display-name" only for this call to keep
-			// the API stable.
-			$data['display-name'] = $data['displayname'];
-			unset($data['displayname']);
-			return new DataResponse($data);
-		}
-
-		throw new OCSException('', OCSController::RESPOND_UNAUTHORISED);
-	}
-
-	/**
-	 * @NoAdminRequired
-	 * @NoSubAdminRequired
-	 */
-	public function getEditableFields(): DataResponse {
-		$permittedFields = [];
-
-		// Editing self (display, email)
-		if ($this->config->getSystemValue('allow_user_to_change_display_name', true) !== false) {
-			$permittedFields[] = IAccountManager::PROPERTY_DISPLAYNAME;
-			$permittedFields[] = IAccountManager::PROPERTY_EMAIL;
-		}
-
-		$permittedFields[] = IAccountManager::PROPERTY_PHONE;
-		$permittedFields[] = IAccountManager::PROPERTY_ADDRESS;
-		$permittedFields[] = IAccountManager::PROPERTY_WEBSITE;
-		$permittedFields[] = IAccountManager::PROPERTY_TWITTER;
-
-		return new DataResponse($permittedFields);
-	}
-
-	/**
-	 * @NoAdminRequired
-	 * @NoSubAdminRequired
-	 * @PasswordConfirmationRequired
-	 *
-	 * 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_UNAUTHORISED);
-		}
-
-		$permittedFields = [];
-		if ($targetUser->getUID() === $currentLoggedInUser->getUID()) {
-			// Editing self (display, email)
-			if ($this->config->getSystemValue('allow_user_to_change_display_name', true) !== false) {
-				$permittedFields[] = 'display';
-				$permittedFields[] = IAccountManager::PROPERTY_DISPLAYNAME;
-				$permittedFields[] = IAccountManager::PROPERTY_EMAIL;
-			}
-
-			$permittedFields[] = IAccountManager::PROPERTY_DISPLAYNAME . self::SCOPE_SUFFIX;
-			$permittedFields[] = IAccountManager::PROPERTY_EMAIL . self::SCOPE_SUFFIX;
-
-			$permittedFields[] = 'password';
-			if ($this->config->getSystemValue('force_language', false) === false ||
-				$this->groupManager->isAdmin($currentLoggedInUser->getUID())) {
-				$permittedFields[] = 'language';
-			}
-
-			if ($this->config->getSystemValue('force_locale', false) === false ||
-				$this->groupManager->isAdmin($currentLoggedInUser->getUID())) {
-				$permittedFields[] = 'locale';
-			}
-
-			$permittedFields[] = IAccountManager::PROPERTY_PHONE;
-			$permittedFields[] = IAccountManager::PROPERTY_ADDRESS;
-			$permittedFields[] = IAccountManager::PROPERTY_WEBSITE;
-			$permittedFields[] = IAccountManager::PROPERTY_TWITTER;
-			$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_AVATAR . self::SCOPE_SUFFIX;
-
-			// If admin they can edit their own quota
-			if ($this->groupManager->isAdmin($currentLoggedInUser->getUID())) {
-				$permittedFields[] = 'quota';
-			}
-		} 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
-				$permittedFields[] = 'display';
-				$permittedFields[] = IAccountManager::PROPERTY_DISPLAYNAME;
-				$permittedFields[] = IAccountManager::PROPERTY_EMAIL;
-				$permittedFields[] = 'password';
-				$permittedFields[] = 'language';
-				$permittedFields[] = 'locale';
-				$permittedFields[] = IAccountManager::PROPERTY_PHONE;
-				$permittedFields[] = IAccountManager::PROPERTY_ADDRESS;
-				$permittedFields[] = IAccountManager::PROPERTY_WEBSITE;
-				$permittedFields[] = IAccountManager::PROPERTY_TWITTER;
-				$permittedFields[] = 'quota';
-			} else {
-				// No rights
-				throw new OCSException('', OCSController::RESPOND_UNAUTHORISED);
-			}
-		}
-		// Check if permitted to edit this field
-		if (!in_array($key, $permittedFields)) {
-			throw new OCSException('', OCSController::RESPOND_UNAUTHORISED);
-		}
-		// Process the edit
-		switch ($key) {
-			case 'display':
-			case IAccountManager::PROPERTY_DISPLAYNAME:
-				$targetUser->setDisplayName($value);
-				break;
-			case '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, 103);
-					}
-					if ($quota === -1) {
-						$quota = 'none';
-					} else {
-						$quota = \OCP\Util::humanFileSize($quota);
-					}
-				}
-				$targetUser->setQuota($quota);
-				break;
-			case 'password':
-				try {
-					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 '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 'locale':
-				if (!$this->l10nFactory->localeExists($value)) {
-					throw new OCSException('Invalid locale', 102);
-				}
-				$this->config->setUserValue($targetUser->getUID(), 'core', 'locale', $value);
-				break;
-			case IAccountManager::PROPERTY_EMAIL:
-				if (filter_var($value, FILTER_VALIDATE_EMAIL) || $value === '') {
-					$targetUser->setEMailAddress($value);
-				} else {
-					throw new OCSException('', 102);
-				}
-				break;
-			case IAccountManager::PROPERTY_PHONE:
-			case IAccountManager::PROPERTY_ADDRESS:
-			case IAccountManager::PROPERTY_WEBSITE:
-			case IAccountManager::PROPERTY_TWITTER:
-				$userAccount = $this->accountManager->getUser($targetUser);
-				if ($userAccount[$key]['value'] !== $value) {
-					$userAccount[$key]['value'] = $value;
-					try {
-						$this->accountManager->updateUser($targetUser, $userAccount, true);
-
-						if ($key === IAccountManager::PROPERTY_PHONE) {
-							$this->knownUserService->deleteByContactUserId($targetUser->getUID());
-						}
-					} catch (\InvalidArgumentException $e) {
-						throw new OCSException('Invalid ' . $e->getMessage(), 102);
-					}
-				}
-				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_AVATAR . self::SCOPE_SUFFIX:
-				$propertyName = substr($key, 0, strlen($key) - strlen(self::SCOPE_SUFFIX));
-				$userAccount = $this->accountManager->getUser($targetUser);
-				if ($userAccount[$propertyName]['scope'] !== $value) {
-					$userAccount[$propertyName]['scope'] = $value;
-					try {
-						$this->accountManager->updateUser($targetUser, $userAccount, true);
-					} 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 || $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_UNAUTHORISED);
-		}
-
-		$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 || $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_UNAUTHORISED);
-		}
-
-		// 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_UNAUTHORISED);
-		}
-
-		// 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_UNAUTHORISED);
-			}
-		}
-	}
-
-	/**
-	 * @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_UNAUTHORISED);
-		}
-
-		$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 IAppManager */
+    private $appManager;
+    /** @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,
+                                IAppManager $appManager,
+                                IGroupManager $groupManager,
+                                IUserSession $userSession,
+                                AccountManager $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->appManager = $appManager;
+        $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();
+
+        $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) {
+                }
+            }
+        }
+
+        $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 = ''): 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('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 ($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 !== '') {
+                $this->editUser($userid, 'display', $displayName);
+            }
+
+            if ($quota !== '') {
+                $this->editUser($userid, 'quota', $quota);
+            }
+
+            if ($language !== '') {
+                $this->editUser($userid, 'language', $language);
+            }
+
+            // 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 exeption.',
+                [
+                    'app' => 'ocs_api',
+                    'exception' => $e,
+                ]
+            );
+            throw $e;
+        } catch (\InvalidArgumentException $e) {
+            $this->logger->error('Failed addUser attempt with invalid argument exeption.',
+                [
+                    '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_UNAUTHORISED);
+        }
+        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);
+            // rename "displayname" to "display-name" only for this call to keep
+            // the API stable.
+            $data['display-name'] = $data['displayname'];
+            unset($data['displayname']);
+            return new DataResponse($data);
+        }
+
+        throw new OCSException('', OCSController::RESPOND_UNAUTHORISED);
+    }
+
+    /**
+     * @NoAdminRequired
+     * @NoSubAdminRequired
+     */
+    public function getEditableFields(): DataResponse {
+        $permittedFields = [];
+
+        // Editing self (display, email)
+        if ($this->config->getSystemValue('allow_user_to_change_display_name', true) !== false) {
+            $permittedFields[] = IAccountManager::PROPERTY_DISPLAYNAME;
+            $permittedFields[] = IAccountManager::PROPERTY_EMAIL;
+        }
+
+        $permittedFields[] = IAccountManager::PROPERTY_PHONE;
+        $permittedFields[] = IAccountManager::PROPERTY_ADDRESS;
+        $permittedFields[] = IAccountManager::PROPERTY_WEBSITE;
+        $permittedFields[] = IAccountManager::PROPERTY_TWITTER;
+
+        return new DataResponse($permittedFields);
+    }
+
+    /**
+     * @NoAdminRequired
+     * @NoSubAdminRequired
+     * @PasswordConfirmationRequired
+     *
+     * 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_UNAUTHORISED);
+        }
+
+        $permittedFields = [];
+        if ($targetUser->getUID() === $currentLoggedInUser->getUID()) {
+            // Editing self (display, email)
+            if ($this->config->getSystemValue('allow_user_to_change_display_name', true) !== false) {
+                $permittedFields[] = 'display';
+                $permittedFields[] = IAccountManager::PROPERTY_DISPLAYNAME;
+                $permittedFields[] = IAccountManager::PROPERTY_EMAIL;
+            }
+
+            $permittedFields[] = IAccountManager::PROPERTY_DISPLAYNAME . self::SCOPE_SUFFIX;
+            $permittedFields[] = IAccountManager::PROPERTY_EMAIL . self::SCOPE_SUFFIX;
+
+            $permittedFields[] = 'password';
+            if ($this->config->getSystemValue('force_language', false) === false ||
+                $this->groupManager->isAdmin($currentLoggedInUser->getUID())) {
+                $permittedFields[] = 'language';
+            }
+
+            if ($this->config->getSystemValue('force_locale', false) === false ||
+                $this->groupManager->isAdmin($currentLoggedInUser->getUID())) {
+                $permittedFields[] = 'locale';
+            }
+
+            $permittedFields[] = IAccountManager::PROPERTY_PHONE;
+            $permittedFields[] = IAccountManager::PROPERTY_ADDRESS;
+            $permittedFields[] = IAccountManager::PROPERTY_WEBSITE;
+            $permittedFields[] = IAccountManager::PROPERTY_TWITTER;
+            $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_AVATAR . self::SCOPE_SUFFIX;
+
+            // If admin they can edit their own quota
+            if ($this->groupManager->isAdmin($currentLoggedInUser->getUID())) {
+                $permittedFields[] = 'quota';
+            }
+        } 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
+                $permittedFields[] = 'display';
+                $permittedFields[] = IAccountManager::PROPERTY_DISPLAYNAME;
+                $permittedFields[] = IAccountManager::PROPERTY_EMAIL;
+                $permittedFields[] = 'password';
+                $permittedFields[] = 'language';
+                $permittedFields[] = 'locale';
+                $permittedFields[] = IAccountManager::PROPERTY_PHONE;
+                $permittedFields[] = IAccountManager::PROPERTY_ADDRESS;
+                $permittedFields[] = IAccountManager::PROPERTY_WEBSITE;
+                $permittedFields[] = IAccountManager::PROPERTY_TWITTER;
+                $permittedFields[] = 'quota';
+            } else {
+                // No rights
+                throw new OCSException('', OCSController::RESPOND_UNAUTHORISED);
+            }
+        }
+        // Check if permitted to edit this field
+        if (!in_array($key, $permittedFields)) {
+            throw new OCSException('', OCSController::RESPOND_UNAUTHORISED);
+        }
+        // Process the edit
+        switch ($key) {
+            case 'display':
+            case IAccountManager::PROPERTY_DISPLAYNAME:
+                $targetUser->setDisplayName($value);
+                break;
+            case '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, 103);
+                    }
+                    if ($quota === -1) {
+                        $quota = 'none';
+                    } else {
+                        $quota = \OCP\Util::humanFileSize($quota);
+                    }
+                }
+                $targetUser->setQuota($quota);
+                break;
+            case 'password':
+                try {
+                    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 '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 'locale':
+                if (!$this->l10nFactory->localeExists($value)) {
+                    throw new OCSException('Invalid locale', 102);
+                }
+                $this->config->setUserValue($targetUser->getUID(), 'core', 'locale', $value);
+                break;
+            case IAccountManager::PROPERTY_EMAIL:
+                if (filter_var($value, FILTER_VALIDATE_EMAIL) || $value === '') {
+                    $targetUser->setEMailAddress($value);
+                } else {
+                    throw new OCSException('', 102);
+                }
+                break;
+            case IAccountManager::PROPERTY_PHONE:
+            case IAccountManager::PROPERTY_ADDRESS:
+            case IAccountManager::PROPERTY_WEBSITE:
+            case IAccountManager::PROPERTY_TWITTER:
+                $userAccount = $this->accountManager->getUser($targetUser);
+                if ($userAccount[$key]['value'] !== $value) {
+                    $userAccount[$key]['value'] = $value;
+                    try {
+                        $this->accountManager->updateUser($targetUser, $userAccount, true);
+
+                        if ($key === IAccountManager::PROPERTY_PHONE) {
+                            $this->knownUserService->deleteByContactUserId($targetUser->getUID());
+                        }
+                    } catch (\InvalidArgumentException $e) {
+                        throw new OCSException('Invalid ' . $e->getMessage(), 102);
+                    }
+                }
+                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_AVATAR . self::SCOPE_SUFFIX:
+                $propertyName = substr($key, 0, strlen($key) - strlen(self::SCOPE_SUFFIX));
+                $userAccount = $this->accountManager->getUser($targetUser);
+                if ($userAccount[$propertyName]['scope'] !== $value) {
+                    $userAccount[$propertyName]['scope'] = $value;
+                    try {
+                        $this->accountManager->updateUser($targetUser, $userAccount, true);
+                    } 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 || $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_UNAUTHORISED);
+        }
+
+        $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 || $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_UNAUTHORISED);
+        }
+
+        // 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_UNAUTHORISED);
+        }
+
+        // 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_UNAUTHORISED);
+            }
+        }
+    }
+
+    /**
+     * @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_UNAUTHORISED);
+        }
+
+        $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();
+    }
 }