nextcloud / server

lib/public/Util.php

Indentation +637 added lines, -637 removed lines

@@ -25,641 +25,641 @@
  * @since 4.0.0
  */
 class Util {
-	private static ?IManager $shareManager = null;
-
-	private static array $scriptsInit = [];
-	private static array $scripts = [];
-	private static array $scriptDeps = [];
-
-	/**
-	 * get the current installed version of Nextcloud
-	 * @return array
-	 * @since 4.0.0
-	 * @deprecated 31.0.0 Use \OCP\ServerVersion::getVersion
-	 */
-	public static function getVersion() {
-		return Server::get(ServerVersion::class)->getVersion();
-	}
-
-	/**
-	 * @since 17.0.0
-	 */
-	public static function hasExtendedSupport(): bool {
-		try {
-			/** @var \OCP\Support\Subscription\IRegistry */
-			$subscriptionRegistry = Server::get(\OCP\Support\Subscription\IRegistry::class);
-			return $subscriptionRegistry->delegateHasExtendedSupport();
-		} catch (ContainerExceptionInterface $e) {
-		}
-		return \OCP\Server::get(IConfig::class)->getSystemValueBool('extendedSupport', false);
-	}
-
-	/**
-	 * Set current update channel
-	 * @param string $channel
-	 * @since 8.1.0
-	 */
-	public static function setChannel($channel) {
-		\OCP\Server::get(IConfig::class)->setSystemValue('updater.release.channel', $channel);
-	}
-
-	/**
-	 * Get current update channel
-	 * @return string
-	 * @since 8.1.0
-	 * @deprecated 31.0.0 Use \OCP\ServerVersion::getChannel
-	 */
-	public static function getChannel() {
-		return \OCP\Server::get(ServerVersion::class)->getChannel();
-	}
-
-	/**
-	 * check if sharing is disabled for the current user
-	 *
-	 * @return boolean
-	 * @since 7.0.0
-	 * @deprecated 9.1.0 Use Server::get(\OCP\Share\IManager::class)->sharingDisabledForUser
-	 */
-	public static function isSharingDisabledForUser() {
-		if (self::$shareManager === null) {
-			self::$shareManager = Server::get(IManager::class);
-		}
-
-		$user = Server::get(\OCP\IUserSession::class)->getUser();
-
-		return self::$shareManager->sharingDisabledForUser($user?->getUID());
-	}
-
-	/**
-	 * get l10n object
-	 * @since 6.0.0 - parameter $language was added in 8.0.0
-	 */
-	public static function getL10N(string $application, ?string $language = null): IL10N {
-		return Server::get(\OCP\L10N\IFactory::class)->get($application, $language);
-	}
-
-	/**
-	 * Add a css file
-	 *
-	 * @param string $application application id
-	 * @param ?string $file filename
-	 * @param bool $prepend prepend the style to the beginning of the list
-	 * @since 4.0.0
-	 */
-	public static function addStyle(string $application, ?string $file = null, bool $prepend = false): void {
-		\OC_Util::addStyle($application, $file, $prepend);
-	}
-
-	/**
-	 * Add a standalone init js file that is loaded for initialization
-	 *
-	 * Be careful loading scripts using this method as they are loaded early
-	 * and block the initial page rendering. They should not have dependencies
-	 * on any other scripts than core-common and core-main.
-	 *
-	 * @since 28.0.0
-	 */
-	public static function addInitScript(string $application, string $file): void {
-		if (!empty($application)) {
-			$path = "$application/js/$file";
-		} else {
-			$path = "js/$file";
-		}
-
-		// We need to handle the translation BEFORE the init script
-		// is loaded, as the init script might use translations
-		if ($application !== 'core' && !str_contains($file, 'l10n')) {
-			self::addTranslations($application, null, true);
-		}
-
-		self::$scriptsInit[] = $path;
-	}
-
-	/**
-	 * add a javascript file
-	 *
-	 * @param string $application
-	 * @param string|null $file
-	 * @param string $afterAppId
-	 * @param bool $prepend
-	 * @since 4.0.0
-	 */
-	public static function addScript(string $application, ?string $file = null, string $afterAppId = 'core', bool $prepend = false): void {
-		if (!empty($application)) {
-			$path = "$application/js/$file";
-		} else {
-			$path = "js/$file";
-		}
-
-		// Inject js translations if we load a script for
-		// a specific app that is not core, as those js files
-		// need separate handling
-		if ($application !== 'core'
-			&& $file !== null
-			&& !str_contains($file, 'l10n')) {
-			self::addTranslations($application);
-		}
-
-		// store app in dependency list
-		if (!array_key_exists($application, self::$scriptDeps)) {
-			self::$scriptDeps[$application] = new AppScriptDependency($application, [$afterAppId]);
-		} else {
-			self::$scriptDeps[$application]->addDep($afterAppId);
-		}
-
-		if ($prepend) {
-			array_unshift(self::$scripts[$application], $path);
-		} else {
-			self::$scripts[$application][] = $path;
-		}
-	}
-
-	/**
-	 * Return the list of scripts injected to the page
-	 *
-	 * @return array
-	 * @since 24.0.0
-	 */
-	public static function getScripts(): array {
-		// Sort scriptDeps into sortedScriptDeps
-		$scriptSort = \OCP\Server::get(AppScriptSort::class);
-		$sortedScripts = $scriptSort->sort(self::$scripts, self::$scriptDeps);
-
-		// Flatten array and remove duplicates
-		$sortedScripts = array_merge([self::$scriptsInit], $sortedScripts);
-		$sortedScripts = array_merge(...array_values($sortedScripts));
-
-		// Override core-common and core-main order
-		if (in_array('core/js/main', $sortedScripts)) {
-			array_unshift($sortedScripts, 'core/js/main');
-		}
-		if (in_array('core/js/common', $sortedScripts)) {
-			array_unshift($sortedScripts, 'core/js/common');
-		}
-
-		return array_unique($sortedScripts);
-	}
-
-	/**
-	 * Add a translation JS file
-	 * @param string $application application id
-	 * @param string $languageCode language code, defaults to the current locale
-	 * @param bool $init whether the translations should be loaded early or not
-	 * @since 8.0.0
-	 */
-	public static function addTranslations($application, $languageCode = null, $init = false) {
-		if (is_null($languageCode)) {
-			$languageCode = \OCP\Server::get(IFactory::class)->findLanguage($application);
-		}
-		if (!empty($application)) {
-			$path = "$application/l10n/$languageCode";
-		} else {
-			$path = "l10n/$languageCode";
-		}
-
-		if ($init) {
-			self::$scriptsInit[] = $path;
-		} else {
-			self::$scripts[$application][] = $path;
-		}
-	}
-
-	/**
-	 * Add a custom element to the header
-	 * If $text is null then the element will be written as empty element.
-	 * So use "" to get a closing tag.
-	 * @param string $tag tag name of the element
-	 * @param array $attributes array of attributes for the element
-	 * @param string $text the text content for the element
-	 * @since 4.0.0
-	 */
-	public static function addHeader($tag, $attributes, $text = null) {
-		\OC_Util::addHeader($tag, $attributes, $text);
-	}
-
-	/**
-	 * Creates an absolute url to the given app and file.
-	 * @param string $app app
-	 * @param string $file file
-	 * @param array $args array with param=>value, will be appended to the returned url
-	 *                    The value of $args will be urlencoded
-	 * @return string the url
-	 * @since 4.0.0 - parameter $args was added in 4.5.0
-	 */
-	public static function linkToAbsolute($app, $file, $args = []) {
-		$urlGenerator = \OCP\Server::get(IURLGenerator::class);
-		return $urlGenerator->getAbsoluteURL(
-			$urlGenerator->linkTo($app, $file, $args)
-		);
-	}
-
-	/**
-	 * Creates an absolute url for remote use.
-	 * @param string $service id
-	 * @return string the url
-	 * @since 4.0.0
-	 */
-	public static function linkToRemote($service) {
-		$urlGenerator = \OCP\Server::get(IURLGenerator::class);
-		$remoteBase = $urlGenerator->linkTo('', 'remote.php') . '/' . $service;
-		return $urlGenerator->getAbsoluteURL(
-			$remoteBase . (($service[strlen($service) - 1] != '/') ? '/' : '')
-		);
-	}
-
-	/**
-	 * Returns the server host name without an eventual port number
-	 * @return string the server hostname
-	 * @since 5.0.0
-	 */
-	public static function getServerHostName() {
-		$host_name = \OCP\Server::get(IRequest::class)->getServerHost();
-		// strip away port number (if existing)
-		$colon_pos = strpos($host_name, ':');
-		if ($colon_pos != false) {
-			$host_name = substr($host_name, 0, $colon_pos);
-		}
-		return $host_name;
-	}
-
-	/**
-	 * Returns the default email address
-	 * @param string $user_part the user part of the address
-	 * @return string the default email address
-	 *
-	 * Assembles a default email address (using the server hostname
-	 * and the given user part, and returns it
-	 * Example: when given lostpassword-noreply as $user_part param,
-	 *     and is currently accessed via http(s)://example.com/,
-	 *     it would return 'lostpassword-noreply@example.com'
-	 *
-	 * If the configuration value 'mail_from_address' is set in
-	 * config.php, this value will override the $user_part that
-	 * is passed to this function
-	 * @since 5.0.0
-	 */
-	public static function getDefaultEmailAddress(string $user_part): string {
-		$config = \OCP\Server::get(IConfig::class);
-		$user_part = $config->getSystemValueString('mail_from_address', $user_part);
-		$host_name = self::getServerHostName();
-		$host_name = $config->getSystemValueString('mail_domain', $host_name);
-		$defaultEmailAddress = $user_part . '@' . $host_name;
-
-		$emailValidator = \OCP\Server::get(IEmailValidator::class);
-		if ($emailValidator->isValid($defaultEmailAddress)) {
-			return $defaultEmailAddress;
-		}
-
-		// in case we cannot build a valid email address from the hostname let's fallback to 'localhost.localdomain'
-		return $user_part . '@localhost.localdomain';
-	}
-
-	/**
-	 * Converts string to int of float depending on if it fits an int
-	 * @param numeric-string|float|int $number numeric string
-	 * @return int|float int if it fits, float if it is too big
-	 * @since 26.0.0
-	 */
-	public static function numericToNumber(string|float|int $number): int|float {
-		/* This is a hack to cast to (int|float) */
-		return 0 + (string)$number;
-	}
-
-	/**
-	 * Make a human file size (2048 to 2 kB)
-	 * @param int|float $bytes file size in bytes
-	 * @return string a human readable file size
-	 * @since 4.0.0
-	 */
-	public static function humanFileSize(int|float $bytes): string {
-		if ($bytes < 0) {
-			return '?';
-		}
-		if ($bytes < 1024) {
-			return "$bytes B";
-		}
-		$bytes = round($bytes / 1024, 0);
-		if ($bytes < 1024) {
-			return "$bytes KB";
-		}
-		$bytes = round($bytes / 1024, 1);
-		if ($bytes < 1024) {
-			return "$bytes MB";
-		}
-		$bytes = round($bytes / 1024, 1);
-		if ($bytes < 1024) {
-			return "$bytes GB";
-		}
-		$bytes = round($bytes / 1024, 1);
-		if ($bytes < 1024) {
-			return "$bytes TB";
-		}
-
-		$bytes = round($bytes / 1024, 1);
-		return "$bytes PB";
-	}
-
-	/**
-	 * Make a computer file size (2 kB to 2048)
-	 * Inspired by: https://www.php.net/manual/en/function.filesize.php#92418
-	 *
-	 * @param string $str file size in a fancy format
-	 * @return false|int|float a file size in bytes
-	 * @since 4.0.0
-	 */
-	public static function computerFileSize(string $str): false|int|float {
-		$str = strtolower($str);
-		if (is_numeric($str)) {
-			return Util::numericToNumber($str);
-		}
-
-		$bytes_array = [
-			'b' => 1,
-			'k' => 1024,
-			'kb' => 1024,
-			'mb' => 1024 * 1024,
-			'm' => 1024 * 1024,
-			'gb' => 1024 * 1024 * 1024,
-			'g' => 1024 * 1024 * 1024,
-			'tb' => 1024 * 1024 * 1024 * 1024,
-			't' => 1024 * 1024 * 1024 * 1024,
-			'pb' => 1024 * 1024 * 1024 * 1024 * 1024,
-			'p' => 1024 * 1024 * 1024 * 1024 * 1024,
-		];
-
-		$bytes = (float)$str;
-
-		if (preg_match('#([kmgtp]?b?)$#si', $str, $matches) && isset($bytes_array[$matches[1]])) {
-			$bytes *= $bytes_array[$matches[1]];
-		} else {
-			return false;
-		}
-
-		return Util::numericToNumber(round($bytes));
-	}
-
-	/**
-	 * connects a function to a hook
-	 *
-	 * @param string $signalClass class name of emitter
-	 * @param string $signalName name of signal
-	 * @param string|object $slotClass class name of slot
-	 * @param string $slotName name of slot
-	 * @return bool
-	 *
-	 * This function makes it very easy to connect to use hooks.
-	 *
-	 * TODO: write example
-	 * @since 4.0.0
-	 * @deprecated 21.0.0 use \OCP\EventDispatcher\IEventDispatcher::addListener
-	 */
-	public static function connectHook($signalClass, $signalName, $slotClass, $slotName) {
-		return \OC_Hook::connect($signalClass, $signalName, $slotClass, $slotName);
-	}
-
-	/**
-	 * Emits a signal. To get data from the slot use references!
-	 * @param string $signalclass class name of emitter
-	 * @param string $signalname name of signal
-	 * @param array $params default: array() array with additional data
-	 * @return bool true if slots exists or false if not
-	 *
-	 * TODO: write example
-	 * @since 4.0.0
-	 * @deprecated 21.0.0 use \OCP\EventDispatcher\IEventDispatcher::dispatchTypedEvent
-	 */
-	public static function emitHook($signalclass, $signalname, $params = []) {
-		return \OC_Hook::emit($signalclass, $signalname, $params);
-	}
-
-	/**
-	 * Cached encrypted CSRF token. Some static unit-tests of ownCloud compare
-	 * multiple Template elements which invoke `callRegister`. If the value
-	 * would not be cached these unit-tests would fail.
-	 * @var string
-	 */
-	private static $token = '';
-
-	/**
-	 * Register an get/post call. This is important to prevent CSRF attacks
-	 * @since 4.5.0
-	 * @deprecated 32.0.0 directly use CsrfTokenManager instead
-	 */
-	public static function callRegister() {
-		if (self::$token === '') {
-			self::$token = \OCP\Server::get(CsrfTokenManager::class)->getToken()->getEncryptedValue();
-		}
-		return self::$token;
-	}
-
-	/**
-	 * Used to sanitize HTML
-	 *
-	 * This function is used to sanitize HTML and should be applied on any
-	 * string or array of strings before displaying it on a web page.
-	 *
-	 * @param string|string[] $value
-	 * @return ($value is array ? string[] : string) an array of sanitized strings or a single sanitized string, depends on the input parameter.
-	 * @since 4.5.0
-	 */
-	public static function sanitizeHTML($value) {
-		return \OC_Util::sanitizeHTML($value);
-	}
-
-	/**
-	 * Public function to encode url parameters
-	 *
-	 * This function is used to encode path to file before output.
-	 * Encoding is done according to RFC 3986 with one exception:
-	 * Character '/' is preserved as is.
-	 *
-	 * @param string $component part of URI to encode
-	 * @return string
-	 * @since 6.0.0
-	 */
-	public static function encodePath($component) {
-		return \OC_Util::encodePath($component);
-	}
-
-	/**
-	 * Returns an array with all keys from input lowercased or uppercased. Numbered indices are left as is.
-	 *
-	 * @param array $input The array to work on
-	 * @param int $case Either MB_CASE_UPPER or MB_CASE_LOWER (default)
-	 * @param string $encoding The encoding parameter is the character encoding. Defaults to UTF-8
-	 * @return array
-	 * @since 4.5.0
-	 */
-	public static function mb_array_change_key_case($input, $case = MB_CASE_LOWER, $encoding = 'UTF-8') {
-		$case = ($case != MB_CASE_UPPER) ? MB_CASE_LOWER : MB_CASE_UPPER;
-		$ret = [];
-		foreach ($input as $k => $v) {
-			$ret[mb_convert_case($k, $case, $encoding)] = $v;
-		}
-		return $ret;
-	}
-
-	/**
-	 * performs a search in a nested array
-	 *
-	 * @param array $haystack the array to be searched
-	 * @param string $needle the search string
-	 * @param mixed $index optional, only search this key name
-	 * @return mixed the key of the matching field, otherwise false
-	 * @since 4.5.0
-	 * @deprecated 15.0.0
-	 */
-	public static function recursiveArraySearch($haystack, $needle, $index = null) {
-		$aIt = new \RecursiveArrayIterator($haystack);
-		$it = new \RecursiveIteratorIterator($aIt);
-
-		while ($it->valid()) {
-			if (((isset($index) && ($it->key() == $index)) || !isset($index)) && ($it->current() == $needle)) {
-				return $aIt->key();
-			}
-
-			$it->next();
-		}
-
-		return false;
-	}
-
-	/**
-	 * calculates the maximum upload size respecting system settings, free space and user quota
-	 *
-	 * @param string $dir the current folder where the user currently operates
-	 * @param int|float|null $free the number of bytes free on the storage holding $dir, if not set this will be received from the storage directly
-	 * @return int|float number of bytes representing
-	 * @since 5.0.0
-	 */
-	public static function maxUploadFilesize(string $dir, int|float|null $free = null): int|float {
-		if (is_null($free) || $free < 0) {
-			$free = self::freeSpace($dir);
-		}
-		return min($free, self::uploadLimit());
-	}
-
-	/**
-	 * Calculate free space left within user quota
-	 * @param string $dir the current folder where the user currently operates
-	 * @return int|float number of bytes representing
-	 * @since 7.0.0
-	 */
-	public static function freeSpace(string $dir): int|float {
-		$freeSpace = \OC\Files\Filesystem::free_space($dir);
-		if ($freeSpace < \OCP\Files\FileInfo::SPACE_UNLIMITED) {
-			$freeSpace = max($freeSpace, 0);
-			return $freeSpace;
-		} else {
-			return (INF > 0)? INF: PHP_INT_MAX; // work around https://bugs.php.net/bug.php?id=69188
-		}
-	}
-
-	/**
-	 * Calculate PHP upload limit
-	 *
-	 * @return int|float number of bytes representing
-	 * @since 7.0.0
-	 */
-	public static function uploadLimit(): int|float {
-		$ini = Server::get(IniGetWrapper::class);
-		$upload_max_filesize = self::computerFileSize($ini->get('upload_max_filesize')) ?: 0;
-		$post_max_size = self::computerFileSize($ini->get('post_max_size')) ?: 0;
-		if ($upload_max_filesize === 0 && $post_max_size === 0) {
-			return INF;
-		} elseif ($upload_max_filesize === 0 || $post_max_size === 0) {
-			return max($upload_max_filesize, $post_max_size); //only the non 0 value counts
-		} else {
-			return min($upload_max_filesize, $post_max_size);
-		}
-	}
-
-	/**
-	 * Compare two strings to provide a natural sort
-	 * @param string $a first string to compare
-	 * @param string $b second string to compare
-	 * @return int -1 if $b comes before $a, 1 if $a comes before $b
-	 *             or 0 if the strings are identical
-	 * @since 7.0.0
-	 */
-	public static function naturalSortCompare($a, $b) {
-		return \OC\NaturalSort::getInstance()->compare($a, $b);
-	}
-
-	/**
-	 * Check if a password is required for each public link
-	 *
-	 * @param bool $checkGroupMembership Check group membership exclusion
-	 * @return boolean
-	 * @since 7.0.0
-	 */
-	public static function isPublicLinkPasswordRequired(bool $checkGroupMembership = true) {
-		return \OC_Util::isPublicLinkPasswordRequired($checkGroupMembership);
-	}
-
-	/**
-	 * check if share API enforces a default expire date
-	 * @return boolean
-	 * @since 8.0.0
-	 */
-	public static function isDefaultExpireDateEnforced() {
-		return \OC_Util::isDefaultExpireDateEnforced();
-	}
-
-	protected static $needUpgradeCache = null;
-
-	/**
-	 * Checks whether the current version needs upgrade.
-	 *
-	 * @return bool true if upgrade is needed, false otherwise
-	 * @since 7.0.0
-	 */
-	public static function needUpgrade() {
-		if (!isset(self::$needUpgradeCache)) {
-			self::$needUpgradeCache = \OC_Util::needUpgrade(\OCP\Server::get(\OC\SystemConfig::class));
-		}
-		return self::$needUpgradeCache;
-	}
-
-	/**
-	 * Sometimes a string has to be shortened to fit within a certain maximum
-	 * data length in bytes. substr() you may break multibyte characters,
-	 * because it operates on single byte level. mb_substr() operates on
-	 * characters, so does not ensure that the shortened string satisfies the
-	 * max length in bytes.
-	 *
-	 * For example, json_encode is messing with multibyte characters a lot,
-	 * replacing them with something along "\u1234".
-	 *
-	 * This function shortens the string with by $accuracy (-5) from
-	 * $dataLength characters, until it fits within $dataLength bytes.
-	 *
-	 * @since 23.0.0
-	 */
-	public static function shortenMultibyteString(string $subject, int $dataLength, int $accuracy = 5): string {
-		$temp = mb_substr($subject, 0, $dataLength);
-		// json encodes encapsulates the string in double quotes, they need to be substracted
-		while ((strlen(json_encode($temp)) - 2) > $dataLength) {
-			$temp = mb_substr($temp, 0, -$accuracy);
-		}
-		return $temp;
-	}
-
-	/**
-	 * Check if a function is enabled in the php configuration
-	 *
-	 * @since 25.0.0
-	 */
-	public static function isFunctionEnabled(string $functionName): bool {
-		if (!function_exists($functionName)) {
-			return false;
-		}
-		$ini = Server::get(IniGetWrapper::class);
-		$disabled = explode(',', $ini->get('disable_functions') ?: '');
-		$disabled = array_map('trim', $disabled);
-		if (in_array($functionName, $disabled)) {
-			return false;
-		}
-		return true;
-	}
+    private static ?IManager $shareManager = null;
+
+    private static array $scriptsInit = [];
+    private static array $scripts = [];
+    private static array $scriptDeps = [];
+
+    /**
+     * get the current installed version of Nextcloud
+     * @return array
+     * @since 4.0.0
+     * @deprecated 31.0.0 Use \OCP\ServerVersion::getVersion
+     */
+    public static function getVersion() {
+        return Server::get(ServerVersion::class)->getVersion();
+    }
+
+    /**
+     * @since 17.0.0
+     */
+    public static function hasExtendedSupport(): bool {
+        try {
+            /** @var \OCP\Support\Subscription\IRegistry */
+            $subscriptionRegistry = Server::get(\OCP\Support\Subscription\IRegistry::class);
+            return $subscriptionRegistry->delegateHasExtendedSupport();
+        } catch (ContainerExceptionInterface $e) {
+        }
+        return \OCP\Server::get(IConfig::class)->getSystemValueBool('extendedSupport', false);
+    }
+
+    /**
+     * Set current update channel
+     * @param string $channel
+     * @since 8.1.0
+     */
+    public static function setChannel($channel) {
+        \OCP\Server::get(IConfig::class)->setSystemValue('updater.release.channel', $channel);
+    }
+
+    /**
+     * Get current update channel
+     * @return string
+     * @since 8.1.0
+     * @deprecated 31.0.0 Use \OCP\ServerVersion::getChannel
+     */
+    public static function getChannel() {
+        return \OCP\Server::get(ServerVersion::class)->getChannel();
+    }
+
+    /**
+     * check if sharing is disabled for the current user
+     *
+     * @return boolean
+     * @since 7.0.0
+     * @deprecated 9.1.0 Use Server::get(\OCP\Share\IManager::class)->sharingDisabledForUser
+     */
+    public static function isSharingDisabledForUser() {
+        if (self::$shareManager === null) {
+            self::$shareManager = Server::get(IManager::class);
+        }
+
+        $user = Server::get(\OCP\IUserSession::class)->getUser();
+
+        return self::$shareManager->sharingDisabledForUser($user?->getUID());
+    }
+
+    /**
+     * get l10n object
+     * @since 6.0.0 - parameter $language was added in 8.0.0
+     */
+    public static function getL10N(string $application, ?string $language = null): IL10N {
+        return Server::get(\OCP\L10N\IFactory::class)->get($application, $language);
+    }
+
+    /**
+     * Add a css file
+     *
+     * @param string $application application id
+     * @param ?string $file filename
+     * @param bool $prepend prepend the style to the beginning of the list
+     * @since 4.0.0
+     */
+    public static function addStyle(string $application, ?string $file = null, bool $prepend = false): void {
+        \OC_Util::addStyle($application, $file, $prepend);
+    }
+
+    /**
+     * Add a standalone init js file that is loaded for initialization
+     *
+     * Be careful loading scripts using this method as they are loaded early
+     * and block the initial page rendering. They should not have dependencies
+     * on any other scripts than core-common and core-main.
+     *
+     * @since 28.0.0
+     */
+    public static function addInitScript(string $application, string $file): void {
+        if (!empty($application)) {
+            $path = "$application/js/$file";
+        } else {
+            $path = "js/$file";
+        }
+
+        // We need to handle the translation BEFORE the init script
+        // is loaded, as the init script might use translations
+        if ($application !== 'core' && !str_contains($file, 'l10n')) {
+            self::addTranslations($application, null, true);
+        }
+
+        self::$scriptsInit[] = $path;
+    }
+
+    /**
+     * add a javascript file
+     *
+     * @param string $application
+     * @param string|null $file
+     * @param string $afterAppId
+     * @param bool $prepend
+     * @since 4.0.0
+     */
+    public static function addScript(string $application, ?string $file = null, string $afterAppId = 'core', bool $prepend = false): void {
+        if (!empty($application)) {
+            $path = "$application/js/$file";
+        } else {
+            $path = "js/$file";
+        }
+
+        // Inject js translations if we load a script for
+        // a specific app that is not core, as those js files
+        // need separate handling
+        if ($application !== 'core'
+            && $file !== null
+            && !str_contains($file, 'l10n')) {
+            self::addTranslations($application);
+        }
+
+        // store app in dependency list
+        if (!array_key_exists($application, self::$scriptDeps)) {
+            self::$scriptDeps[$application] = new AppScriptDependency($application, [$afterAppId]);
+        } else {
+            self::$scriptDeps[$application]->addDep($afterAppId);
+        }
+
+        if ($prepend) {
+            array_unshift(self::$scripts[$application], $path);
+        } else {
+            self::$scripts[$application][] = $path;
+        }
+    }
+
+    /**
+     * Return the list of scripts injected to the page
+     *
+     * @return array
+     * @since 24.0.0
+     */
+    public static function getScripts(): array {
+        // Sort scriptDeps into sortedScriptDeps
+        $scriptSort = \OCP\Server::get(AppScriptSort::class);
+        $sortedScripts = $scriptSort->sort(self::$scripts, self::$scriptDeps);
+
+        // Flatten array and remove duplicates
+        $sortedScripts = array_merge([self::$scriptsInit], $sortedScripts);
+        $sortedScripts = array_merge(...array_values($sortedScripts));
+
+        // Override core-common and core-main order
+        if (in_array('core/js/main', $sortedScripts)) {
+            array_unshift($sortedScripts, 'core/js/main');
+        }
+        if (in_array('core/js/common', $sortedScripts)) {
+            array_unshift($sortedScripts, 'core/js/common');
+        }
+
+        return array_unique($sortedScripts);
+    }
+
+    /**
+     * Add a translation JS file
+     * @param string $application application id
+     * @param string $languageCode language code, defaults to the current locale
+     * @param bool $init whether the translations should be loaded early or not
+     * @since 8.0.0
+     */
+    public static function addTranslations($application, $languageCode = null, $init = false) {
+        if (is_null($languageCode)) {
+            $languageCode = \OCP\Server::get(IFactory::class)->findLanguage($application);
+        }
+        if (!empty($application)) {
+            $path = "$application/l10n/$languageCode";
+        } else {
+            $path = "l10n/$languageCode";
+        }
+
+        if ($init) {
+            self::$scriptsInit[] = $path;
+        } else {
+            self::$scripts[$application][] = $path;
+        }
+    }
+
+    /**
+     * Add a custom element to the header
+     * If $text is null then the element will be written as empty element.
+     * So use "" to get a closing tag.
+     * @param string $tag tag name of the element
+     * @param array $attributes array of attributes for the element
+     * @param string $text the text content for the element
+     * @since 4.0.0
+     */
+    public static function addHeader($tag, $attributes, $text = null) {
+        \OC_Util::addHeader($tag, $attributes, $text);
+    }
+
+    /**
+     * Creates an absolute url to the given app and file.
+     * @param string $app app
+     * @param string $file file
+     * @param array $args array with param=>value, will be appended to the returned url
+     *                    The value of $args will be urlencoded
+     * @return string the url
+     * @since 4.0.0 - parameter $args was added in 4.5.0
+     */
+    public static function linkToAbsolute($app, $file, $args = []) {
+        $urlGenerator = \OCP\Server::get(IURLGenerator::class);
+        return $urlGenerator->getAbsoluteURL(
+            $urlGenerator->linkTo($app, $file, $args)
+        );
+    }
+
+    /**
+     * Creates an absolute url for remote use.
+     * @param string $service id
+     * @return string the url
+     * @since 4.0.0
+     */
+    public static function linkToRemote($service) {
+        $urlGenerator = \OCP\Server::get(IURLGenerator::class);
+        $remoteBase = $urlGenerator->linkTo('', 'remote.php') . '/' . $service;
+        return $urlGenerator->getAbsoluteURL(
+            $remoteBase . (($service[strlen($service) - 1] != '/') ? '/' : '')
+        );
+    }
+
+    /**
+     * Returns the server host name without an eventual port number
+     * @return string the server hostname
+     * @since 5.0.0
+     */
+    public static function getServerHostName() {
+        $host_name = \OCP\Server::get(IRequest::class)->getServerHost();
+        // strip away port number (if existing)
+        $colon_pos = strpos($host_name, ':');
+        if ($colon_pos != false) {
+            $host_name = substr($host_name, 0, $colon_pos);
+        }
+        return $host_name;
+    }
+
+    /**
+     * Returns the default email address
+     * @param string $user_part the user part of the address
+     * @return string the default email address
+     *
+     * Assembles a default email address (using the server hostname
+     * and the given user part, and returns it
+     * Example: when given lostpassword-noreply as $user_part param,
+     *     and is currently accessed via http(s)://example.com/,
+     *     it would return 'lostpassword-noreply@example.com'
+     *
+     * If the configuration value 'mail_from_address' is set in
+     * config.php, this value will override the $user_part that
+     * is passed to this function
+     * @since 5.0.0
+     */
+    public static function getDefaultEmailAddress(string $user_part): string {
+        $config = \OCP\Server::get(IConfig::class);
+        $user_part = $config->getSystemValueString('mail_from_address', $user_part);
+        $host_name = self::getServerHostName();
+        $host_name = $config->getSystemValueString('mail_domain', $host_name);
+        $defaultEmailAddress = $user_part . '@' . $host_name;
+
+        $emailValidator = \OCP\Server::get(IEmailValidator::class);
+        if ($emailValidator->isValid($defaultEmailAddress)) {
+            return $defaultEmailAddress;
+        }
+
+        // in case we cannot build a valid email address from the hostname let's fallback to 'localhost.localdomain'
+        return $user_part . '@localhost.localdomain';
+    }
+
+    /**
+     * Converts string to int of float depending on if it fits an int
+     * @param numeric-string|float|int $number numeric string
+     * @return int|float int if it fits, float if it is too big
+     * @since 26.0.0
+     */
+    public static function numericToNumber(string|float|int $number): int|float {
+        /* This is a hack to cast to (int|float) */
+        return 0 + (string)$number;
+    }
+
+    /**
+     * Make a human file size (2048 to 2 kB)
+     * @param int|float $bytes file size in bytes
+     * @return string a human readable file size
+     * @since 4.0.0
+     */
+    public static function humanFileSize(int|float $bytes): string {
+        if ($bytes < 0) {
+            return '?';
+        }
+        if ($bytes < 1024) {
+            return "$bytes B";
+        }
+        $bytes = round($bytes / 1024, 0);
+        if ($bytes < 1024) {
+            return "$bytes KB";
+        }
+        $bytes = round($bytes / 1024, 1);
+        if ($bytes < 1024) {
+            return "$bytes MB";
+        }
+        $bytes = round($bytes / 1024, 1);
+        if ($bytes < 1024) {
+            return "$bytes GB";
+        }
+        $bytes = round($bytes / 1024, 1);
+        if ($bytes < 1024) {
+            return "$bytes TB";
+        }
+
+        $bytes = round($bytes / 1024, 1);
+        return "$bytes PB";
+    }
+
+    /**
+     * Make a computer file size (2 kB to 2048)
+     * Inspired by: https://www.php.net/manual/en/function.filesize.php#92418
+     *
+     * @param string $str file size in a fancy format
+     * @return false|int|float a file size in bytes
+     * @since 4.0.0
+     */
+    public static function computerFileSize(string $str): false|int|float {
+        $str = strtolower($str);
+        if (is_numeric($str)) {
+            return Util::numericToNumber($str);
+        }
+
+        $bytes_array = [
+            'b' => 1,
+            'k' => 1024,
+            'kb' => 1024,
+            'mb' => 1024 * 1024,
+            'm' => 1024 * 1024,
+            'gb' => 1024 * 1024 * 1024,
+            'g' => 1024 * 1024 * 1024,
+            'tb' => 1024 * 1024 * 1024 * 1024,
+            't' => 1024 * 1024 * 1024 * 1024,
+            'pb' => 1024 * 1024 * 1024 * 1024 * 1024,
+            'p' => 1024 * 1024 * 1024 * 1024 * 1024,
+        ];
+
+        $bytes = (float)$str;
+
+        if (preg_match('#([kmgtp]?b?)$#si', $str, $matches) && isset($bytes_array[$matches[1]])) {
+            $bytes *= $bytes_array[$matches[1]];
+        } else {
+            return false;
+        }
+
+        return Util::numericToNumber(round($bytes));
+    }
+
+    /**
+     * connects a function to a hook
+     *
+     * @param string $signalClass class name of emitter
+     * @param string $signalName name of signal
+     * @param string|object $slotClass class name of slot
+     * @param string $slotName name of slot
+     * @return bool
+     *
+     * This function makes it very easy to connect to use hooks.
+     *
+     * TODO: write example
+     * @since 4.0.0
+     * @deprecated 21.0.0 use \OCP\EventDispatcher\IEventDispatcher::addListener
+     */
+    public static function connectHook($signalClass, $signalName, $slotClass, $slotName) {
+        return \OC_Hook::connect($signalClass, $signalName, $slotClass, $slotName);
+    }
+
+    /**
+     * Emits a signal. To get data from the slot use references!
+     * @param string $signalclass class name of emitter
+     * @param string $signalname name of signal
+     * @param array $params default: array() array with additional data
+     * @return bool true if slots exists or false if not
+     *
+     * TODO: write example
+     * @since 4.0.0
+     * @deprecated 21.0.0 use \OCP\EventDispatcher\IEventDispatcher::dispatchTypedEvent
+     */
+    public static function emitHook($signalclass, $signalname, $params = []) {
+        return \OC_Hook::emit($signalclass, $signalname, $params);
+    }
+
+    /**
+     * Cached encrypted CSRF token. Some static unit-tests of ownCloud compare
+     * multiple Template elements which invoke `callRegister`. If the value
+     * would not be cached these unit-tests would fail.
+     * @var string
+     */
+    private static $token = '';
+
+    /**
+     * Register an get/post call. This is important to prevent CSRF attacks
+     * @since 4.5.0
+     * @deprecated 32.0.0 directly use CsrfTokenManager instead
+     */
+    public static function callRegister() {
+        if (self::$token === '') {
+            self::$token = \OCP\Server::get(CsrfTokenManager::class)->getToken()->getEncryptedValue();
+        }
+        return self::$token;
+    }
+
+    /**
+     * Used to sanitize HTML
+     *
+     * This function is used to sanitize HTML and should be applied on any
+     * string or array of strings before displaying it on a web page.
+     *
+     * @param string|string[] $value
+     * @return ($value is array ? string[] : string) an array of sanitized strings or a single sanitized string, depends on the input parameter.
+     * @since 4.5.0
+     */
+    public static function sanitizeHTML($value) {
+        return \OC_Util::sanitizeHTML($value);
+    }
+
+    /**
+     * Public function to encode url parameters
+     *
+     * This function is used to encode path to file before output.
+     * Encoding is done according to RFC 3986 with one exception:
+     * Character '/' is preserved as is.
+     *
+     * @param string $component part of URI to encode
+     * @return string
+     * @since 6.0.0
+     */
+    public static function encodePath($component) {
+        return \OC_Util::encodePath($component);
+    }
+
+    /**
+     * Returns an array with all keys from input lowercased or uppercased. Numbered indices are left as is.
+     *
+     * @param array $input The array to work on
+     * @param int $case Either MB_CASE_UPPER or MB_CASE_LOWER (default)
+     * @param string $encoding The encoding parameter is the character encoding. Defaults to UTF-8
+     * @return array
+     * @since 4.5.0
+     */
+    public static function mb_array_change_key_case($input, $case = MB_CASE_LOWER, $encoding = 'UTF-8') {
+        $case = ($case != MB_CASE_UPPER) ? MB_CASE_LOWER : MB_CASE_UPPER;
+        $ret = [];
+        foreach ($input as $k => $v) {
+            $ret[mb_convert_case($k, $case, $encoding)] = $v;
+        }
+        return $ret;
+    }
+
+    /**
+     * performs a search in a nested array
+     *
+     * @param array $haystack the array to be searched
+     * @param string $needle the search string
+     * @param mixed $index optional, only search this key name
+     * @return mixed the key of the matching field, otherwise false
+     * @since 4.5.0
+     * @deprecated 15.0.0
+     */
+    public static function recursiveArraySearch($haystack, $needle, $index = null) {
+        $aIt = new \RecursiveArrayIterator($haystack);
+        $it = new \RecursiveIteratorIterator($aIt);
+
+        while ($it->valid()) {
+            if (((isset($index) && ($it->key() == $index)) || !isset($index)) && ($it->current() == $needle)) {
+                return $aIt->key();
+            }
+
+            $it->next();
+        }
+
+        return false;
+    }
+
+    /**
+     * calculates the maximum upload size respecting system settings, free space and user quota
+     *
+     * @param string $dir the current folder where the user currently operates
+     * @param int|float|null $free the number of bytes free on the storage holding $dir, if not set this will be received from the storage directly
+     * @return int|float number of bytes representing
+     * @since 5.0.0
+     */
+    public static function maxUploadFilesize(string $dir, int|float|null $free = null): int|float {
+        if (is_null($free) || $free < 0) {
+            $free = self::freeSpace($dir);
+        }
+        return min($free, self::uploadLimit());
+    }
+
+    /**
+     * Calculate free space left within user quota
+     * @param string $dir the current folder where the user currently operates
+     * @return int|float number of bytes representing
+     * @since 7.0.0
+     */
+    public static function freeSpace(string $dir): int|float {
+        $freeSpace = \OC\Files\Filesystem::free_space($dir);
+        if ($freeSpace < \OCP\Files\FileInfo::SPACE_UNLIMITED) {
+            $freeSpace = max($freeSpace, 0);
+            return $freeSpace;
+        } else {
+            return (INF > 0)? INF: PHP_INT_MAX; // work around https://bugs.php.net/bug.php?id=69188
+        }
+    }
+
+    /**
+     * Calculate PHP upload limit
+     *
+     * @return int|float number of bytes representing
+     * @since 7.0.0
+     */
+    public static function uploadLimit(): int|float {
+        $ini = Server::get(IniGetWrapper::class);
+        $upload_max_filesize = self::computerFileSize($ini->get('upload_max_filesize')) ?: 0;
+        $post_max_size = self::computerFileSize($ini->get('post_max_size')) ?: 0;
+        if ($upload_max_filesize === 0 && $post_max_size === 0) {
+            return INF;
+        } elseif ($upload_max_filesize === 0 || $post_max_size === 0) {
+            return max($upload_max_filesize, $post_max_size); //only the non 0 value counts
+        } else {
+            return min($upload_max_filesize, $post_max_size);
+        }
+    }
+
+    /**
+     * Compare two strings to provide a natural sort
+     * @param string $a first string to compare
+     * @param string $b second string to compare
+     * @return int -1 if $b comes before $a, 1 if $a comes before $b
+     *             or 0 if the strings are identical
+     * @since 7.0.0
+     */
+    public static function naturalSortCompare($a, $b) {
+        return \OC\NaturalSort::getInstance()->compare($a, $b);
+    }
+
+    /**
+     * Check if a password is required for each public link
+     *
+     * @param bool $checkGroupMembership Check group membership exclusion
+     * @return boolean
+     * @since 7.0.0
+     */
+    public static function isPublicLinkPasswordRequired(bool $checkGroupMembership = true) {
+        return \OC_Util::isPublicLinkPasswordRequired($checkGroupMembership);
+    }
+
+    /**
+     * check if share API enforces a default expire date
+     * @return boolean
+     * @since 8.0.0
+     */
+    public static function isDefaultExpireDateEnforced() {
+        return \OC_Util::isDefaultExpireDateEnforced();
+    }
+
+    protected static $needUpgradeCache = null;
+
+    /**
+     * Checks whether the current version needs upgrade.
+     *
+     * @return bool true if upgrade is needed, false otherwise
+     * @since 7.0.0
+     */
+    public static function needUpgrade() {
+        if (!isset(self::$needUpgradeCache)) {
+            self::$needUpgradeCache = \OC_Util::needUpgrade(\OCP\Server::get(\OC\SystemConfig::class));
+        }
+        return self::$needUpgradeCache;
+    }
+
+    /**
+     * Sometimes a string has to be shortened to fit within a certain maximum
+     * data length in bytes. substr() you may break multibyte characters,
+     * because it operates on single byte level. mb_substr() operates on
+     * characters, so does not ensure that the shortened string satisfies the
+     * max length in bytes.
+     *
+     * For example, json_encode is messing with multibyte characters a lot,
+     * replacing them with something along "\u1234".
+     *
+     * This function shortens the string with by $accuracy (-5) from
+     * $dataLength characters, until it fits within $dataLength bytes.
+     *
+     * @since 23.0.0
+     */
+    public static function shortenMultibyteString(string $subject, int $dataLength, int $accuracy = 5): string {
+        $temp = mb_substr($subject, 0, $dataLength);
+        // json encodes encapsulates the string in double quotes, they need to be substracted
+        while ((strlen(json_encode($temp)) - 2) > $dataLength) {
+            $temp = mb_substr($temp, 0, -$accuracy);
+        }
+        return $temp;
+    }
+
+    /**
+     * Check if a function is enabled in the php configuration
+     *
+     * @since 25.0.0
+     */
+    public static function isFunctionEnabled(string $functionName): bool {
+        if (!function_exists($functionName)) {
+            return false;
+        }
+        $ini = Server::get(IniGetWrapper::class);
+        $disabled = explode(',', $ini->get('disable_functions') ?: '');
+        $disabled = array_map('trim', $disabled);
+        if (in_array($functionName, $disabled)) {
+            return false;
+        }
+        return true;
+    }
 }

Spacing +13 added lines, -13 removed lines

@@ -261,9 +261,9 @@ 
 	 */
 	public static function linkToRemote($service) {
 		$urlGenerator = \OCP\Server::get(IURLGenerator::class);
-		$remoteBase = $urlGenerator->linkTo('', 'remote.php') . '/' . $service;
+		$remoteBase = $urlGenerator->linkTo('', 'remote.php').'/'.$service;
 		return $urlGenerator->getAbsoluteURL(
-			$remoteBase . (($service[strlen($service) - 1] != '/') ? '/' : '')
+			$remoteBase.(($service[strlen($service) - 1] != '/') ? '/' : '')
 		);
 	}
 
@@ -303,7 +303,7 @@ 
 		$user_part = $config->getSystemValueString('mail_from_address', $user_part);
 		$host_name = self::getServerHostName();
 		$host_name = $config->getSystemValueString('mail_domain', $host_name);
-		$defaultEmailAddress = $user_part . '@' . $host_name;
+		$defaultEmailAddress = $user_part.'@'.$host_name;
 
 		$emailValidator = \OCP\Server::get(IEmailValidator::class);
 		if ($emailValidator->isValid($defaultEmailAddress)) {
@@ -311,7 +311,7 @@ 
 		}
 
 		// in case we cannot build a valid email address from the hostname let's fallback to 'localhost.localdomain'
-		return $user_part . '@localhost.localdomain';
+		return $user_part.'@localhost.localdomain';
 	}
 
 	/**
@@ -320,9 +320,9 @@ 
 	 * @return int|float int if it fits, float if it is too big
 	 * @since 26.0.0
 	 */
-	public static function numericToNumber(string|float|int $number): int|float {
+	public static function numericToNumber(string | float | int $number): int | float {
 		/* This is a hack to cast to (int|float) */
-		return 0 + (string)$number;
+		return 0 + (string) $number;
 	}
 
 	/**
@@ -331,7 +331,7 @@ 
 	 * @return string a human readable file size
 	 * @since 4.0.0
 	 */
-	public static function humanFileSize(int|float $bytes): string {
+	public static function humanFileSize(int | float $bytes): string {
 		if ($bytes < 0) {
 			return '?';
 		}
@@ -367,7 +367,7 @@ 
 	 * @return false|int|float a file size in bytes
 	 * @since 4.0.0
 	 */
-	public static function computerFileSize(string $str): false|int|float {
+	public static function computerFileSize(string $str): false | int | float {
 		$str = strtolower($str);
 		if (is_numeric($str)) {
 			return Util::numericToNumber($str);
@@ -387,7 +387,7 @@ 
 			'p' => 1024 * 1024 * 1024 * 1024 * 1024,
 		];
 
-		$bytes = (float)$str;
+		$bytes = (float) $str;
 
 		if (preg_match('#([kmgtp]?b?)$#si', $str, $matches) && isset($bytes_array[$matches[1]])) {
 			$bytes *= $bytes_array[$matches[1]];
@@ -532,7 +532,7 @@ 
 	 * @return int|float number of bytes representing
 	 * @since 5.0.0
 	 */
-	public static function maxUploadFilesize(string $dir, int|float|null $free = null): int|float {
+	public static function maxUploadFilesize(string $dir, int | float | null $free = null): int | float {
 		if (is_null($free) || $free < 0) {
 			$free = self::freeSpace($dir);
 		}
@@ -545,13 +545,13 @@ 
 	 * @return int|float number of bytes representing
 	 * @since 7.0.0
 	 */
-	public static function freeSpace(string $dir): int|float {
+	public static function freeSpace(string $dir): int | float {
 		$freeSpace = \OC\Files\Filesystem::free_space($dir);
 		if ($freeSpace < \OCP\Files\FileInfo::SPACE_UNLIMITED) {
 			$freeSpace = max($freeSpace, 0);
 			return $freeSpace;
 		} else {
-			return (INF > 0)? INF: PHP_INT_MAX; // work around https://bugs.php.net/bug.php?id=69188
+			return (INF > 0) ? INF: PHP_INT_MAX; // work around https://bugs.php.net/bug.php?id=69188
 		}
 	}
 
@@ -561,7 +561,7 @@ 
 	 * @return int|float number of bytes representing
 	 * @since 7.0.0
 	 */
-	public static function uploadLimit(): int|float {
+	public static function uploadLimit(): int | float {
 		$ini = Server::get(IniGetWrapper::class);
 		$upload_max_filesize = self::computerFileSize($ini->get('upload_max_filesize')) ?: 0;
 		$post_max_size = self::computerFileSize($ini->get('post_max_size')) ?: 0;

lib/private/Collaboration/Collaborators/MailPlugin.php

Indentation +236 added lines, -236 removed lines

@@ -21,242 +21,242 @@
 use OCP\Share\IShare;
 
 class MailPlugin implements ISearchPlugin {
-	protected bool $shareWithGroupOnly;
-
-	protected bool $shareeEnumeration;
-
-	protected bool $shareeEnumerationInGroupOnly;
-
-	protected bool $shareeEnumerationPhone;
-
-	protected bool $shareeEnumerationFullMatch;
-
-	protected bool $shareeEnumerationFullMatchEmail;
-
-	public function __construct(
-		private IManager $contactsManager,
-		private ICloudIdManager $cloudIdManager,
-		private IConfig $config,
-		private IGroupManager $groupManager,
-		private KnownUserService $knownUserService,
-		private IUserSession $userSession,
-		private IEmailValidator $emailValidator,
-		private mixed $shareWithGroupOnlyExcludeGroupsList = [],
-	) {
-		$this->shareeEnumeration = $this->config->getAppValue('core', 'shareapi_allow_share_dialog_user_enumeration', 'yes') === 'yes';
-		$this->shareWithGroupOnly = $this->config->getAppValue('core', 'shareapi_only_share_with_group_members', 'no') === 'yes';
-		$this->shareeEnumerationInGroupOnly = $this->shareeEnumeration && $this->config->getAppValue('core', 'shareapi_restrict_user_enumeration_to_group', 'no') === 'yes';
-		$this->shareeEnumerationPhone = $this->shareeEnumeration && $this->config->getAppValue('core', 'shareapi_restrict_user_enumeration_to_phone', 'no') === 'yes';
-		$this->shareeEnumerationFullMatch = $this->config->getAppValue('core', 'shareapi_restrict_user_enumeration_full_match', 'yes') === 'yes';
-		$this->shareeEnumerationFullMatchEmail = $this->config->getAppValue('core', 'shareapi_restrict_user_enumeration_full_match_email', 'yes') === 'yes';
-
-		if ($this->shareWithGroupOnly) {
-			$this->shareWithGroupOnlyExcludeGroupsList = json_decode($this->config->getAppValue('core', 'shareapi_only_share_with_group_members_exclude_group_list', ''), true) ?? [];
-		}
-	}
-
-	/**
-	 * {@inheritdoc}
-	 */
-	public function search($search, $limit, $offset, ISearchResult $searchResult): bool {
-		if ($this->shareeEnumerationFullMatch && !$this->shareeEnumerationFullMatchEmail) {
-			return false;
-		}
-
-		// Extract the email address from "Foo Bar <foo.bar@example.tld>" and then search with "foo.bar@example.tld" instead
-		$result = preg_match('/<([^@]+@.+)>$/', $search, $matches);
-		if ($result && filter_var($matches[1], FILTER_VALIDATE_EMAIL)) {
-			return $this->search($matches[1], $limit, $offset, $searchResult);
-		}
-
-		$currentUserId = $this->userSession->getUser()->getUID();
-
-		$result = $userResults = ['wide' => [], 'exact' => []];
-		$userType = new SearchResultType('users');
-		$emailType = new SearchResultType('emails');
-
-		// Search in contacts
-		$addressBookContacts = $this->contactsManager->search(
-			$search,
-			['EMAIL', 'FN'],
-			[
-				'limit' => $limit,
-				'offset' => $offset,
-				'enumeration' => $this->shareeEnumeration,
-				'fullmatch' => $this->shareeEnumerationFullMatch,
-			]
-		);
-		$lowerSearch = strtolower($search);
-		foreach ($addressBookContacts as $contact) {
-			if (isset($contact['EMAIL'])) {
-				$emailAddresses = $contact['EMAIL'];
-				if (\is_string($emailAddresses)) {
-					$emailAddresses = [$emailAddresses];
-				}
-				foreach ($emailAddresses as $type => $emailAddress) {
-					$displayName = $emailAddress;
-					$emailAddressType = null;
-					if (\is_array($emailAddress)) {
-						$emailAddressData = $emailAddress;
-						$emailAddress = $emailAddressData['value'];
-						$emailAddressType = $emailAddressData['type'];
-					}
-
-					if (!filter_var($emailAddress, FILTER_VALIDATE_EMAIL)) {
-						continue;
-					}
-
-					if (isset($contact['FN'])) {
-						$displayName = $contact['FN'] . ' (' . $emailAddress . ')';
-					}
-					$exactEmailMatch = strtolower($emailAddress) === $lowerSearch;
-
-					if (isset($contact['isLocalSystemBook'])) {
-						if ($this->shareWithGroupOnly) {
-							/*
+    protected bool $shareWithGroupOnly;
+
+    protected bool $shareeEnumeration;
+
+    protected bool $shareeEnumerationInGroupOnly;
+
+    protected bool $shareeEnumerationPhone;
+
+    protected bool $shareeEnumerationFullMatch;
+
+    protected bool $shareeEnumerationFullMatchEmail;
+
+    public function __construct(
+        private IManager $contactsManager,
+        private ICloudIdManager $cloudIdManager,
+        private IConfig $config,
+        private IGroupManager $groupManager,
+        private KnownUserService $knownUserService,
+        private IUserSession $userSession,
+        private IEmailValidator $emailValidator,
+        private mixed $shareWithGroupOnlyExcludeGroupsList = [],
+    ) {
+        $this->shareeEnumeration = $this->config->getAppValue('core', 'shareapi_allow_share_dialog_user_enumeration', 'yes') === 'yes';
+        $this->shareWithGroupOnly = $this->config->getAppValue('core', 'shareapi_only_share_with_group_members', 'no') === 'yes';
+        $this->shareeEnumerationInGroupOnly = $this->shareeEnumeration && $this->config->getAppValue('core', 'shareapi_restrict_user_enumeration_to_group', 'no') === 'yes';
+        $this->shareeEnumerationPhone = $this->shareeEnumeration && $this->config->getAppValue('core', 'shareapi_restrict_user_enumeration_to_phone', 'no') === 'yes';
+        $this->shareeEnumerationFullMatch = $this->config->getAppValue('core', 'shareapi_restrict_user_enumeration_full_match', 'yes') === 'yes';
+        $this->shareeEnumerationFullMatchEmail = $this->config->getAppValue('core', 'shareapi_restrict_user_enumeration_full_match_email', 'yes') === 'yes';
+
+        if ($this->shareWithGroupOnly) {
+            $this->shareWithGroupOnlyExcludeGroupsList = json_decode($this->config->getAppValue('core', 'shareapi_only_share_with_group_members_exclude_group_list', ''), true) ?? [];
+        }
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function search($search, $limit, $offset, ISearchResult $searchResult): bool {
+        if ($this->shareeEnumerationFullMatch && !$this->shareeEnumerationFullMatchEmail) {
+            return false;
+        }
+
+        // Extract the email address from "Foo Bar <foo.bar@example.tld>" and then search with "foo.bar@example.tld" instead
+        $result = preg_match('/<([^@]+@.+)>$/', $search, $matches);
+        if ($result && filter_var($matches[1], FILTER_VALIDATE_EMAIL)) {
+            return $this->search($matches[1], $limit, $offset, $searchResult);
+        }
+
+        $currentUserId = $this->userSession->getUser()->getUID();
+
+        $result = $userResults = ['wide' => [], 'exact' => []];
+        $userType = new SearchResultType('users');
+        $emailType = new SearchResultType('emails');
+
+        // Search in contacts
+        $addressBookContacts = $this->contactsManager->search(
+            $search,
+            ['EMAIL', 'FN'],
+            [
+                'limit' => $limit,
+                'offset' => $offset,
+                'enumeration' => $this->shareeEnumeration,
+                'fullmatch' => $this->shareeEnumerationFullMatch,
+            ]
+        );
+        $lowerSearch = strtolower($search);
+        foreach ($addressBookContacts as $contact) {
+            if (isset($contact['EMAIL'])) {
+                $emailAddresses = $contact['EMAIL'];
+                if (\is_string($emailAddresses)) {
+                    $emailAddresses = [$emailAddresses];
+                }
+                foreach ($emailAddresses as $type => $emailAddress) {
+                    $displayName = $emailAddress;
+                    $emailAddressType = null;
+                    if (\is_array($emailAddress)) {
+                        $emailAddressData = $emailAddress;
+                        $emailAddress = $emailAddressData['value'];
+                        $emailAddressType = $emailAddressData['type'];
+                    }
+
+                    if (!filter_var($emailAddress, FILTER_VALIDATE_EMAIL)) {
+                        continue;
+                    }
+
+                    if (isset($contact['FN'])) {
+                        $displayName = $contact['FN'] . ' (' . $emailAddress . ')';
+                    }
+                    $exactEmailMatch = strtolower($emailAddress) === $lowerSearch;
+
+                    if (isset($contact['isLocalSystemBook'])) {
+                        if ($this->shareWithGroupOnly) {
+                            /*
 							 * Check if the user may share with the user associated with the e-mail of the just found contact
 							 */
-							$userGroups = $this->groupManager->getUserGroupIds($this->userSession->getUser());
-
-							// ShareWithGroupOnly filtering
-							$userGroups = array_diff($userGroups, $this->shareWithGroupOnlyExcludeGroupsList);
-
-							$found = false;
-							foreach ($userGroups as $userGroup) {
-								if ($this->groupManager->isInGroup($contact['UID'], $userGroup)) {
-									$found = true;
-									break;
-								}
-							}
-							if (!$found) {
-								continue;
-							}
-						}
-						if ($exactEmailMatch && $this->shareeEnumerationFullMatch) {
-							try {
-								$cloud = $this->cloudIdManager->resolveCloudId($contact['CLOUD'][0] ?? '');
-							} catch (\InvalidArgumentException $e) {
-								continue;
-							}
-
-							if (!$this->isCurrentUser($cloud) && !$searchResult->hasResult($userType, $cloud->getUser())) {
-								$singleResult = [[
-									'label' => $displayName,
-									'uuid' => $contact['UID'] ?? $emailAddress,
-									'name' => $contact['FN'] ?? $displayName,
-									'value' => [
-										'shareType' => IShare::TYPE_USER,
-										'shareWith' => $cloud->getUser(),
-									],
-									'shareWithDisplayNameUnique' => !empty($emailAddress) ? $emailAddress : $cloud->getUser()
-
-								]];
-								$searchResult->addResultSet($userType, [], $singleResult);
-								$searchResult->markExactIdMatch($emailType);
-							}
-							return false;
-						}
-
-						if ($this->shareeEnumeration) {
-							try {
-								$cloud = $this->cloudIdManager->resolveCloudId($contact['CLOUD'][0] ?? '');
-							} catch (\InvalidArgumentException $e) {
-								continue;
-							}
-
-							$addToWide = !($this->shareeEnumerationInGroupOnly || $this->shareeEnumerationPhone);
-							if (!$addToWide && $this->shareeEnumerationPhone && $this->knownUserService->isKnownToUser($currentUserId, $contact['UID'])) {
-								$addToWide = true;
-							}
-
-							if (!$addToWide && $this->shareeEnumerationInGroupOnly) {
-								$addToWide = false;
-								$userGroups = $this->groupManager->getUserGroupIds($this->userSession->getUser());
-								foreach ($userGroups as $userGroup) {
-									if ($this->groupManager->isInGroup($contact['UID'], $userGroup)) {
-										$addToWide = true;
-										break;
-									}
-								}
-							}
-							if ($addToWide && !$this->isCurrentUser($cloud) && !$searchResult->hasResult($userType, $cloud->getUser())) {
-								$userResults['wide'][] = [
-									'label' => $displayName,
-									'uuid' => $contact['UID'] ?? $emailAddress,
-									'name' => $contact['FN'] ?? $displayName,
-									'value' => [
-										'shareType' => IShare::TYPE_USER,
-										'shareWith' => $cloud->getUser(),
-									],
-									'shareWithDisplayNameUnique' => !empty($emailAddress) ? $emailAddress : $cloud->getUser()
-								];
-								continue;
-							}
-						}
-						continue;
-					}
-
-					if ($exactEmailMatch
-						|| (isset($contact['FN']) && strtolower($contact['FN']) === $lowerSearch)) {
-						if ($exactEmailMatch) {
-							$searchResult->markExactIdMatch($emailType);
-						}
-						$result['exact'][] = [
-							'label' => $displayName,
-							'uuid' => $contact['UID'] ?? $emailAddress,
-							'name' => $contact['FN'] ?? $displayName,
-							'type' => $emailAddressType ?? '',
-							'value' => [
-								'shareType' => IShare::TYPE_EMAIL,
-								'shareWith' => $emailAddress,
-							],
-						];
-					} else {
-						$result['wide'][] = [
-							'label' => $displayName,
-							'uuid' => $contact['UID'] ?? $emailAddress,
-							'name' => $contact['FN'] ?? $displayName,
-							'type' => $emailAddressType ?? '',
-							'value' => [
-								'shareType' => IShare::TYPE_EMAIL,
-								'shareWith' => $emailAddress,
-							],
-						];
-					}
-				}
-			}
-		}
-
-		$reachedEnd = true;
-		if ($this->shareeEnumeration) {
-			$reachedEnd = (count($result['wide']) < $offset + $limit)
-				&& (count($userResults['wide']) < $offset + $limit);
-
-			$result['wide'] = array_slice($result['wide'], $offset, $limit);
-			$userResults['wide'] = array_slice($userResults['wide'], $offset, $limit);
-		}
-
-		if (!$searchResult->hasExactIdMatch($emailType) && $this->emailValidator->isValid($search)) {
-			$result['exact'][] = [
-				'label' => $search,
-				'uuid' => $search,
-				'value' => [
-					'shareType' => IShare::TYPE_EMAIL,
-					'shareWith' => $search,
-				],
-			];
-		}
-
-		if (!empty($userResults['wide'])) {
-			$searchResult->addResultSet($userType, $userResults['wide'], []);
-		}
-		$searchResult->addResultSet($emailType, $result['wide'], $result['exact']);
-
-		return !$reachedEnd;
-	}
-
-	public function isCurrentUser(ICloudId $cloud): bool {
-		$currentUser = $this->userSession->getUser();
-		return $currentUser instanceof IUser && $currentUser->getUID() === $cloud->getUser();
-	}
+                            $userGroups = $this->groupManager->getUserGroupIds($this->userSession->getUser());
+
+                            // ShareWithGroupOnly filtering
+                            $userGroups = array_diff($userGroups, $this->shareWithGroupOnlyExcludeGroupsList);
+
+                            $found = false;
+                            foreach ($userGroups as $userGroup) {
+                                if ($this->groupManager->isInGroup($contact['UID'], $userGroup)) {
+                                    $found = true;
+                                    break;
+                                }
+                            }
+                            if (!$found) {
+                                continue;
+                            }
+                        }
+                        if ($exactEmailMatch && $this->shareeEnumerationFullMatch) {
+                            try {
+                                $cloud = $this->cloudIdManager->resolveCloudId($contact['CLOUD'][0] ?? '');
+                            } catch (\InvalidArgumentException $e) {
+                                continue;
+                            }
+
+                            if (!$this->isCurrentUser($cloud) && !$searchResult->hasResult($userType, $cloud->getUser())) {
+                                $singleResult = [[
+                                    'label' => $displayName,
+                                    'uuid' => $contact['UID'] ?? $emailAddress,
+                                    'name' => $contact['FN'] ?? $displayName,
+                                    'value' => [
+                                        'shareType' => IShare::TYPE_USER,
+                                        'shareWith' => $cloud->getUser(),
+                                    ],
+                                    'shareWithDisplayNameUnique' => !empty($emailAddress) ? $emailAddress : $cloud->getUser()
+
+                                ]];
+                                $searchResult->addResultSet($userType, [], $singleResult);
+                                $searchResult->markExactIdMatch($emailType);
+                            }
+                            return false;
+                        }
+
+                        if ($this->shareeEnumeration) {
+                            try {
+                                $cloud = $this->cloudIdManager->resolveCloudId($contact['CLOUD'][0] ?? '');
+                            } catch (\InvalidArgumentException $e) {
+                                continue;
+                            }
+
+                            $addToWide = !($this->shareeEnumerationInGroupOnly || $this->shareeEnumerationPhone);
+                            if (!$addToWide && $this->shareeEnumerationPhone && $this->knownUserService->isKnownToUser($currentUserId, $contact['UID'])) {
+                                $addToWide = true;
+                            }
+
+                            if (!$addToWide && $this->shareeEnumerationInGroupOnly) {
+                                $addToWide = false;
+                                $userGroups = $this->groupManager->getUserGroupIds($this->userSession->getUser());
+                                foreach ($userGroups as $userGroup) {
+                                    if ($this->groupManager->isInGroup($contact['UID'], $userGroup)) {
+                                        $addToWide = true;
+                                        break;
+                                    }
+                                }
+                            }
+                            if ($addToWide && !$this->isCurrentUser($cloud) && !$searchResult->hasResult($userType, $cloud->getUser())) {
+                                $userResults['wide'][] = [
+                                    'label' => $displayName,
+                                    'uuid' => $contact['UID'] ?? $emailAddress,
+                                    'name' => $contact['FN'] ?? $displayName,
+                                    'value' => [
+                                        'shareType' => IShare::TYPE_USER,
+                                        'shareWith' => $cloud->getUser(),
+                                    ],
+                                    'shareWithDisplayNameUnique' => !empty($emailAddress) ? $emailAddress : $cloud->getUser()
+                                ];
+                                continue;
+                            }
+                        }
+                        continue;
+                    }
+
+                    if ($exactEmailMatch
+                        || (isset($contact['FN']) && strtolower($contact['FN']) === $lowerSearch)) {
+                        if ($exactEmailMatch) {
+                            $searchResult->markExactIdMatch($emailType);
+                        }
+                        $result['exact'][] = [
+                            'label' => $displayName,
+                            'uuid' => $contact['UID'] ?? $emailAddress,
+                            'name' => $contact['FN'] ?? $displayName,
+                            'type' => $emailAddressType ?? '',
+                            'value' => [
+                                'shareType' => IShare::TYPE_EMAIL,
+                                'shareWith' => $emailAddress,
+                            ],
+                        ];
+                    } else {
+                        $result['wide'][] = [
+                            'label' => $displayName,
+                            'uuid' => $contact['UID'] ?? $emailAddress,
+                            'name' => $contact['FN'] ?? $displayName,
+                            'type' => $emailAddressType ?? '',
+                            'value' => [
+                                'shareType' => IShare::TYPE_EMAIL,
+                                'shareWith' => $emailAddress,
+                            ],
+                        ];
+                    }
+                }
+            }
+        }
+
+        $reachedEnd = true;
+        if ($this->shareeEnumeration) {
+            $reachedEnd = (count($result['wide']) < $offset + $limit)
+                && (count($userResults['wide']) < $offset + $limit);
+
+            $result['wide'] = array_slice($result['wide'], $offset, $limit);
+            $userResults['wide'] = array_slice($userResults['wide'], $offset, $limit);
+        }
+
+        if (!$searchResult->hasExactIdMatch($emailType) && $this->emailValidator->isValid($search)) {
+            $result['exact'][] = [
+                'label' => $search,
+                'uuid' => $search,
+                'value' => [
+                    'shareType' => IShare::TYPE_EMAIL,
+                    'shareWith' => $search,
+                ],
+            ];
+        }
+
+        if (!empty($userResults['wide'])) {
+            $searchResult->addResultSet($userType, $userResults['wide'], []);
+        }
+        $searchResult->addResultSet($emailType, $result['wide'], $result['exact']);
+
+        return !$reachedEnd;
+    }
+
+    public function isCurrentUser(ICloudId $cloud): bool {
+        $currentUser = $this->userSession->getUser();
+        return $currentUser instanceof IUser && $currentUser->getUID() === $cloud->getUser();
+    }
 }

core/Command/User/Add.php

Indentation +165 added lines, -165 removed lines

@@ -27,169 +27,169 @@
 use Symfony\Component\Console\Question\Question;
 
 class Add extends Command {
-	public function __construct(
-		protected IUserManager $userManager,
-		protected IGroupManager $groupManager,
-		private IEmailValidator $emailValidator,
-		private IAppConfig $appConfig,
-		private NewUserMailHelper $mailHelper,
-		private IEventDispatcher $eventDispatcher,
-		private ISecureRandom $secureRandom,
-	) {
-		parent::__construct();
-	}
-
-	protected function configure(): void {
-		$this
-			->setName('user:add')
-			->setDescription('adds an account')
-			->addArgument(
-				'uid',
-				InputArgument::REQUIRED,
-				'Account ID used to login (must only contain a-z, A-Z, 0-9, -, _ and @)'
-			)
-			->addOption(
-				'password-from-env',
-				null,
-				InputOption::VALUE_NONE,
-				'read password from environment variable NC_PASS/OC_PASS'
-			)
-			->addOption(
-				'generate-password',
-				null,
-				InputOption::VALUE_NONE,
-				'Generate a secure password. A welcome email with a reset link will be sent to the user via an email if --email option and newUser.sendEmail config are set'
-			)
-			->addOption(
-				'display-name',
-				null,
-				InputOption::VALUE_OPTIONAL,
-				'Login used in the web UI (can contain any characters)'
-			)
-			->addOption(
-				'group',
-				'g',
-				InputOption::VALUE_OPTIONAL | InputOption::VALUE_IS_ARRAY,
-				'groups the account should be added to (The group will be created if it does not exist)'
-			)
-			->addOption(
-				'email',
-				null,
-				InputOption::VALUE_REQUIRED,
-				'When set, users may register using the default email verification workflow'
-			);
-	}
-
-	protected function execute(InputInterface $input, OutputInterface $output): int {
-		$uid = $input->getArgument('uid');
-		if ($this->userManager->userExists($uid)) {
-			$output->writeln('<error>The account "' . $uid . '" already exists.</error>');
-			return 1;
-		}
-
-		$password = '';
-
-		// Setup password.
-		if ($input->getOption('password-from-env')) {
-			$password = getenv('NC_PASS') ?: getenv('OC_PASS');
-
-			if (!$password) {
-				$output->writeln('<error>--password-from-env given, but NC_PASS/OC_PASS is empty!</error>');
-				return 1;
-			}
-		} elseif ($input->getOption('generate-password')) {
-			$passwordEvent = new GenerateSecurePasswordEvent();
-			$this->eventDispatcher->dispatchTyped($passwordEvent);
-			$password = $passwordEvent->getPassword() ?? $this->secureRandom->generate(20);
-		} elseif ($input->isInteractive()) {
-			/** @var QuestionHelper $helper */
-			$helper = $this->getHelper('question');
-
-			$question = new Question('Enter password: ');
-			$question->setHidden(true);
-			$password = $helper->ask($input, $output, $question);
-
-			$question = new Question('Confirm password: ');
-			$question->setHidden(true);
-			$confirm = $helper->ask($input, $output, $question);
-
-			if ($password !== $confirm) {
-				$output->writeln('<error>Passwords did not match!</error>');
-				return 1;
-			}
-		} else {
-			$output->writeln('<error>Interactive input or --password-from-env or --generate-password is needed for setting a password!</error>');
-			return 1;
-		}
-
-		try {
-			$user = $this->userManager->createUser(
-				$input->getArgument('uid'),
-				$password,
-			);
-		} catch (\Exception $e) {
-			$output->writeln('<error>' . $e->getMessage() . '</error>');
-			return 1;
-		}
-
-		if ($user instanceof IUser) {
-			$output->writeln('<info>The account "' . $user->getUID() . '" was created successfully</info>');
-		} else {
-			$output->writeln('<error>An error occurred while creating the account</error>');
-			return 1;
-		}
-
-		if ($input->getOption('display-name')) {
-			$user->setDisplayName($input->getOption('display-name'));
-			$output->writeln('Display name set to "' . $user->getDisplayName() . '"');
-		}
-
-		$groups = $input->getOption('group');
-
-		if (!empty($groups)) {
-			// Make sure we init the Filesystem for the user, in case we need to
-			// init some group shares.
-			Filesystem::init($user->getUID(), '');
-		}
-
-		foreach ($groups as $groupName) {
-			$group = $this->groupManager->get($groupName);
-			if (!$group) {
-				$this->groupManager->createGroup($groupName);
-				$group = $this->groupManager->get($groupName);
-				if ($group instanceof IGroup) {
-					$output->writeln('Created group "' . $group->getGID() . '"');
-				}
-			}
-			if ($group instanceof IGroup) {
-				$group->addUser($user);
-				$output->writeln('Account "' . $user->getUID() . '" added to group "' . $group->getGID() . '"');
-			}
-		}
-
-		$email = $input->getOption('email');
-		if (!empty($email)) {
-			if (!$this->emailValidator->isValid($email)) {
-				$output->writeln(\sprintf(
-					'<error>The given email address "%s" is invalid. Email not set for the user.</error>',
-					$email,
-				));
-
-				return 1;
-			}
-
-			$user->setSystemEMailAddress($email);
-
-			if ($this->appConfig->getValueString('core', 'newUser.sendEmail', 'yes') === 'yes') {
-				try {
-					$this->mailHelper->sendMail($user, $this->mailHelper->generateTemplate($user, true));
-					$output->writeln('Welcome email sent to ' . $email);
-				} catch (\Exception $e) {
-					$output->writeln('Unable to send the welcome email to ' . $email);
-				}
-			}
-		}
-
-		return 0;
-	}
+    public function __construct(
+        protected IUserManager $userManager,
+        protected IGroupManager $groupManager,
+        private IEmailValidator $emailValidator,
+        private IAppConfig $appConfig,
+        private NewUserMailHelper $mailHelper,
+        private IEventDispatcher $eventDispatcher,
+        private ISecureRandom $secureRandom,
+    ) {
+        parent::__construct();
+    }
+
+    protected function configure(): void {
+        $this
+            ->setName('user:add')
+            ->setDescription('adds an account')
+            ->addArgument(
+                'uid',
+                InputArgument::REQUIRED,
+                'Account ID used to login (must only contain a-z, A-Z, 0-9, -, _ and @)'
+            )
+            ->addOption(
+                'password-from-env',
+                null,
+                InputOption::VALUE_NONE,
+                'read password from environment variable NC_PASS/OC_PASS'
+            )
+            ->addOption(
+                'generate-password',
+                null,
+                InputOption::VALUE_NONE,
+                'Generate a secure password. A welcome email with a reset link will be sent to the user via an email if --email option and newUser.sendEmail config are set'
+            )
+            ->addOption(
+                'display-name',
+                null,
+                InputOption::VALUE_OPTIONAL,
+                'Login used in the web UI (can contain any characters)'
+            )
+            ->addOption(
+                'group',
+                'g',
+                InputOption::VALUE_OPTIONAL | InputOption::VALUE_IS_ARRAY,
+                'groups the account should be added to (The group will be created if it does not exist)'
+            )
+            ->addOption(
+                'email',
+                null,
+                InputOption::VALUE_REQUIRED,
+                'When set, users may register using the default email verification workflow'
+            );
+    }
+
+    protected function execute(InputInterface $input, OutputInterface $output): int {
+        $uid = $input->getArgument('uid');
+        if ($this->userManager->userExists($uid)) {
+            $output->writeln('<error>The account "' . $uid . '" already exists.</error>');
+            return 1;
+        }
+
+        $password = '';
+
+        // Setup password.
+        if ($input->getOption('password-from-env')) {
+            $password = getenv('NC_PASS') ?: getenv('OC_PASS');
+
+            if (!$password) {
+                $output->writeln('<error>--password-from-env given, but NC_PASS/OC_PASS is empty!</error>');
+                return 1;
+            }
+        } elseif ($input->getOption('generate-password')) {
+            $passwordEvent = new GenerateSecurePasswordEvent();
+            $this->eventDispatcher->dispatchTyped($passwordEvent);
+            $password = $passwordEvent->getPassword() ?? $this->secureRandom->generate(20);
+        } elseif ($input->isInteractive()) {
+            /** @var QuestionHelper $helper */
+            $helper = $this->getHelper('question');
+
+            $question = new Question('Enter password: ');
+            $question->setHidden(true);
+            $password = $helper->ask($input, $output, $question);
+
+            $question = new Question('Confirm password: ');
+            $question->setHidden(true);
+            $confirm = $helper->ask($input, $output, $question);
+
+            if ($password !== $confirm) {
+                $output->writeln('<error>Passwords did not match!</error>');
+                return 1;
+            }
+        } else {
+            $output->writeln('<error>Interactive input or --password-from-env or --generate-password is needed for setting a password!</error>');
+            return 1;
+        }
+
+        try {
+            $user = $this->userManager->createUser(
+                $input->getArgument('uid'),
+                $password,
+            );
+        } catch (\Exception $e) {
+            $output->writeln('<error>' . $e->getMessage() . '</error>');
+            return 1;
+        }
+
+        if ($user instanceof IUser) {
+            $output->writeln('<info>The account "' . $user->getUID() . '" was created successfully</info>');
+        } else {
+            $output->writeln('<error>An error occurred while creating the account</error>');
+            return 1;
+        }
+
+        if ($input->getOption('display-name')) {
+            $user->setDisplayName($input->getOption('display-name'));
+            $output->writeln('Display name set to "' . $user->getDisplayName() . '"');
+        }
+
+        $groups = $input->getOption('group');
+
+        if (!empty($groups)) {
+            // Make sure we init the Filesystem for the user, in case we need to
+            // init some group shares.
+            Filesystem::init($user->getUID(), '');
+        }
+
+        foreach ($groups as $groupName) {
+            $group = $this->groupManager->get($groupName);
+            if (!$group) {
+                $this->groupManager->createGroup($groupName);
+                $group = $this->groupManager->get($groupName);
+                if ($group instanceof IGroup) {
+                    $output->writeln('Created group "' . $group->getGID() . '"');
+                }
+            }
+            if ($group instanceof IGroup) {
+                $group->addUser($user);
+                $output->writeln('Account "' . $user->getUID() . '" added to group "' . $group->getGID() . '"');
+            }
+        }
+
+        $email = $input->getOption('email');
+        if (!empty($email)) {
+            if (!$this->emailValidator->isValid($email)) {
+                $output->writeln(\sprintf(
+                    '<error>The given email address "%s" is invalid. Email not set for the user.</error>',
+                    $email,
+                ));
+
+                return 1;
+            }
+
+            $user->setSystemEMailAddress($email);
+
+            if ($this->appConfig->getValueString('core', 'newUser.sendEmail', 'yes') === 'yes') {
+                try {
+                    $this->mailHelper->sendMail($user, $this->mailHelper->generateTemplate($user, true));
+                    $output->writeln('Welcome email sent to ' . $email);
+                } catch (\Exception $e) {
+                    $output->writeln('Unable to send the welcome email to ' . $email);
+                }
+            }
+        }
+
+        return 0;
+    }
 }

apps/sharebymail/lib/ShareByMailProvider.php

Indentation +1194 added lines, -1194 removed lines

@@ -46,1200 +46,1200 @@
  * @package OCA\ShareByMail
  */
 class ShareByMailProvider extends DefaultShareProvider implements IShareProviderWithNotification {
-	/**
-	 * Return the identifier of this provider.
-	 *
-	 * @return string Containing only [a-zA-Z0-9]
-	 */
-	public function identifier(): string {
-		return 'ocMailShare';
-	}
-
-	public function __construct(
-		private IConfig $config,
-		private IDBConnection $dbConnection,
-		private ISecureRandom $secureRandom,
-		private IUserManager $userManager,
-		private IRootFolder $rootFolder,
-		private IL10N $l,
-		private LoggerInterface $logger,
-		private IMailer $mailer,
-		private IURLGenerator $urlGenerator,
-		private IManager $activityManager,
-		private SettingsManager $settingsManager,
-		private Defaults $defaults,
-		private IHasher $hasher,
-		private IEventDispatcher $eventDispatcher,
-		private IShareManager $shareManager,
-		private IEmailValidator $emailValidator,
-	) {
-	}
-
-	/**
-	 * Share a path
-	 *
-	 * @throws ShareNotFound
-	 * @throws \Exception
-	 */
-	public function create(IShare $share): IShare {
-		$shareWith = $share->getSharedWith();
-		// Check if file is not already shared with the given email,
-		// if we have an email at all.
-		$alreadyShared = $this->getSharedWith($shareWith, IShare::TYPE_EMAIL, $share->getNode(), 1, 0);
-		if ($shareWith !== '' && !empty($alreadyShared)) {
-			$message = 'Sharing %1$s failed, because this item is already shared with the account %2$s';
-			$message_t = $this->l->t('Sharing %1$s failed, because this item is already shared with the account %2$s', [$share->getNode()->getName(), $shareWith]);
-			$this->logger->debug(sprintf($message, $share->getNode()->getName(), $shareWith), ['app' => 'Federated File Sharing']);
-			throw new \Exception($message_t);
-		}
-
-		// if the admin enforces a password for all mail shares we create a
-		// random password and send it to the recipient
-		$password = $share->getPassword() ?: '';
-		$passwordEnforced = $this->shareManager->shareApiLinkEnforcePassword();
-		if ($passwordEnforced && empty($password)) {
-			$password = $this->autoGeneratePassword($share);
-		}
-
-		if (!empty($password)) {
-			$share->setPassword($this->hasher->hash($password));
-		}
-
-		$shareId = $this->createMailShare($share);
-
-		$this->createShareActivity($share);
-		$data = $this->getRawShare($shareId);
-
-		// Temporary set the clear password again to send it by mail
-		// This need to be done after the share was created in the database
-		// as the password is hashed in between.
-		if (!empty($password)) {
-			$data['password'] = $password;
-		}
-
-		return $this->createShareObject($data);
-	}
-
-	/**
-	 * auto generate password in case of password enforcement on mail shares
-	 *
-	 * @throws \Exception
-	 */
-	protected function autoGeneratePassword(IShare $share): string {
-		$initiatorUser = $this->userManager->get($share->getSharedBy());
-		$initiatorEMailAddress = ($initiatorUser instanceof IUser) ? $initiatorUser->getEMailAddress() : null;
-		$allowPasswordByMail = $this->settingsManager->sendPasswordByMail();
-
-		if ($initiatorEMailAddress === null && !$allowPasswordByMail) {
-			throw new \Exception(
-				$this->l->t('We cannot send you the auto-generated password. Please set a valid email address in your personal settings and try again.')
-			);
-		}
-
-		$passwordEvent = new GenerateSecurePasswordEvent(PasswordContext::SHARING);
-		$this->eventDispatcher->dispatchTyped($passwordEvent);
-
-		$password = $passwordEvent->getPassword();
-		if ($password === null) {
-			$password = $this->secureRandom->generate(8, ISecureRandom::CHAR_HUMAN_READABLE);
-		}
-
-		return $password;
-	}
-
-	/**
-	 * create activity if a file/folder was shared by mail
-	 */
-	protected function createShareActivity(IShare $share, string $type = 'share'): void {
-		$userFolder = $this->rootFolder->getUserFolder($share->getSharedBy());
-
-		$this->publishActivity(
-			$type === 'share' ? Activity::SUBJECT_SHARED_EMAIL_SELF : Activity::SUBJECT_UNSHARED_EMAIL_SELF,
-			[$userFolder->getRelativePath($share->getNode()->getPath()), $share->getSharedWith()],
-			$share->getSharedBy(),
-			$share->getNode()->getId(),
-			(string)$userFolder->getRelativePath($share->getNode()->getPath())
-		);
-
-		if ($share->getShareOwner() !== $share->getSharedBy()) {
-			$ownerFolder = $this->rootFolder->getUserFolder($share->getShareOwner());
-			$fileId = $share->getNode()->getId();
-			$nodes = $ownerFolder->getById($fileId);
-			$ownerPath = $nodes[0]->getPath();
-			$this->publishActivity(
-				$type === 'share' ? Activity::SUBJECT_SHARED_EMAIL_BY : Activity::SUBJECT_UNSHARED_EMAIL_BY,
-				[$ownerFolder->getRelativePath($ownerPath), $share->getSharedWith(), $share->getSharedBy()],
-				$share->getShareOwner(),
-				$fileId,
-				(string)$ownerFolder->getRelativePath($ownerPath)
-			);
-		}
-	}
-
-	/**
-	 * create activity if a file/folder was shared by mail
-	 */
-	protected function createPasswordSendActivity(IShare $share, string $sharedWith, bool $sendToSelf): void {
-		$userFolder = $this->rootFolder->getUserFolder($share->getSharedBy());
-
-		if ($sendToSelf) {
-			$this->publishActivity(
-				Activity::SUBJECT_SHARED_EMAIL_PASSWORD_SEND_SELF,
-				[$userFolder->getRelativePath($share->getNode()->getPath())],
-				$share->getSharedBy(),
-				$share->getNode()->getId(),
-				(string)$userFolder->getRelativePath($share->getNode()->getPath())
-			);
-		} else {
-			$this->publishActivity(
-				Activity::SUBJECT_SHARED_EMAIL_PASSWORD_SEND,
-				[$userFolder->getRelativePath($share->getNode()->getPath()), $sharedWith],
-				$share->getSharedBy(),
-				$share->getNode()->getId(),
-				(string)$userFolder->getRelativePath($share->getNode()->getPath())
-			);
-		}
-	}
-
-
-	/**
-	 * publish activity if a file/folder was shared by mail
-	 */
-	protected function publishActivity(string $subject, array $parameters, string $affectedUser, int $fileId, string $filePath): void {
-		$event = $this->activityManager->generateEvent();
-		$event->setApp('sharebymail')
-			->setType('shared')
-			->setSubject($subject, $parameters)
-			->setAffectedUser($affectedUser)
-			->setObject('files', $fileId, $filePath);
-		$this->activityManager->publish($event);
-	}
-
-	/**
-	 * @throws \Exception
-	 */
-	protected function createMailShare(IShare $share): int {
-		$share->setToken($this->generateToken());
-		return $this->addShareToDB(
-			$share->getNodeId(),
-			$share->getNodeType(),
-			$share->getSharedWith(),
-			$share->getSharedBy(),
-			$share->getShareOwner(),
-			$share->getPermissions(),
-			$share->getToken(),
-			$share->getPassword(),
-			$share->getPasswordExpirationTime(),
-			$share->getSendPasswordByTalk(),
-			$share->getHideDownload(),
-			$share->getLabel(),
-			$share->getExpirationDate(),
-			$share->getNote(),
-			$share->getAttributes(),
-			$share->getMailSend(),
-		);
-	}
-
-	/**
-	 * @inheritDoc
-	 */
-	public function sendMailNotification(IShare $share): bool {
-		$shareId = $share->getId();
-
-		$emails = $this->getSharedWithEmails($share);
-		$validEmails = array_filter($emails, function (string $email) {
-			return $this->emailValidator->isValid($email);
-		});
-
-		if (count($validEmails) === 0) {
-			$this->removeShareFromTable((int)$shareId);
-			$e = new HintException('Failed to send share by mail. Could not find a valid email address: ' . join(', ', $emails),
-				$this->l->t('Failed to send share by email. Got an invalid email address'));
-			$this->logger->error('Failed to send share by mail. Could not find a valid email address ' . join(', ', $emails), [
-				'app' => 'sharebymail',
-				'exception' => $e,
-			]);
-		}
-
-		try {
-			$this->sendEmail($share, $validEmails);
-
-			// If we have a password set, we send it to the recipient
-			if ($share->getPassword() !== null) {
-				// If share-by-talk password is enabled, we do not send the notification
-				// to the recipient. They will have to request it to the owner after opening the link.
-				// Secondly, if the password expiration is disabled, we send the notification to the recipient
-				// Lastly, if the mail to recipient failed, we send the password to the owner as a fallback.
-				// If a password expires, the recipient will still be able to request a new one via talk.
-				$passwordExpire = $this->config->getSystemValue('sharing.enable_mail_link_password_expiration', false);
-				$passwordEnforced = $this->shareManager->shareApiLinkEnforcePassword();
-				if ($passwordExpire === false || $share->getSendPasswordByTalk()) {
-					$send = $this->sendPassword($share, $share->getPassword(), $validEmails);
-					if ($passwordEnforced && $send === false) {
-						$this->sendPasswordToOwner($share, $share->getPassword());
-					}
-				}
-			}
-
-			return true;
-		} catch (HintException $hintException) {
-			$this->logger->error('Failed to send share by mail.', [
-				'app' => 'sharebymail',
-				'exception' => $hintException,
-			]);
-			$this->removeShareFromTable((int)$shareId);
-			throw $hintException;
-		} catch (\Exception $e) {
-			$this->logger->error('Failed to send share by mail.', [
-				'app' => 'sharebymail',
-				'exception' => $e,
-			]);
-			$this->removeShareFromTable((int)$shareId);
-			throw new HintException(
-				'Failed to send share by mail',
-				$this->l->t('Failed to send share by email'),
-				0,
-				$e,
-			);
-		}
-		return false;
-	}
-
-	/**
-	 * @param IShare $share The share to send the email for
-	 * @param array $emails The email addresses to send the email to
-	 */
-	protected function sendEmail(IShare $share, array $emails): void {
-		$link = $this->urlGenerator->linkToRouteAbsolute('files_sharing.sharecontroller.showShare', [
-			'token' => $share->getToken()
-		]);
-
-		$expiration = $share->getExpirationDate();
-		$filename = $share->getNode()->getName();
-		$initiator = $share->getSharedBy();
-		$note = $share->getNote();
-		$shareWith = $share->getSharedWith();
-
-		$initiatorUser = $this->userManager->get($initiator);
-		$initiatorDisplayName = ($initiatorUser instanceof IUser) ? $initiatorUser->getDisplayName() : $initiator;
-		$message = $this->mailer->createMessage();
-
-		$emailTemplate = $this->mailer->createEMailTemplate('sharebymail.RecipientNotification', [
-			'filename' => $filename,
-			'link' => $link,
-			'initiator' => $initiatorDisplayName,
-			'expiration' => $expiration,
-			'shareWith' => $shareWith,
-			'note' => $note
-		]);
-
-		$emailTemplate->setSubject($this->l->t('%1$s shared %2$s with you', [$initiatorDisplayName, $filename]));
-		$emailTemplate->addHeader();
-		$emailTemplate->addHeading($this->l->t('%1$s shared %2$s with you', [$initiatorDisplayName, $filename]), false);
-
-		if ($note !== '') {
-			$emailTemplate->addBodyListItem(
-				htmlspecialchars($note),
-				$this->l->t('Note:'),
-				$this->getAbsoluteImagePath('caldav/description.png'),
-				$note
-			);
-		}
-
-		if ($expiration !== null) {
-			$dateString = (string)$this->l->l('date', $expiration, ['width' => 'medium']);
-			$emailTemplate->addBodyListItem(
-				$this->l->t('This share is valid until %s at midnight', [$dateString]),
-				$this->l->t('Expiration:'),
-				$this->getAbsoluteImagePath('caldav/time.png'),
-			);
-		}
-
-		$emailTemplate->addBodyButton(
-			$this->l->t('Open %s', [$filename]),
-			$link
-		);
-
-		// If multiple recipients are given, we send the mail to all of them
-		if (count($emails) > 1) {
-			// We do not want to expose the email addresses of the other recipients
-			$message->setBcc($emails);
-		} else {
-			$message->setTo($emails);
-		}
-
-		// The "From" contains the sharers name
-		$instanceName = $this->defaults->getName();
-		$senderName = $instanceName;
-		if ($this->settingsManager->replyToInitiator()) {
-			$senderName = $this->l->t(
-				'%1$s via %2$s',
-				[
-					$initiatorDisplayName,
-					$instanceName
-				]
-			);
-		}
-		$message->setFrom([Util::getDefaultEmailAddress($instanceName) => $senderName]);
-
-		// The "Reply-To" is set to the sharer if an mail address is configured
-		// also the default footer contains a "Do not reply" which needs to be adjusted.
-		if ($initiatorUser && $this->settingsManager->replyToInitiator()) {
-			$initiatorEmail = $initiatorUser->getEMailAddress();
-			if ($initiatorEmail !== null) {
-				$message->setReplyTo([$initiatorEmail => $initiatorDisplayName]);
-				$emailTemplate->addFooter($instanceName . ($this->defaults->getSlogan() !== '' ? ' - ' . $this->defaults->getSlogan() : ''));
-			} else {
-				$emailTemplate->addFooter();
-			}
-		} else {
-			$emailTemplate->addFooter();
-		}
-
-		$message->useTemplate($emailTemplate);
-		$failedRecipients = $this->mailer->send($message);
-		if (!empty($failedRecipients)) {
-			$this->logger->error('Share notification mail could not be sent to: ' . implode(', ', $failedRecipients));
-			return;
-		}
-	}
-
-	/**
-	 * Send password to recipient of a mail share
-	 * Will return false if
-	 *  1. the password is empty
-	 *  2. the setting to send the password by mail is disabled
-	 *  3. the share is set to send the password by talk
-	 *
-	 * @param IShare $share
-	 * @param string $password
-	 * @param array $emails
-	 * @return bool
-	 */
-	protected function sendPassword(IShare $share, string $password, array $emails): bool {
-		$filename = $share->getNode()->getName();
-		$initiator = $share->getSharedBy();
-		$shareWith = $share->getSharedWith();
-
-		if ($password === '' || $this->settingsManager->sendPasswordByMail() === false || $share->getSendPasswordByTalk()) {
-			return false;
-		}
-
-		$initiatorUser = $this->userManager->get($initiator);
-		$initiatorDisplayName = ($initiatorUser instanceof IUser) ? $initiatorUser->getDisplayName() : $initiator;
-		$initiatorEmailAddress = ($initiatorUser instanceof IUser) ? $initiatorUser->getEMailAddress() : null;
-
-		$plainBodyPart = $this->l->t('%1$s shared %2$s with you. You should have already received a separate mail with a link to access it.', [$initiatorDisplayName, $filename]);
-		$htmlBodyPart = $this->l->t('%1$s shared %2$s with you. You should have already received a separate mail with a link to access it.', [$initiatorDisplayName, $filename]);
-
-		$message = $this->mailer->createMessage();
-
-		$emailTemplate = $this->mailer->createEMailTemplate('sharebymail.RecipientPasswordNotification', [
-			'filename' => $filename,
-			'password' => $password,
-			'initiator' => $initiatorDisplayName,
-			'initiatorEmail' => $initiatorEmailAddress,
-			'shareWith' => $shareWith,
-		]);
-
-		$emailTemplate->setSubject($this->l->t('Password to access %1$s shared to you by %2$s', [$filename, $initiatorDisplayName]));
-		$emailTemplate->addHeader();
-		$emailTemplate->addHeading($this->l->t('Password to access %s', [$filename]), false);
-		$emailTemplate->addBodyText(htmlspecialchars($htmlBodyPart), $plainBodyPart);
-		$emailTemplate->addBodyText($this->l->t('It is protected with the following password:'));
-		$emailTemplate->addBodyText($password);
-
-		if ($this->config->getSystemValue('sharing.enable_mail_link_password_expiration', false) === true) {
-			$expirationTime = new \DateTime();
-			$expirationInterval = $this->config->getSystemValue('sharing.mail_link_password_expiration_interval', 3600);
-			$expirationTime = $expirationTime->add(new \DateInterval('PT' . $expirationInterval . 'S'));
-			$emailTemplate->addBodyText($this->l->t('This password will expire at %s', [$expirationTime->format('r')]));
-		}
-
-		// If multiple recipients are given, we send the mail to all of them
-		if (count($emails) > 1) {
-			// We do not want to expose the email addresses of the other recipients
-			$message->setBcc($emails);
-		} else {
-			$message->setTo($emails);
-		}
-
-		// The "From" contains the sharers name
-		$instanceName = $this->defaults->getName();
-		$senderName = $instanceName;
-		if ($this->settingsManager->replyToInitiator()) {
-			$senderName = $this->l->t(
-				'%1$s via %2$s',
-				[
-					$initiatorDisplayName,
-					$instanceName
-				]
-			);
-		}
-		$message->setFrom([Util::getDefaultEmailAddress($instanceName) => $senderName]);
-
-		// The "Reply-To" is set to the sharer if an mail address is configured
-		// also the default footer contains a "Do not reply" which needs to be adjusted.
-		if ($initiatorUser && $this->settingsManager->replyToInitiator()) {
-			$initiatorEmail = $initiatorUser->getEMailAddress();
-			if ($initiatorEmail !== null) {
-				$message->setReplyTo([$initiatorEmail => $initiatorDisplayName]);
-				$emailTemplate->addFooter($instanceName . ($this->defaults->getSlogan() !== '' ? ' - ' . $this->defaults->getSlogan() : ''));
-			} else {
-				$emailTemplate->addFooter();
-			}
-		} else {
-			$emailTemplate->addFooter();
-		}
-
-		$message->useTemplate($emailTemplate);
-		$failedRecipients = $this->mailer->send($message);
-		if (!empty($failedRecipients)) {
-			$this->logger->error('Share password mail could not be sent to: ' . implode(', ', $failedRecipients));
-			return false;
-		}
-
-		$this->createPasswordSendActivity($share, $shareWith, false);
-		return true;
-	}
-
-	protected function sendNote(IShare $share): void {
-		$recipient = $share->getSharedWith();
-
-
-		$filename = $share->getNode()->getName();
-		$initiator = $share->getSharedBy();
-		$note = $share->getNote();
-
-		$initiatorUser = $this->userManager->get($initiator);
-		$initiatorDisplayName = ($initiatorUser instanceof IUser) ? $initiatorUser->getDisplayName() : $initiator;
-		$initiatorEmailAddress = ($initiatorUser instanceof IUser) ? $initiatorUser->getEMailAddress() : null;
-
-		$plainHeading = $this->l->t('%1$s shared %2$s with you and wants to add:', [$initiatorDisplayName, $filename]);
-		$htmlHeading = $this->l->t('%1$s shared %2$s with you and wants to add', [$initiatorDisplayName, $filename]);
-
-		$message = $this->mailer->createMessage();
-
-		$emailTemplate = $this->mailer->createEMailTemplate('shareByMail.sendNote');
-
-		$emailTemplate->setSubject($this->l->t('%s added a note to a file shared with you', [$initiatorDisplayName]));
-		$emailTemplate->addHeader();
-		$emailTemplate->addHeading(htmlspecialchars($htmlHeading), $plainHeading);
-		$emailTemplate->addBodyText(htmlspecialchars($note), $note);
-
-		$link = $this->urlGenerator->linkToRouteAbsolute('files_sharing.sharecontroller.showShare',
-			['token' => $share->getToken()]);
-		$emailTemplate->addBodyButton(
-			$this->l->t('Open %s', [$filename]),
-			$link
-		);
-
-		// The "From" contains the sharers name
-		$instanceName = $this->defaults->getName();
-		$senderName = $instanceName;
-		if ($this->settingsManager->replyToInitiator()) {
-			$senderName = $this->l->t(
-				'%1$s via %2$s',
-				[
-					$initiatorDisplayName,
-					$instanceName
-				]
-			);
-		}
-		$message->setFrom([Util::getDefaultEmailAddress($instanceName) => $senderName]);
-		if ($this->settingsManager->replyToInitiator() && $initiatorEmailAddress !== null) {
-			$message->setReplyTo([$initiatorEmailAddress => $initiatorDisplayName]);
-			$emailTemplate->addFooter($instanceName . ' - ' . $this->defaults->getSlogan());
-		} else {
-			$emailTemplate->addFooter();
-		}
-
-		$message->setTo([$recipient]);
-		$message->useTemplate($emailTemplate);
-		$this->mailer->send($message);
-	}
-
-	/**
-	 * send auto generated password to the owner. This happens if the admin enforces
-	 * a password for mail shares and forbid to send the password by mail to the recipient
-	 *
-	 * @throws \Exception
-	 */
-	protected function sendPasswordToOwner(IShare $share, string $password): bool {
-		$filename = $share->getNode()->getName();
-		$initiator = $this->userManager->get($share->getSharedBy());
-		$initiatorEMailAddress = ($initiator instanceof IUser) ? $initiator->getEMailAddress() : null;
-		$initiatorDisplayName = ($initiator instanceof IUser) ? $initiator->getDisplayName() : $share->getSharedBy();
-		$shareWith = implode(', ', $this->getSharedWithEmails($share));
-
-		if ($initiatorEMailAddress === null) {
-			throw new \Exception(
-				$this->l->t('We cannot send you the auto-generated password. Please set a valid email address in your personal settings and try again.')
-			);
-		}
-
-		$bodyPart = $this->l->t('You just shared %1$s with %2$s. The share was already sent to the recipient. Due to the security policies defined by the administrator of %3$s each share needs to be protected by password and it is not allowed to send the password directly to the recipient. Therefore you need to forward the password manually to the recipient.', [$filename, $shareWith, $this->defaults->getName()]);
-
-		$message = $this->mailer->createMessage();
-		$emailTemplate = $this->mailer->createEMailTemplate('sharebymail.OwnerPasswordNotification', [
-			'filename' => $filename,
-			'password' => $password,
-			'initiator' => $initiatorDisplayName,
-			'initiatorEmail' => $initiatorEMailAddress,
-			'shareWith' => $shareWith,
-		]);
-
-		$emailTemplate->setSubject($this->l->t('Password to access %1$s shared by you with %2$s', [$filename, $shareWith]));
-		$emailTemplate->addHeader();
-		$emailTemplate->addHeading($this->l->t('Password to access %s', [$filename]), false);
-		$emailTemplate->addBodyText($bodyPart);
-		$emailTemplate->addBodyText($this->l->t('This is the password:'));
-		$emailTemplate->addBodyText($password);
-
-		if ($this->config->getSystemValue('sharing.enable_mail_link_password_expiration', false) === true) {
-			$expirationTime = new \DateTime();
-			$expirationInterval = $this->config->getSystemValue('sharing.mail_link_password_expiration_interval', 3600);
-			$expirationTime = $expirationTime->add(new \DateInterval('PT' . $expirationInterval . 'S'));
-			$emailTemplate->addBodyText($this->l->t('This password will expire at %s', [$expirationTime->format('r')]));
-		}
-
-		$emailTemplate->addBodyText($this->l->t('You can choose a different password at any time in the share dialog.'));
-
-		$emailTemplate->addFooter();
-
-		$instanceName = $this->defaults->getName();
-		$senderName = $this->l->t(
-			'%1$s via %2$s',
-			[
-				$initiatorDisplayName,
-				$instanceName
-			]
-		);
-		$message->setFrom([Util::getDefaultEmailAddress($instanceName) => $senderName]);
-		$message->setTo([$initiatorEMailAddress => $initiatorDisplayName]);
-		$message->useTemplate($emailTemplate);
-		$this->mailer->send($message);
-
-		$this->createPasswordSendActivity($share, $shareWith, true);
-
-		return true;
-	}
-
-	private function getAbsoluteImagePath(string $path):string {
-		return $this->urlGenerator->getAbsoluteURL(
-			$this->urlGenerator->imagePath('core', $path)
-		);
-	}
-
-	/**
-	 * generate share token
-	 */
-	protected function generateToken(int $size = 15): string {
-		$token = $this->secureRandom->generate($size, ISecureRandom::CHAR_HUMAN_READABLE);
-		return $token;
-	}
-
-	public function getChildren(IShare $parent): array {
-		$children = [];
-
-		$qb = $this->dbConnection->getQueryBuilder();
-		$qb->select('*')
-			->from('share')
-			->where($qb->expr()->eq('parent', $qb->createNamedParameter($parent->getId())))
-			->andWhere($qb->expr()->eq('share_type', $qb->createNamedParameter(IShare::TYPE_EMAIL)))
-			->orderBy('id');
-
-		$cursor = $qb->executeQuery();
-		while ($data = $cursor->fetch()) {
-			$children[] = $this->createShareObject($data);
-		}
-		$cursor->closeCursor();
-
-		return $children;
-	}
-
-	/**
-	 * Add share to the database and return the ID
-	 */
-	protected function addShareToDB(
-		?int $itemSource,
-		?string $itemType,
-		?string $shareWith,
-		?string $sharedBy,
-		?string $uidOwner,
-		?int $permissions,
-		?string $token,
-		?string $password,
-		?\DateTimeInterface $passwordExpirationTime,
-		?bool $sendPasswordByTalk,
-		?bool $hideDownload,
-		?string $label,
-		?\DateTimeInterface $expirationTime,
-		?string $note = '',
-		?IAttributes $attributes = null,
-		?bool $mailSend = true,
-	): int {
-		$qb = $this->dbConnection->getQueryBuilder();
-		$qb->insert('share')
-			->setValue('share_type', $qb->createNamedParameter(IShare::TYPE_EMAIL))
-			->setValue('item_type', $qb->createNamedParameter($itemType))
-			->setValue('item_source', $qb->createNamedParameter($itemSource))
-			->setValue('file_source', $qb->createNamedParameter($itemSource))
-			->setValue('share_with', $qb->createNamedParameter($shareWith))
-			->setValue('uid_owner', $qb->createNamedParameter($uidOwner))
-			->setValue('uid_initiator', $qb->createNamedParameter($sharedBy))
-			->setValue('permissions', $qb->createNamedParameter($permissions))
-			->setValue('token', $qb->createNamedParameter($token))
-			->setValue('password', $qb->createNamedParameter($password))
-			->setValue('password_expiration_time', $qb->createNamedParameter($passwordExpirationTime, IQueryBuilder::PARAM_DATETIME_MUTABLE))
-			->setValue('password_by_talk', $qb->createNamedParameter($sendPasswordByTalk, IQueryBuilder::PARAM_BOOL))
-			->setValue('stime', $qb->createNamedParameter(time()))
-			->setValue('hide_download', $qb->createNamedParameter((int)$hideDownload, IQueryBuilder::PARAM_INT))
-			->setValue('label', $qb->createNamedParameter($label))
-			->setValue('note', $qb->createNamedParameter($note))
-			->setValue('mail_send', $qb->createNamedParameter((int)$mailSend, IQueryBuilder::PARAM_INT));
-
-		// set share attributes
-		$shareAttributes = $this->formatShareAttributes($attributes);
-
-		$qb->setValue('attributes', $qb->createNamedParameter($shareAttributes));
-		if ($expirationTime !== null) {
-			$qb->setValue('expiration', $qb->createNamedParameter($expirationTime, IQueryBuilder::PARAM_DATETIME_MUTABLE));
-		}
-
-		$qb->executeStatement();
-		return $qb->getLastInsertId();
-	}
-
-	/**
-	 * Update a share
-	 */
-	public function update(IShare $share, ?string $plainTextPassword = null): IShare {
-		$originalShare = $this->getShareById($share->getId());
-
-		// a real password was given
-		$validPassword = $plainTextPassword !== null && $plainTextPassword !== '';
-
-		if ($validPassword && ($originalShare->getPassword() !== $share->getPassword()
-								|| ($originalShare->getSendPasswordByTalk() && !$share->getSendPasswordByTalk()))) {
-			$emails = $this->getSharedWithEmails($share);
-			$validEmails = array_filter($emails, function ($email) {
-				return $this->emailValidator->isValid($email);
-			});
-			$this->sendPassword($share, $plainTextPassword, $validEmails);
-		}
-
-		$shareAttributes = $this->formatShareAttributes($share->getAttributes());
-
-		/*
+    /**
+     * Return the identifier of this provider.
+     *
+     * @return string Containing only [a-zA-Z0-9]
+     */
+    public function identifier(): string {
+        return 'ocMailShare';
+    }
+
+    public function __construct(
+        private IConfig $config,
+        private IDBConnection $dbConnection,
+        private ISecureRandom $secureRandom,
+        private IUserManager $userManager,
+        private IRootFolder $rootFolder,
+        private IL10N $l,
+        private LoggerInterface $logger,
+        private IMailer $mailer,
+        private IURLGenerator $urlGenerator,
+        private IManager $activityManager,
+        private SettingsManager $settingsManager,
+        private Defaults $defaults,
+        private IHasher $hasher,
+        private IEventDispatcher $eventDispatcher,
+        private IShareManager $shareManager,
+        private IEmailValidator $emailValidator,
+    ) {
+    }
+
+    /**
+     * Share a path
+     *
+     * @throws ShareNotFound
+     * @throws \Exception
+     */
+    public function create(IShare $share): IShare {
+        $shareWith = $share->getSharedWith();
+        // Check if file is not already shared with the given email,
+        // if we have an email at all.
+        $alreadyShared = $this->getSharedWith($shareWith, IShare::TYPE_EMAIL, $share->getNode(), 1, 0);
+        if ($shareWith !== '' && !empty($alreadyShared)) {
+            $message = 'Sharing %1$s failed, because this item is already shared with the account %2$s';
+            $message_t = $this->l->t('Sharing %1$s failed, because this item is already shared with the account %2$s', [$share->getNode()->getName(), $shareWith]);
+            $this->logger->debug(sprintf($message, $share->getNode()->getName(), $shareWith), ['app' => 'Federated File Sharing']);
+            throw new \Exception($message_t);
+        }
+
+        // if the admin enforces a password for all mail shares we create a
+        // random password and send it to the recipient
+        $password = $share->getPassword() ?: '';
+        $passwordEnforced = $this->shareManager->shareApiLinkEnforcePassword();
+        if ($passwordEnforced && empty($password)) {
+            $password = $this->autoGeneratePassword($share);
+        }
+
+        if (!empty($password)) {
+            $share->setPassword($this->hasher->hash($password));
+        }
+
+        $shareId = $this->createMailShare($share);
+
+        $this->createShareActivity($share);
+        $data = $this->getRawShare($shareId);
+
+        // Temporary set the clear password again to send it by mail
+        // This need to be done after the share was created in the database
+        // as the password is hashed in between.
+        if (!empty($password)) {
+            $data['password'] = $password;
+        }
+
+        return $this->createShareObject($data);
+    }
+
+    /**
+     * auto generate password in case of password enforcement on mail shares
+     *
+     * @throws \Exception
+     */
+    protected function autoGeneratePassword(IShare $share): string {
+        $initiatorUser = $this->userManager->get($share->getSharedBy());
+        $initiatorEMailAddress = ($initiatorUser instanceof IUser) ? $initiatorUser->getEMailAddress() : null;
+        $allowPasswordByMail = $this->settingsManager->sendPasswordByMail();
+
+        if ($initiatorEMailAddress === null && !$allowPasswordByMail) {
+            throw new \Exception(
+                $this->l->t('We cannot send you the auto-generated password. Please set a valid email address in your personal settings and try again.')
+            );
+        }
+
+        $passwordEvent = new GenerateSecurePasswordEvent(PasswordContext::SHARING);
+        $this->eventDispatcher->dispatchTyped($passwordEvent);
+
+        $password = $passwordEvent->getPassword();
+        if ($password === null) {
+            $password = $this->secureRandom->generate(8, ISecureRandom::CHAR_HUMAN_READABLE);
+        }
+
+        return $password;
+    }
+
+    /**
+     * create activity if a file/folder was shared by mail
+     */
+    protected function createShareActivity(IShare $share, string $type = 'share'): void {
+        $userFolder = $this->rootFolder->getUserFolder($share->getSharedBy());
+
+        $this->publishActivity(
+            $type === 'share' ? Activity::SUBJECT_SHARED_EMAIL_SELF : Activity::SUBJECT_UNSHARED_EMAIL_SELF,
+            [$userFolder->getRelativePath($share->getNode()->getPath()), $share->getSharedWith()],
+            $share->getSharedBy(),
+            $share->getNode()->getId(),
+            (string)$userFolder->getRelativePath($share->getNode()->getPath())
+        );
+
+        if ($share->getShareOwner() !== $share->getSharedBy()) {
+            $ownerFolder = $this->rootFolder->getUserFolder($share->getShareOwner());
+            $fileId = $share->getNode()->getId();
+            $nodes = $ownerFolder->getById($fileId);
+            $ownerPath = $nodes[0]->getPath();
+            $this->publishActivity(
+                $type === 'share' ? Activity::SUBJECT_SHARED_EMAIL_BY : Activity::SUBJECT_UNSHARED_EMAIL_BY,
+                [$ownerFolder->getRelativePath($ownerPath), $share->getSharedWith(), $share->getSharedBy()],
+                $share->getShareOwner(),
+                $fileId,
+                (string)$ownerFolder->getRelativePath($ownerPath)
+            );
+        }
+    }
+
+    /**
+     * create activity if a file/folder was shared by mail
+     */
+    protected function createPasswordSendActivity(IShare $share, string $sharedWith, bool $sendToSelf): void {
+        $userFolder = $this->rootFolder->getUserFolder($share->getSharedBy());
+
+        if ($sendToSelf) {
+            $this->publishActivity(
+                Activity::SUBJECT_SHARED_EMAIL_PASSWORD_SEND_SELF,
+                [$userFolder->getRelativePath($share->getNode()->getPath())],
+                $share->getSharedBy(),
+                $share->getNode()->getId(),
+                (string)$userFolder->getRelativePath($share->getNode()->getPath())
+            );
+        } else {
+            $this->publishActivity(
+                Activity::SUBJECT_SHARED_EMAIL_PASSWORD_SEND,
+                [$userFolder->getRelativePath($share->getNode()->getPath()), $sharedWith],
+                $share->getSharedBy(),
+                $share->getNode()->getId(),
+                (string)$userFolder->getRelativePath($share->getNode()->getPath())
+            );
+        }
+    }
+
+
+    /**
+     * publish activity if a file/folder was shared by mail
+     */
+    protected function publishActivity(string $subject, array $parameters, string $affectedUser, int $fileId, string $filePath): void {
+        $event = $this->activityManager->generateEvent();
+        $event->setApp('sharebymail')
+            ->setType('shared')
+            ->setSubject($subject, $parameters)
+            ->setAffectedUser($affectedUser)
+            ->setObject('files', $fileId, $filePath);
+        $this->activityManager->publish($event);
+    }
+
+    /**
+     * @throws \Exception
+     */
+    protected function createMailShare(IShare $share): int {
+        $share->setToken($this->generateToken());
+        return $this->addShareToDB(
+            $share->getNodeId(),
+            $share->getNodeType(),
+            $share->getSharedWith(),
+            $share->getSharedBy(),
+            $share->getShareOwner(),
+            $share->getPermissions(),
+            $share->getToken(),
+            $share->getPassword(),
+            $share->getPasswordExpirationTime(),
+            $share->getSendPasswordByTalk(),
+            $share->getHideDownload(),
+            $share->getLabel(),
+            $share->getExpirationDate(),
+            $share->getNote(),
+            $share->getAttributes(),
+            $share->getMailSend(),
+        );
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function sendMailNotification(IShare $share): bool {
+        $shareId = $share->getId();
+
+        $emails = $this->getSharedWithEmails($share);
+        $validEmails = array_filter($emails, function (string $email) {
+            return $this->emailValidator->isValid($email);
+        });
+
+        if (count($validEmails) === 0) {
+            $this->removeShareFromTable((int)$shareId);
+            $e = new HintException('Failed to send share by mail. Could not find a valid email address: ' . join(', ', $emails),
+                $this->l->t('Failed to send share by email. Got an invalid email address'));
+            $this->logger->error('Failed to send share by mail. Could not find a valid email address ' . join(', ', $emails), [
+                'app' => 'sharebymail',
+                'exception' => $e,
+            ]);
+        }
+
+        try {
+            $this->sendEmail($share, $validEmails);
+
+            // If we have a password set, we send it to the recipient
+            if ($share->getPassword() !== null) {
+                // If share-by-talk password is enabled, we do not send the notification
+                // to the recipient. They will have to request it to the owner after opening the link.
+                // Secondly, if the password expiration is disabled, we send the notification to the recipient
+                // Lastly, if the mail to recipient failed, we send the password to the owner as a fallback.
+                // If a password expires, the recipient will still be able to request a new one via talk.
+                $passwordExpire = $this->config->getSystemValue('sharing.enable_mail_link_password_expiration', false);
+                $passwordEnforced = $this->shareManager->shareApiLinkEnforcePassword();
+                if ($passwordExpire === false || $share->getSendPasswordByTalk()) {
+                    $send = $this->sendPassword($share, $share->getPassword(), $validEmails);
+                    if ($passwordEnforced && $send === false) {
+                        $this->sendPasswordToOwner($share, $share->getPassword());
+                    }
+                }
+            }
+
+            return true;
+        } catch (HintException $hintException) {
+            $this->logger->error('Failed to send share by mail.', [
+                'app' => 'sharebymail',
+                'exception' => $hintException,
+            ]);
+            $this->removeShareFromTable((int)$shareId);
+            throw $hintException;
+        } catch (\Exception $e) {
+            $this->logger->error('Failed to send share by mail.', [
+                'app' => 'sharebymail',
+                'exception' => $e,
+            ]);
+            $this->removeShareFromTable((int)$shareId);
+            throw new HintException(
+                'Failed to send share by mail',
+                $this->l->t('Failed to send share by email'),
+                0,
+                $e,
+            );
+        }
+        return false;
+    }
+
+    /**
+     * @param IShare $share The share to send the email for
+     * @param array $emails The email addresses to send the email to
+     */
+    protected function sendEmail(IShare $share, array $emails): void {
+        $link = $this->urlGenerator->linkToRouteAbsolute('files_sharing.sharecontroller.showShare', [
+            'token' => $share->getToken()
+        ]);
+
+        $expiration = $share->getExpirationDate();
+        $filename = $share->getNode()->getName();
+        $initiator = $share->getSharedBy();
+        $note = $share->getNote();
+        $shareWith = $share->getSharedWith();
+
+        $initiatorUser = $this->userManager->get($initiator);
+        $initiatorDisplayName = ($initiatorUser instanceof IUser) ? $initiatorUser->getDisplayName() : $initiator;
+        $message = $this->mailer->createMessage();
+
+        $emailTemplate = $this->mailer->createEMailTemplate('sharebymail.RecipientNotification', [
+            'filename' => $filename,
+            'link' => $link,
+            'initiator' => $initiatorDisplayName,
+            'expiration' => $expiration,
+            'shareWith' => $shareWith,
+            'note' => $note
+        ]);
+
+        $emailTemplate->setSubject($this->l->t('%1$s shared %2$s with you', [$initiatorDisplayName, $filename]));
+        $emailTemplate->addHeader();
+        $emailTemplate->addHeading($this->l->t('%1$s shared %2$s with you', [$initiatorDisplayName, $filename]), false);
+
+        if ($note !== '') {
+            $emailTemplate->addBodyListItem(
+                htmlspecialchars($note),
+                $this->l->t('Note:'),
+                $this->getAbsoluteImagePath('caldav/description.png'),
+                $note
+            );
+        }
+
+        if ($expiration !== null) {
+            $dateString = (string)$this->l->l('date', $expiration, ['width' => 'medium']);
+            $emailTemplate->addBodyListItem(
+                $this->l->t('This share is valid until %s at midnight', [$dateString]),
+                $this->l->t('Expiration:'),
+                $this->getAbsoluteImagePath('caldav/time.png'),
+            );
+        }
+
+        $emailTemplate->addBodyButton(
+            $this->l->t('Open %s', [$filename]),
+            $link
+        );
+
+        // If multiple recipients are given, we send the mail to all of them
+        if (count($emails) > 1) {
+            // We do not want to expose the email addresses of the other recipients
+            $message->setBcc($emails);
+        } else {
+            $message->setTo($emails);
+        }
+
+        // The "From" contains the sharers name
+        $instanceName = $this->defaults->getName();
+        $senderName = $instanceName;
+        if ($this->settingsManager->replyToInitiator()) {
+            $senderName = $this->l->t(
+                '%1$s via %2$s',
+                [
+                    $initiatorDisplayName,
+                    $instanceName
+                ]
+            );
+        }
+        $message->setFrom([Util::getDefaultEmailAddress($instanceName) => $senderName]);
+
+        // The "Reply-To" is set to the sharer if an mail address is configured
+        // also the default footer contains a "Do not reply" which needs to be adjusted.
+        if ($initiatorUser && $this->settingsManager->replyToInitiator()) {
+            $initiatorEmail = $initiatorUser->getEMailAddress();
+            if ($initiatorEmail !== null) {
+                $message->setReplyTo([$initiatorEmail => $initiatorDisplayName]);
+                $emailTemplate->addFooter($instanceName . ($this->defaults->getSlogan() !== '' ? ' - ' . $this->defaults->getSlogan() : ''));
+            } else {
+                $emailTemplate->addFooter();
+            }
+        } else {
+            $emailTemplate->addFooter();
+        }
+
+        $message->useTemplate($emailTemplate);
+        $failedRecipients = $this->mailer->send($message);
+        if (!empty($failedRecipients)) {
+            $this->logger->error('Share notification mail could not be sent to: ' . implode(', ', $failedRecipients));
+            return;
+        }
+    }
+
+    /**
+     * Send password to recipient of a mail share
+     * Will return false if
+     *  1. the password is empty
+     *  2. the setting to send the password by mail is disabled
+     *  3. the share is set to send the password by talk
+     *
+     * @param IShare $share
+     * @param string $password
+     * @param array $emails
+     * @return bool
+     */
+    protected function sendPassword(IShare $share, string $password, array $emails): bool {
+        $filename = $share->getNode()->getName();
+        $initiator = $share->getSharedBy();
+        $shareWith = $share->getSharedWith();
+
+        if ($password === '' || $this->settingsManager->sendPasswordByMail() === false || $share->getSendPasswordByTalk()) {
+            return false;
+        }
+
+        $initiatorUser = $this->userManager->get($initiator);
+        $initiatorDisplayName = ($initiatorUser instanceof IUser) ? $initiatorUser->getDisplayName() : $initiator;
+        $initiatorEmailAddress = ($initiatorUser instanceof IUser) ? $initiatorUser->getEMailAddress() : null;
+
+        $plainBodyPart = $this->l->t('%1$s shared %2$s with you. You should have already received a separate mail with a link to access it.', [$initiatorDisplayName, $filename]);
+        $htmlBodyPart = $this->l->t('%1$s shared %2$s with you. You should have already received a separate mail with a link to access it.', [$initiatorDisplayName, $filename]);
+
+        $message = $this->mailer->createMessage();
+
+        $emailTemplate = $this->mailer->createEMailTemplate('sharebymail.RecipientPasswordNotification', [
+            'filename' => $filename,
+            'password' => $password,
+            'initiator' => $initiatorDisplayName,
+            'initiatorEmail' => $initiatorEmailAddress,
+            'shareWith' => $shareWith,
+        ]);
+
+        $emailTemplate->setSubject($this->l->t('Password to access %1$s shared to you by %2$s', [$filename, $initiatorDisplayName]));
+        $emailTemplate->addHeader();
+        $emailTemplate->addHeading($this->l->t('Password to access %s', [$filename]), false);
+        $emailTemplate->addBodyText(htmlspecialchars($htmlBodyPart), $plainBodyPart);
+        $emailTemplate->addBodyText($this->l->t('It is protected with the following password:'));
+        $emailTemplate->addBodyText($password);
+
+        if ($this->config->getSystemValue('sharing.enable_mail_link_password_expiration', false) === true) {
+            $expirationTime = new \DateTime();
+            $expirationInterval = $this->config->getSystemValue('sharing.mail_link_password_expiration_interval', 3600);
+            $expirationTime = $expirationTime->add(new \DateInterval('PT' . $expirationInterval . 'S'));
+            $emailTemplate->addBodyText($this->l->t('This password will expire at %s', [$expirationTime->format('r')]));
+        }
+
+        // If multiple recipients are given, we send the mail to all of them
+        if (count($emails) > 1) {
+            // We do not want to expose the email addresses of the other recipients
+            $message->setBcc($emails);
+        } else {
+            $message->setTo($emails);
+        }
+
+        // The "From" contains the sharers name
+        $instanceName = $this->defaults->getName();
+        $senderName = $instanceName;
+        if ($this->settingsManager->replyToInitiator()) {
+            $senderName = $this->l->t(
+                '%1$s via %2$s',
+                [
+                    $initiatorDisplayName,
+                    $instanceName
+                ]
+            );
+        }
+        $message->setFrom([Util::getDefaultEmailAddress($instanceName) => $senderName]);
+
+        // The "Reply-To" is set to the sharer if an mail address is configured
+        // also the default footer contains a "Do not reply" which needs to be adjusted.
+        if ($initiatorUser && $this->settingsManager->replyToInitiator()) {
+            $initiatorEmail = $initiatorUser->getEMailAddress();
+            if ($initiatorEmail !== null) {
+                $message->setReplyTo([$initiatorEmail => $initiatorDisplayName]);
+                $emailTemplate->addFooter($instanceName . ($this->defaults->getSlogan() !== '' ? ' - ' . $this->defaults->getSlogan() : ''));
+            } else {
+                $emailTemplate->addFooter();
+            }
+        } else {
+            $emailTemplate->addFooter();
+        }
+
+        $message->useTemplate($emailTemplate);
+        $failedRecipients = $this->mailer->send($message);
+        if (!empty($failedRecipients)) {
+            $this->logger->error('Share password mail could not be sent to: ' . implode(', ', $failedRecipients));
+            return false;
+        }
+
+        $this->createPasswordSendActivity($share, $shareWith, false);
+        return true;
+    }
+
+    protected function sendNote(IShare $share): void {
+        $recipient = $share->getSharedWith();
+
+
+        $filename = $share->getNode()->getName();
+        $initiator = $share->getSharedBy();
+        $note = $share->getNote();
+
+        $initiatorUser = $this->userManager->get($initiator);
+        $initiatorDisplayName = ($initiatorUser instanceof IUser) ? $initiatorUser->getDisplayName() : $initiator;
+        $initiatorEmailAddress = ($initiatorUser instanceof IUser) ? $initiatorUser->getEMailAddress() : null;
+
+        $plainHeading = $this->l->t('%1$s shared %2$s with you and wants to add:', [$initiatorDisplayName, $filename]);
+        $htmlHeading = $this->l->t('%1$s shared %2$s with you and wants to add', [$initiatorDisplayName, $filename]);
+
+        $message = $this->mailer->createMessage();
+
+        $emailTemplate = $this->mailer->createEMailTemplate('shareByMail.sendNote');
+
+        $emailTemplate->setSubject($this->l->t('%s added a note to a file shared with you', [$initiatorDisplayName]));
+        $emailTemplate->addHeader();
+        $emailTemplate->addHeading(htmlspecialchars($htmlHeading), $plainHeading);
+        $emailTemplate->addBodyText(htmlspecialchars($note), $note);
+
+        $link = $this->urlGenerator->linkToRouteAbsolute('files_sharing.sharecontroller.showShare',
+            ['token' => $share->getToken()]);
+        $emailTemplate->addBodyButton(
+            $this->l->t('Open %s', [$filename]),
+            $link
+        );
+
+        // The "From" contains the sharers name
+        $instanceName = $this->defaults->getName();
+        $senderName = $instanceName;
+        if ($this->settingsManager->replyToInitiator()) {
+            $senderName = $this->l->t(
+                '%1$s via %2$s',
+                [
+                    $initiatorDisplayName,
+                    $instanceName
+                ]
+            );
+        }
+        $message->setFrom([Util::getDefaultEmailAddress($instanceName) => $senderName]);
+        if ($this->settingsManager->replyToInitiator() && $initiatorEmailAddress !== null) {
+            $message->setReplyTo([$initiatorEmailAddress => $initiatorDisplayName]);
+            $emailTemplate->addFooter($instanceName . ' - ' . $this->defaults->getSlogan());
+        } else {
+            $emailTemplate->addFooter();
+        }
+
+        $message->setTo([$recipient]);
+        $message->useTemplate($emailTemplate);
+        $this->mailer->send($message);
+    }
+
+    /**
+     * send auto generated password to the owner. This happens if the admin enforces
+     * a password for mail shares and forbid to send the password by mail to the recipient
+     *
+     * @throws \Exception
+     */
+    protected function sendPasswordToOwner(IShare $share, string $password): bool {
+        $filename = $share->getNode()->getName();
+        $initiator = $this->userManager->get($share->getSharedBy());
+        $initiatorEMailAddress = ($initiator instanceof IUser) ? $initiator->getEMailAddress() : null;
+        $initiatorDisplayName = ($initiator instanceof IUser) ? $initiator->getDisplayName() : $share->getSharedBy();
+        $shareWith = implode(', ', $this->getSharedWithEmails($share));
+
+        if ($initiatorEMailAddress === null) {
+            throw new \Exception(
+                $this->l->t('We cannot send you the auto-generated password. Please set a valid email address in your personal settings and try again.')
+            );
+        }
+
+        $bodyPart = $this->l->t('You just shared %1$s with %2$s. The share was already sent to the recipient. Due to the security policies defined by the administrator of %3$s each share needs to be protected by password and it is not allowed to send the password directly to the recipient. Therefore you need to forward the password manually to the recipient.', [$filename, $shareWith, $this->defaults->getName()]);
+
+        $message = $this->mailer->createMessage();
+        $emailTemplate = $this->mailer->createEMailTemplate('sharebymail.OwnerPasswordNotification', [
+            'filename' => $filename,
+            'password' => $password,
+            'initiator' => $initiatorDisplayName,
+            'initiatorEmail' => $initiatorEMailAddress,
+            'shareWith' => $shareWith,
+        ]);
+
+        $emailTemplate->setSubject($this->l->t('Password to access %1$s shared by you with %2$s', [$filename, $shareWith]));
+        $emailTemplate->addHeader();
+        $emailTemplate->addHeading($this->l->t('Password to access %s', [$filename]), false);
+        $emailTemplate->addBodyText($bodyPart);
+        $emailTemplate->addBodyText($this->l->t('This is the password:'));
+        $emailTemplate->addBodyText($password);
+
+        if ($this->config->getSystemValue('sharing.enable_mail_link_password_expiration', false) === true) {
+            $expirationTime = new \DateTime();
+            $expirationInterval = $this->config->getSystemValue('sharing.mail_link_password_expiration_interval', 3600);
+            $expirationTime = $expirationTime->add(new \DateInterval('PT' . $expirationInterval . 'S'));
+            $emailTemplate->addBodyText($this->l->t('This password will expire at %s', [$expirationTime->format('r')]));
+        }
+
+        $emailTemplate->addBodyText($this->l->t('You can choose a different password at any time in the share dialog.'));
+
+        $emailTemplate->addFooter();
+
+        $instanceName = $this->defaults->getName();
+        $senderName = $this->l->t(
+            '%1$s via %2$s',
+            [
+                $initiatorDisplayName,
+                $instanceName
+            ]
+        );
+        $message->setFrom([Util::getDefaultEmailAddress($instanceName) => $senderName]);
+        $message->setTo([$initiatorEMailAddress => $initiatorDisplayName]);
+        $message->useTemplate($emailTemplate);
+        $this->mailer->send($message);
+
+        $this->createPasswordSendActivity($share, $shareWith, true);
+
+        return true;
+    }
+
+    private function getAbsoluteImagePath(string $path):string {
+        return $this->urlGenerator->getAbsoluteURL(
+            $this->urlGenerator->imagePath('core', $path)
+        );
+    }
+
+    /**
+     * generate share token
+     */
+    protected function generateToken(int $size = 15): string {
+        $token = $this->secureRandom->generate($size, ISecureRandom::CHAR_HUMAN_READABLE);
+        return $token;
+    }
+
+    public function getChildren(IShare $parent): array {
+        $children = [];
+
+        $qb = $this->dbConnection->getQueryBuilder();
+        $qb->select('*')
+            ->from('share')
+            ->where($qb->expr()->eq('parent', $qb->createNamedParameter($parent->getId())))
+            ->andWhere($qb->expr()->eq('share_type', $qb->createNamedParameter(IShare::TYPE_EMAIL)))
+            ->orderBy('id');
+
+        $cursor = $qb->executeQuery();
+        while ($data = $cursor->fetch()) {
+            $children[] = $this->createShareObject($data);
+        }
+        $cursor->closeCursor();
+
+        return $children;
+    }
+
+    /**
+     * Add share to the database and return the ID
+     */
+    protected function addShareToDB(
+        ?int $itemSource,
+        ?string $itemType,
+        ?string $shareWith,
+        ?string $sharedBy,
+        ?string $uidOwner,
+        ?int $permissions,
+        ?string $token,
+        ?string $password,
+        ?\DateTimeInterface $passwordExpirationTime,
+        ?bool $sendPasswordByTalk,
+        ?bool $hideDownload,
+        ?string $label,
+        ?\DateTimeInterface $expirationTime,
+        ?string $note = '',
+        ?IAttributes $attributes = null,
+        ?bool $mailSend = true,
+    ): int {
+        $qb = $this->dbConnection->getQueryBuilder();
+        $qb->insert('share')
+            ->setValue('share_type', $qb->createNamedParameter(IShare::TYPE_EMAIL))
+            ->setValue('item_type', $qb->createNamedParameter($itemType))
+            ->setValue('item_source', $qb->createNamedParameter($itemSource))
+            ->setValue('file_source', $qb->createNamedParameter($itemSource))
+            ->setValue('share_with', $qb->createNamedParameter($shareWith))
+            ->setValue('uid_owner', $qb->createNamedParameter($uidOwner))
+            ->setValue('uid_initiator', $qb->createNamedParameter($sharedBy))
+            ->setValue('permissions', $qb->createNamedParameter($permissions))
+            ->setValue('token', $qb->createNamedParameter($token))
+            ->setValue('password', $qb->createNamedParameter($password))
+            ->setValue('password_expiration_time', $qb->createNamedParameter($passwordExpirationTime, IQueryBuilder::PARAM_DATETIME_MUTABLE))
+            ->setValue('password_by_talk', $qb->createNamedParameter($sendPasswordByTalk, IQueryBuilder::PARAM_BOOL))
+            ->setValue('stime', $qb->createNamedParameter(time()))
+            ->setValue('hide_download', $qb->createNamedParameter((int)$hideDownload, IQueryBuilder::PARAM_INT))
+            ->setValue('label', $qb->createNamedParameter($label))
+            ->setValue('note', $qb->createNamedParameter($note))
+            ->setValue('mail_send', $qb->createNamedParameter((int)$mailSend, IQueryBuilder::PARAM_INT));
+
+        // set share attributes
+        $shareAttributes = $this->formatShareAttributes($attributes);
+
+        $qb->setValue('attributes', $qb->createNamedParameter($shareAttributes));
+        if ($expirationTime !== null) {
+            $qb->setValue('expiration', $qb->createNamedParameter($expirationTime, IQueryBuilder::PARAM_DATETIME_MUTABLE));
+        }
+
+        $qb->executeStatement();
+        return $qb->getLastInsertId();
+    }
+
+    /**
+     * Update a share
+     */
+    public function update(IShare $share, ?string $plainTextPassword = null): IShare {
+        $originalShare = $this->getShareById($share->getId());
+
+        // a real password was given
+        $validPassword = $plainTextPassword !== null && $plainTextPassword !== '';
+
+        if ($validPassword && ($originalShare->getPassword() !== $share->getPassword()
+                                || ($originalShare->getSendPasswordByTalk() && !$share->getSendPasswordByTalk()))) {
+            $emails = $this->getSharedWithEmails($share);
+            $validEmails = array_filter($emails, function ($email) {
+                return $this->emailValidator->isValid($email);
+            });
+            $this->sendPassword($share, $plainTextPassword, $validEmails);
+        }
+
+        $shareAttributes = $this->formatShareAttributes($share->getAttributes());
+
+        /*
 		 * We allow updating mail shares
 		 */
-		$qb = $this->dbConnection->getQueryBuilder();
-		$qb->update('share')
-			->where($qb->expr()->eq('id', $qb->createNamedParameter($share->getId())))
-			->set('item_source', $qb->createNamedParameter($share->getNodeId()))
-			->set('file_source', $qb->createNamedParameter($share->getNodeId()))
-			->set('share_with', $qb->createNamedParameter($share->getSharedWith()))
-			->set('permissions', $qb->createNamedParameter($share->getPermissions()))
-			->set('uid_owner', $qb->createNamedParameter($share->getShareOwner()))
-			->set('uid_initiator', $qb->createNamedParameter($share->getSharedBy()))
-			->set('password', $qb->createNamedParameter($share->getPassword()))
-			->set('password_expiration_time', $qb->createNamedParameter($share->getPasswordExpirationTime(), IQueryBuilder::PARAM_DATETIME_MUTABLE))
-			->set('label', $qb->createNamedParameter($share->getLabel()))
-			->set('password_by_talk', $qb->createNamedParameter($share->getSendPasswordByTalk(), IQueryBuilder::PARAM_BOOL))
-			->set('expiration', $qb->createNamedParameter($share->getExpirationDate(), IQueryBuilder::PARAM_DATETIME_MUTABLE))
-			->set('note', $qb->createNamedParameter($share->getNote()))
-			->set('hide_download', $qb->createNamedParameter((int)$share->getHideDownload(), IQueryBuilder::PARAM_INT))
-			->set('attributes', $qb->createNamedParameter($shareAttributes))
-			->set('mail_send', $qb->createNamedParameter((int)$share->getMailSend(), IQueryBuilder::PARAM_INT))
-			->set('reminder_sent', $qb->createNamedParameter($share->getReminderSent(), IQueryBuilder::PARAM_BOOL))
-			->executeStatement();
-
-		if ($originalShare->getNote() !== $share->getNote() && $share->getNote() !== '') {
-			$this->sendNote($share);
-		}
-
-		return $share;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function move(IShare $share, $recipient): IShare {
-		/**
-		 * nothing to do here, mail shares are only outgoing shares
-		 */
-		return $share;
-	}
-
-	/**
-	 * Delete a share (owner unShares the file)
-	 *
-	 * @param IShare $share
-	 */
-	public function delete(IShare $share): void {
-		try {
-			$this->createShareActivity($share, 'unshare');
-		} catch (\Exception $e) {
-		}
-
-		$this->removeShareFromTable((int)$share->getId());
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function deleteFromSelf(IShare $share, $recipient): void {
-		// nothing to do here, mail shares are only outgoing shares
-	}
-
-	public function restore(IShare $share, string $recipient): IShare {
-		throw new GenericShareException('not implemented');
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function getSharesBy($userId, $shareType, $node, $reshares, $limit, $offset): array {
-		$qb = $this->dbConnection->getQueryBuilder();
-		$qb->select('*')
-			->from('share');
-
-		$qb->andWhere($qb->expr()->eq('share_type', $qb->createNamedParameter(IShare::TYPE_EMAIL)));
-
-		/**
-		 * Reshares for this user are shares where they are the owner.
-		 */
-		if ($reshares === false) {
-			//Special case for old shares created via the web UI
-			$or1 = $qb->expr()->andX(
-				$qb->expr()->eq('uid_owner', $qb->createNamedParameter($userId)),
-				$qb->expr()->isNull('uid_initiator')
-			);
-
-			$qb->andWhere(
-				$qb->expr()->orX(
-					$qb->expr()->eq('uid_initiator', $qb->createNamedParameter($userId)),
-					$or1
-				)
-			);
-		} elseif ($node === null) {
-			$qb->andWhere(
-				$qb->expr()->orX(
-					$qb->expr()->eq('uid_owner', $qb->createNamedParameter($userId)),
-					$qb->expr()->eq('uid_initiator', $qb->createNamedParameter($userId))
-				)
-			);
-		}
-
-		if ($node !== null) {
-			$qb->andWhere($qb->expr()->eq('file_source', $qb->createNamedParameter($node->getId())));
-		}
-
-		if ($limit !== -1) {
-			$qb->setMaxResults($limit);
-		}
-
-		$qb->setFirstResult($offset);
-		$qb->orderBy('id');
-
-		$cursor = $qb->executeQuery();
-		$shares = [];
-		while ($data = $cursor->fetch()) {
-			$shares[] = $this->createShareObject($data);
-		}
-		$cursor->closeCursor();
-
-		return $shares;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function getShareById($id, $recipientId = null): IShare {
-		$qb = $this->dbConnection->getQueryBuilder();
-
-		$qb->select('*')
-			->from('share')
-			->where($qb->expr()->eq('id', $qb->createNamedParameter($id)))
-			->andWhere($qb->expr()->eq('share_type', $qb->createNamedParameter(IShare::TYPE_EMAIL)));
-
-		$cursor = $qb->executeQuery();
-		$data = $cursor->fetch();
-		$cursor->closeCursor();
-
-		if ($data === false) {
-			throw new ShareNotFound();
-		}
-
-		try {
-			$share = $this->createShareObject($data);
-		} catch (InvalidShare $e) {
-			throw new ShareNotFound();
-		}
-
-		return $share;
-	}
-
-	/**
-	 * Get shares for a given path
-	 *
-	 * @return IShare[]
-	 */
-	public function getSharesByPath(Node $path): array {
-		$qb = $this->dbConnection->getQueryBuilder();
-
-		$cursor = $qb->select('*')
-			->from('share')
-			->andWhere($qb->expr()->eq('file_source', $qb->createNamedParameter($path->getId())))
-			->andWhere($qb->expr()->eq('share_type', $qb->createNamedParameter(IShare::TYPE_EMAIL)))
-			->executeQuery();
-
-		$shares = [];
-		while ($data = $cursor->fetch()) {
-			$shares[] = $this->createShareObject($data);
-		}
-		$cursor->closeCursor();
-
-		return $shares;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function getSharedWith($userId, $shareType, $node, $limit, $offset): array {
-		/** @var IShare[] $shares */
-		$shares = [];
-
-		//Get shares directly with this user
-		$qb = $this->dbConnection->getQueryBuilder();
-		$qb->select('*')
-			->from('share');
-
-		// Order by id
-		$qb->orderBy('id');
-
-		// Set limit and offset
-		if ($limit !== -1) {
-			$qb->setMaxResults($limit);
-		}
-		$qb->setFirstResult($offset);
-
-		$qb->where($qb->expr()->eq('share_type', $qb->createNamedParameter(IShare::TYPE_EMAIL)));
-		$qb->andWhere($qb->expr()->eq('share_with', $qb->createNamedParameter($userId)));
-
-		// Filter by node if provided
-		if ($node !== null) {
-			$qb->andWhere($qb->expr()->eq('file_source', $qb->createNamedParameter($node->getId())));
-		}
-
-		$cursor = $qb->executeQuery();
-
-		while ($data = $cursor->fetch()) {
-			$shares[] = $this->createShareObject($data);
-		}
-		$cursor->closeCursor();
-
-
-		return $shares;
-	}
-
-	/**
-	 * Get a share by token
-	 *
-	 * @throws ShareNotFound
-	 */
-	public function getShareByToken($token): IShare {
-		$qb = $this->dbConnection->getQueryBuilder();
-
-		$cursor = $qb->select('*')
-			->from('share')
-			->where($qb->expr()->eq('share_type', $qb->createNamedParameter(IShare::TYPE_EMAIL)))
-			->andWhere($qb->expr()->eq('token', $qb->createNamedParameter($token)))
-			->executeQuery();
-
-		$data = $cursor->fetch();
-
-		if ($data === false) {
-			throw new ShareNotFound('Share not found', $this->l->t('Could not find share'));
-		}
-
-		try {
-			$share = $this->createShareObject($data);
-		} catch (InvalidShare $e) {
-			throw new ShareNotFound('Share not found', $this->l->t('Could not find share'));
-		}
-
-		return $share;
-	}
-
-	/**
-	 * remove share from table
-	 */
-	protected function removeShareFromTable(int $shareId): void {
-		$qb = $this->dbConnection->getQueryBuilder();
-		$qb->delete('share')
-			->where($qb->expr()->eq('id', $qb->createNamedParameter($shareId)));
-		$qb->executeStatement();
-	}
-
-	/**
-	 * Create a share object from a database row
-	 *
-	 * @throws InvalidShare
-	 * @throws ShareNotFound
-	 */
-	protected function createShareObject(array $data): IShare {
-		$share = new Share($this->rootFolder, $this->userManager);
-		$share->setId((int)$data['id'])
-			->setShareType((int)$data['share_type'])
-			->setPermissions((int)$data['permissions'])
-			->setTarget($data['file_target'])
-			->setMailSend((bool)$data['mail_send'])
-			->setNote($data['note'])
-			->setToken($data['token']);
-
-		$shareTime = new \DateTime();
-		$shareTime->setTimestamp((int)$data['stime']);
-		$share->setShareTime($shareTime);
-		$share->setSharedWith($data['share_with'] ?? '');
-		$share->setPassword($data['password']);
-		$passwordExpirationTime = \DateTime::createFromFormat('Y-m-d H:i:s', $data['password_expiration_time'] ?? '');
-		$share->setPasswordExpirationTime($passwordExpirationTime !== false ? $passwordExpirationTime : null);
-		$share->setLabel($data['label'] ?? '');
-		$share->setSendPasswordByTalk((bool)$data['password_by_talk']);
-		$share->setHideDownload((bool)$data['hide_download']);
-		$share->setReminderSent((bool)$data['reminder_sent']);
-
-		if ($data['uid_initiator'] !== null) {
-			$share->setShareOwner($data['uid_owner']);
-			$share->setSharedBy($data['uid_initiator']);
-		} else {
-			//OLD SHARE
-			$share->setSharedBy($data['uid_owner']);
-			$path = $this->getNode($share->getSharedBy(), (int)$data['file_source']);
-
-			$owner = $path->getOwner();
-			$share->setShareOwner($owner->getUID());
-		}
-
-		if ($data['expiration'] !== null) {
-			$expiration = \DateTime::createFromFormat('Y-m-d H:i:s', $data['expiration']);
-			if ($expiration !== false) {
-				$share->setExpirationDate($expiration);
-			}
-		}
-
-		$share = $this->updateShareAttributes($share, $data['attributes']);
-
-		$share->setNodeId((int)$data['file_source']);
-		$share->setNodeType($data['item_type']);
-
-		$share->setProviderId($this->identifier());
-
-		return $share;
-	}
-
-	/**
-	 * Get the node with file $id for $user
-	 *
-	 * @throws InvalidShare
-	 */
-	private function getNode(string $userId, int $id): Node {
-		try {
-			$userFolder = $this->rootFolder->getUserFolder($userId);
-		} catch (NoUserException $e) {
-			throw new InvalidShare();
-		}
-
-		$nodes = $userFolder->getById($id);
-
-		if (empty($nodes)) {
-			throw new InvalidShare();
-		}
-
-		return $nodes[0];
-	}
-
-	/**
-	 * A user is deleted from the system
-	 * So clean up the relevant shares.
-	 */
-	public function userDeleted($uid, $shareType): void {
-		$qb = $this->dbConnection->getQueryBuilder();
-
-		$qb->delete('share')
-			->where($qb->expr()->eq('share_type', $qb->createNamedParameter(IShare::TYPE_EMAIL)))
-			->andWhere($qb->expr()->eq('uid_owner', $qb->createNamedParameter($uid)))
-			->executeStatement();
-	}
-
-	/**
-	 * This provider does not support group shares
-	 */
-	public function groupDeleted($gid): void {
-	}
-
-	/**
-	 * This provider does not support group shares
-	 */
-	public function userDeletedFromGroup($uid, $gid): void {
-	}
-
-	/**
-	 * get database row of a give share
-	 *
-	 * @throws ShareNotFound
-	 */
-	protected function getRawShare(int $id): array {
-		// Now fetch the inserted share and create a complete share object
-		$qb = $this->dbConnection->getQueryBuilder();
-		$qb->select('*')
-			->from('share')
-			->where($qb->expr()->eq('id', $qb->createNamedParameter($id)));
-
-		$cursor = $qb->executeQuery();
-		$data = $cursor->fetch();
-		$cursor->closeCursor();
-
-		if ($data === false) {
-			throw new ShareNotFound;
-		}
-
-		return $data;
-	}
-
-	public function getSharesInFolder($userId, Folder $node, $reshares, $shallow = true): array {
-		return $this->getSharesInFolderInternal($userId, $node, $reshares);
-	}
-
-	public function getAllSharesInFolder(Folder $node): array {
-		return $this->getSharesInFolderInternal(null, $node, null);
-	}
-
-	/**
-	 * @return array<int, list<IShare>>
-	 */
-	private function getSharesInFolderInternal(?string $userId, Folder $node, ?bool $reshares): array {
-		$qb = $this->dbConnection->getQueryBuilder();
-		$qb->select('*')
-			->from('share', 's')
-			->andWhere($qb->expr()->in('item_type', $qb->createNamedParameter(['file', 'folder'], IQueryBuilder::PARAM_STR_ARRAY)))
-			->andWhere(
-				$qb->expr()->eq('share_type', $qb->createNamedParameter(IShare::TYPE_EMAIL))
-			);
-
-		if ($userId !== null) {
-			/**
-			 * Reshares for this user are shares where they are the owner.
-			 */
-			if ($reshares !== true) {
-				$qb->andWhere($qb->expr()->eq('uid_initiator', $qb->createNamedParameter($userId)));
-			} else {
-				$qb->andWhere(
-					$qb->expr()->orX(
-						$qb->expr()->eq('uid_owner', $qb->createNamedParameter($userId)),
-						$qb->expr()->eq('uid_initiator', $qb->createNamedParameter($userId))
-					)
-				);
-			}
-		}
-
-		$qb->innerJoin('s', 'filecache', 'f', $qb->expr()->eq('s.file_source', 'f.fileid'));
-
-		$qb->andWhere($qb->expr()->eq('f.parent', $qb->createNamedParameter($node->getId())));
-
-		$qb->orderBy('id');
-
-		$cursor = $qb->executeQuery();
-		$shares = [];
-		while ($data = $cursor->fetch()) {
-			$shares[$data['fileid']][] = $this->createShareObject($data);
-		}
-		$cursor->closeCursor();
-
-		return $shares;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function getAccessList($nodes, $currentAccess): array {
-		$ids = [];
-		foreach ($nodes as $node) {
-			$ids[] = $node->getId();
-		}
-
-		$qb = $this->dbConnection->getQueryBuilder();
-		$qb->select('share_with', 'file_source', 'token')
-			->from('share')
-			->where($qb->expr()->eq('share_type', $qb->createNamedParameter(IShare::TYPE_EMAIL)))
-			->andWhere($qb->expr()->in('file_source', $qb->createNamedParameter($ids, IQueryBuilder::PARAM_INT_ARRAY)))
-			->andWhere($qb->expr()->in('item_type', $qb->createNamedParameter(['file', 'folder'], IQueryBuilder::PARAM_STR_ARRAY)));
-		$cursor = $qb->executeQuery();
-
-		$public = false;
-		$mail = [];
-		while ($row = $cursor->fetch()) {
-			$public = true;
-			if ($currentAccess === false) {
-				$mail[] = $row['share_with'];
-			} else {
-				$mail[$row['share_with']] = [
-					'node_id' => $row['file_source'],
-					'token' => $row['token']
-				];
-			}
-		}
-		$cursor->closeCursor();
-
-		return ['public' => $public, 'mail' => $mail];
-	}
-
-	public function getAllShares(): iterable {
-		$qb = $this->dbConnection->getQueryBuilder();
-
-		$qb->select('*')
-			->from('share')
-			->where(
-				$qb->expr()->orX(
-					$qb->expr()->eq('share_type', $qb->createNamedParameter(IShare::TYPE_EMAIL))
-				)
-			);
-
-		$cursor = $qb->executeQuery();
-		while ($data = $cursor->fetch()) {
-			try {
-				$share = $this->createShareObject($data);
-			} catch (InvalidShare $e) {
-				continue;
-			} catch (ShareNotFound $e) {
-				continue;
-			}
-
-			yield $share;
-		}
-		$cursor->closeCursor();
-	}
-
-	/**
-	 * Extract the emails from the share
-	 * It can be a single email, from the share_with field
-	 * or a list of emails from the emails attributes field.
-	 * @param IShare $share
-	 * @return string[]
-	 */
-	protected function getSharedWithEmails(IShare $share): array {
-		$attributes = $share->getAttributes();
-
-		if ($attributes === null) {
-			return [$share->getSharedWith()];
-		}
-
-		$emails = $attributes->getAttribute('shareWith', 'emails');
-		if (isset($emails) && is_array($emails) && !empty($emails)) {
-			return $emails;
-		}
-		return [$share->getSharedWith()];
-	}
+        $qb = $this->dbConnection->getQueryBuilder();
+        $qb->update('share')
+            ->where($qb->expr()->eq('id', $qb->createNamedParameter($share->getId())))
+            ->set('item_source', $qb->createNamedParameter($share->getNodeId()))
+            ->set('file_source', $qb->createNamedParameter($share->getNodeId()))
+            ->set('share_with', $qb->createNamedParameter($share->getSharedWith()))
+            ->set('permissions', $qb->createNamedParameter($share->getPermissions()))
+            ->set('uid_owner', $qb->createNamedParameter($share->getShareOwner()))
+            ->set('uid_initiator', $qb->createNamedParameter($share->getSharedBy()))
+            ->set('password', $qb->createNamedParameter($share->getPassword()))
+            ->set('password_expiration_time', $qb->createNamedParameter($share->getPasswordExpirationTime(), IQueryBuilder::PARAM_DATETIME_MUTABLE))
+            ->set('label', $qb->createNamedParameter($share->getLabel()))
+            ->set('password_by_talk', $qb->createNamedParameter($share->getSendPasswordByTalk(), IQueryBuilder::PARAM_BOOL))
+            ->set('expiration', $qb->createNamedParameter($share->getExpirationDate(), IQueryBuilder::PARAM_DATETIME_MUTABLE))
+            ->set('note', $qb->createNamedParameter($share->getNote()))
+            ->set('hide_download', $qb->createNamedParameter((int)$share->getHideDownload(), IQueryBuilder::PARAM_INT))
+            ->set('attributes', $qb->createNamedParameter($shareAttributes))
+            ->set('mail_send', $qb->createNamedParameter((int)$share->getMailSend(), IQueryBuilder::PARAM_INT))
+            ->set('reminder_sent', $qb->createNamedParameter($share->getReminderSent(), IQueryBuilder::PARAM_BOOL))
+            ->executeStatement();
+
+        if ($originalShare->getNote() !== $share->getNote() && $share->getNote() !== '') {
+            $this->sendNote($share);
+        }
+
+        return $share;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function move(IShare $share, $recipient): IShare {
+        /**
+         * nothing to do here, mail shares are only outgoing shares
+         */
+        return $share;
+    }
+
+    /**
+     * Delete a share (owner unShares the file)
+     *
+     * @param IShare $share
+     */
+    public function delete(IShare $share): void {
+        try {
+            $this->createShareActivity($share, 'unshare');
+        } catch (\Exception $e) {
+        }
+
+        $this->removeShareFromTable((int)$share->getId());
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function deleteFromSelf(IShare $share, $recipient): void {
+        // nothing to do here, mail shares are only outgoing shares
+    }
+
+    public function restore(IShare $share, string $recipient): IShare {
+        throw new GenericShareException('not implemented');
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getSharesBy($userId, $shareType, $node, $reshares, $limit, $offset): array {
+        $qb = $this->dbConnection->getQueryBuilder();
+        $qb->select('*')
+            ->from('share');
+
+        $qb->andWhere($qb->expr()->eq('share_type', $qb->createNamedParameter(IShare::TYPE_EMAIL)));
+
+        /**
+         * Reshares for this user are shares where they are the owner.
+         */
+        if ($reshares === false) {
+            //Special case for old shares created via the web UI
+            $or1 = $qb->expr()->andX(
+                $qb->expr()->eq('uid_owner', $qb->createNamedParameter($userId)),
+                $qb->expr()->isNull('uid_initiator')
+            );
+
+            $qb->andWhere(
+                $qb->expr()->orX(
+                    $qb->expr()->eq('uid_initiator', $qb->createNamedParameter($userId)),
+                    $or1
+                )
+            );
+        } elseif ($node === null) {
+            $qb->andWhere(
+                $qb->expr()->orX(
+                    $qb->expr()->eq('uid_owner', $qb->createNamedParameter($userId)),
+                    $qb->expr()->eq('uid_initiator', $qb->createNamedParameter($userId))
+                )
+            );
+        }
+
+        if ($node !== null) {
+            $qb->andWhere($qb->expr()->eq('file_source', $qb->createNamedParameter($node->getId())));
+        }
+
+        if ($limit !== -1) {
+            $qb->setMaxResults($limit);
+        }
+
+        $qb->setFirstResult($offset);
+        $qb->orderBy('id');
+
+        $cursor = $qb->executeQuery();
+        $shares = [];
+        while ($data = $cursor->fetch()) {
+            $shares[] = $this->createShareObject($data);
+        }
+        $cursor->closeCursor();
+
+        return $shares;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getShareById($id, $recipientId = null): IShare {
+        $qb = $this->dbConnection->getQueryBuilder();
+
+        $qb->select('*')
+            ->from('share')
+            ->where($qb->expr()->eq('id', $qb->createNamedParameter($id)))
+            ->andWhere($qb->expr()->eq('share_type', $qb->createNamedParameter(IShare::TYPE_EMAIL)));
+
+        $cursor = $qb->executeQuery();
+        $data = $cursor->fetch();
+        $cursor->closeCursor();
+
+        if ($data === false) {
+            throw new ShareNotFound();
+        }
+
+        try {
+            $share = $this->createShareObject($data);
+        } catch (InvalidShare $e) {
+            throw new ShareNotFound();
+        }
+
+        return $share;
+    }
+
+    /**
+     * Get shares for a given path
+     *
+     * @return IShare[]
+     */
+    public function getSharesByPath(Node $path): array {
+        $qb = $this->dbConnection->getQueryBuilder();
+
+        $cursor = $qb->select('*')
+            ->from('share')
+            ->andWhere($qb->expr()->eq('file_source', $qb->createNamedParameter($path->getId())))
+            ->andWhere($qb->expr()->eq('share_type', $qb->createNamedParameter(IShare::TYPE_EMAIL)))
+            ->executeQuery();
+
+        $shares = [];
+        while ($data = $cursor->fetch()) {
+            $shares[] = $this->createShareObject($data);
+        }
+        $cursor->closeCursor();
+
+        return $shares;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getSharedWith($userId, $shareType, $node, $limit, $offset): array {
+        /** @var IShare[] $shares */
+        $shares = [];
+
+        //Get shares directly with this user
+        $qb = $this->dbConnection->getQueryBuilder();
+        $qb->select('*')
+            ->from('share');
+
+        // Order by id
+        $qb->orderBy('id');
+
+        // Set limit and offset
+        if ($limit !== -1) {
+            $qb->setMaxResults($limit);
+        }
+        $qb->setFirstResult($offset);
+
+        $qb->where($qb->expr()->eq('share_type', $qb->createNamedParameter(IShare::TYPE_EMAIL)));
+        $qb->andWhere($qb->expr()->eq('share_with', $qb->createNamedParameter($userId)));
+
+        // Filter by node if provided
+        if ($node !== null) {
+            $qb->andWhere($qb->expr()->eq('file_source', $qb->createNamedParameter($node->getId())));
+        }
+
+        $cursor = $qb->executeQuery();
+
+        while ($data = $cursor->fetch()) {
+            $shares[] = $this->createShareObject($data);
+        }
+        $cursor->closeCursor();
+
+
+        return $shares;
+    }
+
+    /**
+     * Get a share by token
+     *
+     * @throws ShareNotFound
+     */
+    public function getShareByToken($token): IShare {
+        $qb = $this->dbConnection->getQueryBuilder();
+
+        $cursor = $qb->select('*')
+            ->from('share')
+            ->where($qb->expr()->eq('share_type', $qb->createNamedParameter(IShare::TYPE_EMAIL)))
+            ->andWhere($qb->expr()->eq('token', $qb->createNamedParameter($token)))
+            ->executeQuery();
+
+        $data = $cursor->fetch();
+
+        if ($data === false) {
+            throw new ShareNotFound('Share not found', $this->l->t('Could not find share'));
+        }
+
+        try {
+            $share = $this->createShareObject($data);
+        } catch (InvalidShare $e) {
+            throw new ShareNotFound('Share not found', $this->l->t('Could not find share'));
+        }
+
+        return $share;
+    }
+
+    /**
+     * remove share from table
+     */
+    protected function removeShareFromTable(int $shareId): void {
+        $qb = $this->dbConnection->getQueryBuilder();
+        $qb->delete('share')
+            ->where($qb->expr()->eq('id', $qb->createNamedParameter($shareId)));
+        $qb->executeStatement();
+    }
+
+    /**
+     * Create a share object from a database row
+     *
+     * @throws InvalidShare
+     * @throws ShareNotFound
+     */
+    protected function createShareObject(array $data): IShare {
+        $share = new Share($this->rootFolder, $this->userManager);
+        $share->setId((int)$data['id'])
+            ->setShareType((int)$data['share_type'])
+            ->setPermissions((int)$data['permissions'])
+            ->setTarget($data['file_target'])
+            ->setMailSend((bool)$data['mail_send'])
+            ->setNote($data['note'])
+            ->setToken($data['token']);
+
+        $shareTime = new \DateTime();
+        $shareTime->setTimestamp((int)$data['stime']);
+        $share->setShareTime($shareTime);
+        $share->setSharedWith($data['share_with'] ?? '');
+        $share->setPassword($data['password']);
+        $passwordExpirationTime = \DateTime::createFromFormat('Y-m-d H:i:s', $data['password_expiration_time'] ?? '');
+        $share->setPasswordExpirationTime($passwordExpirationTime !== false ? $passwordExpirationTime : null);
+        $share->setLabel($data['label'] ?? '');
+        $share->setSendPasswordByTalk((bool)$data['password_by_talk']);
+        $share->setHideDownload((bool)$data['hide_download']);
+        $share->setReminderSent((bool)$data['reminder_sent']);
+
+        if ($data['uid_initiator'] !== null) {
+            $share->setShareOwner($data['uid_owner']);
+            $share->setSharedBy($data['uid_initiator']);
+        } else {
+            //OLD SHARE
+            $share->setSharedBy($data['uid_owner']);
+            $path = $this->getNode($share->getSharedBy(), (int)$data['file_source']);
+
+            $owner = $path->getOwner();
+            $share->setShareOwner($owner->getUID());
+        }
+
+        if ($data['expiration'] !== null) {
+            $expiration = \DateTime::createFromFormat('Y-m-d H:i:s', $data['expiration']);
+            if ($expiration !== false) {
+                $share->setExpirationDate($expiration);
+            }
+        }
+
+        $share = $this->updateShareAttributes($share, $data['attributes']);
+
+        $share->setNodeId((int)$data['file_source']);
+        $share->setNodeType($data['item_type']);
+
+        $share->setProviderId($this->identifier());
+
+        return $share;
+    }
+
+    /**
+     * Get the node with file $id for $user
+     *
+     * @throws InvalidShare
+     */
+    private function getNode(string $userId, int $id): Node {
+        try {
+            $userFolder = $this->rootFolder->getUserFolder($userId);
+        } catch (NoUserException $e) {
+            throw new InvalidShare();
+        }
+
+        $nodes = $userFolder->getById($id);
+
+        if (empty($nodes)) {
+            throw new InvalidShare();
+        }
+
+        return $nodes[0];
+    }
+
+    /**
+     * A user is deleted from the system
+     * So clean up the relevant shares.
+     */
+    public function userDeleted($uid, $shareType): void {
+        $qb = $this->dbConnection->getQueryBuilder();
+
+        $qb->delete('share')
+            ->where($qb->expr()->eq('share_type', $qb->createNamedParameter(IShare::TYPE_EMAIL)))
+            ->andWhere($qb->expr()->eq('uid_owner', $qb->createNamedParameter($uid)))
+            ->executeStatement();
+    }
+
+    /**
+     * This provider does not support group shares
+     */
+    public function groupDeleted($gid): void {
+    }
+
+    /**
+     * This provider does not support group shares
+     */
+    public function userDeletedFromGroup($uid, $gid): void {
+    }
+
+    /**
+     * get database row of a give share
+     *
+     * @throws ShareNotFound
+     */
+    protected function getRawShare(int $id): array {
+        // Now fetch the inserted share and create a complete share object
+        $qb = $this->dbConnection->getQueryBuilder();
+        $qb->select('*')
+            ->from('share')
+            ->where($qb->expr()->eq('id', $qb->createNamedParameter($id)));
+
+        $cursor = $qb->executeQuery();
+        $data = $cursor->fetch();
+        $cursor->closeCursor();
+
+        if ($data === false) {
+            throw new ShareNotFound;
+        }
+
+        return $data;
+    }
+
+    public function getSharesInFolder($userId, Folder $node, $reshares, $shallow = true): array {
+        return $this->getSharesInFolderInternal($userId, $node, $reshares);
+    }
+
+    public function getAllSharesInFolder(Folder $node): array {
+        return $this->getSharesInFolderInternal(null, $node, null);
+    }
+
+    /**
+     * @return array<int, list<IShare>>
+     */
+    private function getSharesInFolderInternal(?string $userId, Folder $node, ?bool $reshares): array {
+        $qb = $this->dbConnection->getQueryBuilder();
+        $qb->select('*')
+            ->from('share', 's')
+            ->andWhere($qb->expr()->in('item_type', $qb->createNamedParameter(['file', 'folder'], IQueryBuilder::PARAM_STR_ARRAY)))
+            ->andWhere(
+                $qb->expr()->eq('share_type', $qb->createNamedParameter(IShare::TYPE_EMAIL))
+            );
+
+        if ($userId !== null) {
+            /**
+             * Reshares for this user are shares where they are the owner.
+             */
+            if ($reshares !== true) {
+                $qb->andWhere($qb->expr()->eq('uid_initiator', $qb->createNamedParameter($userId)));
+            } else {
+                $qb->andWhere(
+                    $qb->expr()->orX(
+                        $qb->expr()->eq('uid_owner', $qb->createNamedParameter($userId)),
+                        $qb->expr()->eq('uid_initiator', $qb->createNamedParameter($userId))
+                    )
+                );
+            }
+        }
+
+        $qb->innerJoin('s', 'filecache', 'f', $qb->expr()->eq('s.file_source', 'f.fileid'));
+
+        $qb->andWhere($qb->expr()->eq('f.parent', $qb->createNamedParameter($node->getId())));
+
+        $qb->orderBy('id');
+
+        $cursor = $qb->executeQuery();
+        $shares = [];
+        while ($data = $cursor->fetch()) {
+            $shares[$data['fileid']][] = $this->createShareObject($data);
+        }
+        $cursor->closeCursor();
+
+        return $shares;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getAccessList($nodes, $currentAccess): array {
+        $ids = [];
+        foreach ($nodes as $node) {
+            $ids[] = $node->getId();
+        }
+
+        $qb = $this->dbConnection->getQueryBuilder();
+        $qb->select('share_with', 'file_source', 'token')
+            ->from('share')
+            ->where($qb->expr()->eq('share_type', $qb->createNamedParameter(IShare::TYPE_EMAIL)))
+            ->andWhere($qb->expr()->in('file_source', $qb->createNamedParameter($ids, IQueryBuilder::PARAM_INT_ARRAY)))
+            ->andWhere($qb->expr()->in('item_type', $qb->createNamedParameter(['file', 'folder'], IQueryBuilder::PARAM_STR_ARRAY)));
+        $cursor = $qb->executeQuery();
+
+        $public = false;
+        $mail = [];
+        while ($row = $cursor->fetch()) {
+            $public = true;
+            if ($currentAccess === false) {
+                $mail[] = $row['share_with'];
+            } else {
+                $mail[$row['share_with']] = [
+                    'node_id' => $row['file_source'],
+                    'token' => $row['token']
+                ];
+            }
+        }
+        $cursor->closeCursor();
+
+        return ['public' => $public, 'mail' => $mail];
+    }
+
+    public function getAllShares(): iterable {
+        $qb = $this->dbConnection->getQueryBuilder();
+
+        $qb->select('*')
+            ->from('share')
+            ->where(
+                $qb->expr()->orX(
+                    $qb->expr()->eq('share_type', $qb->createNamedParameter(IShare::TYPE_EMAIL))
+                )
+            );
+
+        $cursor = $qb->executeQuery();
+        while ($data = $cursor->fetch()) {
+            try {
+                $share = $this->createShareObject($data);
+            } catch (InvalidShare $e) {
+                continue;
+            } catch (ShareNotFound $e) {
+                continue;
+            }
+
+            yield $share;
+        }
+        $cursor->closeCursor();
+    }
+
+    /**
+     * Extract the emails from the share
+     * It can be a single email, from the share_with field
+     * or a list of emails from the emails attributes field.
+     * @param IShare $share
+     * @return string[]
+     */
+    protected function getSharedWithEmails(IShare $share): array {
+        $attributes = $share->getAttributes();
+
+        if ($attributes === null) {
+            return [$share->getSharedWith()];
+        }
+
+        $emails = $attributes->getAttribute('shareWith', 'emails');
+        if (isset($emails) && is_array($emails) && !empty($emails)) {
+            return $emails;
+        }
+        return [$share->getSharedWith()];
+    }
 }

Spacing +34 added lines, -34 removed lines

@@ -158,7 +158,7 @@ 
 			[$userFolder->getRelativePath($share->getNode()->getPath()), $share->getSharedWith()],
 			$share->getSharedBy(),
 			$share->getNode()->getId(),
-			(string)$userFolder->getRelativePath($share->getNode()->getPath())
+			(string) $userFolder->getRelativePath($share->getNode()->getPath())
 		);
 
 		if ($share->getShareOwner() !== $share->getSharedBy()) {
@@ -171,7 +171,7 @@ 
 				[$ownerFolder->getRelativePath($ownerPath), $share->getSharedWith(), $share->getSharedBy()],
 				$share->getShareOwner(),
 				$fileId,
-				(string)$ownerFolder->getRelativePath($ownerPath)
+				(string) $ownerFolder->getRelativePath($ownerPath)
 			);
 		}
 	}
@@ -188,7 +188,7 @@ 
 				[$userFolder->getRelativePath($share->getNode()->getPath())],
 				$share->getSharedBy(),
 				$share->getNode()->getId(),
-				(string)$userFolder->getRelativePath($share->getNode()->getPath())
+				(string) $userFolder->getRelativePath($share->getNode()->getPath())
 			);
 		} else {
 			$this->publishActivity(
@@ -196,7 +196,7 @@ 
 				[$userFolder->getRelativePath($share->getNode()->getPath()), $sharedWith],
 				$share->getSharedBy(),
 				$share->getNode()->getId(),
-				(string)$userFolder->getRelativePath($share->getNode()->getPath())
+				(string) $userFolder->getRelativePath($share->getNode()->getPath())
 			);
 		}
 	}
@@ -247,15 +247,15 @@ 
 		$shareId = $share->getId();
 
 		$emails = $this->getSharedWithEmails($share);
-		$validEmails = array_filter($emails, function (string $email) {
+		$validEmails = array_filter($emails, function(string $email) {
 			return $this->emailValidator->isValid($email);
 		});
 
 		if (count($validEmails) === 0) {
-			$this->removeShareFromTable((int)$shareId);
-			$e = new HintException('Failed to send share by mail. Could not find a valid email address: ' . join(', ', $emails),
+			$this->removeShareFromTable((int) $shareId);
+			$e = new HintException('Failed to send share by mail. Could not find a valid email address: '.join(', ', $emails),
 				$this->l->t('Failed to send share by email. Got an invalid email address'));
-			$this->logger->error('Failed to send share by mail. Could not find a valid email address ' . join(', ', $emails), [
+			$this->logger->error('Failed to send share by mail. Could not find a valid email address '.join(', ', $emails), [
 				'app' => 'sharebymail',
 				'exception' => $e,
 			]);
@@ -287,14 +287,14 @@ 
 				'app' => 'sharebymail',
 				'exception' => $hintException,
 			]);
-			$this->removeShareFromTable((int)$shareId);
+			$this->removeShareFromTable((int) $shareId);
 			throw $hintException;
 		} catch (\Exception $e) {
 			$this->logger->error('Failed to send share by mail.', [
 				'app' => 'sharebymail',
 				'exception' => $e,
 			]);
-			$this->removeShareFromTable((int)$shareId);
+			$this->removeShareFromTable((int) $shareId);
 			throw new HintException(
 				'Failed to send share by mail',
 				$this->l->t('Failed to send share by email'),
@@ -347,7 +347,7 @@ 
 		}
 
 		if ($expiration !== null) {
-			$dateString = (string)$this->l->l('date', $expiration, ['width' => 'medium']);
+			$dateString = (string) $this->l->l('date', $expiration, ['width' => 'medium']);
 			$emailTemplate->addBodyListItem(
 				$this->l->t('This share is valid until %s at midnight', [$dateString]),
 				$this->l->t('Expiration:'),
@@ -388,7 +388,7 @@ 
 			$initiatorEmail = $initiatorUser->getEMailAddress();
 			if ($initiatorEmail !== null) {
 				$message->setReplyTo([$initiatorEmail => $initiatorDisplayName]);
-				$emailTemplate->addFooter($instanceName . ($this->defaults->getSlogan() !== '' ? ' - ' . $this->defaults->getSlogan() : ''));
+				$emailTemplate->addFooter($instanceName.($this->defaults->getSlogan() !== '' ? ' - '.$this->defaults->getSlogan() : ''));
 			} else {
 				$emailTemplate->addFooter();
 			}
@@ -399,7 +399,7 @@ 
 		$message->useTemplate($emailTemplate);
 		$failedRecipients = $this->mailer->send($message);
 		if (!empty($failedRecipients)) {
-			$this->logger->error('Share notification mail could not be sent to: ' . implode(', ', $failedRecipients));
+			$this->logger->error('Share notification mail could not be sent to: '.implode(', ', $failedRecipients));
 			return;
 		}
 	}
@@ -452,7 +452,7 @@ 
 		if ($this->config->getSystemValue('sharing.enable_mail_link_password_expiration', false) === true) {
 			$expirationTime = new \DateTime();
 			$expirationInterval = $this->config->getSystemValue('sharing.mail_link_password_expiration_interval', 3600);
-			$expirationTime = $expirationTime->add(new \DateInterval('PT' . $expirationInterval . 'S'));
+			$expirationTime = $expirationTime->add(new \DateInterval('PT'.$expirationInterval.'S'));
 			$emailTemplate->addBodyText($this->l->t('This password will expire at %s', [$expirationTime->format('r')]));
 		}
 
@@ -484,7 +484,7 @@ 
 			$initiatorEmail = $initiatorUser->getEMailAddress();
 			if ($initiatorEmail !== null) {
 				$message->setReplyTo([$initiatorEmail => $initiatorDisplayName]);
-				$emailTemplate->addFooter($instanceName . ($this->defaults->getSlogan() !== '' ? ' - ' . $this->defaults->getSlogan() : ''));
+				$emailTemplate->addFooter($instanceName.($this->defaults->getSlogan() !== '' ? ' - '.$this->defaults->getSlogan() : ''));
 			} else {
 				$emailTemplate->addFooter();
 			}
@@ -495,7 +495,7 @@ 
 		$message->useTemplate($emailTemplate);
 		$failedRecipients = $this->mailer->send($message);
 		if (!empty($failedRecipients)) {
-			$this->logger->error('Share password mail could not be sent to: ' . implode(', ', $failedRecipients));
+			$this->logger->error('Share password mail could not be sent to: '.implode(', ', $failedRecipients));
 			return false;
 		}
 
@@ -549,7 +549,7 @@ 
 		$message->setFrom([Util::getDefaultEmailAddress($instanceName) => $senderName]);
 		if ($this->settingsManager->replyToInitiator() && $initiatorEmailAddress !== null) {
 			$message->setReplyTo([$initiatorEmailAddress => $initiatorDisplayName]);
-			$emailTemplate->addFooter($instanceName . ' - ' . $this->defaults->getSlogan());
+			$emailTemplate->addFooter($instanceName.' - '.$this->defaults->getSlogan());
 		} else {
 			$emailTemplate->addFooter();
 		}
@@ -599,7 +599,7 @@ 
 		if ($this->config->getSystemValue('sharing.enable_mail_link_password_expiration', false) === true) {
 			$expirationTime = new \DateTime();
 			$expirationInterval = $this->config->getSystemValue('sharing.mail_link_password_expiration_interval', 3600);
-			$expirationTime = $expirationTime->add(new \DateInterval('PT' . $expirationInterval . 'S'));
+			$expirationTime = $expirationTime->add(new \DateInterval('PT'.$expirationInterval.'S'));
 			$emailTemplate->addBodyText($this->l->t('This password will expire at %s', [$expirationTime->format('r')]));
 		}
 
@@ -694,10 +694,10 @@ 
 			->setValue('password_expiration_time', $qb->createNamedParameter($passwordExpirationTime, IQueryBuilder::PARAM_DATETIME_MUTABLE))
 			->setValue('password_by_talk', $qb->createNamedParameter($sendPasswordByTalk, IQueryBuilder::PARAM_BOOL))
 			->setValue('stime', $qb->createNamedParameter(time()))
-			->setValue('hide_download', $qb->createNamedParameter((int)$hideDownload, IQueryBuilder::PARAM_INT))
+			->setValue('hide_download', $qb->createNamedParameter((int) $hideDownload, IQueryBuilder::PARAM_INT))
 			->setValue('label', $qb->createNamedParameter($label))
 			->setValue('note', $qb->createNamedParameter($note))
-			->setValue('mail_send', $qb->createNamedParameter((int)$mailSend, IQueryBuilder::PARAM_INT));
+			->setValue('mail_send', $qb->createNamedParameter((int) $mailSend, IQueryBuilder::PARAM_INT));
 
 		// set share attributes
 		$shareAttributes = $this->formatShareAttributes($attributes);
@@ -723,7 +723,7 @@ 
 		if ($validPassword && ($originalShare->getPassword() !== $share->getPassword()
 								|| ($originalShare->getSendPasswordByTalk() && !$share->getSendPasswordByTalk()))) {
 			$emails = $this->getSharedWithEmails($share);
-			$validEmails = array_filter($emails, function ($email) {
+			$validEmails = array_filter($emails, function($email) {
 				return $this->emailValidator->isValid($email);
 			});
 			$this->sendPassword($share, $plainTextPassword, $validEmails);
@@ -749,9 +749,9 @@ 
 			->set('password_by_talk', $qb->createNamedParameter($share->getSendPasswordByTalk(), IQueryBuilder::PARAM_BOOL))
 			->set('expiration', $qb->createNamedParameter($share->getExpirationDate(), IQueryBuilder::PARAM_DATETIME_MUTABLE))
 			->set('note', $qb->createNamedParameter($share->getNote()))
-			->set('hide_download', $qb->createNamedParameter((int)$share->getHideDownload(), IQueryBuilder::PARAM_INT))
+			->set('hide_download', $qb->createNamedParameter((int) $share->getHideDownload(), IQueryBuilder::PARAM_INT))
 			->set('attributes', $qb->createNamedParameter($shareAttributes))
-			->set('mail_send', $qb->createNamedParameter((int)$share->getMailSend(), IQueryBuilder::PARAM_INT))
+			->set('mail_send', $qb->createNamedParameter((int) $share->getMailSend(), IQueryBuilder::PARAM_INT))
 			->set('reminder_sent', $qb->createNamedParameter($share->getReminderSent(), IQueryBuilder::PARAM_BOOL))
 			->executeStatement();
 
@@ -783,7 +783,7 @@ 
 		} catch (\Exception $e) {
 		}
 
-		$this->removeShareFromTable((int)$share->getId());
+		$this->removeShareFromTable((int) $share->getId());
 	}
 
 	/**
@@ -991,25 +991,25 @@ 
 	 */
 	protected function createShareObject(array $data): IShare {
 		$share = new Share($this->rootFolder, $this->userManager);
-		$share->setId((int)$data['id'])
-			->setShareType((int)$data['share_type'])
-			->setPermissions((int)$data['permissions'])
+		$share->setId((int) $data['id'])
+			->setShareType((int) $data['share_type'])
+			->setPermissions((int) $data['permissions'])
 			->setTarget($data['file_target'])
-			->setMailSend((bool)$data['mail_send'])
+			->setMailSend((bool) $data['mail_send'])
 			->setNote($data['note'])
 			->setToken($data['token']);
 
 		$shareTime = new \DateTime();
-		$shareTime->setTimestamp((int)$data['stime']);
+		$shareTime->setTimestamp((int) $data['stime']);
 		$share->setShareTime($shareTime);
 		$share->setSharedWith($data['share_with'] ?? '');
 		$share->setPassword($data['password']);
 		$passwordExpirationTime = \DateTime::createFromFormat('Y-m-d H:i:s', $data['password_expiration_time'] ?? '');
 		$share->setPasswordExpirationTime($passwordExpirationTime !== false ? $passwordExpirationTime : null);
 		$share->setLabel($data['label'] ?? '');
-		$share->setSendPasswordByTalk((bool)$data['password_by_talk']);
-		$share->setHideDownload((bool)$data['hide_download']);
-		$share->setReminderSent((bool)$data['reminder_sent']);
+		$share->setSendPasswordByTalk((bool) $data['password_by_talk']);
+		$share->setHideDownload((bool) $data['hide_download']);
+		$share->setReminderSent((bool) $data['reminder_sent']);
 
 		if ($data['uid_initiator'] !== null) {
 			$share->setShareOwner($data['uid_owner']);
@@ -1017,7 +1017,7 @@ 
 		} else {
 			//OLD SHARE
 			$share->setSharedBy($data['uid_owner']);
-			$path = $this->getNode($share->getSharedBy(), (int)$data['file_source']);
+			$path = $this->getNode($share->getSharedBy(), (int) $data['file_source']);
 
 			$owner = $path->getOwner();
 			$share->setShareOwner($owner->getUID());
@@ -1032,7 +1032,7 @@ 
 
 		$share = $this->updateShareAttributes($share, $data['attributes']);
 
-		$share->setNodeId((int)$data['file_source']);
+		$share->setNodeId((int) $data['file_source']);
 		$share->setNodeType($data['item_type']);
 
 		$share->setProviderId($this->identifier());

apps/sharebymail/tests/ShareByMailProviderTest.php

Indentation +1810 added lines, -1810 removed lines

@@ -50,1861 +50,1861 @@
  * @group DB
  */
 class ShareByMailProviderTest extends TestCase {
-	use EmailValidatorTrait;
-
-	private IDBConnection $connection;
-
-	private IL10N&MockObject $l;
-	private IShare&MockObject $share;
-	private IConfig&MockObject $config;
-	private IMailer&MockObject $mailer;
-	private IHasher&MockObject $hasher;
-	private Defaults&MockObject $defaults;
-	private IManager&MockObject $shareManager;
-	private LoggerInterface&MockObject $logger;
-	private IRootFolder&MockObject $rootFolder;
-	private IUserManager&MockObject $userManager;
-	private ISecureRandom&MockObject $secureRandom;
-	private IURLGenerator&MockObject $urlGenerator;
-	private SettingsManager&MockObject $settingsManager;
-	private IActivityManager&MockObject $activityManager;
-	private IEventDispatcher&MockObject $eventDispatcher;
-
-	protected function setUp(): void {
-		parent::setUp();
-
-		$this->connection = Server::get(IDBConnection::class);
-
-		$this->l = $this->createMock(IL10N::class);
-		$this->l->method('t')
-			->willReturnCallback(function ($text, $parameters = []) {
-				return vsprintf($text, $parameters);
-			});
-		$this->config = $this->createMock(IConfig::class);
-		$this->logger = $this->createMock(LoggerInterface::class);
-		$this->rootFolder = $this->createMock('OCP\Files\IRootFolder');
-		$this->userManager = $this->createMock(IUserManager::class);
-		$this->secureRandom = $this->createMock('\OCP\Security\ISecureRandom');
-		$this->mailer = $this->createMock('\OCP\Mail\IMailer');
-		$this->urlGenerator = $this->createMock(IURLGenerator::class);
-		$this->share = $this->createMock(IShare::class);
-		$this->activityManager = $this->createMock('OCP\Activity\IManager');
-		$this->settingsManager = $this->createMock(SettingsManager::class);
-		$this->defaults = $this->createMock(Defaults::class);
-		$this->hasher = $this->createMock(IHasher::class);
-		$this->eventDispatcher = $this->createMock(IEventDispatcher::class);
-		$this->shareManager = $this->createMock(IManager::class);
-
-		$this->userManager->expects($this->any())->method('userExists')->willReturn(true);
-		$this->config->expects($this->any())->method('getAppValue')->with('core', 'enforce_strict_email_check')->willReturn('yes');
-	}
-
-	/**
-	 * get instance of Mocked ShareByMailProvider
-	 *
-	 * @param array $mockedMethods internal methods which should be mocked
-	 * @return \PHPUnit\Framework\MockObject\MockObject | ShareByMailProvider
-	 */
-	private function getInstance(array $mockedMethods = []) {
-		if (!empty($mockedMethods)) {
-			return $this->getMockBuilder(ShareByMailProvider::class)
-				->setConstructorArgs([
-					$this->config,
-					$this->connection,
-					$this->secureRandom,
-					$this->userManager,
-					$this->rootFolder,
-					$this->l,
-					$this->logger,
-					$this->mailer,
-					$this->urlGenerator,
-					$this->activityManager,
-					$this->settingsManager,
-					$this->defaults,
-					$this->hasher,
-					$this->eventDispatcher,
-					$this->shareManager,
-					$this->getEmailValidatorWithStrictEmailCheck(),
-				])
-				->onlyMethods($mockedMethods)
-				->getMock();
-		}
-
-		return new ShareByMailProvider(
-			$this->config,
-			$this->connection,
-			$this->secureRandom,
-			$this->userManager,
-			$this->rootFolder,
-			$this->l,
-			$this->logger,
-			$this->mailer,
-			$this->urlGenerator,
-			$this->activityManager,
-			$this->settingsManager,
-			$this->defaults,
-			$this->hasher,
-			$this->eventDispatcher,
-			$this->shareManager,
-			$this->getEmailValidatorWithStrictEmailCheck(),
-		);
-	}
-
-	protected function tearDown(): void {
-		$this->connection
-			->getQueryBuilder()
-			->delete('share')
-			->executeStatement();
-
-		parent::tearDown();
-	}
-
-	public function testCreate(): void {
-		$expectedShare = $this->createMock(IShare::class);
-
-		$share = $this->createMock(IShare::class);
-		$share->expects($this->any())->method('getSharedWith')->willReturn('user1');
-
-		$node = $this->createMock(File::class);
-		$node->expects($this->any())->method('getName')->willReturn('filename');
-
-		$instance = $this->getInstance(['getSharedWith', 'createMailShare', 'getRawShare', 'createShareObject', 'createShareActivity', 'sendEmail', 'sendPassword']);
-
-		$instance->expects($this->once())->method('getSharedWith')->willReturn([]);
-		$instance->expects($this->once())->method('createMailShare')->with($share)->willReturn(42);
-		$instance->expects($this->once())->method('createShareActivity')->with($share);
-		$instance->expects($this->once())->method('getRawShare')->with(42)->willReturn(['rawShare']);
-		$instance->expects($this->once())->method('createShareObject')->with(['rawShare'])->willReturn($expectedShare);
-		$share->expects($this->any())->method('getNode')->willReturn($node);
-
-		// As share api link password is not enforced, the password will not be generated.
-		$this->shareManager->expects($this->once())->method('shareApiLinkEnforcePassword')->willReturn(false);
-		$this->settingsManager->expects($this->never())->method('sendPasswordByMail');
-
-		// Mail notification is triggered by the share manager.
-		$instance->expects($this->never())->method('sendEmail');
-		$instance->expects($this->never())->method('sendPassword');
-
-		$this->assertSame($expectedShare, $instance->create($share));
-	}
-
-	public function testCreateSendPasswordByMailWithoutEnforcedPasswordProtection(): void {
-		$expectedShare = $this->createMock(IShare::class);
-
-		$node = $this->createMock(File::class);
-		$node->expects($this->any())->method('getName')->willReturn('filename');
-
-		$share = $this->createMock(IShare::class);
-		$share->expects($this->any())->method('getSharedWith')->willReturn('receiver@examplelölöl.com');
-		$share->expects($this->any())->method('getSendPasswordByTalk')->willReturn(false);
-		$share->expects($this->any())->method('getSharedBy')->willReturn('owner');
-		$share->expects($this->any())->method('getNode')->willReturn($node);
-		$share->expects($this->any())->method('getId')->willReturn(42);
-		$share->expects($this->any())->method('getNote')->willReturn('');
-		$share->expects($this->any())->method('getToken')->willReturn('token');
-
-		$instance = $this->getInstance(['getSharedWith', 'createMailShare', 'getRawShare', 'createShareObject', 'createShareActivity', 'autoGeneratePassword', 'createPasswordSendActivity', 'sendEmail', 'sendPassword', 'sendPasswordToOwner']);
-		$instance->expects($this->once())->method('getSharedWith')->willReturn([]);
-		$instance->expects($this->once())->method('createMailShare')->with($share)->willReturn(42);
-		$instance->expects($this->once())->method('createShareActivity')->with($share);
-		$instance->expects($this->once())->method('getRawShare')->with(42)->willReturn(['rawShare']);
-		$instance->expects($this->once())->method('createShareObject')->with(['rawShare'])->willReturn($expectedShare);
-		$share->expects($this->any())->method('getNode')->willReturn($node);
-
-		// The autogenerated password should not be mailed.
-		$this->shareManager->expects($this->any())->method('shareApiLinkEnforcePassword')->willReturn(false);
-		$this->settingsManager->expects($this->any())->method('sendPasswordByMail')->willReturn(true);
-		$instance->expects($this->never())->method('autoGeneratePassword');
-
-		// No password is set and no password sent via talk is requested
-		$instance->expects($this->once())->method('sendEmail')->with($share, ['receiver@examplelölöl.com']);
-		$instance->expects($this->never())->method('sendPassword');
-		$instance->expects($this->never())->method('sendPasswordToOwner');
-
-		// The manager sends the mail notification.
-		// For the sake of testing simplicity, we will handle it ourselves.
-		$this->assertSame($expectedShare, $instance->create($share));
-		$instance->sendMailNotification($share);
-	}
-
-	public function testCreateSendPasswordByMailWithPasswordAndWithoutEnforcedPasswordProtectionWithPermanentPassword(): void {
-		$expectedShare = $this->createMock(IShare::class);
-
-		$node = $this->createMock(File::class);
-		$node->expects($this->any())->method('getName')->willReturn('filename');
-
-		$share = $this->createMock(IShare::class);
-		$share->expects($this->any())->method('getSharedWith')->willReturn('receiver@example.com');
-		$share->expects($this->any())->method('getSendPasswordByTalk')->willReturn(false);
-		$share->expects($this->any())->method('getSharedBy')->willReturn('owner');
-		$share->expects($this->any())->method('getNode')->willReturn($node);
-		$share->expects($this->any())->method('getId')->willReturn(42);
-		$share->expects($this->any())->method('getNote')->willReturn('');
-		$share->expects($this->any())->method('getToken')->willReturn('token');
-
-		$instance = $this->getInstance(['getSharedWith', 'createMailShare', 'getRawShare', 'createShareObject', 'createShareActivity', 'autoGeneratePassword', 'createPasswordSendActivity', 'sendEmail', 'sendPassword', 'sendPasswordToOwner']);
-
-		$instance->expects($this->once())->method('getSharedWith')->willReturn([]);
-		$instance->expects($this->once())->method('createMailShare')->with($share)->willReturn(42);
-		$instance->expects($this->once())->method('createShareActivity')->with($share);
-		$instance->expects($this->once())->method('getRawShare')->with(42)->willReturn(['rawShare', 'password' => 'password']);
-		$instance->expects($this->once())->method('createShareObject')->with(['rawShare', 'password' => 'password'])->willReturn($expectedShare);
-		$share->expects($this->any())->method('getNode')->willReturn($node);
-
-		$share->expects($this->any())->method('getPassword')->willReturn('password');
-		$this->hasher->expects($this->once())->method('hash')->with('password')->willReturn('passwordHashed');
-		$share->expects($this->once())->method('setPassword')->with('passwordHashed');
-
-		// The given password (but not the autogenerated password) should not be
-		// mailed to the receiver of the share because permanent passwords are not enforced.
-		$this->shareManager->expects($this->any())->method('shareApiLinkEnforcePassword')->willReturn(false);
-		$this->config->expects($this->once())->method('getSystemValue')->with('sharing.enable_mail_link_password_expiration')->willReturn(false);
-		$instance->expects($this->never())->method('autoGeneratePassword');
-
-		// A password is set but no password sent via talk has been requested
-		$instance->expects($this->once())->method('sendEmail')->with($share, ['receiver@example.com']);
-		$instance->expects($this->once())->method('sendPassword')->with($share, 'password');
-		$instance->expects($this->never())->method('sendPasswordToOwner');
-
-		$this->assertSame($expectedShare, $instance->create($share));
-		$instance->sendMailNotification($share);
-	}
-
-	public function testCreateSendPasswordByMailWithPasswordAndWithoutEnforcedPasswordProtectionWithoutPermanentPassword(): void {
-		$expectedShare = $this->createMock(IShare::class);
-
-		$node = $this->createMock(File::class);
-		$node->expects($this->any())->method('getName')->willReturn('filename');
-
-		$share = $this->createMock(IShare::class);
-		$share->expects($this->any())->method('getSharedWith')->willReturn('receiver@example.com');
-		$share->expects($this->any())->method('getSendPasswordByTalk')->willReturn(false);
-		$share->expects($this->any())->method('getSharedBy')->willReturn('owner');
-		$share->expects($this->any())->method('getNode')->willReturn($node);
-		$share->expects($this->any())->method('getId')->willReturn(42);
-		$share->expects($this->any())->method('getNote')->willReturn('');
-		$share->expects($this->any())->method('getToken')->willReturn('token');
-
-		$instance = $this->getInstance([
-			'getSharedWith', 'createMailShare', 'getRawShare', 'createShareObject',
-			'createShareActivity', 'autoGeneratePassword', 'createPasswordSendActivity',
-			'sendEmail', 'sendPassword', 'sendPasswordToOwner',
-		]);
-
-		$instance->expects($this->once())->method('getSharedWith')->willReturn([]);
-		$instance->expects($this->once())->method('createMailShare')->with($share)->willReturn(42);
-		$instance->expects($this->once())->method('createShareActivity')->with($share);
-		$instance->expects($this->once())->method('getRawShare')->with(42)->willReturn(['rawShare', 'password' => 'password']);
-		$instance->expects($this->once())->method('createShareObject')->with(['rawShare', 'password' => 'password'])->willReturn($expectedShare);
-		$share->expects($this->any())->method('getNode')->willReturn($node);
-
-		$share->expects($this->any())->method('getPassword')->willReturn('password');
-		$this->hasher->expects($this->once())->method('hash')->with('password')->willReturn('passwordHashed');
-		$share->expects($this->once())->method('setPassword')->with('passwordHashed');
-
-		// No password is generated, so no emails need to be sent
-		// aside from the main email notification.
-		$this->shareManager->expects($this->any())->method('shareApiLinkEnforcePassword')->willReturn(false);
-		$instance->expects($this->never())->method('autoGeneratePassword');
-		$this->config->expects($this->once())->method('getSystemValue')
-			->with('sharing.enable_mail_link_password_expiration')
-			->willReturn(true);
-
-		// No password has been set and no password sent via talk has been requested,
-		// but password has been enforced for the whole instance and will be generated.
-		$instance->expects($this->once())->method('sendEmail')->with($share, ['receiver@example.com']);
-		$instance->expects($this->never())->method('sendPassword');
-		$instance->expects($this->never())->method('sendPasswordToOwner');
-
-		$this->assertSame($expectedShare, $instance->create($share));
-		$instance->sendMailNotification($share);
-	}
-
-	public function testCreateSendPasswordByMailWithEnforcedPasswordProtectionWithPermanentPassword(): void {
-		$expectedShare = $this->createMock(IShare::class);
-
-		$node = $this->createMock(File::class);
-		$node->expects($this->any())->method('getName')->willReturn('filename');
-
-		$share = $this->createMock(IShare::class);
-		$share->expects($this->any())->method('getSharedWith')->willReturn('receiver@example.com');
-		$share->expects($this->any())->method('getSendPasswordByTalk')->willReturn(false);
-		$share->expects($this->any())->method('getSharedBy')->willReturn('owner');
-		$share->expects($this->any())->method('getNode')->willReturn($node);
-		$share->expects($this->any())->method('getId')->willReturn(42);
-		$share->expects($this->any())->method('getNote')->willReturn('');
-		$share->expects($this->any())->method('getToken')->willReturn('token');
-
-		$this->urlGenerator->expects($this->once())->method('linkToRouteAbsolute')
-			->with('files_sharing.sharecontroller.showShare', ['token' => 'token'])
-			->willReturn('https://example.com/file.txt');
-
-		$this->secureRandom->expects($this->once())
-			->method('generate')
-			->with(8, ISecureRandom::CHAR_HUMAN_READABLE)
-			->willReturn('autogeneratedPassword');
-		$this->eventDispatcher->expects($this->once())
-			->method('dispatchTyped')
-			->with(new GenerateSecurePasswordEvent(PasswordContext::SHARING));
-
-		$instance = $this->getInstance(['getSharedWith', 'createMailShare', 'getRawShare', 'createShareObject', 'createShareActivity', 'createPasswordSendActivity', 'sendPasswordToOwner']);
-
-		$instance->expects($this->once())->method('getSharedWith')->willReturn([]);
-		$instance->expects($this->once())->method('createMailShare')->with($share)->willReturn(42);
-		$instance->expects($this->once())->method('createShareActivity')->with($share);
-		$instance->expects($this->once())->method('getRawShare')->with(42)->willReturn(['rawShare', 'password' => 'autogeneratedPassword']);
-		$instance->expects($this->once())->method('createShareObject')->with(['rawShare', 'password' => 'autogeneratedPassword'])->willReturn($expectedShare);
-
-		// Initially not set, but will be set by the autoGeneratePassword method.
-		$share->expects($this->exactly(3))->method('getPassword')->willReturnOnConsecutiveCalls(null, 'autogeneratedPassword', 'autogeneratedPassword');
-		$this->hasher->expects($this->once())->method('hash')->with('autogeneratedPassword')->willReturn('autogeneratedPasswordHashed');
-		$share->expects($this->once())->method('setPassword')->with('autogeneratedPasswordHashed');
-
-		// The autogenerated password should be mailed to the receiver of the share because permanent passwords are enforced.
-		$this->shareManager->expects($this->any())->method('shareApiLinkEnforcePassword')->willReturn(true);
-		$this->config->expects($this->any())->method('getSystemValue')->with('sharing.enable_mail_link_password_expiration')->willReturn(false);
-		$this->settingsManager->expects($this->any())->method('sendPasswordByMail')->willReturn(true);
-
-		$message = $this->createMock(IMessage::class);
-		$message->expects($this->exactly(2))->method('setTo')->with(['receiver@example.com']);
-		$this->mailer->expects($this->exactly(2))->method('createMessage')->willReturn($message);
-		$calls = [
-			[
-				'sharebymail.RecipientNotification',
-				[
-					'filename' => 'filename',
-					'link' => 'https://example.com/file.txt',
-					'initiator' => 'owner',
-					'expiration' => null,
-					'shareWith' => 'receiver@example.com',
-					'note' => '',
-				],
-			],
-			[
-				'sharebymail.RecipientPasswordNotification',
-				[
-					'filename' => 'filename',
-					'password' => 'autogeneratedPassword',
-					'initiator' => 'owner',
-					'initiatorEmail' => null,
-					'shareWith' => 'receiver@example.com',
-				],
-			],
-		];
-		$this->mailer->expects($this->exactly(2))
-			->method('createEMailTemplate')
-			->willReturnCallback(function () use (&$calls) {
-				$expected = array_shift($calls);
-				$this->assertEquals($expected, func_get_args());
-				return $this->createMock(IEMailTemplate::class);
-			});
-
-		// Main email notification is sent as well as the password
-		// to the recipient because shareApiLinkEnforcePassword is enabled.
-		$this->mailer->expects($this->exactly(2))->method('send');
-		$instance->expects($this->never())->method('sendPasswordToOwner');
-
-		$this->assertSame($expectedShare, $instance->create($share));
-		$instance->sendMailNotification($share);
-	}
-
-	public function testCreateSendPasswordByMailWithPasswordAndWithEnforcedPasswordProtectionWithPermanentPassword(): void {
-		$expectedShare = $this->createMock(IShare::class);
-
-		$node = $this->createMock(File::class);
-		$node->expects($this->any())->method('getName')->willReturn('filename');
-
-		$share = $this->createMock(IShare::class);
-		$share->expects($this->any())->method('getSharedWith')->willReturn('receiver@example.com');
-		$share->expects($this->any())->method('getSendPasswordByTalk')->willReturn(false);
-		$share->expects($this->any())->method('getSharedBy')->willReturn('owner');
-		$share->expects($this->any())->method('getNode')->willReturn($node);
-		$share->expects($this->any())->method('getId')->willReturn(42);
-		$share->expects($this->any())->method('getNote')->willReturn('');
-		$share->expects($this->any())->method('getToken')->willReturn('token');
-
-		$this->urlGenerator->expects($this->once())->method('linkToRouteAbsolute')
-			->with('files_sharing.sharecontroller.showShare', ['token' => 'token'])
-			->willReturn('https://example.com/file.txt');
-
-		$instance = $this->getInstance(['getSharedWith', 'createMailShare', 'getRawShare', 'createShareObject', 'createShareActivity', 'autoGeneratePassword', 'createPasswordSendActivity', 'sendPasswordToOwner']);
-
-		$instance->expects($this->once())->method('getSharedWith')->willReturn([]);
-		$instance->expects($this->once())->method('createMailShare')->with($share)->willReturn(42);
-		$instance->expects($this->once())->method('createShareActivity')->with($share);
-		$instance->expects($this->once())->method('getRawShare')->with(42)->willReturn(['rawShare', 'password' => 'password']);
-		$instance->expects($this->once())->method('createShareObject')->with(['rawShare', 'password' => 'password'])->willReturn($expectedShare);
-
-		$share->expects($this->exactly(3))->method('getPassword')->willReturn('password');
-		$this->hasher->expects($this->once())->method('hash')->with('password')->willReturn('passwordHashed');
-		$share->expects($this->once())->method('setPassword')->with('passwordHashed');
-
-		// The given password (but not the autogenerated password) should be
-		// mailed to the receiver of the share.
-		$this->shareManager->expects($this->any())->method('shareApiLinkEnforcePassword')->willReturn(true);
-		$this->config->expects($this->any())->method('getSystemValue')->with('sharing.enable_mail_link_password_expiration')->willReturn(false);
-		$this->settingsManager->expects($this->any())->method('sendPasswordByMail')->willReturn(true);
-		$instance->expects($this->never())->method('autoGeneratePassword');
-
-		$message = $this->createMock(IMessage::class);
-		$message->expects($this->exactly(2))->method('setTo')->with(['receiver@example.com']);
-		$this->mailer->expects($this->exactly(2))->method('createMessage')->willReturn($message);
-
-		$calls = [
-			[
-				'sharebymail.RecipientNotification',
-				[
-					'filename' => 'filename',
-					'link' => 'https://example.com/file.txt',
-					'initiator' => 'owner',
-					'expiration' => null,
-					'shareWith' => 'receiver@example.com',
-					'note' => '',
-				],
-			],
-			[
-				'sharebymail.RecipientPasswordNotification',
-				[
-					'filename' => 'filename',
-					'password' => 'password',
-					'initiator' => 'owner',
-					'initiatorEmail' => null,
-					'shareWith' => 'receiver@example.com',
-				],
-			],
-		];
-		$this->mailer->expects($this->exactly(2))
-			->method('createEMailTemplate')
-			->willReturnCallback(function () use (&$calls) {
-				$expected = array_shift($calls);
-				$this->assertEquals($expected, func_get_args());
-				return $this->createMock(IEMailTemplate::class);
-			});
-
-		// Main email notification is sent as well as the password
-		// to the recipient because the password is set.
-		$this->mailer->expects($this->exactly(2))->method('send');
-		$instance->expects($this->never())->method('sendPasswordToOwner');
-
-		$this->assertSame($expectedShare, $instance->create($share));
-		$instance->sendMailNotification($share);
-	}
-
-	public function testCreateSendPasswordByTalkWithEnforcedPasswordProtectionWithPermanentPassword(): void {
-		$expectedShare = $this->createMock(IShare::class);
-
-		// The owner of the share.
-		$owner = $this->createMock(IUser::class);
-		$this->userManager->expects($this->any())->method('get')->with('owner')->willReturn($owner);
-		$owner->expects($this->any())->method('getEMailAddress')->willReturn('owner@example.com');
-		$owner->expects($this->any())->method('getDisplayName')->willReturn('owner');
-
-		$node = $this->createMock(File::class);
-		$node->expects($this->any())->method('getName')->willReturn('filename');
-
-		$share = $this->createMock(IShare::class);
-		$share->expects($this->any())->method('getSharedWith')->willReturn('receiver@example.com');
-		$share->expects($this->any())->method('getSendPasswordByTalk')->willReturn(true);
-		$share->expects($this->any())->method('getSharedBy')->willReturn('owner');
-		$share->expects($this->any())->method('getNode')->willReturn($node);
-		$share->expects($this->any())->method('getId')->willReturn(42);
-		$share->expects($this->any())->method('getNote')->willReturn('');
-		$share->expects($this->any())->method('getToken')->willReturn('token');
-
-		$this->urlGenerator->expects($this->once())->method('linkToRouteAbsolute')
-			->with('files_sharing.sharecontroller.showShare', ['token' => 'token'])
-			->willReturn('https://example.com/file.txt');
-
-		$instance = $this->getInstance(['getSharedWith', 'createMailShare', 'getRawShare', 'createShareObject', 'createShareActivity', 'autoGeneratePassword', 'createPasswordSendActivity']);
-
-		$instance->expects($this->once())->method('getSharedWith')->willReturn([]);
-		$instance->expects($this->once())->method('createMailShare')->with($share)->willReturn(42);
-		$instance->expects($this->once())->method('createShareActivity')->with($share);
-		$instance->expects($this->once())->method('getRawShare')->with(42)->willReturn(['rawShare', 'password' => 'autogeneratedPassword']);
-		$instance->expects($this->once())->method('createShareObject')->with(['rawShare', 'password' => 'autogeneratedPassword'])->willReturn($expectedShare);
-
-		$share->expects($this->exactly(4))->method('getPassword')->willReturnOnConsecutiveCalls(null, 'autogeneratedPassword', 'autogeneratedPassword', 'autogeneratedPassword');
-		$this->hasher->expects($this->once())->method('hash')->with('autogeneratedPassword')->willReturn('autogeneratedPasswordHashed');
-		$share->expects($this->once())->method('setPassword')->with('autogeneratedPasswordHashed');
-
-		// The autogenerated password should be mailed to the owner of the share.
-		$this->shareManager->expects($this->any())->method('shareApiLinkEnforcePassword')->willReturn(true);
-		$this->config->expects($this->any())->method('getSystemValue')->with('sharing.enable_mail_link_password_expiration')->willReturn(false);
-		$this->settingsManager->expects($this->any())->method('sendPasswordByMail')->willReturn(true);
-		$instance->expects($this->once())->method('autoGeneratePassword')->with($share)->willReturn('autogeneratedPassword');
-
-		$message = $this->createMock(IMessage::class);
-		$setToCalls = [
-			[['receiver@example.com']],
-			[['owner@example.com' => 'owner']],
-		];
-		$message->expects($this->exactly(2))
-			->method('setTo')
-			->willReturnCallback(function () use (&$setToCalls, $message) {
-				$expected = array_shift($setToCalls);
-				$this->assertEquals($expected, func_get_args());
-				return $message;
-			});
-		$this->mailer->expects($this->exactly(2))->method('createMessage')->willReturn($message);
-
-		$calls = [
-			[
-				'sharebymail.RecipientNotification',
-				[
-					'filename' => 'filename',
-					'link' => 'https://example.com/file.txt',
-					'initiator' => 'owner',
-					'expiration' => null,
-					'shareWith' => 'receiver@example.com',
-					'note' => '',
-				],
-			],
-			[
-				'sharebymail.OwnerPasswordNotification',
-				[
-					'filename' => 'filename',
-					'password' => 'autogeneratedPassword',
-					'initiator' => 'owner',
-					'initiatorEmail' => 'owner@example.com',
-					'shareWith' => 'receiver@example.com',
-				],
-			],
-		];
-		$this->mailer->expects($this->exactly(2))
-			->method('createEMailTemplate')
-			->willReturnCallback(function () use (&$calls) {
-				$expected = array_shift($calls);
-				$this->assertEquals($expected, func_get_args());
-				return $this->createMock(IEMailTemplate::class);
-			});
-
-		// Main email notification is sent as well as the password to owner
-		// because the password is set and SendPasswordByTalk is enabled.
-		$this->mailer->expects($this->exactly(2))->method('send');
-
-		$this->assertSame($expectedShare, $instance->create($share));
-		$instance->sendMailNotification($share);
-	}
-
-	// If attributes is set to multiple emails, use them as BCC
-	public function sendNotificationToMultipleEmails() {
-		$expectedShare = $this->createMock(IShare::class);
-
-		$node = $this->createMock(File::class);
-		$node->expects($this->any())->method('getName')->willReturn('filename');
-
-		$share = $this->createMock(IShare::class);
-		$share->expects($this->any())->method('getSharedWith')->willReturn('');
-		$share->expects($this->any())->method('getSendPasswordByTalk')->willReturn(false);
-		$share->expects($this->any())->method('getSharedBy')->willReturn('owner');
-		$share->expects($this->any())->method('getNode')->willReturn($node);
-		$share->expects($this->any())->method('getId')->willReturn(42);
-		$share->expects($this->any())->method('getNote')->willReturn('');
-		$share->expects($this->any())->method('getToken')->willReturn('token');
-
-		$attributes = $this->createMock(IAttributes::class);
-		$share->expects($this->any())->method('getAttributes')->willReturn($attributes);
-		$attributes->expects($this->any())->method('getAttribute')->with('shareWith', 'emails')->willReturn([
-			'receiver1@example.com',
-			'receiver2@example.com',
-			'receiver3@example.com',
-		]);
-
-		$instance = $this->getInstance(['getSharedWith', 'createMailShare', 'getRawShare', 'createShareObject', 'createShareActivity', 'autoGeneratePassword', 'createPasswordSendActivity', 'sendEmail', 'sendPassword', 'sendPasswordToOwner']);
-
-		$instance->expects($this->once())->method('getSharedWith')->willReturn([]);
-		$instance->expects($this->once())->method('createMailShare')->with($share)->willReturn(42);
-		$instance->expects($this->once())->method('createShareActivity')->with($share);
-		$instance->expects($this->once())->method('getRawShare')->with(42)->willReturn(['rawShare', 'password' => 'password']);
-		$instance->expects($this->once())->method('createShareObject')->with(['rawShare', 'password' => 'password'])->willReturn($expectedShare);
-		$share->expects($this->any())->method('getNode')->willReturn($node);
-
-		$share->expects($this->any())->method('getPassword')->willReturn('password');
-		$this->hasher->expects($this->once())->method('hash')->with('password')->willReturn('passwordHashed');
-		$share->expects($this->once())->method('setPassword')->with('passwordHashed');
-
-		// The given password (but not the autogenerated password) should not be
-		// mailed to the receiver of the share because permanent passwords are not enforced.
-		$this->shareManager->expects($this->any())->method('shareApiLinkEnforcePassword')->willReturn(false);
-		$this->config->expects($this->once())->method('getSystemValue')->with('sharing.enable_mail_link_password_expiration')->willReturn(false);
-		$instance->expects($this->never())->method('autoGeneratePassword');
-
-		// A password is set but no password sent via talk has been requested
-		$instance->expects($this->once())->method('sendEmail')
-			->with($share, ['receiver1@example.com', 'receiver2@example.com', 'receiver3@example.com']);
-		$instance->expects($this->once())->method('sendPassword')->with($share, 'password');
-		$instance->expects($this->never())->method('sendPasswordToOwner');
-
-
-		$message = $this->createMock(IMessage::class);
-		$message->expects($this->never())->method('setTo');
-		$message->expects($this->exactly(2))->method('setBcc')->with(['receiver1@example.com', 'receiver2@example.com', 'receiver3@example.com']);
-		$this->mailer->expects($this->exactly(2))->method('createMessage')->willReturn($message);
-
-		// Main email notification is sent as well as the password
-		// to recipients because the password is set.
-		$this->mailer->expects($this->exactly(2))->method('send');
-
-		$this->assertSame($expectedShare, $instance->create($share));
-		$instance->sendMailNotification($share);
-	}
-
-	public function testCreateFailed(): void {
-		$this->expectException(\Exception::class);
-
-		$this->share->expects($this->once())->method('getSharedWith')->willReturn('user1');
-		$node = $this->createMock('OCP\Files\Node');
-		$node->expects($this->any())->method('getName')->willReturn('fileName');
-		$this->share->expects($this->any())->method('getNode')->willReturn($node);
-
-		$instance = $this->getInstance(['getSharedWith', 'createMailShare', 'getRawShare', 'createShareObject']);
-
-		$instance->expects($this->once())->method('getSharedWith')->willReturn(['found']);
-		$instance->expects($this->never())->method('createMailShare');
-		$instance->expects($this->never())->method('getRawShare');
-		$instance->expects($this->never())->method('createShareObject');
-
-		$this->assertSame('shareObject',
-			$instance->create($this->share)
-		);
-	}
-
-	public function testCreateMailShare(): void {
-		$this->share->expects($this->any())->method('getToken')->willReturn('token');
-		$this->share->expects($this->once())->method('setToken')->with('token');
-		$this->share->expects($this->any())->method('getSharedBy')->willReturn('validby@valid.com');
-		$this->share->expects($this->any())->method('getSharedWith')->willReturn('validwith@valid.com');
-		$this->share->expects($this->any())->method('getNote')->willReturn('Check this!');
-		$this->share->expects($this->any())->method('getMailSend')->willReturn(true);
-
-		$node = $this->createMock('OCP\Files\Node');
-		$node->expects($this->any())->method('getName')->willReturn('fileName');
-		$this->share->expects($this->any())->method('getNode')->willReturn($node);
-
-		$instance = $this->getInstance(['generateToken', 'addShareToDB', 'sendMailNotification']);
-
-		$instance->expects($this->once())->method('generateToken')->willReturn('token');
-		$instance->expects($this->once())->method('addShareToDB')->willReturn(42);
-
-		// The manager handle the mail sending
-		$instance->expects($this->never())->method('sendMailNotification');
-
-		$this->assertSame(42,
-			$this->invokePrivate($instance, 'createMailShare', [$this->share])
-		);
-	}
-
-	public function testGenerateToken(): void {
-		$instance = $this->getInstance();
-
-		$this->secureRandom->expects($this->once())->method('generate')->willReturn('token');
-
-		$this->assertSame('token',
-			$this->invokePrivate($instance, 'generateToken')
-		);
-	}
-
-	public function testAddShareToDB(): void {
-		$itemSource = 11;
-		$itemType = 'file';
-		$shareWith = 'user@server.com';
-		$sharedBy = 'user1';
-		$uidOwner = 'user2';
-		$permissions = 1;
-		$token = 'token';
-		$password = 'password';
-		$sendPasswordByTalk = true;
-		$hideDownload = true;
-		$label = 'label';
-		$expiration = new \DateTime();
-		$passwordExpirationTime = new \DateTime();
-
-
-		$instance = $this->getInstance();
-		$id = $this->invokePrivate(
-			$instance,
-			'addShareToDB',
-			[
-				$itemSource,
-				$itemType,
-				$shareWith,
-				$sharedBy,
-				$uidOwner,
-				$permissions,
-				$token,
-				$password,
-				$passwordExpirationTime,
-				$sendPasswordByTalk,
-				$hideDownload,
-				$label,
-				$expiration
-			]
-		);
-
-		$qb = $this->connection->getQueryBuilder();
-		$qb->select('*')
-			->from('share')
-			->where($qb->expr()->eq('id', $qb->createNamedParameter($id)));
-
-		$qResult = $qb->execute();
-		$result = $qResult->fetchAll();
-		$qResult->closeCursor();
-
-		$this->assertSame(1, count($result));
-
-		$this->assertSame($itemSource, (int)$result[0]['item_source']);
-		$this->assertSame($itemType, $result[0]['item_type']);
-		$this->assertSame($shareWith, $result[0]['share_with']);
-		$this->assertSame($sharedBy, $result[0]['uid_initiator']);
-		$this->assertSame($uidOwner, $result[0]['uid_owner']);
-		$this->assertSame($permissions, (int)$result[0]['permissions']);
-		$this->assertSame($token, $result[0]['token']);
-		$this->assertSame($password, $result[0]['password']);
-		$this->assertSame($passwordExpirationTime->getTimestamp(), \DateTime::createFromFormat('Y-m-d H:i:s', $result[0]['password_expiration_time'])->getTimestamp());
-		$this->assertSame($sendPasswordByTalk, (bool)$result[0]['password_by_talk']);
-		$this->assertSame($hideDownload, (bool)$result[0]['hide_download']);
-		$this->assertSame($label, $result[0]['label']);
-		$this->assertSame($expiration->getTimestamp(), \DateTime::createFromFormat('Y-m-d H:i:s', $result[0]['expiration'])->getTimestamp());
-	}
-
-	public function testUpdate(): void {
-		$itemSource = 11;
-		$itemType = 'file';
-		$shareWith = 'user@server.com';
-		$sharedBy = 'user1';
-		$uidOwner = 'user2';
-		$permissions = 1;
-		$token = 'token';
-		$note = 'personal note';
-
-
-		$instance = $this->getInstance();
-
-		$id = $this->createDummyShare($itemType, $itemSource, $shareWith, $sharedBy, $uidOwner, $permissions, $token, $note);
-
-		$this->share->expects($this->once())->method('getPermissions')->willReturn($permissions + 1);
-		$this->share->expects($this->once())->method('getShareOwner')->willReturn($uidOwner);
-		$this->share->expects($this->once())->method('getSharedBy')->willReturn($sharedBy);
-		$this->share->expects($this->any())->method('getNote')->willReturn($note);
-		$this->share->expects($this->atLeastOnce())->method('getId')->willReturn($id);
-		$this->share->expects($this->atLeastOnce())->method('getNodeId')->willReturn($itemSource);
-		$this->share->expects($this->once())->method('getSharedWith')->willReturn($shareWith);
-
-		$this->assertSame($this->share,
-			$instance->update($this->share)
-		);
-
-		$qb = $this->connection->getQueryBuilder();
-		$qb->select('*')
-			->from('share')
-			->where($qb->expr()->eq('id', $qb->createNamedParameter($id)));
-
-		$qResult = $qb->execute();
-		$result = $qResult->fetchAll();
-		$qResult->closeCursor();
-
-		$this->assertSame(1, count($result));
-
-		$this->assertSame($itemSource, (int)$result[0]['item_source']);
-		$this->assertSame($itemType, $result[0]['item_type']);
-		$this->assertSame($shareWith, $result[0]['share_with']);
-		$this->assertSame($sharedBy, $result[0]['uid_initiator']);
-		$this->assertSame($uidOwner, $result[0]['uid_owner']);
-		$this->assertSame($permissions + 1, (int)$result[0]['permissions']);
-		$this->assertSame($token, $result[0]['token']);
-		$this->assertSame($note, $result[0]['note']);
-	}
-
-	public static function dataUpdateSendPassword(): array {
-		return [
-			['password', 'hashed', 'hashed new', false, false, true],
-			['', 'hashed', 'hashed new', false, false, false],
-			[null, 'hashed', 'hashed new', false, false, false],
-			['password', 'hashed', 'hashed', false, false, false],
-			['password', 'hashed', 'hashed new', false, true, false],
-			['password', 'hashed', 'hashed new', true, false, true],
-			['password', 'hashed', 'hashed', true, false, true],
-		];
-	}
-
-	#[\PHPUnit\Framework\Attributes\DataProvider('dataUpdateSendPassword')]
-	public function testUpdateSendPassword(?string $plainTextPassword, string $originalPassword, string $newPassword, bool $originalSendPasswordByTalk, bool $newSendPasswordByTalk, bool $sendMail): void {
-		$node = $this->createMock(File::class);
-		$node->expects($this->any())->method('getName')->willReturn('filename');
-
-		$this->settingsManager->method('sendPasswordByMail')->willReturn(true);
-
-		$originalShare = $this->createMock(IShare::class);
-		$originalShare->expects($this->any())->method('getSharedWith')->willReturn('receiver@example.com');
-		$originalShare->expects($this->any())->method('getNode')->willReturn($node);
-		$originalShare->expects($this->any())->method('getId')->willReturn(42);
-		$originalShare->expects($this->any())->method('getPassword')->willReturn($originalPassword);
-		$originalShare->expects($this->any())->method('getSendPasswordByTalk')->willReturn($originalSendPasswordByTalk);
-
-		$share = $this->createMock(IShare::class);
-		$share->expects($this->any())->method('getSharedWith')->willReturn('receiver@example.com');
-		$share->expects($this->any())->method('getNode')->willReturn($node);
-		$share->expects($this->any())->method('getId')->willReturn(42);
-		$share->expects($this->any())->method('getPassword')->willReturn($newPassword);
-		$share->expects($this->any())->method('getSendPasswordByTalk')->willReturn($newSendPasswordByTalk);
-
-		if ($sendMail) {
-			$this->mailer->expects($this->once())->method('createEMailTemplate')->with('sharebymail.RecipientPasswordNotification', [
-				'filename' => 'filename',
-				'password' => $plainTextPassword,
-				'initiator' => null,
-				'initiatorEmail' => null,
-				'shareWith' => 'receiver@example.com',
-			]);
-			$this->mailer->expects($this->once())->method('send');
-		} else {
-			$this->mailer->expects($this->never())->method('send');
-		}
-
-		$instance = $this->getInstance(['getShareById', 'createPasswordSendActivity']);
-		$instance->expects($this->once())->method('getShareById')->willReturn($originalShare);
-
-		$this->assertSame($share,
-			$instance->update($share, $plainTextPassword)
-		);
-	}
-
-	public function testDelete(): void {
-		$instance = $this->getInstance(['removeShareFromTable', 'createShareActivity']);
-		$this->share->expects($this->once())->method('getId')->willReturn(42);
-		$instance->expects($this->once())->method('removeShareFromTable')->with(42);
-		$instance->expects($this->once())->method('createShareActivity')->with($this->share, 'unshare');
-		$instance->delete($this->share);
-	}
-
-	public function testGetShareById(): void {
-		$instance = $this->getInstance(['createShareObject']);
-
-		$itemSource = 11;
-		$itemType = 'file';
-		$shareWith = 'user@server.com';
-		$sharedBy = 'user1';
-		$uidOwner = 'user2';
-		$permissions = 1;
-		$token = 'token';
-
-		$this->createDummyShare($itemType, $itemSource, $shareWith, 'user1wrong', 'user2wrong', $permissions, $token);
-		$id2 = $this->createDummyShare($itemType, $itemSource, $shareWith, $sharedBy, $uidOwner, $permissions, $token);
-
-		$instance->expects($this->once())->method('createShareObject')
-			->willReturnCallback(
-				function ($data) use ($uidOwner, $sharedBy, $id2) {
-					$this->assertSame($uidOwner, $data['uid_owner']);
-					$this->assertSame($sharedBy, $data['uid_initiator']);
-					$this->assertSame($id2, (int)$data['id']);
-					return $this->share;
-				}
-			);
-
-		$result = $instance->getShareById($id2);
-
-		$this->assertInstanceOf('OCP\Share\IShare', $result);
-	}
-
-
-	public function testGetShareByIdFailed(): void {
-		$this->expectException(ShareNotFound::class);
-
-		$instance = $this->getInstance(['createShareObject']);
-
-		$itemSource = 11;
-		$itemType = 'file';
-		$shareWith = 'user@server.com';
-		$sharedBy = 'user1';
-		$uidOwner = 'user2';
-		$permissions = 1;
-		$token = 'token';
-
-		$id = $this->createDummyShare($itemType, $itemSource, $shareWith, $sharedBy, $uidOwner, $permissions, $token);
-
-		$instance->getShareById($id + 1);
-	}
-
-	public function testGetShareByPath(): void {
-		$itemSource = 11;
-		$itemType = 'file';
-		$shareWith = 'user@server.com';
-		$sharedBy = 'user1';
-		$uidOwner = 'user2';
-		$permissions = 1;
-		$token = 'token';
-
-		$node = $this->createMock(Node::class);
-		$node->expects($this->once())->method('getId')->willReturn($itemSource);
-
-
-		$instance = $this->getInstance(['createShareObject']);
-
-		$this->createDummyShare($itemType, 111, $shareWith, $sharedBy, $uidOwner, $permissions, $token);
-		$id = $this->createDummyShare($itemType, $itemSource, $shareWith, $sharedBy, $uidOwner, $permissions, $token);
-
-		$instance->expects($this->once())->method('createShareObject')
-			->willReturnCallback(
-				function ($data) use ($uidOwner, $sharedBy, $id) {
-					$this->assertSame($uidOwner, $data['uid_owner']);
-					$this->assertSame($sharedBy, $data['uid_initiator']);
-					$this->assertSame($id, (int)$data['id']);
-					return $this->share;
-				}
-			);
-
-		$result = $instance->getSharesByPath($node);
-
-		$this->assertTrue(is_array($result));
-		$this->assertSame(1, count($result));
-		$this->assertInstanceOf('OCP\Share\IShare', $result[0]);
-	}
-
-	public function testGetShareByToken(): void {
-		$itemSource = 11;
-		$itemType = 'file';
-		$shareWith = 'user@server.com';
-		$sharedBy = 'user1';
-		$uidOwner = 'user2';
-		$permissions = 1;
-		$token = 'token';
+    use EmailValidatorTrait;
+
+    private IDBConnection $connection;
+
+    private IL10N&MockObject $l;
+    private IShare&MockObject $share;
+    private IConfig&MockObject $config;
+    private IMailer&MockObject $mailer;
+    private IHasher&MockObject $hasher;
+    private Defaults&MockObject $defaults;
+    private IManager&MockObject $shareManager;
+    private LoggerInterface&MockObject $logger;
+    private IRootFolder&MockObject $rootFolder;
+    private IUserManager&MockObject $userManager;
+    private ISecureRandom&MockObject $secureRandom;
+    private IURLGenerator&MockObject $urlGenerator;
+    private SettingsManager&MockObject $settingsManager;
+    private IActivityManager&MockObject $activityManager;
+    private IEventDispatcher&MockObject $eventDispatcher;
+
+    protected function setUp(): void {
+        parent::setUp();
+
+        $this->connection = Server::get(IDBConnection::class);
+
+        $this->l = $this->createMock(IL10N::class);
+        $this->l->method('t')
+            ->willReturnCallback(function ($text, $parameters = []) {
+                return vsprintf($text, $parameters);
+            });
+        $this->config = $this->createMock(IConfig::class);
+        $this->logger = $this->createMock(LoggerInterface::class);
+        $this->rootFolder = $this->createMock('OCP\Files\IRootFolder');
+        $this->userManager = $this->createMock(IUserManager::class);
+        $this->secureRandom = $this->createMock('\OCP\Security\ISecureRandom');
+        $this->mailer = $this->createMock('\OCP\Mail\IMailer');
+        $this->urlGenerator = $this->createMock(IURLGenerator::class);
+        $this->share = $this->createMock(IShare::class);
+        $this->activityManager = $this->createMock('OCP\Activity\IManager');
+        $this->settingsManager = $this->createMock(SettingsManager::class);
+        $this->defaults = $this->createMock(Defaults::class);
+        $this->hasher = $this->createMock(IHasher::class);
+        $this->eventDispatcher = $this->createMock(IEventDispatcher::class);
+        $this->shareManager = $this->createMock(IManager::class);
+
+        $this->userManager->expects($this->any())->method('userExists')->willReturn(true);
+        $this->config->expects($this->any())->method('getAppValue')->with('core', 'enforce_strict_email_check')->willReturn('yes');
+    }
+
+    /**
+     * get instance of Mocked ShareByMailProvider
+     *
+     * @param array $mockedMethods internal methods which should be mocked
+     * @return \PHPUnit\Framework\MockObject\MockObject | ShareByMailProvider
+     */
+    private function getInstance(array $mockedMethods = []) {
+        if (!empty($mockedMethods)) {
+            return $this->getMockBuilder(ShareByMailProvider::class)
+                ->setConstructorArgs([
+                    $this->config,
+                    $this->connection,
+                    $this->secureRandom,
+                    $this->userManager,
+                    $this->rootFolder,
+                    $this->l,
+                    $this->logger,
+                    $this->mailer,
+                    $this->urlGenerator,
+                    $this->activityManager,
+                    $this->settingsManager,
+                    $this->defaults,
+                    $this->hasher,
+                    $this->eventDispatcher,
+                    $this->shareManager,
+                    $this->getEmailValidatorWithStrictEmailCheck(),
+                ])
+                ->onlyMethods($mockedMethods)
+                ->getMock();
+        }
+
+        return new ShareByMailProvider(
+            $this->config,
+            $this->connection,
+            $this->secureRandom,
+            $this->userManager,
+            $this->rootFolder,
+            $this->l,
+            $this->logger,
+            $this->mailer,
+            $this->urlGenerator,
+            $this->activityManager,
+            $this->settingsManager,
+            $this->defaults,
+            $this->hasher,
+            $this->eventDispatcher,
+            $this->shareManager,
+            $this->getEmailValidatorWithStrictEmailCheck(),
+        );
+    }
+
+    protected function tearDown(): void {
+        $this->connection
+            ->getQueryBuilder()
+            ->delete('share')
+            ->executeStatement();
+
+        parent::tearDown();
+    }
+
+    public function testCreate(): void {
+        $expectedShare = $this->createMock(IShare::class);
+
+        $share = $this->createMock(IShare::class);
+        $share->expects($this->any())->method('getSharedWith')->willReturn('user1');
+
+        $node = $this->createMock(File::class);
+        $node->expects($this->any())->method('getName')->willReturn('filename');
+
+        $instance = $this->getInstance(['getSharedWith', 'createMailShare', 'getRawShare', 'createShareObject', 'createShareActivity', 'sendEmail', 'sendPassword']);
+
+        $instance->expects($this->once())->method('getSharedWith')->willReturn([]);
+        $instance->expects($this->once())->method('createMailShare')->with($share)->willReturn(42);
+        $instance->expects($this->once())->method('createShareActivity')->with($share);
+        $instance->expects($this->once())->method('getRawShare')->with(42)->willReturn(['rawShare']);
+        $instance->expects($this->once())->method('createShareObject')->with(['rawShare'])->willReturn($expectedShare);
+        $share->expects($this->any())->method('getNode')->willReturn($node);
+
+        // As share api link password is not enforced, the password will not be generated.
+        $this->shareManager->expects($this->once())->method('shareApiLinkEnforcePassword')->willReturn(false);
+        $this->settingsManager->expects($this->never())->method('sendPasswordByMail');
+
+        // Mail notification is triggered by the share manager.
+        $instance->expects($this->never())->method('sendEmail');
+        $instance->expects($this->never())->method('sendPassword');
+
+        $this->assertSame($expectedShare, $instance->create($share));
+    }
+
+    public function testCreateSendPasswordByMailWithoutEnforcedPasswordProtection(): void {
+        $expectedShare = $this->createMock(IShare::class);
+
+        $node = $this->createMock(File::class);
+        $node->expects($this->any())->method('getName')->willReturn('filename');
+
+        $share = $this->createMock(IShare::class);
+        $share->expects($this->any())->method('getSharedWith')->willReturn('receiver@examplelölöl.com');
+        $share->expects($this->any())->method('getSendPasswordByTalk')->willReturn(false);
+        $share->expects($this->any())->method('getSharedBy')->willReturn('owner');
+        $share->expects($this->any())->method('getNode')->willReturn($node);
+        $share->expects($this->any())->method('getId')->willReturn(42);
+        $share->expects($this->any())->method('getNote')->willReturn('');
+        $share->expects($this->any())->method('getToken')->willReturn('token');
+
+        $instance = $this->getInstance(['getSharedWith', 'createMailShare', 'getRawShare', 'createShareObject', 'createShareActivity', 'autoGeneratePassword', 'createPasswordSendActivity', 'sendEmail', 'sendPassword', 'sendPasswordToOwner']);
+        $instance->expects($this->once())->method('getSharedWith')->willReturn([]);
+        $instance->expects($this->once())->method('createMailShare')->with($share)->willReturn(42);
+        $instance->expects($this->once())->method('createShareActivity')->with($share);
+        $instance->expects($this->once())->method('getRawShare')->with(42)->willReturn(['rawShare']);
+        $instance->expects($this->once())->method('createShareObject')->with(['rawShare'])->willReturn($expectedShare);
+        $share->expects($this->any())->method('getNode')->willReturn($node);
+
+        // The autogenerated password should not be mailed.
+        $this->shareManager->expects($this->any())->method('shareApiLinkEnforcePassword')->willReturn(false);
+        $this->settingsManager->expects($this->any())->method('sendPasswordByMail')->willReturn(true);
+        $instance->expects($this->never())->method('autoGeneratePassword');
+
+        // No password is set and no password sent via talk is requested
+        $instance->expects($this->once())->method('sendEmail')->with($share, ['receiver@examplelölöl.com']);
+        $instance->expects($this->never())->method('sendPassword');
+        $instance->expects($this->never())->method('sendPasswordToOwner');
+
+        // The manager sends the mail notification.
+        // For the sake of testing simplicity, we will handle it ourselves.
+        $this->assertSame($expectedShare, $instance->create($share));
+        $instance->sendMailNotification($share);
+    }
+
+    public function testCreateSendPasswordByMailWithPasswordAndWithoutEnforcedPasswordProtectionWithPermanentPassword(): void {
+        $expectedShare = $this->createMock(IShare::class);
+
+        $node = $this->createMock(File::class);
+        $node->expects($this->any())->method('getName')->willReturn('filename');
+
+        $share = $this->createMock(IShare::class);
+        $share->expects($this->any())->method('getSharedWith')->willReturn('receiver@example.com');
+        $share->expects($this->any())->method('getSendPasswordByTalk')->willReturn(false);
+        $share->expects($this->any())->method('getSharedBy')->willReturn('owner');
+        $share->expects($this->any())->method('getNode')->willReturn($node);
+        $share->expects($this->any())->method('getId')->willReturn(42);
+        $share->expects($this->any())->method('getNote')->willReturn('');
+        $share->expects($this->any())->method('getToken')->willReturn('token');
+
+        $instance = $this->getInstance(['getSharedWith', 'createMailShare', 'getRawShare', 'createShareObject', 'createShareActivity', 'autoGeneratePassword', 'createPasswordSendActivity', 'sendEmail', 'sendPassword', 'sendPasswordToOwner']);
+
+        $instance->expects($this->once())->method('getSharedWith')->willReturn([]);
+        $instance->expects($this->once())->method('createMailShare')->with($share)->willReturn(42);
+        $instance->expects($this->once())->method('createShareActivity')->with($share);
+        $instance->expects($this->once())->method('getRawShare')->with(42)->willReturn(['rawShare', 'password' => 'password']);
+        $instance->expects($this->once())->method('createShareObject')->with(['rawShare', 'password' => 'password'])->willReturn($expectedShare);
+        $share->expects($this->any())->method('getNode')->willReturn($node);
+
+        $share->expects($this->any())->method('getPassword')->willReturn('password');
+        $this->hasher->expects($this->once())->method('hash')->with('password')->willReturn('passwordHashed');
+        $share->expects($this->once())->method('setPassword')->with('passwordHashed');
+
+        // The given password (but not the autogenerated password) should not be
+        // mailed to the receiver of the share because permanent passwords are not enforced.
+        $this->shareManager->expects($this->any())->method('shareApiLinkEnforcePassword')->willReturn(false);
+        $this->config->expects($this->once())->method('getSystemValue')->with('sharing.enable_mail_link_password_expiration')->willReturn(false);
+        $instance->expects($this->never())->method('autoGeneratePassword');
+
+        // A password is set but no password sent via talk has been requested
+        $instance->expects($this->once())->method('sendEmail')->with($share, ['receiver@example.com']);
+        $instance->expects($this->once())->method('sendPassword')->with($share, 'password');
+        $instance->expects($this->never())->method('sendPasswordToOwner');
+
+        $this->assertSame($expectedShare, $instance->create($share));
+        $instance->sendMailNotification($share);
+    }
+
+    public function testCreateSendPasswordByMailWithPasswordAndWithoutEnforcedPasswordProtectionWithoutPermanentPassword(): void {
+        $expectedShare = $this->createMock(IShare::class);
+
+        $node = $this->createMock(File::class);
+        $node->expects($this->any())->method('getName')->willReturn('filename');
+
+        $share = $this->createMock(IShare::class);
+        $share->expects($this->any())->method('getSharedWith')->willReturn('receiver@example.com');
+        $share->expects($this->any())->method('getSendPasswordByTalk')->willReturn(false);
+        $share->expects($this->any())->method('getSharedBy')->willReturn('owner');
+        $share->expects($this->any())->method('getNode')->willReturn($node);
+        $share->expects($this->any())->method('getId')->willReturn(42);
+        $share->expects($this->any())->method('getNote')->willReturn('');
+        $share->expects($this->any())->method('getToken')->willReturn('token');
+
+        $instance = $this->getInstance([
+            'getSharedWith', 'createMailShare', 'getRawShare', 'createShareObject',
+            'createShareActivity', 'autoGeneratePassword', 'createPasswordSendActivity',
+            'sendEmail', 'sendPassword', 'sendPasswordToOwner',
+        ]);
+
+        $instance->expects($this->once())->method('getSharedWith')->willReturn([]);
+        $instance->expects($this->once())->method('createMailShare')->with($share)->willReturn(42);
+        $instance->expects($this->once())->method('createShareActivity')->with($share);
+        $instance->expects($this->once())->method('getRawShare')->with(42)->willReturn(['rawShare', 'password' => 'password']);
+        $instance->expects($this->once())->method('createShareObject')->with(['rawShare', 'password' => 'password'])->willReturn($expectedShare);
+        $share->expects($this->any())->method('getNode')->willReturn($node);
+
+        $share->expects($this->any())->method('getPassword')->willReturn('password');
+        $this->hasher->expects($this->once())->method('hash')->with('password')->willReturn('passwordHashed');
+        $share->expects($this->once())->method('setPassword')->with('passwordHashed');
+
+        // No password is generated, so no emails need to be sent
+        // aside from the main email notification.
+        $this->shareManager->expects($this->any())->method('shareApiLinkEnforcePassword')->willReturn(false);
+        $instance->expects($this->never())->method('autoGeneratePassword');
+        $this->config->expects($this->once())->method('getSystemValue')
+            ->with('sharing.enable_mail_link_password_expiration')
+            ->willReturn(true);
+
+        // No password has been set and no password sent via talk has been requested,
+        // but password has been enforced for the whole instance and will be generated.
+        $instance->expects($this->once())->method('sendEmail')->with($share, ['receiver@example.com']);
+        $instance->expects($this->never())->method('sendPassword');
+        $instance->expects($this->never())->method('sendPasswordToOwner');
+
+        $this->assertSame($expectedShare, $instance->create($share));
+        $instance->sendMailNotification($share);
+    }
+
+    public function testCreateSendPasswordByMailWithEnforcedPasswordProtectionWithPermanentPassword(): void {
+        $expectedShare = $this->createMock(IShare::class);
+
+        $node = $this->createMock(File::class);
+        $node->expects($this->any())->method('getName')->willReturn('filename');
+
+        $share = $this->createMock(IShare::class);
+        $share->expects($this->any())->method('getSharedWith')->willReturn('receiver@example.com');
+        $share->expects($this->any())->method('getSendPasswordByTalk')->willReturn(false);
+        $share->expects($this->any())->method('getSharedBy')->willReturn('owner');
+        $share->expects($this->any())->method('getNode')->willReturn($node);
+        $share->expects($this->any())->method('getId')->willReturn(42);
+        $share->expects($this->any())->method('getNote')->willReturn('');
+        $share->expects($this->any())->method('getToken')->willReturn('token');
+
+        $this->urlGenerator->expects($this->once())->method('linkToRouteAbsolute')
+            ->with('files_sharing.sharecontroller.showShare', ['token' => 'token'])
+            ->willReturn('https://example.com/file.txt');
+
+        $this->secureRandom->expects($this->once())
+            ->method('generate')
+            ->with(8, ISecureRandom::CHAR_HUMAN_READABLE)
+            ->willReturn('autogeneratedPassword');
+        $this->eventDispatcher->expects($this->once())
+            ->method('dispatchTyped')
+            ->with(new GenerateSecurePasswordEvent(PasswordContext::SHARING));
+
+        $instance = $this->getInstance(['getSharedWith', 'createMailShare', 'getRawShare', 'createShareObject', 'createShareActivity', 'createPasswordSendActivity', 'sendPasswordToOwner']);
+
+        $instance->expects($this->once())->method('getSharedWith')->willReturn([]);
+        $instance->expects($this->once())->method('createMailShare')->with($share)->willReturn(42);
+        $instance->expects($this->once())->method('createShareActivity')->with($share);
+        $instance->expects($this->once())->method('getRawShare')->with(42)->willReturn(['rawShare', 'password' => 'autogeneratedPassword']);
+        $instance->expects($this->once())->method('createShareObject')->with(['rawShare', 'password' => 'autogeneratedPassword'])->willReturn($expectedShare);
+
+        // Initially not set, but will be set by the autoGeneratePassword method.
+        $share->expects($this->exactly(3))->method('getPassword')->willReturnOnConsecutiveCalls(null, 'autogeneratedPassword', 'autogeneratedPassword');
+        $this->hasher->expects($this->once())->method('hash')->with('autogeneratedPassword')->willReturn('autogeneratedPasswordHashed');
+        $share->expects($this->once())->method('setPassword')->with('autogeneratedPasswordHashed');
+
+        // The autogenerated password should be mailed to the receiver of the share because permanent passwords are enforced.
+        $this->shareManager->expects($this->any())->method('shareApiLinkEnforcePassword')->willReturn(true);
+        $this->config->expects($this->any())->method('getSystemValue')->with('sharing.enable_mail_link_password_expiration')->willReturn(false);
+        $this->settingsManager->expects($this->any())->method('sendPasswordByMail')->willReturn(true);
+
+        $message = $this->createMock(IMessage::class);
+        $message->expects($this->exactly(2))->method('setTo')->with(['receiver@example.com']);
+        $this->mailer->expects($this->exactly(2))->method('createMessage')->willReturn($message);
+        $calls = [
+            [
+                'sharebymail.RecipientNotification',
+                [
+                    'filename' => 'filename',
+                    'link' => 'https://example.com/file.txt',
+                    'initiator' => 'owner',
+                    'expiration' => null,
+                    'shareWith' => 'receiver@example.com',
+                    'note' => '',
+                ],
+            ],
+            [
+                'sharebymail.RecipientPasswordNotification',
+                [
+                    'filename' => 'filename',
+                    'password' => 'autogeneratedPassword',
+                    'initiator' => 'owner',
+                    'initiatorEmail' => null,
+                    'shareWith' => 'receiver@example.com',
+                ],
+            ],
+        ];
+        $this->mailer->expects($this->exactly(2))
+            ->method('createEMailTemplate')
+            ->willReturnCallback(function () use (&$calls) {
+                $expected = array_shift($calls);
+                $this->assertEquals($expected, func_get_args());
+                return $this->createMock(IEMailTemplate::class);
+            });
+
+        // Main email notification is sent as well as the password
+        // to the recipient because shareApiLinkEnforcePassword is enabled.
+        $this->mailer->expects($this->exactly(2))->method('send');
+        $instance->expects($this->never())->method('sendPasswordToOwner');
+
+        $this->assertSame($expectedShare, $instance->create($share));
+        $instance->sendMailNotification($share);
+    }
+
+    public function testCreateSendPasswordByMailWithPasswordAndWithEnforcedPasswordProtectionWithPermanentPassword(): void {
+        $expectedShare = $this->createMock(IShare::class);
+
+        $node = $this->createMock(File::class);
+        $node->expects($this->any())->method('getName')->willReturn('filename');
+
+        $share = $this->createMock(IShare::class);
+        $share->expects($this->any())->method('getSharedWith')->willReturn('receiver@example.com');
+        $share->expects($this->any())->method('getSendPasswordByTalk')->willReturn(false);
+        $share->expects($this->any())->method('getSharedBy')->willReturn('owner');
+        $share->expects($this->any())->method('getNode')->willReturn($node);
+        $share->expects($this->any())->method('getId')->willReturn(42);
+        $share->expects($this->any())->method('getNote')->willReturn('');
+        $share->expects($this->any())->method('getToken')->willReturn('token');
+
+        $this->urlGenerator->expects($this->once())->method('linkToRouteAbsolute')
+            ->with('files_sharing.sharecontroller.showShare', ['token' => 'token'])
+            ->willReturn('https://example.com/file.txt');
+
+        $instance = $this->getInstance(['getSharedWith', 'createMailShare', 'getRawShare', 'createShareObject', 'createShareActivity', 'autoGeneratePassword', 'createPasswordSendActivity', 'sendPasswordToOwner']);
+
+        $instance->expects($this->once())->method('getSharedWith')->willReturn([]);
+        $instance->expects($this->once())->method('createMailShare')->with($share)->willReturn(42);
+        $instance->expects($this->once())->method('createShareActivity')->with($share);
+        $instance->expects($this->once())->method('getRawShare')->with(42)->willReturn(['rawShare', 'password' => 'password']);
+        $instance->expects($this->once())->method('createShareObject')->with(['rawShare', 'password' => 'password'])->willReturn($expectedShare);
+
+        $share->expects($this->exactly(3))->method('getPassword')->willReturn('password');
+        $this->hasher->expects($this->once())->method('hash')->with('password')->willReturn('passwordHashed');
+        $share->expects($this->once())->method('setPassword')->with('passwordHashed');
+
+        // The given password (but not the autogenerated password) should be
+        // mailed to the receiver of the share.
+        $this->shareManager->expects($this->any())->method('shareApiLinkEnforcePassword')->willReturn(true);
+        $this->config->expects($this->any())->method('getSystemValue')->with('sharing.enable_mail_link_password_expiration')->willReturn(false);
+        $this->settingsManager->expects($this->any())->method('sendPasswordByMail')->willReturn(true);
+        $instance->expects($this->never())->method('autoGeneratePassword');
+
+        $message = $this->createMock(IMessage::class);
+        $message->expects($this->exactly(2))->method('setTo')->with(['receiver@example.com']);
+        $this->mailer->expects($this->exactly(2))->method('createMessage')->willReturn($message);
+
+        $calls = [
+            [
+                'sharebymail.RecipientNotification',
+                [
+                    'filename' => 'filename',
+                    'link' => 'https://example.com/file.txt',
+                    'initiator' => 'owner',
+                    'expiration' => null,
+                    'shareWith' => 'receiver@example.com',
+                    'note' => '',
+                ],
+            ],
+            [
+                'sharebymail.RecipientPasswordNotification',
+                [
+                    'filename' => 'filename',
+                    'password' => 'password',
+                    'initiator' => 'owner',
+                    'initiatorEmail' => null,
+                    'shareWith' => 'receiver@example.com',
+                ],
+            ],
+        ];
+        $this->mailer->expects($this->exactly(2))
+            ->method('createEMailTemplate')
+            ->willReturnCallback(function () use (&$calls) {
+                $expected = array_shift($calls);
+                $this->assertEquals($expected, func_get_args());
+                return $this->createMock(IEMailTemplate::class);
+            });
+
+        // Main email notification is sent as well as the password
+        // to the recipient because the password is set.
+        $this->mailer->expects($this->exactly(2))->method('send');
+        $instance->expects($this->never())->method('sendPasswordToOwner');
+
+        $this->assertSame($expectedShare, $instance->create($share));
+        $instance->sendMailNotification($share);
+    }
+
+    public function testCreateSendPasswordByTalkWithEnforcedPasswordProtectionWithPermanentPassword(): void {
+        $expectedShare = $this->createMock(IShare::class);
+
+        // The owner of the share.
+        $owner = $this->createMock(IUser::class);
+        $this->userManager->expects($this->any())->method('get')->with('owner')->willReturn($owner);
+        $owner->expects($this->any())->method('getEMailAddress')->willReturn('owner@example.com');
+        $owner->expects($this->any())->method('getDisplayName')->willReturn('owner');
+
+        $node = $this->createMock(File::class);
+        $node->expects($this->any())->method('getName')->willReturn('filename');
+
+        $share = $this->createMock(IShare::class);
+        $share->expects($this->any())->method('getSharedWith')->willReturn('receiver@example.com');
+        $share->expects($this->any())->method('getSendPasswordByTalk')->willReturn(true);
+        $share->expects($this->any())->method('getSharedBy')->willReturn('owner');
+        $share->expects($this->any())->method('getNode')->willReturn($node);
+        $share->expects($this->any())->method('getId')->willReturn(42);
+        $share->expects($this->any())->method('getNote')->willReturn('');
+        $share->expects($this->any())->method('getToken')->willReturn('token');
+
+        $this->urlGenerator->expects($this->once())->method('linkToRouteAbsolute')
+            ->with('files_sharing.sharecontroller.showShare', ['token' => 'token'])
+            ->willReturn('https://example.com/file.txt');
+
+        $instance = $this->getInstance(['getSharedWith', 'createMailShare', 'getRawShare', 'createShareObject', 'createShareActivity', 'autoGeneratePassword', 'createPasswordSendActivity']);
+
+        $instance->expects($this->once())->method('getSharedWith')->willReturn([]);
+        $instance->expects($this->once())->method('createMailShare')->with($share)->willReturn(42);
+        $instance->expects($this->once())->method('createShareActivity')->with($share);
+        $instance->expects($this->once())->method('getRawShare')->with(42)->willReturn(['rawShare', 'password' => 'autogeneratedPassword']);
+        $instance->expects($this->once())->method('createShareObject')->with(['rawShare', 'password' => 'autogeneratedPassword'])->willReturn($expectedShare);
+
+        $share->expects($this->exactly(4))->method('getPassword')->willReturnOnConsecutiveCalls(null, 'autogeneratedPassword', 'autogeneratedPassword', 'autogeneratedPassword');
+        $this->hasher->expects($this->once())->method('hash')->with('autogeneratedPassword')->willReturn('autogeneratedPasswordHashed');
+        $share->expects($this->once())->method('setPassword')->with('autogeneratedPasswordHashed');
+
+        // The autogenerated password should be mailed to the owner of the share.
+        $this->shareManager->expects($this->any())->method('shareApiLinkEnforcePassword')->willReturn(true);
+        $this->config->expects($this->any())->method('getSystemValue')->with('sharing.enable_mail_link_password_expiration')->willReturn(false);
+        $this->settingsManager->expects($this->any())->method('sendPasswordByMail')->willReturn(true);
+        $instance->expects($this->once())->method('autoGeneratePassword')->with($share)->willReturn('autogeneratedPassword');
+
+        $message = $this->createMock(IMessage::class);
+        $setToCalls = [
+            [['receiver@example.com']],
+            [['owner@example.com' => 'owner']],
+        ];
+        $message->expects($this->exactly(2))
+            ->method('setTo')
+            ->willReturnCallback(function () use (&$setToCalls, $message) {
+                $expected = array_shift($setToCalls);
+                $this->assertEquals($expected, func_get_args());
+                return $message;
+            });
+        $this->mailer->expects($this->exactly(2))->method('createMessage')->willReturn($message);
+
+        $calls = [
+            [
+                'sharebymail.RecipientNotification',
+                [
+                    'filename' => 'filename',
+                    'link' => 'https://example.com/file.txt',
+                    'initiator' => 'owner',
+                    'expiration' => null,
+                    'shareWith' => 'receiver@example.com',
+                    'note' => '',
+                ],
+            ],
+            [
+                'sharebymail.OwnerPasswordNotification',
+                [
+                    'filename' => 'filename',
+                    'password' => 'autogeneratedPassword',
+                    'initiator' => 'owner',
+                    'initiatorEmail' => 'owner@example.com',
+                    'shareWith' => 'receiver@example.com',
+                ],
+            ],
+        ];
+        $this->mailer->expects($this->exactly(2))
+            ->method('createEMailTemplate')
+            ->willReturnCallback(function () use (&$calls) {
+                $expected = array_shift($calls);
+                $this->assertEquals($expected, func_get_args());
+                return $this->createMock(IEMailTemplate::class);
+            });
+
+        // Main email notification is sent as well as the password to owner
+        // because the password is set and SendPasswordByTalk is enabled.
+        $this->mailer->expects($this->exactly(2))->method('send');
+
+        $this->assertSame($expectedShare, $instance->create($share));
+        $instance->sendMailNotification($share);
+    }
+
+    // If attributes is set to multiple emails, use them as BCC
+    public function sendNotificationToMultipleEmails() {
+        $expectedShare = $this->createMock(IShare::class);
+
+        $node = $this->createMock(File::class);
+        $node->expects($this->any())->method('getName')->willReturn('filename');
+
+        $share = $this->createMock(IShare::class);
+        $share->expects($this->any())->method('getSharedWith')->willReturn('');
+        $share->expects($this->any())->method('getSendPasswordByTalk')->willReturn(false);
+        $share->expects($this->any())->method('getSharedBy')->willReturn('owner');
+        $share->expects($this->any())->method('getNode')->willReturn($node);
+        $share->expects($this->any())->method('getId')->willReturn(42);
+        $share->expects($this->any())->method('getNote')->willReturn('');
+        $share->expects($this->any())->method('getToken')->willReturn('token');
+
+        $attributes = $this->createMock(IAttributes::class);
+        $share->expects($this->any())->method('getAttributes')->willReturn($attributes);
+        $attributes->expects($this->any())->method('getAttribute')->with('shareWith', 'emails')->willReturn([
+            'receiver1@example.com',
+            'receiver2@example.com',
+            'receiver3@example.com',
+        ]);
+
+        $instance = $this->getInstance(['getSharedWith', 'createMailShare', 'getRawShare', 'createShareObject', 'createShareActivity', 'autoGeneratePassword', 'createPasswordSendActivity', 'sendEmail', 'sendPassword', 'sendPasswordToOwner']);
+
+        $instance->expects($this->once())->method('getSharedWith')->willReturn([]);
+        $instance->expects($this->once())->method('createMailShare')->with($share)->willReturn(42);
+        $instance->expects($this->once())->method('createShareActivity')->with($share);
+        $instance->expects($this->once())->method('getRawShare')->with(42)->willReturn(['rawShare', 'password' => 'password']);
+        $instance->expects($this->once())->method('createShareObject')->with(['rawShare', 'password' => 'password'])->willReturn($expectedShare);
+        $share->expects($this->any())->method('getNode')->willReturn($node);
+
+        $share->expects($this->any())->method('getPassword')->willReturn('password');
+        $this->hasher->expects($this->once())->method('hash')->with('password')->willReturn('passwordHashed');
+        $share->expects($this->once())->method('setPassword')->with('passwordHashed');
+
+        // The given password (but not the autogenerated password) should not be
+        // mailed to the receiver of the share because permanent passwords are not enforced.
+        $this->shareManager->expects($this->any())->method('shareApiLinkEnforcePassword')->willReturn(false);
+        $this->config->expects($this->once())->method('getSystemValue')->with('sharing.enable_mail_link_password_expiration')->willReturn(false);
+        $instance->expects($this->never())->method('autoGeneratePassword');
+
+        // A password is set but no password sent via talk has been requested
+        $instance->expects($this->once())->method('sendEmail')
+            ->with($share, ['receiver1@example.com', 'receiver2@example.com', 'receiver3@example.com']);
+        $instance->expects($this->once())->method('sendPassword')->with($share, 'password');
+        $instance->expects($this->never())->method('sendPasswordToOwner');
+
+
+        $message = $this->createMock(IMessage::class);
+        $message->expects($this->never())->method('setTo');
+        $message->expects($this->exactly(2))->method('setBcc')->with(['receiver1@example.com', 'receiver2@example.com', 'receiver3@example.com']);
+        $this->mailer->expects($this->exactly(2))->method('createMessage')->willReturn($message);
+
+        // Main email notification is sent as well as the password
+        // to recipients because the password is set.
+        $this->mailer->expects($this->exactly(2))->method('send');
+
+        $this->assertSame($expectedShare, $instance->create($share));
+        $instance->sendMailNotification($share);
+    }
+
+    public function testCreateFailed(): void {
+        $this->expectException(\Exception::class);
+
+        $this->share->expects($this->once())->method('getSharedWith')->willReturn('user1');
+        $node = $this->createMock('OCP\Files\Node');
+        $node->expects($this->any())->method('getName')->willReturn('fileName');
+        $this->share->expects($this->any())->method('getNode')->willReturn($node);
+
+        $instance = $this->getInstance(['getSharedWith', 'createMailShare', 'getRawShare', 'createShareObject']);
+
+        $instance->expects($this->once())->method('getSharedWith')->willReturn(['found']);
+        $instance->expects($this->never())->method('createMailShare');
+        $instance->expects($this->never())->method('getRawShare');
+        $instance->expects($this->never())->method('createShareObject');
+
+        $this->assertSame('shareObject',
+            $instance->create($this->share)
+        );
+    }
+
+    public function testCreateMailShare(): void {
+        $this->share->expects($this->any())->method('getToken')->willReturn('token');
+        $this->share->expects($this->once())->method('setToken')->with('token');
+        $this->share->expects($this->any())->method('getSharedBy')->willReturn('validby@valid.com');
+        $this->share->expects($this->any())->method('getSharedWith')->willReturn('validwith@valid.com');
+        $this->share->expects($this->any())->method('getNote')->willReturn('Check this!');
+        $this->share->expects($this->any())->method('getMailSend')->willReturn(true);
+
+        $node = $this->createMock('OCP\Files\Node');
+        $node->expects($this->any())->method('getName')->willReturn('fileName');
+        $this->share->expects($this->any())->method('getNode')->willReturn($node);
+
+        $instance = $this->getInstance(['generateToken', 'addShareToDB', 'sendMailNotification']);
+
+        $instance->expects($this->once())->method('generateToken')->willReturn('token');
+        $instance->expects($this->once())->method('addShareToDB')->willReturn(42);
+
+        // The manager handle the mail sending
+        $instance->expects($this->never())->method('sendMailNotification');
+
+        $this->assertSame(42,
+            $this->invokePrivate($instance, 'createMailShare', [$this->share])
+        );
+    }
+
+    public function testGenerateToken(): void {
+        $instance = $this->getInstance();
+
+        $this->secureRandom->expects($this->once())->method('generate')->willReturn('token');
+
+        $this->assertSame('token',
+            $this->invokePrivate($instance, 'generateToken')
+        );
+    }
+
+    public function testAddShareToDB(): void {
+        $itemSource = 11;
+        $itemType = 'file';
+        $shareWith = 'user@server.com';
+        $sharedBy = 'user1';
+        $uidOwner = 'user2';
+        $permissions = 1;
+        $token = 'token';
+        $password = 'password';
+        $sendPasswordByTalk = true;
+        $hideDownload = true;
+        $label = 'label';
+        $expiration = new \DateTime();
+        $passwordExpirationTime = new \DateTime();
+
+
+        $instance = $this->getInstance();
+        $id = $this->invokePrivate(
+            $instance,
+            'addShareToDB',
+            [
+                $itemSource,
+                $itemType,
+                $shareWith,
+                $sharedBy,
+                $uidOwner,
+                $permissions,
+                $token,
+                $password,
+                $passwordExpirationTime,
+                $sendPasswordByTalk,
+                $hideDownload,
+                $label,
+                $expiration
+            ]
+        );
+
+        $qb = $this->connection->getQueryBuilder();
+        $qb->select('*')
+            ->from('share')
+            ->where($qb->expr()->eq('id', $qb->createNamedParameter($id)));
+
+        $qResult = $qb->execute();
+        $result = $qResult->fetchAll();
+        $qResult->closeCursor();
+
+        $this->assertSame(1, count($result));
+
+        $this->assertSame($itemSource, (int)$result[0]['item_source']);
+        $this->assertSame($itemType, $result[0]['item_type']);
+        $this->assertSame($shareWith, $result[0]['share_with']);
+        $this->assertSame($sharedBy, $result[0]['uid_initiator']);
+        $this->assertSame($uidOwner, $result[0]['uid_owner']);
+        $this->assertSame($permissions, (int)$result[0]['permissions']);
+        $this->assertSame($token, $result[0]['token']);
+        $this->assertSame($password, $result[0]['password']);
+        $this->assertSame($passwordExpirationTime->getTimestamp(), \DateTime::createFromFormat('Y-m-d H:i:s', $result[0]['password_expiration_time'])->getTimestamp());
+        $this->assertSame($sendPasswordByTalk, (bool)$result[0]['password_by_talk']);
+        $this->assertSame($hideDownload, (bool)$result[0]['hide_download']);
+        $this->assertSame($label, $result[0]['label']);
+        $this->assertSame($expiration->getTimestamp(), \DateTime::createFromFormat('Y-m-d H:i:s', $result[0]['expiration'])->getTimestamp());
+    }
+
+    public function testUpdate(): void {
+        $itemSource = 11;
+        $itemType = 'file';
+        $shareWith = 'user@server.com';
+        $sharedBy = 'user1';
+        $uidOwner = 'user2';
+        $permissions = 1;
+        $token = 'token';
+        $note = 'personal note';
+
+
+        $instance = $this->getInstance();
+
+        $id = $this->createDummyShare($itemType, $itemSource, $shareWith, $sharedBy, $uidOwner, $permissions, $token, $note);
+
+        $this->share->expects($this->once())->method('getPermissions')->willReturn($permissions + 1);
+        $this->share->expects($this->once())->method('getShareOwner')->willReturn($uidOwner);
+        $this->share->expects($this->once())->method('getSharedBy')->willReturn($sharedBy);
+        $this->share->expects($this->any())->method('getNote')->willReturn($note);
+        $this->share->expects($this->atLeastOnce())->method('getId')->willReturn($id);
+        $this->share->expects($this->atLeastOnce())->method('getNodeId')->willReturn($itemSource);
+        $this->share->expects($this->once())->method('getSharedWith')->willReturn($shareWith);
+
+        $this->assertSame($this->share,
+            $instance->update($this->share)
+        );
+
+        $qb = $this->connection->getQueryBuilder();
+        $qb->select('*')
+            ->from('share')
+            ->where($qb->expr()->eq('id', $qb->createNamedParameter($id)));
+
+        $qResult = $qb->execute();
+        $result = $qResult->fetchAll();
+        $qResult->closeCursor();
+
+        $this->assertSame(1, count($result));
+
+        $this->assertSame($itemSource, (int)$result[0]['item_source']);
+        $this->assertSame($itemType, $result[0]['item_type']);
+        $this->assertSame($shareWith, $result[0]['share_with']);
+        $this->assertSame($sharedBy, $result[0]['uid_initiator']);
+        $this->assertSame($uidOwner, $result[0]['uid_owner']);
+        $this->assertSame($permissions + 1, (int)$result[0]['permissions']);
+        $this->assertSame($token, $result[0]['token']);
+        $this->assertSame($note, $result[0]['note']);
+    }
+
+    public static function dataUpdateSendPassword(): array {
+        return [
+            ['password', 'hashed', 'hashed new', false, false, true],
+            ['', 'hashed', 'hashed new', false, false, false],
+            [null, 'hashed', 'hashed new', false, false, false],
+            ['password', 'hashed', 'hashed', false, false, false],
+            ['password', 'hashed', 'hashed new', false, true, false],
+            ['password', 'hashed', 'hashed new', true, false, true],
+            ['password', 'hashed', 'hashed', true, false, true],
+        ];
+    }
+
+    #[\PHPUnit\Framework\Attributes\DataProvider('dataUpdateSendPassword')]
+    public function testUpdateSendPassword(?string $plainTextPassword, string $originalPassword, string $newPassword, bool $originalSendPasswordByTalk, bool $newSendPasswordByTalk, bool $sendMail): void {
+        $node = $this->createMock(File::class);
+        $node->expects($this->any())->method('getName')->willReturn('filename');
+
+        $this->settingsManager->method('sendPasswordByMail')->willReturn(true);
+
+        $originalShare = $this->createMock(IShare::class);
+        $originalShare->expects($this->any())->method('getSharedWith')->willReturn('receiver@example.com');
+        $originalShare->expects($this->any())->method('getNode')->willReturn($node);
+        $originalShare->expects($this->any())->method('getId')->willReturn(42);
+        $originalShare->expects($this->any())->method('getPassword')->willReturn($originalPassword);
+        $originalShare->expects($this->any())->method('getSendPasswordByTalk')->willReturn($originalSendPasswordByTalk);
+
+        $share = $this->createMock(IShare::class);
+        $share->expects($this->any())->method('getSharedWith')->willReturn('receiver@example.com');
+        $share->expects($this->any())->method('getNode')->willReturn($node);
+        $share->expects($this->any())->method('getId')->willReturn(42);
+        $share->expects($this->any())->method('getPassword')->willReturn($newPassword);
+        $share->expects($this->any())->method('getSendPasswordByTalk')->willReturn($newSendPasswordByTalk);
+
+        if ($sendMail) {
+            $this->mailer->expects($this->once())->method('createEMailTemplate')->with('sharebymail.RecipientPasswordNotification', [
+                'filename' => 'filename',
+                'password' => $plainTextPassword,
+                'initiator' => null,
+                'initiatorEmail' => null,
+                'shareWith' => 'receiver@example.com',
+            ]);
+            $this->mailer->expects($this->once())->method('send');
+        } else {
+            $this->mailer->expects($this->never())->method('send');
+        }
+
+        $instance = $this->getInstance(['getShareById', 'createPasswordSendActivity']);
+        $instance->expects($this->once())->method('getShareById')->willReturn($originalShare);
+
+        $this->assertSame($share,
+            $instance->update($share, $plainTextPassword)
+        );
+    }
+
+    public function testDelete(): void {
+        $instance = $this->getInstance(['removeShareFromTable', 'createShareActivity']);
+        $this->share->expects($this->once())->method('getId')->willReturn(42);
+        $instance->expects($this->once())->method('removeShareFromTable')->with(42);
+        $instance->expects($this->once())->method('createShareActivity')->with($this->share, 'unshare');
+        $instance->delete($this->share);
+    }
+
+    public function testGetShareById(): void {
+        $instance = $this->getInstance(['createShareObject']);
+
+        $itemSource = 11;
+        $itemType = 'file';
+        $shareWith = 'user@server.com';
+        $sharedBy = 'user1';
+        $uidOwner = 'user2';
+        $permissions = 1;
+        $token = 'token';
+
+        $this->createDummyShare($itemType, $itemSource, $shareWith, 'user1wrong', 'user2wrong', $permissions, $token);
+        $id2 = $this->createDummyShare($itemType, $itemSource, $shareWith, $sharedBy, $uidOwner, $permissions, $token);
+
+        $instance->expects($this->once())->method('createShareObject')
+            ->willReturnCallback(
+                function ($data) use ($uidOwner, $sharedBy, $id2) {
+                    $this->assertSame($uidOwner, $data['uid_owner']);
+                    $this->assertSame($sharedBy, $data['uid_initiator']);
+                    $this->assertSame($id2, (int)$data['id']);
+                    return $this->share;
+                }
+            );
+
+        $result = $instance->getShareById($id2);
+
+        $this->assertInstanceOf('OCP\Share\IShare', $result);
+    }
+
+
+    public function testGetShareByIdFailed(): void {
+        $this->expectException(ShareNotFound::class);
+
+        $instance = $this->getInstance(['createShareObject']);
+
+        $itemSource = 11;
+        $itemType = 'file';
+        $shareWith = 'user@server.com';
+        $sharedBy = 'user1';
+        $uidOwner = 'user2';
+        $permissions = 1;
+        $token = 'token';
+
+        $id = $this->createDummyShare($itemType, $itemSource, $shareWith, $sharedBy, $uidOwner, $permissions, $token);
+
+        $instance->getShareById($id + 1);
+    }
+
+    public function testGetShareByPath(): void {
+        $itemSource = 11;
+        $itemType = 'file';
+        $shareWith = 'user@server.com';
+        $sharedBy = 'user1';
+        $uidOwner = 'user2';
+        $permissions = 1;
+        $token = 'token';
+
+        $node = $this->createMock(Node::class);
+        $node->expects($this->once())->method('getId')->willReturn($itemSource);
+
+
+        $instance = $this->getInstance(['createShareObject']);
+
+        $this->createDummyShare($itemType, 111, $shareWith, $sharedBy, $uidOwner, $permissions, $token);
+        $id = $this->createDummyShare($itemType, $itemSource, $shareWith, $sharedBy, $uidOwner, $permissions, $token);
+
+        $instance->expects($this->once())->method('createShareObject')
+            ->willReturnCallback(
+                function ($data) use ($uidOwner, $sharedBy, $id) {
+                    $this->assertSame($uidOwner, $data['uid_owner']);
+                    $this->assertSame($sharedBy, $data['uid_initiator']);
+                    $this->assertSame($id, (int)$data['id']);
+                    return $this->share;
+                }
+            );
+
+        $result = $instance->getSharesByPath($node);
+
+        $this->assertTrue(is_array($result));
+        $this->assertSame(1, count($result));
+        $this->assertInstanceOf('OCP\Share\IShare', $result[0]);
+    }
+
+    public function testGetShareByToken(): void {
+        $itemSource = 11;
+        $itemType = 'file';
+        $shareWith = 'user@server.com';
+        $sharedBy = 'user1';
+        $uidOwner = 'user2';
+        $permissions = 1;
+        $token = 'token';
 
-		$instance = $this->getInstance(['createShareObject']);
+        $instance = $this->getInstance(['createShareObject']);
 
-		$idMail = $this->createDummyShare($itemType, $itemSource, $shareWith, $sharedBy, $uidOwner, $permissions, $token);
-		$idPublic = $this->createDummyShare($itemType, $itemSource, $shareWith, $sharedBy, $uidOwner, $permissions, $token, '', IShare::TYPE_LINK);
+        $idMail = $this->createDummyShare($itemType, $itemSource, $shareWith, $sharedBy, $uidOwner, $permissions, $token);
+        $idPublic = $this->createDummyShare($itemType, $itemSource, $shareWith, $sharedBy, $uidOwner, $permissions, $token, '', IShare::TYPE_LINK);
 
-		$this->assertTrue($idMail !== $idPublic);
+        $this->assertTrue($idMail !== $idPublic);
 
-		$instance->expects($this->once())->method('createShareObject')
-			->willReturnCallback(
-				function ($data) use ($idMail) {
-					$this->assertSame($idMail, (int)$data['id']);
-					return $this->share;
-				}
-			);
+        $instance->expects($this->once())->method('createShareObject')
+            ->willReturnCallback(
+                function ($data) use ($idMail) {
+                    $this->assertSame($idMail, (int)$data['id']);
+                    return $this->share;
+                }
+            );
 
-		$result = $instance->getShareByToken('token');
+        $result = $instance->getShareByToken('token');
 
-		$this->assertInstanceOf('OCP\Share\IShare', $result);
-	}
+        $this->assertInstanceOf('OCP\Share\IShare', $result);
+    }
 
 
-	public function testGetShareByTokenFailed(): void {
-		$this->expectException(ShareNotFound::class);
+    public function testGetShareByTokenFailed(): void {
+        $this->expectException(ShareNotFound::class);
 
 
-		$itemSource = 11;
-		$itemType = 'file';
-		$shareWith = 'user@server.com';
-		$sharedBy = 'user1';
-		$uidOwner = 'user2';
-		$permissions = 1;
-		$token = 'token';
+        $itemSource = 11;
+        $itemType = 'file';
+        $shareWith = 'user@server.com';
+        $sharedBy = 'user1';
+        $uidOwner = 'user2';
+        $permissions = 1;
+        $token = 'token';
 
-		$instance = $this->getInstance(['createShareObject']);
+        $instance = $this->getInstance(['createShareObject']);
 
-		$idMail = $this->createDummyShare($itemType, $itemSource, $shareWith, $sharedBy, $uidOwner, $permissions, $token);
-		$idPublic = $this->createDummyShare($itemType, $itemSource, $shareWith, $sharedBy, $uidOwner, $permissions, 'token2', '', IShare::TYPE_LINK);
+        $idMail = $this->createDummyShare($itemType, $itemSource, $shareWith, $sharedBy, $uidOwner, $permissions, $token);
+        $idPublic = $this->createDummyShare($itemType, $itemSource, $shareWith, $sharedBy, $uidOwner, $permissions, 'token2', '', IShare::TYPE_LINK);
 
-		$this->assertTrue($idMail !== $idPublic);
+        $this->assertTrue($idMail !== $idPublic);
 
-		$this->assertInstanceOf('OCP\Share\IShare',
-			$instance->getShareByToken('token2')
-		);
-	}
+        $this->assertInstanceOf('OCP\Share\IShare',
+            $instance->getShareByToken('token2')
+        );
+    }
 
-	public function testRemoveShareFromTable(): void {
-		$itemSource = 11;
-		$itemType = 'file';
-		$shareWith = 'user@server.com';
-		$sharedBy = 'user1';
-		$uidOwner = 'user2';
-		$permissions = 1;
-		$token = 'token';
+    public function testRemoveShareFromTable(): void {
+        $itemSource = 11;
+        $itemType = 'file';
+        $shareWith = 'user@server.com';
+        $sharedBy = 'user1';
+        $uidOwner = 'user2';
+        $permissions = 1;
+        $token = 'token';
 
-		$instance = $this->getInstance();
+        $instance = $this->getInstance();
 
-		$id = $this->createDummyShare($itemType, $itemSource, $shareWith, $sharedBy, $uidOwner, $permissions, $token);
+        $id = $this->createDummyShare($itemType, $itemSource, $shareWith, $sharedBy, $uidOwner, $permissions, $token);
 
-		$query = $this->connection->getQueryBuilder();
-		$query->select('*')->from('share')
-			->where($query->expr()->eq('id', $query->createNamedParameter($id)));
+        $query = $this->connection->getQueryBuilder();
+        $query->select('*')->from('share')
+            ->where($query->expr()->eq('id', $query->createNamedParameter($id)));
 
-		$result = $query->execute();
-		$before = $result->fetchAll();
-		$result->closeCursor();
+        $result = $query->execute();
+        $before = $result->fetchAll();
+        $result->closeCursor();
 
-		$this->assertTrue(is_array($before));
-		$this->assertSame(1, count($before));
+        $this->assertTrue(is_array($before));
+        $this->assertSame(1, count($before));
 
-		$this->invokePrivate($instance, 'removeShareFromTable', [$id]);
+        $this->invokePrivate($instance, 'removeShareFromTable', [$id]);
 
-		$query = $this->connection->getQueryBuilder();
-		$query->select('*')->from('share')
-			->where($query->expr()->eq('id', $query->createNamedParameter($id)));
+        $query = $this->connection->getQueryBuilder();
+        $query->select('*')->from('share')
+            ->where($query->expr()->eq('id', $query->createNamedParameter($id)));
 
-		$result = $query->execute();
-		$after = $result->fetchAll();
-		$result->closeCursor();
+        $result = $query->execute();
+        $after = $result->fetchAll();
+        $result->closeCursor();
 
-		$this->assertTrue(is_array($after));
-		$this->assertEmpty($after);
-	}
+        $this->assertTrue(is_array($after));
+        $this->assertEmpty($after);
+    }
 
-	public function testUserDeleted(): void {
-		$itemSource = 11;
-		$itemType = 'file';
-		$shareWith = 'user@server.com';
-		$sharedBy = 'user1';
-		$uidOwner = 'user2';
-		$permissions = 1;
-		$token = 'token';
+    public function testUserDeleted(): void {
+        $itemSource = 11;
+        $itemType = 'file';
+        $shareWith = 'user@server.com';
+        $sharedBy = 'user1';
+        $uidOwner = 'user2';
+        $permissions = 1;
+        $token = 'token';
 
-		$this->createDummyShare($itemType, $itemSource, $shareWith, $sharedBy, $uidOwner, $permissions, $token);
-		$id = $this->createDummyShare($itemType, $itemSource, $shareWith, $sharedBy, 'user2Wrong', $permissions, $token);
+        $this->createDummyShare($itemType, $itemSource, $shareWith, $sharedBy, $uidOwner, $permissions, $token);
+        $id = $this->createDummyShare($itemType, $itemSource, $shareWith, $sharedBy, 'user2Wrong', $permissions, $token);
 
-		$query = $this->connection->getQueryBuilder();
-		$query->select('*')->from('share');
+        $query = $this->connection->getQueryBuilder();
+        $query->select('*')->from('share');
 
-		$result = $query->execute();
-		$before = $result->fetchAll();
-		$result->closeCursor();
+        $result = $query->execute();
+        $before = $result->fetchAll();
+        $result->closeCursor();
 
-		$this->assertTrue(is_array($before));
-		$this->assertSame(2, count($before));
+        $this->assertTrue(is_array($before));
+        $this->assertSame(2, count($before));
 
 
-		$instance = $this->getInstance();
+        $instance = $this->getInstance();
 
-		$instance->userDeleted($uidOwner, IShare::TYPE_EMAIL);
+        $instance->userDeleted($uidOwner, IShare::TYPE_EMAIL);
 
-		$query = $this->connection->getQueryBuilder();
-		$query->select('*')->from('share');
+        $query = $this->connection->getQueryBuilder();
+        $query->select('*')->from('share');
 
-		$result = $query->execute();
-		$after = $result->fetchAll();
-		$result->closeCursor();
+        $result = $query->execute();
+        $after = $result->fetchAll();
+        $result->closeCursor();
 
-		$this->assertTrue(is_array($after));
-		$this->assertSame(1, count($after));
-		$this->assertSame($id, (int)$after[0]['id']);
-	}
+        $this->assertTrue(is_array($after));
+        $this->assertSame(1, count($after));
+        $this->assertSame($id, (int)$after[0]['id']);
+    }
 
-	public function testGetRawShare(): void {
-		$itemSource = 11;
-		$itemType = 'file';
-		$shareWith = 'user@server.com';
-		$sharedBy = 'user1';
-		$uidOwner = 'user2';
-		$permissions = 1;
-		$token = 'token';
+    public function testGetRawShare(): void {
+        $itemSource = 11;
+        $itemType = 'file';
+        $shareWith = 'user@server.com';
+        $sharedBy = 'user1';
+        $uidOwner = 'user2';
+        $permissions = 1;
+        $token = 'token';
 
-		$instance = $this->getInstance();
+        $instance = $this->getInstance();
 
-		$id = $this->createDummyShare($itemType, $itemSource, $shareWith, $sharedBy, $uidOwner, $permissions, $token);
+        $id = $this->createDummyShare($itemType, $itemSource, $shareWith, $sharedBy, $uidOwner, $permissions, $token);
 
-		$result = $this->invokePrivate($instance, 'getRawShare', [$id]);
-
-		$this->assertTrue(is_array($result));
-		$this->assertSame($itemSource, (int)$result['item_source']);
-		$this->assertSame($itemType, $result['item_type']);
-		$this->assertSame($shareWith, $result['share_with']);
-		$this->assertSame($sharedBy, $result['uid_initiator']);
-		$this->assertSame($uidOwner, $result['uid_owner']);
-		$this->assertSame($permissions, (int)$result['permissions']);
-		$this->assertSame($token, $result['token']);
-	}
+        $result = $this->invokePrivate($instance, 'getRawShare', [$id]);
+
+        $this->assertTrue(is_array($result));
+        $this->assertSame($itemSource, (int)$result['item_source']);
+        $this->assertSame($itemType, $result['item_type']);
+        $this->assertSame($shareWith, $result['share_with']);
+        $this->assertSame($sharedBy, $result['uid_initiator']);
+        $this->assertSame($uidOwner, $result['uid_owner']);
+        $this->assertSame($permissions, (int)$result['permissions']);
+        $this->assertSame($token, $result['token']);
+    }
 
 
-	public function testGetRawShareFailed(): void {
-		$this->expectException(ShareNotFound::class);
+    public function testGetRawShareFailed(): void {
+        $this->expectException(ShareNotFound::class);
 
-		$itemSource = 11;
-		$itemType = 'file';
-		$shareWith = 'user@server.com';
-		$sharedBy = 'user1';
-		$uidOwner = 'user2';
-		$permissions = 1;
-		$token = 'token';
-
-		$instance = $this->getInstance();
+        $itemSource = 11;
+        $itemType = 'file';
+        $shareWith = 'user@server.com';
+        $sharedBy = 'user1';
+        $uidOwner = 'user2';
+        $permissions = 1;
+        $token = 'token';
+
+        $instance = $this->getInstance();
 
-		$id = $this->createDummyShare($itemType, $itemSource, $shareWith, $sharedBy, $uidOwner, $permissions, $token);
-
-		$this->invokePrivate($instance, 'getRawShare', [$id + 1]);
-	}
+        $id = $this->createDummyShare($itemType, $itemSource, $shareWith, $sharedBy, $uidOwner, $permissions, $token);
+
+        $this->invokePrivate($instance, 'getRawShare', [$id + 1]);
+    }
 
-	private function createDummyShare($itemType, $itemSource, $shareWith, $sharedBy, $uidOwner, $permissions, $token, $note = '', $shareType = IShare::TYPE_EMAIL) {
-		$qb = $this->connection->getQueryBuilder();
-		$qb->insert('share')
-			->setValue('share_type', $qb->createNamedParameter($shareType))
-			->setValue('item_type', $qb->createNamedParameter($itemType))
-			->setValue('item_source', $qb->createNamedParameter($itemSource))
-			->setValue('file_source', $qb->createNamedParameter($itemSource))
-			->setValue('share_with', $qb->createNamedParameter($shareWith))
-			->setValue('uid_owner', $qb->createNamedParameter($uidOwner))
-			->setValue('uid_initiator', $qb->createNamedParameter($sharedBy))
-			->setValue('permissions', $qb->createNamedParameter($permissions))
-			->setValue('token', $qb->createNamedParameter($token))
-			->setValue('note', $qb->createNamedParameter($note))
-			->setValue('stime', $qb->createNamedParameter(time()));
-
-		/*
+    private function createDummyShare($itemType, $itemSource, $shareWith, $sharedBy, $uidOwner, $permissions, $token, $note = '', $shareType = IShare::TYPE_EMAIL) {
+        $qb = $this->connection->getQueryBuilder();
+        $qb->insert('share')
+            ->setValue('share_type', $qb->createNamedParameter($shareType))
+            ->setValue('item_type', $qb->createNamedParameter($itemType))
+            ->setValue('item_source', $qb->createNamedParameter($itemSource))
+            ->setValue('file_source', $qb->createNamedParameter($itemSource))
+            ->setValue('share_with', $qb->createNamedParameter($shareWith))
+            ->setValue('uid_owner', $qb->createNamedParameter($uidOwner))
+            ->setValue('uid_initiator', $qb->createNamedParameter($sharedBy))
+            ->setValue('permissions', $qb->createNamedParameter($permissions))
+            ->setValue('token', $qb->createNamedParameter($token))
+            ->setValue('note', $qb->createNamedParameter($note))
+            ->setValue('stime', $qb->createNamedParameter(time()));
+
+        /*
 		 * Added to fix https://github.com/owncloud/core/issues/22215
 		 * Can be removed once we get rid of ajax/share.php
 		 */
-		$qb->setValue('file_target', $qb->createNamedParameter(''));
-
-		$qb->execute();
-		$id = $qb->getLastInsertId();
-
-		return (int)$id;
-	}
-
-	public function testGetSharesInFolder(): void {
-		$userManager = Server::get(IUserManager::class);
-		$rootFolder = Server::get(IRootFolder::class);
-
-		$this->shareManager->expects($this->any())
-			->method('newShare')
-			->willReturn(new Share($rootFolder, $userManager));
-
-		$provider = $this->getInstance(['sendMailNotification', 'createShareActivity']);
-
-		$u1 = $userManager->createUser('testFed', md5((string)time()));
-		$u2 = $userManager->createUser('testFed2', md5((string)time()));
-
-		$folder1 = $rootFolder->getUserFolder($u1->getUID())->newFolder('foo');
-		$file1 = $folder1->newFile('bar1');
-		$file2 = $folder1->newFile('bar2');
-
-		$share1 = $this->shareManager->newShare();
-		$share1->setSharedWith('user@server.com')
-			->setSharedBy($u1->getUID())
-			->setShareOwner($u1->getUID())
-			->setPermissions(Constants::PERMISSION_READ)
-			->setNode($file1);
-		$provider->create($share1);
-
-		$share2 = $this->shareManager->newShare();
-		$share2->setSharedWith('user@server.com')
-			->setSharedBy($u2->getUID())
-			->setShareOwner($u1->getUID())
-			->setPermissions(Constants::PERMISSION_READ)
-			->setNode($file2);
-		$provider->create($share2);
-
-		$result = $provider->getSharesInFolder($u1->getUID(), $folder1, false);
-		$this->assertCount(1, $result);
-		$this->assertCount(1, $result[$file1->getId()]);
-
-		$result = $provider->getSharesInFolder($u1->getUID(), $folder1, true);
-		$this->assertCount(2, $result);
-		$this->assertCount(1, $result[$file1->getId()]);
-		$this->assertCount(1, $result[$file2->getId()]);
-
-		$u1->delete();
-		$u2->delete();
-	}
-
-	public function testGetAccessList(): void {
-		$userManager = Server::get(IUserManager::class);
-		$rootFolder = Server::get(IRootFolder::class);
-
-		$this->shareManager->expects($this->any())
-			->method('newShare')
-			->willReturn(new Share($rootFolder, $userManager));
-
-		$provider = $this->getInstance(['sendMailNotification', 'createShareActivity']);
-
-		$u1 = $userManager->createUser('testFed', md5((string)time()));
-		$u2 = $userManager->createUser('testFed2', md5((string)time()));
-
-		$folder = $rootFolder->getUserFolder($u1->getUID())->newFolder('foo');
-
-		$accessList = $provider->getAccessList([$folder], true);
-		$this->assertArrayHasKey('public', $accessList);
-		$this->assertFalse($accessList['public']);
-		$accessList = $provider->getAccessList([$folder], false);
-		$this->assertArrayHasKey('public', $accessList);
-		$this->assertFalse($accessList['public']);
-
-		$share1 = $this->shareManager->newShare();
-		$share1->setSharedWith('user@server.com')
-			->setSharedBy($u1->getUID())
-			->setShareOwner($u1->getUID())
-			->setPermissions(Constants::PERMISSION_READ)
-			->setNode($folder);
-		$share1 = $provider->create($share1);
-
-		$share2 = $this->shareManager->newShare();
-		$share2->setSharedWith('user2@server.com')
-			->setSharedBy($u2->getUID())
-			->setShareOwner($u1->getUID())
-			->setPermissions(Constants::PERMISSION_READ)
-			->setNode($folder);
-		$share2 = $provider->create($share2);
-
-		$accessList = $provider->getAccessList([$folder], true);
-		$this->assertArrayHasKey('public', $accessList);
-		$this->assertTrue($accessList['public']);
-		$accessList = $provider->getAccessList([$folder], false);
-		$this->assertArrayHasKey('public', $accessList);
-		$this->assertTrue($accessList['public']);
-
-		$provider->delete($share2);
-
-		$accessList = $provider->getAccessList([$folder], true);
-		$this->assertArrayHasKey('public', $accessList);
-		$this->assertTrue($accessList['public']);
-		$accessList = $provider->getAccessList([$folder], false);
-		$this->assertArrayHasKey('public', $accessList);
-		$this->assertTrue($accessList['public']);
-
-		$provider->delete($share1);
-
-		$accessList = $provider->getAccessList([$folder], true);
-		$this->assertArrayHasKey('public', $accessList);
-		$this->assertFalse($accessList['public']);
-		$accessList = $provider->getAccessList([$folder], false);
-		$this->assertArrayHasKey('public', $accessList);
-		$this->assertFalse($accessList['public']);
-
-		$u1->delete();
-		$u2->delete();
-	}
-
-	public function testSendMailNotificationWithSameUserAndUserEmail(): void {
-		$provider = $this->getInstance();
-		$user = $this->createMock(IUser::class);
-		$this->settingsManager->expects($this->any())->method('replyToInitiator')->willReturn(true);
-		$this->userManager
-			->expects($this->once())
-			->method('get')
-			->with('OwnerUser')
-			->willReturn($user);
-		$user
-			->expects($this->once())
-			->method('getDisplayName')
-			->willReturn('Mrs. Owner User');
-		$message = $this->createMock(Message::class);
-		$this->mailer
-			->expects($this->once())
-			->method('createMessage')
-			->willReturn($message);
-		$template = $this->createMock(IEMailTemplate::class);
-		$this->mailer
-			->expects($this->once())
-			->method('createEMailTemplate')
-			->willReturn($template);
-		$template
-			->expects($this->once())
-			->method('addHeader');
-		$template
-			->expects($this->once())
-			->method('addHeading')
-			->with('Mrs. Owner User shared file.txt with you');
-		$template
-			->expects($this->once())
-			->method('addBodyButton')
-			->with(
-				'Open file.txt',
-				'https://example.com/file.txt'
-			);
-		$message
-			->expects($this->once())
-			->method('setTo')
-			->with(['john@doe.com']);
-		$this->defaults
-			->expects($this->once())
-			->method('getName')
-			->willReturn('UnitTestCloud');
-		$message
-			->expects($this->once())
-			->method('setFrom')
-			->with([
-				Util::getDefaultEmailAddress('UnitTestCloud') => 'Mrs. Owner User via UnitTestCloud'
-			]);
-		$user
-			->expects($this->once())
-			->method('getEMailAddress')
-			->willReturn('owner@example.com');
-		$message
-			->expects($this->once())
-			->method('setReplyTo')
-			->with(['owner@example.com' => 'Mrs. Owner User']);
-		$this->defaults
-			->expects($this->exactly(2))
-			->method('getSlogan')
-			->willReturn('Testing like 1990');
-		$template
-			->expects($this->once())
-			->method('addFooter')
-			->with('UnitTestCloud - Testing like 1990');
-		$template
-			->expects($this->once())
-			->method('setSubject')
-			->with('Mrs. Owner User shared file.txt with you');
-		$message
-			->expects($this->once())
-			->method('useTemplate')
-			->with($template);
-
-		$this->mailer
-			->expects($this->once())
-			->method('send')
-			->with($message);
-
-		$this->urlGenerator->expects($this->once())->method('linkToRouteAbsolute')
-			->with('files_sharing.sharecontroller.showShare', ['token' => 'token'])
-			->willReturn('https://example.com/file.txt');
-
-		$node = $this->createMock(File::class);
-		$node->expects($this->any())->method('getName')->willReturn('file.txt');
-
-		$share = $this->createMock(IShare::class);
-		$share->expects($this->any())->method('getSharedBy')->willReturn('OwnerUser');
-		$share->expects($this->any())->method('getSharedWith')->willReturn('john@doe.com');
-		$share->expects($this->any())->method('getNode')->willReturn($node);
-		$share->expects($this->any())->method('getId')->willReturn(42);
-		$share->expects($this->any())->method('getNote')->willReturn('');
-		$share->expects($this->any())->method('getToken')->willReturn('token');
-
-		self::invokePrivate(
-			$provider,
-			'sendMailNotification',
-			[$share]
-		);
-	}
-
-	public function testSendMailNotificationWithSameUserAndUserEmailAndNote(): void {
-		$provider = $this->getInstance();
-		$user = $this->createMock(IUser::class);
-		$this->settingsManager->expects($this->any())->method('replyToInitiator')->willReturn(true);
-		$this->userManager
-			->expects($this->once())
-			->method('get')
-			->with('OwnerUser')
-			->willReturn($user);
-		$user
-			->expects($this->once())
-			->method('getDisplayName')
-			->willReturn('Mrs. Owner User');
-		$message = $this->createMock(Message::class);
-		$this->mailer
-			->expects($this->once())
-			->method('createMessage')
-			->willReturn($message);
-		$template = $this->createMock(IEMailTemplate::class);
-		$this->mailer
-			->expects($this->once())
-			->method('createEMailTemplate')
-			->willReturn($template);
-		$template
-			->expects($this->once())
-			->method('addHeader');
-		$template
-			->expects($this->once())
-			->method('addHeading')
-			->with('Mrs. Owner User shared file.txt with you');
-
-		$this->urlGenerator->expects($this->once())->method('imagePath')
-			->with('core', 'caldav/description.png')
-			->willReturn('core/img/caldav/description.png');
-		$this->urlGenerator->expects($this->once())->method('getAbsoluteURL')
-			->with('core/img/caldav/description.png')
-			->willReturn('https://example.com/core/img/caldav/description.png');
-		$template
-			->expects($this->once())
-			->method('addBodyListItem')
-			->with(
-				'This is a note to the recipient',
-				'Note:',
-				'https://example.com/core/img/caldav/description.png',
-				'This is a note to the recipient'
-			);
-		$template
-			->expects($this->once())
-			->method('addBodyButton')
-			->with(
-				'Open file.txt',
-				'https://example.com/file.txt'
-			);
-		$message
-			->expects($this->once())
-			->method('setTo')
-			->with(['john@doe.com']);
-		$this->defaults
-			->expects($this->once())
-			->method('getName')
-			->willReturn('UnitTestCloud');
-		$message
-			->expects($this->once())
-			->method('setFrom')
-			->with([
-				Util::getDefaultEmailAddress('UnitTestCloud') => 'Mrs. Owner User via UnitTestCloud'
-			]);
-		$user
-			->expects($this->once())
-			->method('getEMailAddress')
-			->willReturn('owner@example.com');
-		$message
-			->expects($this->once())
-			->method('setReplyTo')
-			->with(['owner@example.com' => 'Mrs. Owner User']);
-		$this->defaults
-			->expects($this->exactly(2))
-			->method('getSlogan')
-			->willReturn('Testing like 1990');
-		$template
-			->expects($this->once())
-			->method('addFooter')
-			->with('UnitTestCloud - Testing like 1990');
-		$template
-			->expects($this->once())
-			->method('setSubject')
-			->with('Mrs. Owner User shared file.txt with you');
-		$message
-			->expects($this->once())
-			->method('useTemplate')
-			->with($template);
-
-		$this->mailer
-			->expects($this->once())
-			->method('send')
-			->with($message);
-
-		$this->urlGenerator->expects($this->once())->method('linkToRouteAbsolute')
-			->with('files_sharing.sharecontroller.showShare', ['token' => 'token'])
-			->willReturn('https://example.com/file.txt');
-
-		$node = $this->createMock(File::class);
-		$node->expects($this->any())->method('getName')->willReturn('file.txt');
-
-		$share = $this->createMock(IShare::class);
-		$share->expects($this->any())->method('getSharedBy')->willReturn('OwnerUser');
-		$share->expects($this->any())->method('getSharedWith')->willReturn('john@doe.com');
-		$share->expects($this->any())->method('getNode')->willReturn($node);
-		$share->expects($this->any())->method('getId')->willReturn(42);
-		$share->expects($this->any())->method('getNote')->willReturn('This is a note to the recipient');
-		$share->expects($this->any())->method('getToken')->willReturn('token');
-
-		self::invokePrivate(
-			$provider,
-			'sendMailNotification',
-			[$share]
-		);
-	}
-
-	public function testSendMailNotificationWithSameUserAndUserEmailAndExpiration(): void {
-		$provider = $this->getInstance();
-		$user = $this->createMock(IUser::class);
-		$this->settingsManager->expects($this->any())->method('replyToInitiator')->willReturn(true);
-		$this->userManager
-			->expects($this->once())
-			->method('get')
-			->with('OwnerUser')
-			->willReturn($user);
-		$user
-			->expects($this->once())
-			->method('getDisplayName')
-			->willReturn('Mrs. Owner User');
-		$message = $this->createMock(Message::class);
-		$this->mailer
-			->expects($this->once())
-			->method('createMessage')
-			->willReturn($message);
-		$template = $this->createMock(IEMailTemplate::class);
-		$this->mailer
-			->expects($this->once())
-			->method('createEMailTemplate')
-			->willReturn($template);
-		$template
-			->expects($this->once())
-			->method('addHeader');
-		$template
-			->expects($this->once())
-			->method('addHeading')
-			->with('Mrs. Owner User shared file.txt with you');
-
-		$expiration = new DateTime('2001-01-01');
-		$this->l->expects($this->once())
-			->method('l')
-			->with('date', $expiration, ['width' => 'medium'])
-			->willReturn('2001-01-01');
-		$this->urlGenerator->expects($this->once())->method('imagePath')
-			->with('core', 'caldav/time.png')
-			->willReturn('core/img/caldav/time.png');
-		$this->urlGenerator->expects($this->once())->method('getAbsoluteURL')
-			->with('core/img/caldav/time.png')
-			->willReturn('https://example.com/core/img/caldav/time.png');
-		$template
-			->expects($this->once())
-			->method('addBodyListItem')
-			->with(
-				'This share is valid until 2001-01-01 at midnight',
-				'Expiration:',
-				'https://example.com/core/img/caldav/time.png',
-			);
-
-		$template
-			->expects($this->once())
-			->method('addBodyButton')
-			->with(
-				'Open file.txt',
-				'https://example.com/file.txt'
-			);
-		$message
-			->expects($this->once())
-			->method('setTo')
-			->with(['john@doe.com']);
-		$this->defaults
-			->expects($this->once())
-			->method('getName')
-			->willReturn('UnitTestCloud');
-		$message
-			->expects($this->once())
-			->method('setFrom')
-			->with([
-				Util::getDefaultEmailAddress('UnitTestCloud') => 'Mrs. Owner User via UnitTestCloud'
-			]);
-		$user
-			->expects($this->once())
-			->method('getEMailAddress')
-			->willReturn('owner@example.com');
-		$message
-			->expects($this->once())
-			->method('setReplyTo')
-			->with(['owner@example.com' => 'Mrs. Owner User']);
-		$this->defaults
-			->expects($this->exactly(2))
-			->method('getSlogan')
-			->willReturn('Testing like 1990');
-		$template
-			->expects($this->once())
-			->method('addFooter')
-			->with('UnitTestCloud - Testing like 1990');
-		$template
-			->expects($this->once())
-			->method('setSubject')
-			->with('Mrs. Owner User shared file.txt with you');
-		$message
-			->expects($this->once())
-			->method('useTemplate')
-			->with($template);
-
-		$this->mailer
-			->expects($this->once())
-			->method('send')
-			->with($message);
-
-		$this->urlGenerator->expects($this->once())->method('linkToRouteAbsolute')
-			->with('files_sharing.sharecontroller.showShare', ['token' => 'token'])
-			->willReturn('https://example.com/file.txt');
-
-		$node = $this->createMock(File::class);
-		$node->expects($this->any())->method('getName')->willReturn('file.txt');
-
-		$share = $this->createMock(IShare::class);
-		$share->expects($this->any())->method('getSharedBy')->willReturn('OwnerUser');
-		$share->expects($this->any())->method('getSharedWith')->willReturn('john@doe.com');
-		$share->expects($this->any())->method('getNode')->willReturn($node);
-		$share->expects($this->any())->method('getId')->willReturn(42);
-		$share->expects($this->any())->method('getNote')->willReturn('');
-		$share->expects($this->any())->method('getExpirationDate')->willReturn($expiration);
-		$share->expects($this->any())->method('getToken')->willReturn('token');
-
-		self::invokePrivate(
-			$provider,
-			'sendMailNotification',
-			[$share]
-		);
-	}
-
-	public function testSendMailNotificationWithDifferentUserAndNoUserEmail(): void {
-		$provider = $this->getInstance();
-		$initiatorUser = $this->createMock(IUser::class);
-		$this->settingsManager->expects($this->any())->method('replyToInitiator')->willReturn(true);
-		$this->userManager
-			->expects($this->once())
-			->method('get')
-			->with('InitiatorUser')
-			->willReturn($initiatorUser);
-		$initiatorUser
-			->expects($this->once())
-			->method('getDisplayName')
-			->willReturn('Mr. Initiator User');
-		$message = $this->createMock(Message::class);
-		$this->mailer
-			->expects($this->once())
-			->method('createMessage')
-			->willReturn($message);
-		$template = $this->createMock(IEMailTemplate::class);
-		$this->mailer
-			->expects($this->once())
-			->method('createEMailTemplate')
-			->willReturn($template);
-		$template
-			->expects($this->once())
-			->method('addHeader');
-		$template
-			->expects($this->once())
-			->method('addHeading')
-			->with('Mr. Initiator User shared file.txt with you');
-		$template
-			->expects($this->once())
-			->method('addBodyButton')
-			->with(
-				'Open file.txt',
-				'https://example.com/file.txt'
-			);
-		$message
-			->expects($this->once())
-			->method('setTo')
-			->with(['john@doe.com']);
-		$this->defaults
-			->expects($this->once())
-			->method('getName')
-			->willReturn('UnitTestCloud');
-		$message
-			->expects($this->once())
-			->method('setFrom')
-			->with([
-				Util::getDefaultEmailAddress('UnitTestCloud') => 'Mr. Initiator User via UnitTestCloud'
-			]);
-		$message
-			->expects($this->never())
-			->method('setReplyTo');
-		$template
-			->expects($this->once())
-			->method('addFooter')
-			->with('');
-		$template
-			->expects($this->once())
-			->method('setSubject')
-			->with('Mr. Initiator User shared file.txt with you');
-		$message
-			->expects($this->once())
-			->method('useTemplate')
-			->with($template);
-
-		$this->mailer
-			->expects($this->once())
-			->method('send')
-			->with($message);
-
-		$this->urlGenerator->expects($this->once())->method('linkToRouteAbsolute')
-			->with('files_sharing.sharecontroller.showShare', ['token' => 'token'])
-			->willReturn('https://example.com/file.txt');
-
-		$node = $this->createMock(File::class);
-		$node->expects($this->any())->method('getName')->willReturn('file.txt');
-
-		$share = $this->createMock(IShare::class);
-		$share->expects($this->any())->method('getSharedBy')->willReturn('InitiatorUser');
-		$share->expects($this->any())->method('getSharedWith')->willReturn('john@doe.com');
-		$share->expects($this->any())->method('getNode')->willReturn($node);
-		$share->expects($this->any())->method('getId')->willReturn(42);
-		$share->expects($this->any())->method('getNote')->willReturn('');
-		$share->expects($this->any())->method('getToken')->willReturn('token');
-
-		self::invokePrivate(
-			$provider,
-			'sendMailNotification',
-			[$share]
-		);
-	}
-
-	public function testSendMailNotificationWithSameUserAndUserEmailAndReplyToDesactivate(): void {
-		$provider = $this->getInstance();
-		$user = $this->createMock(IUser::class);
-		$this->settingsManager->expects($this->any())->method('replyToInitiator')->willReturn(false);
-		$this->userManager
-			->expects($this->once())
-			->method('get')
-			->with('OwnerUser')
-			->willReturn($user);
-		$user
-			->expects($this->once())
-			->method('getDisplayName')
-			->willReturn('Mrs. Owner User');
-		$message = $this->createMock(Message::class);
-		$this->mailer
-			->expects($this->once())
-			->method('createMessage')
-			->willReturn($message);
-		$template = $this->createMock(IEMailTemplate::class);
-		$this->mailer
-			->expects($this->once())
-			->method('createEMailTemplate')
-			->willReturn($template);
-		$template
-			->expects($this->once())
-			->method('addHeader');
-		$template
-			->expects($this->once())
-			->method('addHeading')
-			->with('Mrs. Owner User shared file.txt with you');
-		$template
-			->expects($this->once())
-			->method('addBodyButton')
-			->with(
-				'Open file.txt',
-				'https://example.com/file.txt'
-			);
-		$message
-			->expects($this->once())
-			->method('setTo')
-			->with(['john@doe.com']);
-		$this->defaults
-			->expects($this->once())
-			->method('getName')
-			->willReturn('UnitTestCloud');
-		$message
-			->expects($this->once())
-			->method('setFrom')
-			->with([
-				Util::getDefaultEmailAddress('UnitTestCloud') => 'UnitTestCloud'
-			]);
-		// Since replyToInitiator is false, we never get the initiator email address
-		$user
-			->expects($this->never())
-			->method('getEMailAddress');
-		$message
-			->expects($this->never())
-			->method('setReplyTo');
-		$template
-			->expects($this->once())
-			->method('addFooter')
-			->with('');
-		$template
-			->expects($this->once())
-			->method('setSubject')
-			->with('Mrs. Owner User shared file.txt with you');
-		$message
-			->expects($this->once())
-			->method('useTemplate')
-			->with($template);
-
-		$this->mailer
-			->expects($this->once())
-			->method('send')
-			->with($message);
-
-		$this->urlGenerator->expects($this->once())->method('linkToRouteAbsolute')
-			->with('files_sharing.sharecontroller.showShare', ['token' => 'token'])
-			->willReturn('https://example.com/file.txt');
-
-		$node = $this->createMock(File::class);
-		$node->expects($this->any())->method('getName')->willReturn('file.txt');
-
-		$share = $this->createMock(IShare::class);
-		$share->expects($this->any())->method('getSharedBy')->willReturn('OwnerUser');
-		$share->expects($this->any())->method('getSharedWith')->willReturn('john@doe.com');
-		$share->expects($this->any())->method('getNode')->willReturn($node);
-		$share->expects($this->any())->method('getId')->willReturn(42);
-		$share->expects($this->any())->method('getNote')->willReturn('');
-		$share->expects($this->any())->method('getToken')->willReturn('token');
-
-		self::invokePrivate(
-			$provider,
-			'sendMailNotification',
-			[$share]
-		);
-	}
-
-	public function testSendMailNotificationWithDifferentUserAndNoUserEmailAndReplyToDesactivate(): void {
-		$provider = $this->getInstance();
-		$initiatorUser = $this->createMock(IUser::class);
-		$this->settingsManager->expects($this->any())->method('replyToInitiator')->willReturn(false);
-		$this->userManager
-			->expects($this->once())
-			->method('get')
-			->with('InitiatorUser')
-			->willReturn($initiatorUser);
-		$initiatorUser
-			->expects($this->once())
-			->method('getDisplayName')
-			->willReturn('Mr. Initiator User');
-		$message = $this->createMock(Message::class);
-		$this->mailer
-			->expects($this->once())
-			->method('createMessage')
-			->willReturn($message);
-		$template = $this->createMock(IEMailTemplate::class);
-		$this->mailer
-			->expects($this->once())
-			->method('createEMailTemplate')
-			->willReturn($template);
-		$template
-			->expects($this->once())
-			->method('addHeader');
-		$template
-			->expects($this->once())
-			->method('addHeading')
-			->with('Mr. Initiator User shared file.txt with you');
-		$template
-			->expects($this->once())
-			->method('addBodyButton')
-			->with(
-				'Open file.txt',
-				'https://example.com/file.txt'
-			);
-		$message
-			->expects($this->once())
-			->method('setTo')
-			->with(['john@doe.com']);
-		$this->defaults
-			->expects($this->once())
-			->method('getName')
-			->willReturn('UnitTestCloud');
-		$message
-			->expects($this->once())
-			->method('setFrom')
-			->with([
-				Util::getDefaultEmailAddress('UnitTestCloud') => 'UnitTestCloud'
-			]);
-		$message
-			->expects($this->never())
-			->method('setReplyTo');
-		$template
-			->expects($this->once())
-			->method('addFooter')
-			->with('');
-		$template
-			->expects($this->once())
-			->method('setSubject')
-			->with('Mr. Initiator User shared file.txt with you');
-		$message
-			->expects($this->once())
-			->method('useTemplate')
-			->with($template);
-
-		$this->mailer
-			->expects($this->once())
-			->method('send')
-			->with($message);
-
-		$this->urlGenerator->expects($this->once())->method('linkToRouteAbsolute')
-			->with('files_sharing.sharecontroller.showShare', ['token' => 'token'])
-			->willReturn('https://example.com/file.txt');
-
-		$node = $this->createMock(File::class);
-		$node->expects($this->any())->method('getName')->willReturn('file.txt');
-
-		$share = $this->createMock(IShare::class);
-		$share->expects($this->any())->method('getSharedBy')->willReturn('InitiatorUser');
-		$share->expects($this->any())->method('getSharedWith')->willReturn('john@doe.com');
-		$share->expects($this->any())->method('getNode')->willReturn($node);
-		$share->expects($this->any())->method('getId')->willReturn(42);
-		$share->expects($this->any())->method('getNote')->willReturn('');
-		$share->expects($this->any())->method('getToken')->willReturn('token');
-
-		self::invokePrivate(
-			$provider,
-			'sendMailNotification',
-			[$share]
-		);
-	}
+        $qb->setValue('file_target', $qb->createNamedParameter(''));
+
+        $qb->execute();
+        $id = $qb->getLastInsertId();
+
+        return (int)$id;
+    }
+
+    public function testGetSharesInFolder(): void {
+        $userManager = Server::get(IUserManager::class);
+        $rootFolder = Server::get(IRootFolder::class);
+
+        $this->shareManager->expects($this->any())
+            ->method('newShare')
+            ->willReturn(new Share($rootFolder, $userManager));
+
+        $provider = $this->getInstance(['sendMailNotification', 'createShareActivity']);
+
+        $u1 = $userManager->createUser('testFed', md5((string)time()));
+        $u2 = $userManager->createUser('testFed2', md5((string)time()));
+
+        $folder1 = $rootFolder->getUserFolder($u1->getUID())->newFolder('foo');
+        $file1 = $folder1->newFile('bar1');
+        $file2 = $folder1->newFile('bar2');
+
+        $share1 = $this->shareManager->newShare();
+        $share1->setSharedWith('user@server.com')
+            ->setSharedBy($u1->getUID())
+            ->setShareOwner($u1->getUID())
+            ->setPermissions(Constants::PERMISSION_READ)
+            ->setNode($file1);
+        $provider->create($share1);
+
+        $share2 = $this->shareManager->newShare();
+        $share2->setSharedWith('user@server.com')
+            ->setSharedBy($u2->getUID())
+            ->setShareOwner($u1->getUID())
+            ->setPermissions(Constants::PERMISSION_READ)
+            ->setNode($file2);
+        $provider->create($share2);
+
+        $result = $provider->getSharesInFolder($u1->getUID(), $folder1, false);
+        $this->assertCount(1, $result);
+        $this->assertCount(1, $result[$file1->getId()]);
+
+        $result = $provider->getSharesInFolder($u1->getUID(), $folder1, true);
+        $this->assertCount(2, $result);
+        $this->assertCount(1, $result[$file1->getId()]);
+        $this->assertCount(1, $result[$file2->getId()]);
+
+        $u1->delete();
+        $u2->delete();
+    }
+
+    public function testGetAccessList(): void {
+        $userManager = Server::get(IUserManager::class);
+        $rootFolder = Server::get(IRootFolder::class);
+
+        $this->shareManager->expects($this->any())
+            ->method('newShare')
+            ->willReturn(new Share($rootFolder, $userManager));
+
+        $provider = $this->getInstance(['sendMailNotification', 'createShareActivity']);
+
+        $u1 = $userManager->createUser('testFed', md5((string)time()));
+        $u2 = $userManager->createUser('testFed2', md5((string)time()));
+
+        $folder = $rootFolder->getUserFolder($u1->getUID())->newFolder('foo');
+
+        $accessList = $provider->getAccessList([$folder], true);
+        $this->assertArrayHasKey('public', $accessList);
+        $this->assertFalse($accessList['public']);
+        $accessList = $provider->getAccessList([$folder], false);
+        $this->assertArrayHasKey('public', $accessList);
+        $this->assertFalse($accessList['public']);
+
+        $share1 = $this->shareManager->newShare();
+        $share1->setSharedWith('user@server.com')
+            ->setSharedBy($u1->getUID())
+            ->setShareOwner($u1->getUID())
+            ->setPermissions(Constants::PERMISSION_READ)
+            ->setNode($folder);
+        $share1 = $provider->create($share1);
+
+        $share2 = $this->shareManager->newShare();
+        $share2->setSharedWith('user2@server.com')
+            ->setSharedBy($u2->getUID())
+            ->setShareOwner($u1->getUID())
+            ->setPermissions(Constants::PERMISSION_READ)
+            ->setNode($folder);
+        $share2 = $provider->create($share2);
+
+        $accessList = $provider->getAccessList([$folder], true);
+        $this->assertArrayHasKey('public', $accessList);
+        $this->assertTrue($accessList['public']);
+        $accessList = $provider->getAccessList([$folder], false);
+        $this->assertArrayHasKey('public', $accessList);
+        $this->assertTrue($accessList['public']);
+
+        $provider->delete($share2);
+
+        $accessList = $provider->getAccessList([$folder], true);
+        $this->assertArrayHasKey('public', $accessList);
+        $this->assertTrue($accessList['public']);
+        $accessList = $provider->getAccessList([$folder], false);
+        $this->assertArrayHasKey('public', $accessList);
+        $this->assertTrue($accessList['public']);
+
+        $provider->delete($share1);
+
+        $accessList = $provider->getAccessList([$folder], true);
+        $this->assertArrayHasKey('public', $accessList);
+        $this->assertFalse($accessList['public']);
+        $accessList = $provider->getAccessList([$folder], false);
+        $this->assertArrayHasKey('public', $accessList);
+        $this->assertFalse($accessList['public']);
+
+        $u1->delete();
+        $u2->delete();
+    }
+
+    public function testSendMailNotificationWithSameUserAndUserEmail(): void {
+        $provider = $this->getInstance();
+        $user = $this->createMock(IUser::class);
+        $this->settingsManager->expects($this->any())->method('replyToInitiator')->willReturn(true);
+        $this->userManager
+            ->expects($this->once())
+            ->method('get')
+            ->with('OwnerUser')
+            ->willReturn($user);
+        $user
+            ->expects($this->once())
+            ->method('getDisplayName')
+            ->willReturn('Mrs. Owner User');
+        $message = $this->createMock(Message::class);
+        $this->mailer
+            ->expects($this->once())
+            ->method('createMessage')
+            ->willReturn($message);
+        $template = $this->createMock(IEMailTemplate::class);
+        $this->mailer
+            ->expects($this->once())
+            ->method('createEMailTemplate')
+            ->willReturn($template);
+        $template
+            ->expects($this->once())
+            ->method('addHeader');
+        $template
+            ->expects($this->once())
+            ->method('addHeading')
+            ->with('Mrs. Owner User shared file.txt with you');
+        $template
+            ->expects($this->once())
+            ->method('addBodyButton')
+            ->with(
+                'Open file.txt',
+                'https://example.com/file.txt'
+            );
+        $message
+            ->expects($this->once())
+            ->method('setTo')
+            ->with(['john@doe.com']);
+        $this->defaults
+            ->expects($this->once())
+            ->method('getName')
+            ->willReturn('UnitTestCloud');
+        $message
+            ->expects($this->once())
+            ->method('setFrom')
+            ->with([
+                Util::getDefaultEmailAddress('UnitTestCloud') => 'Mrs. Owner User via UnitTestCloud'
+            ]);
+        $user
+            ->expects($this->once())
+            ->method('getEMailAddress')
+            ->willReturn('owner@example.com');
+        $message
+            ->expects($this->once())
+            ->method('setReplyTo')
+            ->with(['owner@example.com' => 'Mrs. Owner User']);
+        $this->defaults
+            ->expects($this->exactly(2))
+            ->method('getSlogan')
+            ->willReturn('Testing like 1990');
+        $template
+            ->expects($this->once())
+            ->method('addFooter')
+            ->with('UnitTestCloud - Testing like 1990');
+        $template
+            ->expects($this->once())
+            ->method('setSubject')
+            ->with('Mrs. Owner User shared file.txt with you');
+        $message
+            ->expects($this->once())
+            ->method('useTemplate')
+            ->with($template);
+
+        $this->mailer
+            ->expects($this->once())
+            ->method('send')
+            ->with($message);
+
+        $this->urlGenerator->expects($this->once())->method('linkToRouteAbsolute')
+            ->with('files_sharing.sharecontroller.showShare', ['token' => 'token'])
+            ->willReturn('https://example.com/file.txt');
+
+        $node = $this->createMock(File::class);
+        $node->expects($this->any())->method('getName')->willReturn('file.txt');
+
+        $share = $this->createMock(IShare::class);
+        $share->expects($this->any())->method('getSharedBy')->willReturn('OwnerUser');
+        $share->expects($this->any())->method('getSharedWith')->willReturn('john@doe.com');
+        $share->expects($this->any())->method('getNode')->willReturn($node);
+        $share->expects($this->any())->method('getId')->willReturn(42);
+        $share->expects($this->any())->method('getNote')->willReturn('');
+        $share->expects($this->any())->method('getToken')->willReturn('token');
+
+        self::invokePrivate(
+            $provider,
+            'sendMailNotification',
+            [$share]
+        );
+    }
+
+    public function testSendMailNotificationWithSameUserAndUserEmailAndNote(): void {
+        $provider = $this->getInstance();
+        $user = $this->createMock(IUser::class);
+        $this->settingsManager->expects($this->any())->method('replyToInitiator')->willReturn(true);
+        $this->userManager
+            ->expects($this->once())
+            ->method('get')
+            ->with('OwnerUser')
+            ->willReturn($user);
+        $user
+            ->expects($this->once())
+            ->method('getDisplayName')
+            ->willReturn('Mrs. Owner User');
+        $message = $this->createMock(Message::class);
+        $this->mailer
+            ->expects($this->once())
+            ->method('createMessage')
+            ->willReturn($message);
+        $template = $this->createMock(IEMailTemplate::class);
+        $this->mailer
+            ->expects($this->once())
+            ->method('createEMailTemplate')
+            ->willReturn($template);
+        $template
+            ->expects($this->once())
+            ->method('addHeader');
+        $template
+            ->expects($this->once())
+            ->method('addHeading')
+            ->with('Mrs. Owner User shared file.txt with you');
+
+        $this->urlGenerator->expects($this->once())->method('imagePath')
+            ->with('core', 'caldav/description.png')
+            ->willReturn('core/img/caldav/description.png');
+        $this->urlGenerator->expects($this->once())->method('getAbsoluteURL')
+            ->with('core/img/caldav/description.png')
+            ->willReturn('https://example.com/core/img/caldav/description.png');
+        $template
+            ->expects($this->once())
+            ->method('addBodyListItem')
+            ->with(
+                'This is a note to the recipient',
+                'Note:',
+                'https://example.com/core/img/caldav/description.png',
+                'This is a note to the recipient'
+            );
+        $template
+            ->expects($this->once())
+            ->method('addBodyButton')
+            ->with(
+                'Open file.txt',
+                'https://example.com/file.txt'
+            );
+        $message
+            ->expects($this->once())
+            ->method('setTo')
+            ->with(['john@doe.com']);
+        $this->defaults
+            ->expects($this->once())
+            ->method('getName')
+            ->willReturn('UnitTestCloud');
+        $message
+            ->expects($this->once())
+            ->method('setFrom')
+            ->with([
+                Util::getDefaultEmailAddress('UnitTestCloud') => 'Mrs. Owner User via UnitTestCloud'
+            ]);
+        $user
+            ->expects($this->once())
+            ->method('getEMailAddress')
+            ->willReturn('owner@example.com');
+        $message
+            ->expects($this->once())
+            ->method('setReplyTo')
+            ->with(['owner@example.com' => 'Mrs. Owner User']);
+        $this->defaults
+            ->expects($this->exactly(2))
+            ->method('getSlogan')
+            ->willReturn('Testing like 1990');
+        $template
+            ->expects($this->once())
+            ->method('addFooter')
+            ->with('UnitTestCloud - Testing like 1990');
+        $template
+            ->expects($this->once())
+            ->method('setSubject')
+            ->with('Mrs. Owner User shared file.txt with you');
+        $message
+            ->expects($this->once())
+            ->method('useTemplate')
+            ->with($template);
+
+        $this->mailer
+            ->expects($this->once())
+            ->method('send')
+            ->with($message);
+
+        $this->urlGenerator->expects($this->once())->method('linkToRouteAbsolute')
+            ->with('files_sharing.sharecontroller.showShare', ['token' => 'token'])
+            ->willReturn('https://example.com/file.txt');
+
+        $node = $this->createMock(File::class);
+        $node->expects($this->any())->method('getName')->willReturn('file.txt');
+
+        $share = $this->createMock(IShare::class);
+        $share->expects($this->any())->method('getSharedBy')->willReturn('OwnerUser');
+        $share->expects($this->any())->method('getSharedWith')->willReturn('john@doe.com');
+        $share->expects($this->any())->method('getNode')->willReturn($node);
+        $share->expects($this->any())->method('getId')->willReturn(42);
+        $share->expects($this->any())->method('getNote')->willReturn('This is a note to the recipient');
+        $share->expects($this->any())->method('getToken')->willReturn('token');
+
+        self::invokePrivate(
+            $provider,
+            'sendMailNotification',
+            [$share]
+        );
+    }
+
+    public function testSendMailNotificationWithSameUserAndUserEmailAndExpiration(): void {
+        $provider = $this->getInstance();
+        $user = $this->createMock(IUser::class);
+        $this->settingsManager->expects($this->any())->method('replyToInitiator')->willReturn(true);
+        $this->userManager
+            ->expects($this->once())
+            ->method('get')
+            ->with('OwnerUser')
+            ->willReturn($user);
+        $user
+            ->expects($this->once())
+            ->method('getDisplayName')
+            ->willReturn('Mrs. Owner User');
+        $message = $this->createMock(Message::class);
+        $this->mailer
+            ->expects($this->once())
+            ->method('createMessage')
+            ->willReturn($message);
+        $template = $this->createMock(IEMailTemplate::class);
+        $this->mailer
+            ->expects($this->once())
+            ->method('createEMailTemplate')
+            ->willReturn($template);
+        $template
+            ->expects($this->once())
+            ->method('addHeader');
+        $template
+            ->expects($this->once())
+            ->method('addHeading')
+            ->with('Mrs. Owner User shared file.txt with you');
+
+        $expiration = new DateTime('2001-01-01');
+        $this->l->expects($this->once())
+            ->method('l')
+            ->with('date', $expiration, ['width' => 'medium'])
+            ->willReturn('2001-01-01');
+        $this->urlGenerator->expects($this->once())->method('imagePath')
+            ->with('core', 'caldav/time.png')
+            ->willReturn('core/img/caldav/time.png');
+        $this->urlGenerator->expects($this->once())->method('getAbsoluteURL')
+            ->with('core/img/caldav/time.png')
+            ->willReturn('https://example.com/core/img/caldav/time.png');
+        $template
+            ->expects($this->once())
+            ->method('addBodyListItem')
+            ->with(
+                'This share is valid until 2001-01-01 at midnight',
+                'Expiration:',
+                'https://example.com/core/img/caldav/time.png',
+            );
+
+        $template
+            ->expects($this->once())
+            ->method('addBodyButton')
+            ->with(
+                'Open file.txt',
+                'https://example.com/file.txt'
+            );
+        $message
+            ->expects($this->once())
+            ->method('setTo')
+            ->with(['john@doe.com']);
+        $this->defaults
+            ->expects($this->once())
+            ->method('getName')
+            ->willReturn('UnitTestCloud');
+        $message
+            ->expects($this->once())
+            ->method('setFrom')
+            ->with([
+                Util::getDefaultEmailAddress('UnitTestCloud') => 'Mrs. Owner User via UnitTestCloud'
+            ]);
+        $user
+            ->expects($this->once())
+            ->method('getEMailAddress')
+            ->willReturn('owner@example.com');
+        $message
+            ->expects($this->once())
+            ->method('setReplyTo')
+            ->with(['owner@example.com' => 'Mrs. Owner User']);
+        $this->defaults
+            ->expects($this->exactly(2))
+            ->method('getSlogan')
+            ->willReturn('Testing like 1990');
+        $template
+            ->expects($this->once())
+            ->method('addFooter')
+            ->with('UnitTestCloud - Testing like 1990');
+        $template
+            ->expects($this->once())
+            ->method('setSubject')
+            ->with('Mrs. Owner User shared file.txt with you');
+        $message
+            ->expects($this->once())
+            ->method('useTemplate')
+            ->with($template);
+
+        $this->mailer
+            ->expects($this->once())
+            ->method('send')
+            ->with($message);
+
+        $this->urlGenerator->expects($this->once())->method('linkToRouteAbsolute')
+            ->with('files_sharing.sharecontroller.showShare', ['token' => 'token'])
+            ->willReturn('https://example.com/file.txt');
+
+        $node = $this->createMock(File::class);
+        $node->expects($this->any())->method('getName')->willReturn('file.txt');
+
+        $share = $this->createMock(IShare::class);
+        $share->expects($this->any())->method('getSharedBy')->willReturn('OwnerUser');
+        $share->expects($this->any())->method('getSharedWith')->willReturn('john@doe.com');
+        $share->expects($this->any())->method('getNode')->willReturn($node);
+        $share->expects($this->any())->method('getId')->willReturn(42);
+        $share->expects($this->any())->method('getNote')->willReturn('');
+        $share->expects($this->any())->method('getExpirationDate')->willReturn($expiration);
+        $share->expects($this->any())->method('getToken')->willReturn('token');
+
+        self::invokePrivate(
+            $provider,
+            'sendMailNotification',
+            [$share]
+        );
+    }
+
+    public function testSendMailNotificationWithDifferentUserAndNoUserEmail(): void {
+        $provider = $this->getInstance();
+        $initiatorUser = $this->createMock(IUser::class);
+        $this->settingsManager->expects($this->any())->method('replyToInitiator')->willReturn(true);
+        $this->userManager
+            ->expects($this->once())
+            ->method('get')
+            ->with('InitiatorUser')
+            ->willReturn($initiatorUser);
+        $initiatorUser
+            ->expects($this->once())
+            ->method('getDisplayName')
+            ->willReturn('Mr. Initiator User');
+        $message = $this->createMock(Message::class);
+        $this->mailer
+            ->expects($this->once())
+            ->method('createMessage')
+            ->willReturn($message);
+        $template = $this->createMock(IEMailTemplate::class);
+        $this->mailer
+            ->expects($this->once())
+            ->method('createEMailTemplate')
+            ->willReturn($template);
+        $template
+            ->expects($this->once())
+            ->method('addHeader');
+        $template
+            ->expects($this->once())
+            ->method('addHeading')
+            ->with('Mr. Initiator User shared file.txt with you');
+        $template
+            ->expects($this->once())
+            ->method('addBodyButton')
+            ->with(
+                'Open file.txt',
+                'https://example.com/file.txt'
+            );
+        $message
+            ->expects($this->once())
+            ->method('setTo')
+            ->with(['john@doe.com']);
+        $this->defaults
+            ->expects($this->once())
+            ->method('getName')
+            ->willReturn('UnitTestCloud');
+        $message
+            ->expects($this->once())
+            ->method('setFrom')
+            ->with([
+                Util::getDefaultEmailAddress('UnitTestCloud') => 'Mr. Initiator User via UnitTestCloud'
+            ]);
+        $message
+            ->expects($this->never())
+            ->method('setReplyTo');
+        $template
+            ->expects($this->once())
+            ->method('addFooter')
+            ->with('');
+        $template
+            ->expects($this->once())
+            ->method('setSubject')
+            ->with('Mr. Initiator User shared file.txt with you');
+        $message
+            ->expects($this->once())
+            ->method('useTemplate')
+            ->with($template);
+
+        $this->mailer
+            ->expects($this->once())
+            ->method('send')
+            ->with($message);
+
+        $this->urlGenerator->expects($this->once())->method('linkToRouteAbsolute')
+            ->with('files_sharing.sharecontroller.showShare', ['token' => 'token'])
+            ->willReturn('https://example.com/file.txt');
+
+        $node = $this->createMock(File::class);
+        $node->expects($this->any())->method('getName')->willReturn('file.txt');
+
+        $share = $this->createMock(IShare::class);
+        $share->expects($this->any())->method('getSharedBy')->willReturn('InitiatorUser');
+        $share->expects($this->any())->method('getSharedWith')->willReturn('john@doe.com');
+        $share->expects($this->any())->method('getNode')->willReturn($node);
+        $share->expects($this->any())->method('getId')->willReturn(42);
+        $share->expects($this->any())->method('getNote')->willReturn('');
+        $share->expects($this->any())->method('getToken')->willReturn('token');
+
+        self::invokePrivate(
+            $provider,
+            'sendMailNotification',
+            [$share]
+        );
+    }
+
+    public function testSendMailNotificationWithSameUserAndUserEmailAndReplyToDesactivate(): void {
+        $provider = $this->getInstance();
+        $user = $this->createMock(IUser::class);
+        $this->settingsManager->expects($this->any())->method('replyToInitiator')->willReturn(false);
+        $this->userManager
+            ->expects($this->once())
+            ->method('get')
+            ->with('OwnerUser')
+            ->willReturn($user);
+        $user
+            ->expects($this->once())
+            ->method('getDisplayName')
+            ->willReturn('Mrs. Owner User');
+        $message = $this->createMock(Message::class);
+        $this->mailer
+            ->expects($this->once())
+            ->method('createMessage')
+            ->willReturn($message);
+        $template = $this->createMock(IEMailTemplate::class);
+        $this->mailer
+            ->expects($this->once())
+            ->method('createEMailTemplate')
+            ->willReturn($template);
+        $template
+            ->expects($this->once())
+            ->method('addHeader');
+        $template
+            ->expects($this->once())
+            ->method('addHeading')
+            ->with('Mrs. Owner User shared file.txt with you');
+        $template
+            ->expects($this->once())
+            ->method('addBodyButton')
+            ->with(
+                'Open file.txt',
+                'https://example.com/file.txt'
+            );
+        $message
+            ->expects($this->once())
+            ->method('setTo')
+            ->with(['john@doe.com']);
+        $this->defaults
+            ->expects($this->once())
+            ->method('getName')
+            ->willReturn('UnitTestCloud');
+        $message
+            ->expects($this->once())
+            ->method('setFrom')
+            ->with([
+                Util::getDefaultEmailAddress('UnitTestCloud') => 'UnitTestCloud'
+            ]);
+        // Since replyToInitiator is false, we never get the initiator email address
+        $user
+            ->expects($this->never())
+            ->method('getEMailAddress');
+        $message
+            ->expects($this->never())
+            ->method('setReplyTo');
+        $template
+            ->expects($this->once())
+            ->method('addFooter')
+            ->with('');
+        $template
+            ->expects($this->once())
+            ->method('setSubject')
+            ->with('Mrs. Owner User shared file.txt with you');
+        $message
+            ->expects($this->once())
+            ->method('useTemplate')
+            ->with($template);
+
+        $this->mailer
+            ->expects($this->once())
+            ->method('send')
+            ->with($message);
+
+        $this->urlGenerator->expects($this->once())->method('linkToRouteAbsolute')
+            ->with('files_sharing.sharecontroller.showShare', ['token' => 'token'])
+            ->willReturn('https://example.com/file.txt');
+
+        $node = $this->createMock(File::class);
+        $node->expects($this->any())->method('getName')->willReturn('file.txt');
+
+        $share = $this->createMock(IShare::class);
+        $share->expects($this->any())->method('getSharedBy')->willReturn('OwnerUser');
+        $share->expects($this->any())->method('getSharedWith')->willReturn('john@doe.com');
+        $share->expects($this->any())->method('getNode')->willReturn($node);
+        $share->expects($this->any())->method('getId')->willReturn(42);
+        $share->expects($this->any())->method('getNote')->willReturn('');
+        $share->expects($this->any())->method('getToken')->willReturn('token');
+
+        self::invokePrivate(
+            $provider,
+            'sendMailNotification',
+            [$share]
+        );
+    }
+
+    public function testSendMailNotificationWithDifferentUserAndNoUserEmailAndReplyToDesactivate(): void {
+        $provider = $this->getInstance();
+        $initiatorUser = $this->createMock(IUser::class);
+        $this->settingsManager->expects($this->any())->method('replyToInitiator')->willReturn(false);
+        $this->userManager
+            ->expects($this->once())
+            ->method('get')
+            ->with('InitiatorUser')
+            ->willReturn($initiatorUser);
+        $initiatorUser
+            ->expects($this->once())
+            ->method('getDisplayName')
+            ->willReturn('Mr. Initiator User');
+        $message = $this->createMock(Message::class);
+        $this->mailer
+            ->expects($this->once())
+            ->method('createMessage')
+            ->willReturn($message);
+        $template = $this->createMock(IEMailTemplate::class);
+        $this->mailer
+            ->expects($this->once())
+            ->method('createEMailTemplate')
+            ->willReturn($template);
+        $template
+            ->expects($this->once())
+            ->method('addHeader');
+        $template
+            ->expects($this->once())
+            ->method('addHeading')
+            ->with('Mr. Initiator User shared file.txt with you');
+        $template
+            ->expects($this->once())
+            ->method('addBodyButton')
+            ->with(
+                'Open file.txt',
+                'https://example.com/file.txt'
+            );
+        $message
+            ->expects($this->once())
+            ->method('setTo')
+            ->with(['john@doe.com']);
+        $this->defaults
+            ->expects($this->once())
+            ->method('getName')
+            ->willReturn('UnitTestCloud');
+        $message
+            ->expects($this->once())
+            ->method('setFrom')
+            ->with([
+                Util::getDefaultEmailAddress('UnitTestCloud') => 'UnitTestCloud'
+            ]);
+        $message
+            ->expects($this->never())
+            ->method('setReplyTo');
+        $template
+            ->expects($this->once())
+            ->method('addFooter')
+            ->with('');
+        $template
+            ->expects($this->once())
+            ->method('setSubject')
+            ->with('Mr. Initiator User shared file.txt with you');
+        $message
+            ->expects($this->once())
+            ->method('useTemplate')
+            ->with($template);
+
+        $this->mailer
+            ->expects($this->once())
+            ->method('send')
+            ->with($message);
+
+        $this->urlGenerator->expects($this->once())->method('linkToRouteAbsolute')
+            ->with('files_sharing.sharecontroller.showShare', ['token' => 'token'])
+            ->willReturn('https://example.com/file.txt');
+
+        $node = $this->createMock(File::class);
+        $node->expects($this->any())->method('getName')->willReturn('file.txt');
+
+        $share = $this->createMock(IShare::class);
+        $share->expects($this->any())->method('getSharedBy')->willReturn('InitiatorUser');
+        $share->expects($this->any())->method('getSharedWith')->willReturn('john@doe.com');
+        $share->expects($this->any())->method('getNode')->willReturn($node);
+        $share->expects($this->any())->method('getId')->willReturn(42);
+        $share->expects($this->any())->method('getNote')->willReturn('');
+        $share->expects($this->any())->method('getToken')->willReturn('token');
+
+        self::invokePrivate(
+            $provider,
+            'sendMailNotification',
+            [$share]
+        );
+    }
 }

Spacing +25 added lines, -25 removed lines

@@ -77,7 +77,7 @@ 
 
 		$this->l = $this->createMock(IL10N::class);
 		$this->l->method('t')
-			->willReturnCallback(function ($text, $parameters = []) {
+			->willReturnCallback(function($text, $parameters = []) {
 				return vsprintf($text, $parameters);
 			});
 		$this->config = $this->createMock(IConfig::class);
@@ -393,7 +393,7 @@ 
 		];
 		$this->mailer->expects($this->exactly(2))
 			->method('createEMailTemplate')
-			->willReturnCallback(function () use (&$calls) {
+			->willReturnCallback(function() use (&$calls) {
 				$expected = array_shift($calls);
 				$this->assertEquals($expected, func_get_args());
 				return $this->createMock(IEMailTemplate::class);
@@ -475,7 +475,7 @@ 
 		];
 		$this->mailer->expects($this->exactly(2))
 			->method('createEMailTemplate')
-			->willReturnCallback(function () use (&$calls) {
+			->willReturnCallback(function() use (&$calls) {
 				$expected = array_shift($calls);
 				$this->assertEquals($expected, func_get_args());
 				return $this->createMock(IEMailTemplate::class);
@@ -540,7 +540,7 @@ 
 		];
 		$message->expects($this->exactly(2))
 			->method('setTo')
-			->willReturnCallback(function () use (&$setToCalls, $message) {
+			->willReturnCallback(function() use (&$setToCalls, $message) {
 				$expected = array_shift($setToCalls);
 				$this->assertEquals($expected, func_get_args());
 				return $message;
@@ -572,7 +572,7 @@ 
 		];
 		$this->mailer->expects($this->exactly(2))
 			->method('createEMailTemplate')
-			->willReturnCallback(function () use (&$calls) {
+			->willReturnCallback(function() use (&$calls) {
 				$expected = array_shift($calls);
 				$this->assertEquals($expected, func_get_args());
 				return $this->createMock(IEMailTemplate::class);
@@ -752,17 +752,17 @@ 
 
 		$this->assertSame(1, count($result));
 
-		$this->assertSame($itemSource, (int)$result[0]['item_source']);
+		$this->assertSame($itemSource, (int) $result[0]['item_source']);
 		$this->assertSame($itemType, $result[0]['item_type']);
 		$this->assertSame($shareWith, $result[0]['share_with']);
 		$this->assertSame($sharedBy, $result[0]['uid_initiator']);
 		$this->assertSame($uidOwner, $result[0]['uid_owner']);
-		$this->assertSame($permissions, (int)$result[0]['permissions']);
+		$this->assertSame($permissions, (int) $result[0]['permissions']);
 		$this->assertSame($token, $result[0]['token']);
 		$this->assertSame($password, $result[0]['password']);
 		$this->assertSame($passwordExpirationTime->getTimestamp(), \DateTime::createFromFormat('Y-m-d H:i:s', $result[0]['password_expiration_time'])->getTimestamp());
-		$this->assertSame($sendPasswordByTalk, (bool)$result[0]['password_by_talk']);
-		$this->assertSame($hideDownload, (bool)$result[0]['hide_download']);
+		$this->assertSame($sendPasswordByTalk, (bool) $result[0]['password_by_talk']);
+		$this->assertSame($hideDownload, (bool) $result[0]['hide_download']);
 		$this->assertSame($label, $result[0]['label']);
 		$this->assertSame($expiration->getTimestamp(), \DateTime::createFromFormat('Y-m-d H:i:s', $result[0]['expiration'])->getTimestamp());
 	}
@@ -805,12 +805,12 @@ 
 
 		$this->assertSame(1, count($result));
 
-		$this->assertSame($itemSource, (int)$result[0]['item_source']);
+		$this->assertSame($itemSource, (int) $result[0]['item_source']);
 		$this->assertSame($itemType, $result[0]['item_type']);
 		$this->assertSame($shareWith, $result[0]['share_with']);
 		$this->assertSame($sharedBy, $result[0]['uid_initiator']);
 		$this->assertSame($uidOwner, $result[0]['uid_owner']);
-		$this->assertSame($permissions + 1, (int)$result[0]['permissions']);
+		$this->assertSame($permissions + 1, (int) $result[0]['permissions']);
 		$this->assertSame($token, $result[0]['token']);
 		$this->assertSame($note, $result[0]['note']);
 	}
@@ -893,10 +893,10 @@ 
 
 		$instance->expects($this->once())->method('createShareObject')
 			->willReturnCallback(
-				function ($data) use ($uidOwner, $sharedBy, $id2) {
+				function($data) use ($uidOwner, $sharedBy, $id2) {
 					$this->assertSame($uidOwner, $data['uid_owner']);
 					$this->assertSame($sharedBy, $data['uid_initiator']);
-					$this->assertSame($id2, (int)$data['id']);
+					$this->assertSame($id2, (int) $data['id']);
 					return $this->share;
 				}
 			);
@@ -945,10 +945,10 @@ 
 
 		$instance->expects($this->once())->method('createShareObject')
 			->willReturnCallback(
-				function ($data) use ($uidOwner, $sharedBy, $id) {
+				function($data) use ($uidOwner, $sharedBy, $id) {
 					$this->assertSame($uidOwner, $data['uid_owner']);
 					$this->assertSame($sharedBy, $data['uid_initiator']);
-					$this->assertSame($id, (int)$data['id']);
+					$this->assertSame($id, (int) $data['id']);
 					return $this->share;
 				}
 			);
@@ -978,8 +978,8 @@ 
 
 		$instance->expects($this->once())->method('createShareObject')
 			->willReturnCallback(
-				function ($data) use ($idMail) {
-					$this->assertSame($idMail, (int)$data['id']);
+				function($data) use ($idMail) {
+					$this->assertSame($idMail, (int) $data['id']);
 					return $this->share;
 				}
 			);
@@ -1088,7 +1088,7 @@ 
 
 		$this->assertTrue(is_array($after));
 		$this->assertSame(1, count($after));
-		$this->assertSame($id, (int)$after[0]['id']);
+		$this->assertSame($id, (int) $after[0]['id']);
 	}
 
 	public function testGetRawShare(): void {
@@ -1107,12 +1107,12 @@ 
 		$result = $this->invokePrivate($instance, 'getRawShare', [$id]);
 
 		$this->assertTrue(is_array($result));
-		$this->assertSame($itemSource, (int)$result['item_source']);
+		$this->assertSame($itemSource, (int) $result['item_source']);
 		$this->assertSame($itemType, $result['item_type']);
 		$this->assertSame($shareWith, $result['share_with']);
 		$this->assertSame($sharedBy, $result['uid_initiator']);
 		$this->assertSame($uidOwner, $result['uid_owner']);
-		$this->assertSame($permissions, (int)$result['permissions']);
+		$this->assertSame($permissions, (int) $result['permissions']);
 		$this->assertSame($token, $result['token']);
 	}
 
@@ -1159,7 +1159,7 @@ 
 		$qb->execute();
 		$id = $qb->getLastInsertId();
 
-		return (int)$id;
+		return (int) $id;
 	}
 
 	public function testGetSharesInFolder(): void {
@@ -1172,8 +1172,8 @@ 
 
 		$provider = $this->getInstance(['sendMailNotification', 'createShareActivity']);
 
-		$u1 = $userManager->createUser('testFed', md5((string)time()));
-		$u2 = $userManager->createUser('testFed2', md5((string)time()));
+		$u1 = $userManager->createUser('testFed', md5((string) time()));
+		$u2 = $userManager->createUser('testFed2', md5((string) time()));
 
 		$folder1 = $rootFolder->getUserFolder($u1->getUID())->newFolder('foo');
 		$file1 = $folder1->newFile('bar1');
@@ -1218,8 +1218,8 @@ 
 
 		$provider = $this->getInstance(['sendMailNotification', 'createShareActivity']);
 
-		$u1 = $userManager->createUser('testFed', md5((string)time()));
-		$u2 = $userManager->createUser('testFed2', md5((string)time()));
+		$u1 = $userManager->createUser('testFed', md5((string) time()));
+		$u2 = $userManager->createUser('testFed2', md5((string) time()));
 
 		$folder = $rootFolder->getUserFolder($u1->getUID())->newFolder('foo');
 

apps/dav/lib/Server.php

Indentation +335 added lines, -335 removed lines

@@ -105,340 +105,340 @@
 use SearchDAV\DAV\SearchPlugin;
 
 class Server {
-	public Connector\Sabre\Server $server;
-	private IProfiler $profiler;
-
-	public function __construct(
-		private IRequest $request,
-		private string $baseUri,
-	) {
-		$debugEnabled = \OCP\Server::get(IConfig::class)->getSystemValue('debug', false);
-		$this->profiler = \OCP\Server::get(IProfiler::class);
-		if ($this->profiler->isEnabled()) {
-			/** @var IEventLogger $eventLogger */
-			$eventLogger = \OCP\Server::get(IEventLogger::class);
-			$eventLogger->start('runtime', 'DAV Runtime');
-		}
-
-		$logger = \OCP\Server::get(LoggerInterface::class);
-		$eventDispatcher = \OCP\Server::get(IEventDispatcher::class);
-
-		$root = new RootCollection();
-		$this->server = new \OCA\DAV\Connector\Sabre\Server(new CachingTree($root));
-		$this->server->setLogger($logger);
-
-		// Add maintenance plugin
-		$this->server->addPlugin(new MaintenancePlugin(\OCP\Server::get(IConfig::class), \OC::$server->getL10N('dav')));
-
-		$this->server->addPlugin(new AppleQuirksPlugin());
-
-		// Backends
-		$authBackend = new Auth(
-			\OCP\Server::get(ISession::class),
-			\OCP\Server::get(IUserSession::class),
-			\OCP\Server::get(IRequest::class),
-			\OCP\Server::get(\OC\Authentication\TwoFactorAuth\Manager::class),
-			\OCP\Server::get(IThrottler::class)
-		);
-
-		// Set URL explicitly due to reverse-proxy situations
-		$this->server->httpRequest->setUrl($this->request->getRequestUri());
-		$this->server->setBaseUri($this->baseUri);
-
-		$this->server->addPlugin(new ProfilerPlugin($this->request));
-		$this->server->addPlugin(new BlockLegacyClientPlugin(
-			\OCP\Server::get(IConfig::class),
-			\OCP\Server::get(ThemingDefaults::class),
-		));
-		$this->server->addPlugin(new AnonymousOptionsPlugin());
-		$authPlugin = new Plugin();
-		$authPlugin->addBackend(new PublicAuth());
-		$this->server->addPlugin($authPlugin);
-
-		// allow setup of additional auth backends
-		$event = new SabrePluginEvent($this->server);
-		$eventDispatcher->dispatch('OCA\DAV\Connector\Sabre::authInit', $event);
-
-		$newAuthEvent = new SabrePluginAuthInitEvent($this->server);
-		$eventDispatcher->dispatchTyped($newAuthEvent);
-
-		$bearerAuthBackend = new BearerAuth(
-			\OCP\Server::get(IUserSession::class),
-			\OCP\Server::get(ISession::class),
-			\OCP\Server::get(IRequest::class),
-			\OCP\Server::get(IConfig::class),
-		);
-		$authPlugin->addBackend($bearerAuthBackend);
-		// because we are throwing exceptions this plugin has to be the last one
-		$authPlugin->addBackend($authBackend);
-
-		// debugging
-		if ($debugEnabled) {
-			$this->server->debugEnabled = true;
-			$this->server->addPlugin(new PropFindMonitorPlugin());
-			$this->server->addPlugin(new \Sabre\DAV\Browser\Plugin());
-		} else {
-			$this->server->addPlugin(new DummyGetResponsePlugin());
-		}
-
-		$this->server->addPlugin(new ExceptionLoggerPlugin('webdav', $logger));
-		$this->server->addPlugin(new LockPlugin());
-		$this->server->addPlugin(new \Sabre\DAV\Sync\Plugin());
-
-		// acl
-		$acl = new DavAclPlugin();
-		$acl->principalCollectionSet = [
-			'principals/users',
-			'principals/groups',
-			'principals/calendar-resources',
-			'principals/calendar-rooms',
-		];
-		$this->server->addPlugin($acl);
-
-		// calendar plugins
-		if ($this->requestIsForSubtree(['calendars', 'public-calendars', 'system-calendars', 'principals'])) {
-			$this->server->addPlugin(new DAV\Sharing\Plugin($authBackend, \OCP\Server::get(IRequest::class), \OCP\Server::get(IConfig::class)));
-			$this->server->addPlugin(new \OCA\DAV\CalDAV\Plugin());
-			$this->server->addPlugin(new ICSExportPlugin(\OCP\Server::get(IConfig::class), $logger));
-			$this->server->addPlugin(new \OCA\DAV\CalDAV\Schedule\Plugin(\OCP\Server::get(IConfig::class), \OCP\Server::get(LoggerInterface::class), \OCP\Server::get(DefaultCalendarValidator::class)));
-
-			$this->server->addPlugin(\OCP\Server::get(\OCA\DAV\CalDAV\Trashbin\Plugin::class));
-			$this->server->addPlugin(new \OCA\DAV\CalDAV\WebcalCaching\Plugin($this->request));
-			if (\OCP\Server::get(IConfig::class)->getAppValue('dav', 'allow_calendar_link_subscriptions', 'yes') === 'yes') {
-				$this->server->addPlugin(new \Sabre\CalDAV\Subscriptions\Plugin());
-			}
-
-			$this->server->addPlugin(new \Sabre\CalDAV\Notifications\Plugin());
-			$this->server->addPlugin(new PublishPlugin(
-				\OCP\Server::get(IConfig::class),
-				\OCP\Server::get(IURLGenerator::class)
-			));
-
-			$this->server->addPlugin(\OCP\Server::get(RateLimitingPlugin::class));
-			$this->server->addPlugin(\OCP\Server::get(CalDavValidatePlugin::class));
-		}
-
-		// addressbook plugins
-		if ($this->requestIsForSubtree(['addressbooks', 'principals'])) {
-			$this->server->addPlugin(new DAV\Sharing\Plugin($authBackend, \OCP\Server::get(IRequest::class), \OCP\Server::get(IConfig::class)));
-			$this->server->addPlugin(new \OCA\DAV\CardDAV\Plugin());
-			$this->server->addPlugin(new VCFExportPlugin());
-			$this->server->addPlugin(new MultiGetExportPlugin());
-			$this->server->addPlugin(new HasPhotoPlugin());
-			$this->server->addPlugin(new ImageExportPlugin(\OCP\Server::get(PhotoCache::class)));
-
-			$this->server->addPlugin(\OCP\Server::get(CardDavRateLimitingPlugin::class));
-			$this->server->addPlugin(\OCP\Server::get(CardDavValidatePlugin::class));
-		}
-
-		// system tags plugins
-		$this->server->addPlugin(\OCP\Server::get(SystemTagPlugin::class));
-
-		// comments plugin
-		$this->server->addPlugin(new CommentsPlugin(
-			\OCP\Server::get(ICommentsManager::class),
-			\OCP\Server::get(IUserSession::class)
-		));
-
-		// performance improvement plugins
-		$this->server->addPlugin(new CopyEtagHeaderPlugin());
-		$this->server->addPlugin(new RequestIdHeaderPlugin(\OCP\Server::get(IRequest::class)));
-		$this->server->addPlugin(new UploadAutoMkcolPlugin());
-		$this->server->addPlugin(new ChunkingV2Plugin(\OCP\Server::get(ICacheFactory::class)));
-		$this->server->addPlugin(new ChunkingPlugin());
-		$this->server->addPlugin(new ZipFolderPlugin(
-			$this->server->tree,
-			$logger,
-			$eventDispatcher,
-			\OCP\Server::get(IDateTimeZone::class),
-		));
-		$this->server->addPlugin(\OCP\Server::get(PaginatePlugin::class));
-		$this->server->addPlugin(new PropFindPreloadNotifyPlugin());
-
-		// allow setup of additional plugins
-		$eventDispatcher->dispatch('OCA\DAV\Connector\Sabre::addPlugin', $event);
-		$typedEvent = new SabrePluginAddEvent($this->server);
-		$eventDispatcher->dispatchTyped($typedEvent);
-
-		// Some WebDAV clients do require Class 2 WebDAV support (locking), since
-		// we do not provide locking we emulate it using a fake locking plugin.
-		if ($this->request->isUserAgent([
-			'/WebDAVFS/',
-			'/OneNote/',
-			'/^Microsoft-WebDAV/',// Microsoft-WebDAV-MiniRedir/6.1.7601
-		])) {
-			$this->server->addPlugin(new FakeLockerPlugin());
-		}
-
-		if (BrowserErrorPagePlugin::isBrowserRequest($request)) {
-			$this->server->addPlugin(new BrowserErrorPagePlugin());
-		}
-
-		$lazySearchBackend = new LazySearchBackend();
-		$this->server->addPlugin(new SearchPlugin($lazySearchBackend));
-
-		// wait with registering these until auth is handled and the filesystem is setup
-		$this->server->on('beforeMethod:*', function () use ($root, $lazySearchBackend, $logger): void {
-			// Allow view-only plugin for webdav requests
-			$this->server->addPlugin(new ViewOnlyPlugin(
-				\OC::$server->getUserFolder(),
-			));
-
-			// custom properties plugin must be the last one
-			$userSession = \OCP\Server::get(IUserSession::class);
-			$user = $userSession->getUser();
-			if ($user !== null) {
-				$view = Filesystem::getView();
-				$config = \OCP\Server::get(IConfig::class);
-				$this->server->addPlugin(
-					new FilesPlugin(
-						$this->server->tree,
-						$config,
-						$this->request,
-						\OCP\Server::get(IPreview::class),
-						\OCP\Server::get(IUserSession::class),
-						\OCP\Server::get(IFilenameValidator::class),
-						\OCP\Server::get(IAccountManager::class),
-						false,
-						$config->getSystemValueBool('debug', false) === false,
-					)
-				);
-				$this->server->addPlugin(new ChecksumUpdatePlugin());
-
-				$this->server->addPlugin(
-					new \Sabre\DAV\PropertyStorage\Plugin(
-						new CustomPropertiesBackend(
-							$this->server,
-							$this->server->tree,
-							\OCP\Server::get(IDBConnection::class),
-							\OCP\Server::get(IUserSession::class)->getUser(),
-							\OCP\Server::get(PropertyMapper::class),
-							\OCP\Server::get(DefaultCalendarValidator::class),
-						)
-					)
-				);
-				if ($view !== null) {
-					$this->server->addPlugin(
-						new QuotaPlugin($view));
-				}
-				$this->server->addPlugin(
-					new TagsPlugin(
-						$this->server->tree, \OCP\Server::get(ITagManager::class), \OCP\Server::get(IEventDispatcher::class), \OCP\Server::get(IUserSession::class)
-					)
-				);
-
-				// TODO: switch to LazyUserFolder
-				$userFolder = \OC::$server->getUserFolder();
-				$shareManager = \OCP\Server::get(\OCP\Share\IManager::class);
-				$this->server->addPlugin(new SharesPlugin(
-					$this->server->tree,
-					$userSession,
-					$userFolder,
-					$shareManager,
-				));
-				$this->server->addPlugin(new CommentPropertiesPlugin(
-					\OCP\Server::get(ICommentsManager::class),
-					$userSession
-				));
-				if (\OCP\Server::get(IConfig::class)->getAppValue('dav', 'sendInvitations', 'yes') === 'yes') {
-					$this->server->addPlugin(new IMipPlugin(
-						\OCP\Server::get(IAppConfig::class),
-						\OCP\Server::get(IMailer::class),
-						\OCP\Server::get(LoggerInterface::class),
-						\OCP\Server::get(ITimeFactory::class),
-						\OCP\Server::get(Defaults::class),
-						$userSession,
-						\OCP\Server::get(IMipService::class),
-						\OCP\Server::get(EventComparisonService::class),
-						\OCP\Server::get(\OCP\Mail\Provider\IManager::class),
-						\OCP\Server::get(\OCP\Mail\IEmailValidator::class),
-					));
-				}
-				$this->server->addPlugin(new \OCA\DAV\CalDAV\Search\SearchPlugin());
-				if ($view !== null) {
-					$this->server->addPlugin(new FilesReportPlugin(
-						$this->server->tree,
-						$view,
-						\OCP\Server::get(ISystemTagManager::class),
-						\OCP\Server::get(ISystemTagObjectMapper::class),
-						\OCP\Server::get(ITagManager::class),
-						$userSession,
-						\OCP\Server::get(IGroupManager::class),
-						$userFolder,
-						\OCP\Server::get(IAppManager::class)
-					));
-					$lazySearchBackend->setBackend(new FileSearchBackend(
-						$this->server,
-						$this->server->tree,
-						$user,
-						\OCP\Server::get(IRootFolder::class),
-						$shareManager,
-						$view,
-						\OCP\Server::get(IFilesMetadataManager::class)
-					));
-					$this->server->addPlugin(
-						new BulkUploadPlugin(
-							$userFolder,
-							$logger
-						)
-					);
-				}
-				$this->server->addPlugin(new EnablePlugin(
-					\OCP\Server::get(IConfig::class),
-					\OCP\Server::get(BirthdayService::class),
-					$user
-				));
-				$this->server->addPlugin(new AppleProvisioningPlugin(
-					\OCP\Server::get(IUserSession::class),
-					\OCP\Server::get(IURLGenerator::class),
-					\OCP\Server::get(ThemingDefaults::class),
-					\OCP\Server::get(IRequest::class),
-					\OC::$server->getL10N('dav'),
-					function () {
-						return UUIDUtil::getUUID();
-					}
-				));
-			}
-
-			// register plugins from apps
-			$pluginManager = new PluginManager(
-				\OC::$server,
-				\OCP\Server::get(IAppManager::class)
-			);
-			foreach ($pluginManager->getAppPlugins() as $appPlugin) {
-				$this->server->addPlugin($appPlugin);
-			}
-			foreach ($pluginManager->getAppCollections() as $appCollection) {
-				$root->addChild($appCollection);
-			}
-		});
-
-		$this->server->addPlugin(
-			new PropfindCompressionPlugin()
-		);
-	}
-
-	public function exec() {
-		/** @var IEventLogger $eventLogger */
-		$eventLogger = \OCP\Server::get(IEventLogger::class);
-		$eventLogger->start('dav_server_exec', '');
-		$this->server->start();
-		$eventLogger->end('dav_server_exec');
-		if ($this->profiler->isEnabled()) {
-			$eventLogger->end('runtime');
-			$profile = $this->profiler->collect(\OCP\Server::get(IRequest::class), new Response());
-			$this->profiler->saveProfile($profile);
-		}
-	}
-
-	private function requestIsForSubtree(array $subTrees): bool {
-		foreach ($subTrees as $subTree) {
-			$subTree = trim($subTree, ' /');
-			if (str_starts_with($this->server->getRequestUri(), $subTree . '/')) {
-				return true;
-			}
-		}
-		return false;
-	}
+    public Connector\Sabre\Server $server;
+    private IProfiler $profiler;
+
+    public function __construct(
+        private IRequest $request,
+        private string $baseUri,
+    ) {
+        $debugEnabled = \OCP\Server::get(IConfig::class)->getSystemValue('debug', false);
+        $this->profiler = \OCP\Server::get(IProfiler::class);
+        if ($this->profiler->isEnabled()) {
+            /** @var IEventLogger $eventLogger */
+            $eventLogger = \OCP\Server::get(IEventLogger::class);
+            $eventLogger->start('runtime', 'DAV Runtime');
+        }
+
+        $logger = \OCP\Server::get(LoggerInterface::class);
+        $eventDispatcher = \OCP\Server::get(IEventDispatcher::class);
+
+        $root = new RootCollection();
+        $this->server = new \OCA\DAV\Connector\Sabre\Server(new CachingTree($root));
+        $this->server->setLogger($logger);
+
+        // Add maintenance plugin
+        $this->server->addPlugin(new MaintenancePlugin(\OCP\Server::get(IConfig::class), \OC::$server->getL10N('dav')));
+
+        $this->server->addPlugin(new AppleQuirksPlugin());
+
+        // Backends
+        $authBackend = new Auth(
+            \OCP\Server::get(ISession::class),
+            \OCP\Server::get(IUserSession::class),
+            \OCP\Server::get(IRequest::class),
+            \OCP\Server::get(\OC\Authentication\TwoFactorAuth\Manager::class),
+            \OCP\Server::get(IThrottler::class)
+        );
+
+        // Set URL explicitly due to reverse-proxy situations
+        $this->server->httpRequest->setUrl($this->request->getRequestUri());
+        $this->server->setBaseUri($this->baseUri);
+
+        $this->server->addPlugin(new ProfilerPlugin($this->request));
+        $this->server->addPlugin(new BlockLegacyClientPlugin(
+            \OCP\Server::get(IConfig::class),
+            \OCP\Server::get(ThemingDefaults::class),
+        ));
+        $this->server->addPlugin(new AnonymousOptionsPlugin());
+        $authPlugin = new Plugin();
+        $authPlugin->addBackend(new PublicAuth());
+        $this->server->addPlugin($authPlugin);
+
+        // allow setup of additional auth backends
+        $event = new SabrePluginEvent($this->server);
+        $eventDispatcher->dispatch('OCA\DAV\Connector\Sabre::authInit', $event);
+
+        $newAuthEvent = new SabrePluginAuthInitEvent($this->server);
+        $eventDispatcher->dispatchTyped($newAuthEvent);
+
+        $bearerAuthBackend = new BearerAuth(
+            \OCP\Server::get(IUserSession::class),
+            \OCP\Server::get(ISession::class),
+            \OCP\Server::get(IRequest::class),
+            \OCP\Server::get(IConfig::class),
+        );
+        $authPlugin->addBackend($bearerAuthBackend);
+        // because we are throwing exceptions this plugin has to be the last one
+        $authPlugin->addBackend($authBackend);
+
+        // debugging
+        if ($debugEnabled) {
+            $this->server->debugEnabled = true;
+            $this->server->addPlugin(new PropFindMonitorPlugin());
+            $this->server->addPlugin(new \Sabre\DAV\Browser\Plugin());
+        } else {
+            $this->server->addPlugin(new DummyGetResponsePlugin());
+        }
+
+        $this->server->addPlugin(new ExceptionLoggerPlugin('webdav', $logger));
+        $this->server->addPlugin(new LockPlugin());
+        $this->server->addPlugin(new \Sabre\DAV\Sync\Plugin());
+
+        // acl
+        $acl = new DavAclPlugin();
+        $acl->principalCollectionSet = [
+            'principals/users',
+            'principals/groups',
+            'principals/calendar-resources',
+            'principals/calendar-rooms',
+        ];
+        $this->server->addPlugin($acl);
+
+        // calendar plugins
+        if ($this->requestIsForSubtree(['calendars', 'public-calendars', 'system-calendars', 'principals'])) {
+            $this->server->addPlugin(new DAV\Sharing\Plugin($authBackend, \OCP\Server::get(IRequest::class), \OCP\Server::get(IConfig::class)));
+            $this->server->addPlugin(new \OCA\DAV\CalDAV\Plugin());
+            $this->server->addPlugin(new ICSExportPlugin(\OCP\Server::get(IConfig::class), $logger));
+            $this->server->addPlugin(new \OCA\DAV\CalDAV\Schedule\Plugin(\OCP\Server::get(IConfig::class), \OCP\Server::get(LoggerInterface::class), \OCP\Server::get(DefaultCalendarValidator::class)));
+
+            $this->server->addPlugin(\OCP\Server::get(\OCA\DAV\CalDAV\Trashbin\Plugin::class));
+            $this->server->addPlugin(new \OCA\DAV\CalDAV\WebcalCaching\Plugin($this->request));
+            if (\OCP\Server::get(IConfig::class)->getAppValue('dav', 'allow_calendar_link_subscriptions', 'yes') === 'yes') {
+                $this->server->addPlugin(new \Sabre\CalDAV\Subscriptions\Plugin());
+            }
+
+            $this->server->addPlugin(new \Sabre\CalDAV\Notifications\Plugin());
+            $this->server->addPlugin(new PublishPlugin(
+                \OCP\Server::get(IConfig::class),
+                \OCP\Server::get(IURLGenerator::class)
+            ));
+
+            $this->server->addPlugin(\OCP\Server::get(RateLimitingPlugin::class));
+            $this->server->addPlugin(\OCP\Server::get(CalDavValidatePlugin::class));
+        }
+
+        // addressbook plugins
+        if ($this->requestIsForSubtree(['addressbooks', 'principals'])) {
+            $this->server->addPlugin(new DAV\Sharing\Plugin($authBackend, \OCP\Server::get(IRequest::class), \OCP\Server::get(IConfig::class)));
+            $this->server->addPlugin(new \OCA\DAV\CardDAV\Plugin());
+            $this->server->addPlugin(new VCFExportPlugin());
+            $this->server->addPlugin(new MultiGetExportPlugin());
+            $this->server->addPlugin(new HasPhotoPlugin());
+            $this->server->addPlugin(new ImageExportPlugin(\OCP\Server::get(PhotoCache::class)));
+
+            $this->server->addPlugin(\OCP\Server::get(CardDavRateLimitingPlugin::class));
+            $this->server->addPlugin(\OCP\Server::get(CardDavValidatePlugin::class));
+        }
+
+        // system tags plugins
+        $this->server->addPlugin(\OCP\Server::get(SystemTagPlugin::class));
+
+        // comments plugin
+        $this->server->addPlugin(new CommentsPlugin(
+            \OCP\Server::get(ICommentsManager::class),
+            \OCP\Server::get(IUserSession::class)
+        ));
+
+        // performance improvement plugins
+        $this->server->addPlugin(new CopyEtagHeaderPlugin());
+        $this->server->addPlugin(new RequestIdHeaderPlugin(\OCP\Server::get(IRequest::class)));
+        $this->server->addPlugin(new UploadAutoMkcolPlugin());
+        $this->server->addPlugin(new ChunkingV2Plugin(\OCP\Server::get(ICacheFactory::class)));
+        $this->server->addPlugin(new ChunkingPlugin());
+        $this->server->addPlugin(new ZipFolderPlugin(
+            $this->server->tree,
+            $logger,
+            $eventDispatcher,
+            \OCP\Server::get(IDateTimeZone::class),
+        ));
+        $this->server->addPlugin(\OCP\Server::get(PaginatePlugin::class));
+        $this->server->addPlugin(new PropFindPreloadNotifyPlugin());
+
+        // allow setup of additional plugins
+        $eventDispatcher->dispatch('OCA\DAV\Connector\Sabre::addPlugin', $event);
+        $typedEvent = new SabrePluginAddEvent($this->server);
+        $eventDispatcher->dispatchTyped($typedEvent);
+
+        // Some WebDAV clients do require Class 2 WebDAV support (locking), since
+        // we do not provide locking we emulate it using a fake locking plugin.
+        if ($this->request->isUserAgent([
+            '/WebDAVFS/',
+            '/OneNote/',
+            '/^Microsoft-WebDAV/',// Microsoft-WebDAV-MiniRedir/6.1.7601
+        ])) {
+            $this->server->addPlugin(new FakeLockerPlugin());
+        }
+
+        if (BrowserErrorPagePlugin::isBrowserRequest($request)) {
+            $this->server->addPlugin(new BrowserErrorPagePlugin());
+        }
+
+        $lazySearchBackend = new LazySearchBackend();
+        $this->server->addPlugin(new SearchPlugin($lazySearchBackend));
+
+        // wait with registering these until auth is handled and the filesystem is setup
+        $this->server->on('beforeMethod:*', function () use ($root, $lazySearchBackend, $logger): void {
+            // Allow view-only plugin for webdav requests
+            $this->server->addPlugin(new ViewOnlyPlugin(
+                \OC::$server->getUserFolder(),
+            ));
+
+            // custom properties plugin must be the last one
+            $userSession = \OCP\Server::get(IUserSession::class);
+            $user = $userSession->getUser();
+            if ($user !== null) {
+                $view = Filesystem::getView();
+                $config = \OCP\Server::get(IConfig::class);
+                $this->server->addPlugin(
+                    new FilesPlugin(
+                        $this->server->tree,
+                        $config,
+                        $this->request,
+                        \OCP\Server::get(IPreview::class),
+                        \OCP\Server::get(IUserSession::class),
+                        \OCP\Server::get(IFilenameValidator::class),
+                        \OCP\Server::get(IAccountManager::class),
+                        false,
+                        $config->getSystemValueBool('debug', false) === false,
+                    )
+                );
+                $this->server->addPlugin(new ChecksumUpdatePlugin());
+
+                $this->server->addPlugin(
+                    new \Sabre\DAV\PropertyStorage\Plugin(
+                        new CustomPropertiesBackend(
+                            $this->server,
+                            $this->server->tree,
+                            \OCP\Server::get(IDBConnection::class),
+                            \OCP\Server::get(IUserSession::class)->getUser(),
+                            \OCP\Server::get(PropertyMapper::class),
+                            \OCP\Server::get(DefaultCalendarValidator::class),
+                        )
+                    )
+                );
+                if ($view !== null) {
+                    $this->server->addPlugin(
+                        new QuotaPlugin($view));
+                }
+                $this->server->addPlugin(
+                    new TagsPlugin(
+                        $this->server->tree, \OCP\Server::get(ITagManager::class), \OCP\Server::get(IEventDispatcher::class), \OCP\Server::get(IUserSession::class)
+                    )
+                );
+
+                // TODO: switch to LazyUserFolder
+                $userFolder = \OC::$server->getUserFolder();
+                $shareManager = \OCP\Server::get(\OCP\Share\IManager::class);
+                $this->server->addPlugin(new SharesPlugin(
+                    $this->server->tree,
+                    $userSession,
+                    $userFolder,
+                    $shareManager,
+                ));
+                $this->server->addPlugin(new CommentPropertiesPlugin(
+                    \OCP\Server::get(ICommentsManager::class),
+                    $userSession
+                ));
+                if (\OCP\Server::get(IConfig::class)->getAppValue('dav', 'sendInvitations', 'yes') === 'yes') {
+                    $this->server->addPlugin(new IMipPlugin(
+                        \OCP\Server::get(IAppConfig::class),
+                        \OCP\Server::get(IMailer::class),
+                        \OCP\Server::get(LoggerInterface::class),
+                        \OCP\Server::get(ITimeFactory::class),
+                        \OCP\Server::get(Defaults::class),
+                        $userSession,
+                        \OCP\Server::get(IMipService::class),
+                        \OCP\Server::get(EventComparisonService::class),
+                        \OCP\Server::get(\OCP\Mail\Provider\IManager::class),
+                        \OCP\Server::get(\OCP\Mail\IEmailValidator::class),
+                    ));
+                }
+                $this->server->addPlugin(new \OCA\DAV\CalDAV\Search\SearchPlugin());
+                if ($view !== null) {
+                    $this->server->addPlugin(new FilesReportPlugin(
+                        $this->server->tree,
+                        $view,
+                        \OCP\Server::get(ISystemTagManager::class),
+                        \OCP\Server::get(ISystemTagObjectMapper::class),
+                        \OCP\Server::get(ITagManager::class),
+                        $userSession,
+                        \OCP\Server::get(IGroupManager::class),
+                        $userFolder,
+                        \OCP\Server::get(IAppManager::class)
+                    ));
+                    $lazySearchBackend->setBackend(new FileSearchBackend(
+                        $this->server,
+                        $this->server->tree,
+                        $user,
+                        \OCP\Server::get(IRootFolder::class),
+                        $shareManager,
+                        $view,
+                        \OCP\Server::get(IFilesMetadataManager::class)
+                    ));
+                    $this->server->addPlugin(
+                        new BulkUploadPlugin(
+                            $userFolder,
+                            $logger
+                        )
+                    );
+                }
+                $this->server->addPlugin(new EnablePlugin(
+                    \OCP\Server::get(IConfig::class),
+                    \OCP\Server::get(BirthdayService::class),
+                    $user
+                ));
+                $this->server->addPlugin(new AppleProvisioningPlugin(
+                    \OCP\Server::get(IUserSession::class),
+                    \OCP\Server::get(IURLGenerator::class),
+                    \OCP\Server::get(ThemingDefaults::class),
+                    \OCP\Server::get(IRequest::class),
+                    \OC::$server->getL10N('dav'),
+                    function () {
+                        return UUIDUtil::getUUID();
+                    }
+                ));
+            }
+
+            // register plugins from apps
+            $pluginManager = new PluginManager(
+                \OC::$server,
+                \OCP\Server::get(IAppManager::class)
+            );
+            foreach ($pluginManager->getAppPlugins() as $appPlugin) {
+                $this->server->addPlugin($appPlugin);
+            }
+            foreach ($pluginManager->getAppCollections() as $appCollection) {
+                $root->addChild($appCollection);
+            }
+        });
+
+        $this->server->addPlugin(
+            new PropfindCompressionPlugin()
+        );
+    }
+
+    public function exec() {
+        /** @var IEventLogger $eventLogger */
+        $eventLogger = \OCP\Server::get(IEventLogger::class);
+        $eventLogger->start('dav_server_exec', '');
+        $this->server->start();
+        $eventLogger->end('dav_server_exec');
+        if ($this->profiler->isEnabled()) {
+            $eventLogger->end('runtime');
+            $profile = $this->profiler->collect(\OCP\Server::get(IRequest::class), new Response());
+            $this->profiler->saveProfile($profile);
+        }
+    }
+
+    private function requestIsForSubtree(array $subTrees): bool {
+        foreach ($subTrees as $subTree) {
+            $subTree = trim($subTree, ' /');
+            if (str_starts_with($this->server->getRequestUri(), $subTree . '/')) {
+                return true;
+            }
+        }
+        return false;
+    }
 
 }

apps/dav/lib/Listener/CalendarContactInteractionListener.php

Indentation +109 added lines, -109 removed lines

@@ -30,113 +30,113 @@
 
 /** @template-implements IEventListener<CalendarObjectCreatedEvent|CalendarObjectUpdatedEvent|CalendarShareUpdatedEvent> */
 class CalendarContactInteractionListener implements IEventListener {
-	private const URI_USERS = 'principals/users/';
-
-	public function __construct(
-		private IEventDispatcher $dispatcher,
-		private IUserSession $userSession,
-		private Principal $principalConnector,
-		private IEmailValidator $emailValidator,
-		private LoggerInterface $logger,
-	) {
-	}
-
-	public function handle(Event $event): void {
-		if (($user = $this->userSession->getUser()) === null) {
-			// Without user context we can't do anything
-			return;
-		}
-
-		if ($event instanceof CalendarObjectCreatedEvent || $event instanceof CalendarObjectUpdatedEvent) {
-			// users: href => principal:principals/users/admin
-			foreach ($event->getShares() as $share) {
-				if (!isset($share['href'])) {
-					continue;
-				}
-				$this->emitFromUri($share['href'], $user);
-			}
-
-			// emit interaction for email attendees as well
-			if (isset($event->getObjectData()['calendardata'])) {
-				try {
-					$calendar = Reader::read($event->getObjectData()['calendardata']);
-					if ($calendar->VEVENT) {
-						foreach ($calendar->VEVENT as $calendarEvent) {
-							$this->emitFromObject($calendarEvent, $user);
-						}
-					}
-				} catch (Throwable $e) {
-					$this->logger->warning('Could not read calendar data for interaction events: ' . $e->getMessage(), [
-						'exception' => $e,
-					]);
-				}
-			}
-		}
-
-		if ($event instanceof CalendarShareUpdatedEvent && !empty($event->getAdded())) {
-			// group: href => principal:principals/groups/admin
-			// users: href => principal:principals/users/admin
-			foreach ($event->getAdded() as $added) {
-				if (!isset($added['href'])) {
-					// Nothing to work with
-					continue;
-				}
-				$this->emitFromUri($added['href'], $user);
-			}
-		}
-	}
-
-	private function emitFromUri(string $uri, IUser $user): void {
-		$principal = $this->principalConnector->findByUri(
-			$uri,
-			$this->principalConnector->getPrincipalPrefix()
-		);
-		if ($principal === null) {
-			// Invalid principal
-			return;
-		}
-		if (!str_starts_with($principal, self::URI_USERS)) {
-			// Not a user principal
-			return;
-		}
-
-		$uid = substr($principal, strlen(self::URI_USERS));
-		$this->dispatcher->dispatchTyped(
-			(new ContactInteractedWithEvent($user))->setUid($uid)
-		);
-	}
-
-	private function emitFromObject(VEvent $vevent, IUser $user): void {
-		if (!$vevent->ATTENDEE) {
-			// Nothing left to do
-			return;
-		}
-
-		foreach ($vevent->ATTENDEE as $attendee) {
-			if (!($attendee instanceof Property)) {
-				continue;
-			}
-
-			$cuType = $attendee->offsetGet('CUTYPE');
-			if ($cuType instanceof Parameter && $cuType->getValue() !== 'INDIVIDUAL') {
-				// Don't care about those
-				continue;
-			}
-
-			$mailTo = $attendee->getValue();
-			if (!str_starts_with($mailTo, 'mailto:')) {
-				// Doesn't look like an email
-				continue;
-			}
-			$email = substr($mailTo, strlen('mailto:'));
-			if (!$this->emailValidator->isValid($email)) {
-				// This really isn't a valid email
-				continue;
-			}
-
-			$this->dispatcher->dispatchTyped(
-				(new ContactInteractedWithEvent($user))->setEmail($email)
-			);
-		}
-	}
+    private const URI_USERS = 'principals/users/';
+
+    public function __construct(
+        private IEventDispatcher $dispatcher,
+        private IUserSession $userSession,
+        private Principal $principalConnector,
+        private IEmailValidator $emailValidator,
+        private LoggerInterface $logger,
+    ) {
+    }
+
+    public function handle(Event $event): void {
+        if (($user = $this->userSession->getUser()) === null) {
+            // Without user context we can't do anything
+            return;
+        }
+
+        if ($event instanceof CalendarObjectCreatedEvent || $event instanceof CalendarObjectUpdatedEvent) {
+            // users: href => principal:principals/users/admin
+            foreach ($event->getShares() as $share) {
+                if (!isset($share['href'])) {
+                    continue;
+                }
+                $this->emitFromUri($share['href'], $user);
+            }
+
+            // emit interaction for email attendees as well
+            if (isset($event->getObjectData()['calendardata'])) {
+                try {
+                    $calendar = Reader::read($event->getObjectData()['calendardata']);
+                    if ($calendar->VEVENT) {
+                        foreach ($calendar->VEVENT as $calendarEvent) {
+                            $this->emitFromObject($calendarEvent, $user);
+                        }
+                    }
+                } catch (Throwable $e) {
+                    $this->logger->warning('Could not read calendar data for interaction events: ' . $e->getMessage(), [
+                        'exception' => $e,
+                    ]);
+                }
+            }
+        }
+
+        if ($event instanceof CalendarShareUpdatedEvent && !empty($event->getAdded())) {
+            // group: href => principal:principals/groups/admin
+            // users: href => principal:principals/users/admin
+            foreach ($event->getAdded() as $added) {
+                if (!isset($added['href'])) {
+                    // Nothing to work with
+                    continue;
+                }
+                $this->emitFromUri($added['href'], $user);
+            }
+        }
+    }
+
+    private function emitFromUri(string $uri, IUser $user): void {
+        $principal = $this->principalConnector->findByUri(
+            $uri,
+            $this->principalConnector->getPrincipalPrefix()
+        );
+        if ($principal === null) {
+            // Invalid principal
+            return;
+        }
+        if (!str_starts_with($principal, self::URI_USERS)) {
+            // Not a user principal
+            return;
+        }
+
+        $uid = substr($principal, strlen(self::URI_USERS));
+        $this->dispatcher->dispatchTyped(
+            (new ContactInteractedWithEvent($user))->setUid($uid)
+        );
+    }
+
+    private function emitFromObject(VEvent $vevent, IUser $user): void {
+        if (!$vevent->ATTENDEE) {
+            // Nothing left to do
+            return;
+        }
+
+        foreach ($vevent->ATTENDEE as $attendee) {
+            if (!($attendee instanceof Property)) {
+                continue;
+            }
+
+            $cuType = $attendee->offsetGet('CUTYPE');
+            if ($cuType instanceof Parameter && $cuType->getValue() !== 'INDIVIDUAL') {
+                // Don't care about those
+                continue;
+            }
+
+            $mailTo = $attendee->getValue();
+            if (!str_starts_with($mailTo, 'mailto:')) {
+                // Doesn't look like an email
+                continue;
+            }
+            $email = substr($mailTo, strlen('mailto:'));
+            if (!$this->emailValidator->isValid($email)) {
+                // This really isn't a valid email
+                continue;
+            }
+
+            $this->dispatcher->dispatchTyped(
+                (new ContactInteractedWithEvent($user))->setEmail($email)
+            );
+        }
+    }
 }

apps/dav/lib/CalDAV/Schedule/IMipPlugin.php

Indentation +271 added lines, -271 removed lines

@@ -47,176 +47,176 @@ 
  */
 class IMipPlugin extends SabreIMipPlugin {
 
-	private ?VCalendar $vCalendar = null;
-	public const MAX_DATE = '2038-01-01';
-	public const METHOD_REQUEST = 'request';
-	public const METHOD_REPLY = 'reply';
-	public const METHOD_CANCEL = 'cancel';
-	public const IMIP_INDENT = 15;
-
-	public function __construct(
-		private IAppConfig $config,
-		private IMailer $mailer,
-		private LoggerInterface $logger,
-		private ITimeFactory $timeFactory,
-		private Defaults $defaults,
-		private IUserSession $userSession,
-		private IMipService $imipService,
-		private EventComparisonService $eventComparisonService,
-		private IMailManager $mailManager,
-		private IEmailValidator $emailValidator,
-	) {
-		parent::__construct('');
-	}
-
-	public function initialize(DAV\Server $server): void {
-		parent::initialize($server);
-		$server->on('beforeWriteContent', [$this, 'beforeWriteContent'], 10);
-	}
-
-	/**
-	 * Check quota before writing content
-	 *
-	 * @param string $uri target file URI
-	 * @param INode $node Sabre Node
-	 * @param resource $data data
-	 * @param bool $modified modified
-	 */
-	public function beforeWriteContent($uri, INode $node, $data, $modified): void {
-		if (!$node instanceof CalendarObject) {
-			return;
-		}
-		/** @var VCalendar $vCalendar */
-		$vCalendar = Reader::read($node->get());
-		$this->setVCalendar($vCalendar);
-	}
-
-	/**
-	 * Event handler for the 'schedule' event.
-	 *
-	 * @param Message $iTipMessage
-	 * @return void
-	 */
-	public function schedule(Message $iTipMessage) {
-
-		// Not sending any emails if the system considers the update insignificant
-		if (!$iTipMessage->significantChange) {
-			if (!$iTipMessage->scheduleStatus) {
-				$iTipMessage->scheduleStatus = '1.0;We got the message, but it\'s not significant enough to warrant an email';
-			}
-			return;
-		}
-
-		if (parse_url($iTipMessage->sender, PHP_URL_SCHEME) !== 'mailto'
-			|| parse_url($iTipMessage->recipient, PHP_URL_SCHEME) !== 'mailto') {
-			return;
-		}
-
-		// don't send out mails for events that already took place
-		$lastOccurrence = $this->imipService->getLastOccurrence($iTipMessage->message);
-		$currentTime = $this->timeFactory->getTime();
-		if ($lastOccurrence < $currentTime) {
-			return;
-		}
-
-		// Strip off mailto:
-		$recipient = substr($iTipMessage->recipient, 7);
-		if (!$this->emailValidator->isValid($recipient)) {
-			// Nothing to send if the recipient doesn't have a valid email address
-			$iTipMessage->scheduleStatus = '5.0; EMail delivery failed';
-			return;
-		}
-		$recipientName = $iTipMessage->recipientName ? (string)$iTipMessage->recipientName : null;
-
-		$newEvents = $iTipMessage->message;
-		$oldEvents = $this->getVCalendar();
-
-		$modified = $this->eventComparisonService->findModified($newEvents, $oldEvents);
-		/** @var VEvent $vEvent */
-		$vEvent = array_pop($modified['new']);
-		/** @var VEvent $oldVevent */
-		$oldVevent = !empty($modified['old']) && is_array($modified['old']) ? array_pop($modified['old']) : null;
-		$isModified = isset($oldVevent);
-
-		// No changed events after all - this shouldn't happen if there is significant change yet here we are
-		// The scheduling status is debatable
-		if (empty($vEvent)) {
-			$this->logger->warning('iTip message said the change was significant but comparison did not detect any updated VEvents');
-			$iTipMessage->scheduleStatus = '1.0;We got the message, but it\'s not significant enough to warrant an email';
-			return;
-		}
-
-		// we (should) have one event component left
-		// as the ITip\Broker creates one iTip message per change
-		// and triggers the "schedule" event once per message
-		// we also might not have an old event as this could be a new
-		// invitation, or a new recurrence exception
-		$attendee = $this->imipService->getCurrentAttendee($iTipMessage);
-		if ($attendee === null) {
-			$uid = $vEvent->UID ?? 'no UID found';
-			$this->logger->debug('Could not find recipient ' . $recipient . ' as attendee for event with UID ' . $uid);
-			$iTipMessage->scheduleStatus = '5.0; EMail delivery failed';
-			return;
-		}
-		// Don't send emails to rooms, resources and circles
-		if ($this->imipService->isRoomOrResource($attendee)
-				|| $this->imipService->isCircle($attendee)) {
-			$this->logger->debug('No invitation sent as recipient is room, resource or circle', [
-				'attendee' => $recipient,
-			]);
-			$iTipMessage->scheduleStatus = '1.0;We got the message, but it\'s not significant enough to warrant an email';
-			return;
-		}
-		$this->imipService->setL10n($attendee);
-
-		// Build the sender name.
-		// Due to a bug in sabre, the senderName property for an iTIP message can actually also be a VObject Property
-		// If the iTIP message senderName is null or empty use the user session name as the senderName
-		if (($iTipMessage->senderName instanceof Parameter) && !empty(trim($iTipMessage->senderName->getValue()))) {
-			$senderName = trim($iTipMessage->senderName->getValue());
-		} elseif (is_string($iTipMessage->senderName) && !empty(trim($iTipMessage->senderName))) {
-			$senderName = trim($iTipMessage->senderName);
-		} elseif ($this->userSession->getUser() !== null) {
-			$senderName = trim($this->userSession->getUser()->getDisplayName());
-		} else {
-			$senderName = '';
-		}
-
-		$sender = substr($iTipMessage->sender, 7);
-
-		$replyingAttendee = null;
-		switch (strtolower($iTipMessage->method)) {
-			case self::METHOD_REPLY:
-				$method = self::METHOD_REPLY;
-				$data = $this->imipService->buildReplyBodyData($vEvent);
-				$replyingAttendee = $this->imipService->getReplyingAttendee($iTipMessage);
-				break;
-			case self::METHOD_CANCEL:
-				$method = self::METHOD_CANCEL;
-				$data = $this->imipService->buildCancelledBodyData($vEvent);
-				break;
-			default:
-				$method = self::METHOD_REQUEST;
-				$data = $this->imipService->buildBodyData($vEvent, $oldVevent);
-				break;
-		}
-
-		$data['attendee_name'] = ($recipientName ?: $recipient);
-		$data['invitee_name'] = ($senderName ?: $sender);
-
-		$fromEMail = Util::getDefaultEmailAddress('invitations-noreply');
-		$fromName = $this->imipService->getFrom($senderName, $this->defaults->getName());
-
-		$template = $this->mailer->createEMailTemplate('dav.calendarInvite.' . $method, $data);
-		$template->addHeader();
-
-		$this->imipService->addSubjectAndHeading($template, $method, $data['invitee_name'], $data['meeting_title'], $isModified, $replyingAttendee);
-		$this->imipService->addBulletList($template, $vEvent, $data);
-
-		// Only add response buttons to invitation requests: Fix Issue #11230
-		if (strcasecmp($method, self::METHOD_REQUEST) === 0 && $this->imipService->getAttendeeRsvpOrReqForParticipant($attendee)) {
-
-			/*
+    private ?VCalendar $vCalendar = null;
+    public const MAX_DATE = '2038-01-01';
+    public const METHOD_REQUEST = 'request';
+    public const METHOD_REPLY = 'reply';
+    public const METHOD_CANCEL = 'cancel';
+    public const IMIP_INDENT = 15;
+
+    public function __construct(
+        private IAppConfig $config,
+        private IMailer $mailer,
+        private LoggerInterface $logger,
+        private ITimeFactory $timeFactory,
+        private Defaults $defaults,
+        private IUserSession $userSession,
+        private IMipService $imipService,
+        private EventComparisonService $eventComparisonService,
+        private IMailManager $mailManager,
+        private IEmailValidator $emailValidator,
+    ) {
+        parent::__construct('');
+    }
+
+    public function initialize(DAV\Server $server): void {
+        parent::initialize($server);
+        $server->on('beforeWriteContent', [$this, 'beforeWriteContent'], 10);
+    }
+
+    /**
+     * Check quota before writing content
+     *
+     * @param string $uri target file URI
+     * @param INode $node Sabre Node
+     * @param resource $data data
+     * @param bool $modified modified
+     */
+    public function beforeWriteContent($uri, INode $node, $data, $modified): void {
+        if (!$node instanceof CalendarObject) {
+            return;
+        }
+        /** @var VCalendar $vCalendar */
+        $vCalendar = Reader::read($node->get());
+        $this->setVCalendar($vCalendar);
+    }
+
+    /**
+     * Event handler for the 'schedule' event.
+     *
+     * @param Message $iTipMessage
+     * @return void
+     */
+    public function schedule(Message $iTipMessage) {
+
+        // Not sending any emails if the system considers the update insignificant
+        if (!$iTipMessage->significantChange) {
+            if (!$iTipMessage->scheduleStatus) {
+                $iTipMessage->scheduleStatus = '1.0;We got the message, but it\'s not significant enough to warrant an email';
+            }
+            return;
+        }
+
+        if (parse_url($iTipMessage->sender, PHP_URL_SCHEME) !== 'mailto'
+            || parse_url($iTipMessage->recipient, PHP_URL_SCHEME) !== 'mailto') {
+            return;
+        }
+
+        // don't send out mails for events that already took place
+        $lastOccurrence = $this->imipService->getLastOccurrence($iTipMessage->message);
+        $currentTime = $this->timeFactory->getTime();
+        if ($lastOccurrence < $currentTime) {
+            return;
+        }
+
+        // Strip off mailto:
+        $recipient = substr($iTipMessage->recipient, 7);
+        if (!$this->emailValidator->isValid($recipient)) {
+            // Nothing to send if the recipient doesn't have a valid email address
+            $iTipMessage->scheduleStatus = '5.0; EMail delivery failed';
+            return;
+        }
+        $recipientName = $iTipMessage->recipientName ? (string)$iTipMessage->recipientName : null;
+
+        $newEvents = $iTipMessage->message;
+        $oldEvents = $this->getVCalendar();
+
+        $modified = $this->eventComparisonService->findModified($newEvents, $oldEvents);
+        /** @var VEvent $vEvent */
+        $vEvent = array_pop($modified['new']);
+        /** @var VEvent $oldVevent */
+        $oldVevent = !empty($modified['old']) && is_array($modified['old']) ? array_pop($modified['old']) : null;
+        $isModified = isset($oldVevent);
+
+        // No changed events after all - this shouldn't happen if there is significant change yet here we are
+        // The scheduling status is debatable
+        if (empty($vEvent)) {
+            $this->logger->warning('iTip message said the change was significant but comparison did not detect any updated VEvents');
+            $iTipMessage->scheduleStatus = '1.0;We got the message, but it\'s not significant enough to warrant an email';
+            return;
+        }
+
+        // we (should) have one event component left
+        // as the ITip\Broker creates one iTip message per change
+        // and triggers the "schedule" event once per message
+        // we also might not have an old event as this could be a new
+        // invitation, or a new recurrence exception
+        $attendee = $this->imipService->getCurrentAttendee($iTipMessage);
+        if ($attendee === null) {
+            $uid = $vEvent->UID ?? 'no UID found';
+            $this->logger->debug('Could not find recipient ' . $recipient . ' as attendee for event with UID ' . $uid);
+            $iTipMessage->scheduleStatus = '5.0; EMail delivery failed';
+            return;
+        }
+        // Don't send emails to rooms, resources and circles
+        if ($this->imipService->isRoomOrResource($attendee)
+                || $this->imipService->isCircle($attendee)) {
+            $this->logger->debug('No invitation sent as recipient is room, resource or circle', [
+                'attendee' => $recipient,
+            ]);
+            $iTipMessage->scheduleStatus = '1.0;We got the message, but it\'s not significant enough to warrant an email';
+            return;
+        }
+        $this->imipService->setL10n($attendee);
+
+        // Build the sender name.
+        // Due to a bug in sabre, the senderName property for an iTIP message can actually also be a VObject Property
+        // If the iTIP message senderName is null or empty use the user session name as the senderName
+        if (($iTipMessage->senderName instanceof Parameter) && !empty(trim($iTipMessage->senderName->getValue()))) {
+            $senderName = trim($iTipMessage->senderName->getValue());
+        } elseif (is_string($iTipMessage->senderName) && !empty(trim($iTipMessage->senderName))) {
+            $senderName = trim($iTipMessage->senderName);
+        } elseif ($this->userSession->getUser() !== null) {
+            $senderName = trim($this->userSession->getUser()->getDisplayName());
+        } else {
+            $senderName = '';
+        }
+
+        $sender = substr($iTipMessage->sender, 7);
+
+        $replyingAttendee = null;
+        switch (strtolower($iTipMessage->method)) {
+            case self::METHOD_REPLY:
+                $method = self::METHOD_REPLY;
+                $data = $this->imipService->buildReplyBodyData($vEvent);
+                $replyingAttendee = $this->imipService->getReplyingAttendee($iTipMessage);
+                break;
+            case self::METHOD_CANCEL:
+                $method = self::METHOD_CANCEL;
+                $data = $this->imipService->buildCancelledBodyData($vEvent);
+                break;
+            default:
+                $method = self::METHOD_REQUEST;
+                $data = $this->imipService->buildBodyData($vEvent, $oldVevent);
+                break;
+        }
+
+        $data['attendee_name'] = ($recipientName ?: $recipient);
+        $data['invitee_name'] = ($senderName ?: $sender);
+
+        $fromEMail = Util::getDefaultEmailAddress('invitations-noreply');
+        $fromName = $this->imipService->getFrom($senderName, $this->defaults->getName());
+
+        $template = $this->mailer->createEMailTemplate('dav.calendarInvite.' . $method, $data);
+        $template->addHeader();
+
+        $this->imipService->addSubjectAndHeading($template, $method, $data['invitee_name'], $data['meeting_title'], $isModified, $replyingAttendee);
+        $this->imipService->addBulletList($template, $vEvent, $data);
+
+        // Only add response buttons to invitation requests: Fix Issue #11230
+        if (strcasecmp($method, self::METHOD_REQUEST) === 0 && $this->imipService->getAttendeeRsvpOrReqForParticipant($attendee)) {
+
+            /*
 			** Only offer invitation accept/reject buttons, which link back to the
 			** nextcloud server, to recipients who can access the nextcloud server via
 			** their internet/intranet.  Issue #12156
@@ -235,106 +235,106 @@ 
 			** To suppress URLs entirely, set invitation_link_recipients to boolean "no".
 			*/
 
-			$recipientDomain = substr(strrchr($recipient, '@'), 1);
-			$invitationLinkRecipients = explode(',', preg_replace('/\s+/', '', strtolower($this->config->getValueString('dav', 'invitation_link_recipients', 'yes'))));
-
-			if (strcmp('yes', $invitationLinkRecipients[0]) === 0
-				|| in_array(strtolower($recipient), $invitationLinkRecipients)
-				|| in_array(strtolower($recipientDomain), $invitationLinkRecipients)) {
-				$token = $this->imipService->createInvitationToken($iTipMessage, $vEvent, $lastOccurrence);
-				$this->imipService->addResponseButtons($template, $token);
-				$this->imipService->addMoreOptionsButton($template, $token);
-			}
-		}
-
-		$template->addFooter();
-		// convert iTip Message to string
-		$itip_msg = $iTipMessage->message->serialize();
-
-		$mailService = null;
-
-		try {
-			if ($this->config->getValueBool('core', 'mail_providers_enabled', true)) {
-				// retrieve user object
-				$user = $this->userSession->getUser();
-				if ($user !== null) {
-					// retrieve appropriate service with the same address as sender
-					$mailService = $this->mailManager->findServiceByAddress($user->getUID(), $sender);
-				}
-			}
-
-			// The display name in Nextcloud can use utf-8.
-			// As the default charset for text/* is us-ascii, it's important to explicitly define it.
-			// See https://www.rfc-editor.org/rfc/rfc6047.html#section-2.4.
-			$contentType = 'text/calendar; method=' . $iTipMessage->method . '; charset="utf-8"';
-
-			// evaluate if a mail service was found and has sending capabilities
-			if ($mailService instanceof IMessageSend) {
-				// construct mail message and set required parameters
-				$message = $mailService->initiateMessage();
-				$message->setFrom(
-					(new Address($sender, $fromName))
-				);
-				$message->setTo(
-					(new Address($recipient, $recipientName))
-				);
-				$message->setSubject($template->renderSubject());
-				$message->setBodyPlain($template->renderText());
-				$message->setBodyHtml($template->renderHtml());
-				// Adding name=event.ics is a trick to make the invitation also appear
-				// as a file attachment in mail clients like Thunderbird or Evolution.
-				$message->setAttachments((new Attachment(
-					$itip_msg,
-					null,
-					$contentType . '; name=event.ics',
-					true
-				)));
-				// send message
-				$mailService->sendMessage($message);
-			} else {
-				// construct symfony mailer message and set required parameters
-				$message = $this->mailer->createMessage();
-				$message->setFrom([$fromEMail => $fromName]);
-				$message->setTo(
-					(($recipientName !== null) ? [$recipient => $recipientName] : [$recipient])
-				);
-				$message->setReplyTo(
-					(($senderName !== null) ? [$sender => $senderName] : [$sender])
-				);
-				$message->useTemplate($template);
-				// Using a different content type because Symfony Mailer/Mime will append the name to
-				// the content type header and attachInline does not allow null.
-				$message->attachInline(
-					$itip_msg,
-					'event.ics',
-					$contentType,
-				);
-				$failed = $this->mailer->send($message);
-			}
-
-			$iTipMessage->scheduleStatus = '1.1; Scheduling message is sent via iMip';
-			if (!empty($failed)) {
-				$this->logger->error('Unable to deliver message to {failed}', ['app' => 'dav', 'failed' => implode(', ', $failed)]);
-				$iTipMessage->scheduleStatus = '5.0; EMail delivery failed';
-			}
-		} catch (\Exception $ex) {
-			$this->logger->error($ex->getMessage(), ['app' => 'dav', 'exception' => $ex]);
-			$iTipMessage->scheduleStatus = '5.0; EMail delivery failed';
-		}
-	}
-
-	/**
-	 * @return ?VCalendar
-	 */
-	public function getVCalendar(): ?VCalendar {
-		return $this->vCalendar;
-	}
-
-	/**
-	 * @param ?VCalendar $vCalendar
-	 */
-	public function setVCalendar(?VCalendar $vCalendar): void {
-		$this->vCalendar = $vCalendar;
-	}
+            $recipientDomain = substr(strrchr($recipient, '@'), 1);
+            $invitationLinkRecipients = explode(',', preg_replace('/\s+/', '', strtolower($this->config->getValueString('dav', 'invitation_link_recipients', 'yes'))));
+
+            if (strcmp('yes', $invitationLinkRecipients[0]) === 0
+                || in_array(strtolower($recipient), $invitationLinkRecipients)
+                || in_array(strtolower($recipientDomain), $invitationLinkRecipients)) {
+                $token = $this->imipService->createInvitationToken($iTipMessage, $vEvent, $lastOccurrence);
+                $this->imipService->addResponseButtons($template, $token);
+                $this->imipService->addMoreOptionsButton($template, $token);
+            }
+        }
+
+        $template->addFooter();
+        // convert iTip Message to string
+        $itip_msg = $iTipMessage->message->serialize();
+
+        $mailService = null;
+
+        try {
+            if ($this->config->getValueBool('core', 'mail_providers_enabled', true)) {
+                // retrieve user object
+                $user = $this->userSession->getUser();
+                if ($user !== null) {
+                    // retrieve appropriate service with the same address as sender
+                    $mailService = $this->mailManager->findServiceByAddress($user->getUID(), $sender);
+                }
+            }
+
+            // The display name in Nextcloud can use utf-8.
+            // As the default charset for text/* is us-ascii, it's important to explicitly define it.
+            // See https://www.rfc-editor.org/rfc/rfc6047.html#section-2.4.
+            $contentType = 'text/calendar; method=' . $iTipMessage->method . '; charset="utf-8"';
+
+            // evaluate if a mail service was found and has sending capabilities
+            if ($mailService instanceof IMessageSend) {
+                // construct mail message and set required parameters
+                $message = $mailService->initiateMessage();
+                $message->setFrom(
+                    (new Address($sender, $fromName))
+                );
+                $message->setTo(
+                    (new Address($recipient, $recipientName))
+                );
+                $message->setSubject($template->renderSubject());
+                $message->setBodyPlain($template->renderText());
+                $message->setBodyHtml($template->renderHtml());
+                // Adding name=event.ics is a trick to make the invitation also appear
+                // as a file attachment in mail clients like Thunderbird or Evolution.
+                $message->setAttachments((new Attachment(
+                    $itip_msg,
+                    null,
+                    $contentType . '; name=event.ics',
+                    true
+                )));
+                // send message
+                $mailService->sendMessage($message);
+            } else {
+                // construct symfony mailer message and set required parameters
+                $message = $this->mailer->createMessage();
+                $message->setFrom([$fromEMail => $fromName]);
+                $message->setTo(
+                    (($recipientName !== null) ? [$recipient => $recipientName] : [$recipient])
+                );
+                $message->setReplyTo(
+                    (($senderName !== null) ? [$sender => $senderName] : [$sender])
+                );
+                $message->useTemplate($template);
+                // Using a different content type because Symfony Mailer/Mime will append the name to
+                // the content type header and attachInline does not allow null.
+                $message->attachInline(
+                    $itip_msg,
+                    'event.ics',
+                    $contentType,
+                );
+                $failed = $this->mailer->send($message);
+            }
+
+            $iTipMessage->scheduleStatus = '1.1; Scheduling message is sent via iMip';
+            if (!empty($failed)) {
+                $this->logger->error('Unable to deliver message to {failed}', ['app' => 'dav', 'failed' => implode(', ', $failed)]);
+                $iTipMessage->scheduleStatus = '5.0; EMail delivery failed';
+            }
+        } catch (\Exception $ex) {
+            $this->logger->error($ex->getMessage(), ['app' => 'dav', 'exception' => $ex]);
+            $iTipMessage->scheduleStatus = '5.0; EMail delivery failed';
+        }
+    }
+
+    /**
+     * @return ?VCalendar
+     */
+    public function getVCalendar(): ?VCalendar {
+        return $this->vCalendar;
+    }
+
+    /**
+     * @param ?VCalendar $vCalendar
+     */
+    public function setVCalendar(?VCalendar $vCalendar): void {
+        $this->vCalendar = $vCalendar;
+    }
 
 }

apps/dav/lib/CalDAV/Reminder/NotificationProvider/EmailProvider.php

Indentation +410 added lines, -410 removed lines

@@ -31,414 +31,414 @@
  * @package OCA\DAV\CalDAV\Reminder\NotificationProvider
  */
 class EmailProvider extends AbstractProvider {
-	/** @var string */
-	public const NOTIFICATION_TYPE = 'EMAIL';
-
-	public function __construct(
-		IConfig $config,
-		private IMailer $mailer,
-		LoggerInterface $logger,
-		L10NFactory $l10nFactory,
-		IURLGenerator $urlGenerator,
-		private IEmailValidator $emailValidator,
-	) {
-		parent::__construct($logger, $l10nFactory, $urlGenerator, $config);
-	}
-
-	/**
-	 * Send out notification via email
-	 *
-	 * @param VEvent $vevent
-	 * @param string|null $calendarDisplayName
-	 * @param string[] $principalEmailAddresses
-	 * @param array $users
-	 * @throws \Exception
-	 */
-	public function send(VEvent $vevent,
-		?string $calendarDisplayName,
-		array $principalEmailAddresses,
-		array $users = []):void {
-		$fallbackLanguage = $this->getFallbackLanguage();
-
-		$organizerEmailAddress = null;
-		if (isset($vevent->ORGANIZER)) {
-			$organizerEmailAddress = $this->getEMailAddressOfAttendee($vevent->ORGANIZER);
-		}
-
-		$emailAddressesOfSharees = $this->getEMailAddressesOfAllUsersWithWriteAccessToCalendar($users);
-		$emailAddressesOfAttendees = [];
-		if (count($principalEmailAddresses) === 0
-			|| ($organizerEmailAddress && in_array($organizerEmailAddress, $principalEmailAddresses, true))
-		) {
-			$emailAddressesOfAttendees = $this->getAllEMailAddressesFromEvent($vevent);
-		}
-
-		// Quote from php.net:
-		// If the input arrays have the same string keys, then the later value for that key will overwrite the previous one.
-		// => if there are duplicate email addresses, it will always take the system value
-		$emailAddresses = array_merge(
-			$emailAddressesOfAttendees,
-			$emailAddressesOfSharees
-		);
-
-		$sortedByLanguage = $this->sortEMailAddressesByLanguage($emailAddresses, $fallbackLanguage);
-		$organizer = $this->getOrganizerEMailAndNameFromEvent($vevent);
-
-		foreach ($sortedByLanguage as $lang => $emailAddresses) {
-			if (!$this->hasL10NForLang($lang)) {
-				$lang = $fallbackLanguage;
-			}
-			$l10n = $this->getL10NForLang($lang);
-			$fromEMail = Util::getDefaultEmailAddress('reminders-noreply');
-
-			$template = $this->mailer->createEMailTemplate('dav.calendarReminder');
-			$template->addHeader();
-			$this->addSubjectAndHeading($template, $l10n, $vevent);
-			$this->addBulletList($template, $l10n, $calendarDisplayName ?? $this->getCalendarDisplayNameFallback($lang), $vevent);
-			$template->addFooter();
-
-			foreach ($emailAddresses as $emailAddress) {
-				if (!$this->emailValidator->isValid($emailAddress)) {
-					$this->logger->error('Email address {address} for reminder notification is incorrect', ['app' => 'dav', 'address' => $emailAddress]);
-					continue;
-				}
-
-				$message = $this->mailer->createMessage();
-				$message->setFrom([$fromEMail]);
-				if ($organizer) {
-					$message->setReplyTo($organizer);
-				}
-				$message->setTo([$emailAddress]);
-				$message->useTemplate($template);
-				$message->setAutoSubmitted(AutoSubmitted::VALUE_AUTO_GENERATED);
-
-				try {
-					$failed = $this->mailer->send($message);
-					if ($failed) {
-						$this->logger->error('Unable to deliver message to {failed}', ['app' => 'dav', 'failed' => implode(', ', $failed)]);
-					}
-				} catch (\Exception $ex) {
-					$this->logger->error($ex->getMessage(), ['app' => 'dav', 'exception' => $ex]);
-				}
-			}
-		}
-	}
-
-	/**
-	 * @param IEMailTemplate $template
-	 * @param IL10N $l10n
-	 * @param VEvent $vevent
-	 */
-	private function addSubjectAndHeading(IEMailTemplate $template, IL10N $l10n, VEvent $vevent):void {
-		$template->setSubject('Notification: ' . $this->getTitleFromVEvent($vevent, $l10n));
-		$template->addHeading($this->getTitleFromVEvent($vevent, $l10n));
-	}
-
-	/**
-	 * @param IEMailTemplate $template
-	 * @param IL10N $l10n
-	 * @param string $calendarDisplayName
-	 * @param array $eventData
-	 */
-	private function addBulletList(IEMailTemplate $template,
-		IL10N $l10n,
-		string $calendarDisplayName,
-		VEvent $vevent):void {
-		$template->addBodyListItem($calendarDisplayName, $l10n->t('Calendar:'),
-			$this->getAbsoluteImagePath('actions/info.png'));
-
-		$template->addBodyListItem($this->generateDateString($l10n, $vevent), $l10n->t('Date:'),
-			$this->getAbsoluteImagePath('places/calendar.png'));
-
-		if (isset($vevent->LOCATION)) {
-			$template->addBodyListItem((string)$vevent->LOCATION, $l10n->t('Where:'),
-				$this->getAbsoluteImagePath('actions/address.png'));
-		}
-		if (isset($vevent->DESCRIPTION)) {
-			$template->addBodyListItem((string)$vevent->DESCRIPTION, $l10n->t('Description:'),
-				$this->getAbsoluteImagePath('actions/more.png'));
-		}
-	}
-
-	private function getAbsoluteImagePath(string $path):string {
-		return $this->urlGenerator->getAbsoluteURL(
-			$this->urlGenerator->imagePath('core', $path)
-		);
-	}
-
-	/**
-	 * @param VEvent $vevent
-	 * @return array|null
-	 */
-	private function getOrganizerEMailAndNameFromEvent(VEvent $vevent):?array {
-		if (!$vevent->ORGANIZER) {
-			return null;
-		}
-
-		$organizer = $vevent->ORGANIZER;
-		if (strcasecmp($organizer->getValue(), 'mailto:') !== 0) {
-			return null;
-		}
-
-		$organizerEMail = substr($organizer->getValue(), 7);
-
-		if (!$this->emailValidator->isValid($organizerEMail)) {
-			return null;
-		}
-
-		$name = $organizer->offsetGet('CN');
-		if ($name instanceof Parameter) {
-			return [$organizerEMail => $name];
-		}
-
-		return [$organizerEMail];
-	}
-
-	/**
-	 * @param array<string, array{LANG?: string}> $emails
-	 * @return array<string, string[]>
-	 */
-	private function sortEMailAddressesByLanguage(array $emails,
-		string $defaultLanguage):array {
-		$sortedByLanguage = [];
-
-		foreach ($emails as $emailAddress => $parameters) {
-			if (isset($parameters['LANG'])) {
-				$lang = $parameters['LANG'];
-			} else {
-				$lang = $defaultLanguage;
-			}
-
-			if (!isset($sortedByLanguage[$lang])) {
-				$sortedByLanguage[$lang] = [];
-			}
-
-			$sortedByLanguage[$lang][] = $emailAddress;
-		}
-
-		return $sortedByLanguage;
-	}
-
-	/**
-	 * @param VEvent $vevent
-	 * @return array<string, array{LANG?: string}>
-	 */
-	private function getAllEMailAddressesFromEvent(VEvent $vevent):array {
-		$emailAddresses = [];
-
-		if (isset($vevent->ATTENDEE)) {
-			foreach ($vevent->ATTENDEE as $attendee) {
-				if (!($attendee instanceof VObject\Property)) {
-					continue;
-				}
-
-				$cuType = $this->getCUTypeOfAttendee($attendee);
-				if (\in_array($cuType, ['RESOURCE', 'ROOM', 'UNKNOWN'])) {
-					// Don't send emails to things
-					continue;
-				}
-
-				$partstat = $this->getPartstatOfAttendee($attendee);
-				if ($partstat === 'DECLINED') {
-					// Don't send out emails to people who declined
-					continue;
-				}
-				if ($partstat === 'DELEGATED') {
-					$delegates = $attendee->offsetGet('DELEGATED-TO');
-					if (!($delegates instanceof VObject\Parameter)) {
-						continue;
-					}
-
-					$emailAddressesOfDelegates = $delegates->getParts();
-					foreach ($emailAddressesOfDelegates as $addressesOfDelegate) {
-						if (strcasecmp($addressesOfDelegate, 'mailto:') === 0) {
-							$delegateEmail = substr($addressesOfDelegate, 7);
-							if ($this->emailValidator->isValid($delegateEmail)) {
-								$emailAddresses[$delegateEmail] = [];
-							}
-						}
-					}
-
-					continue;
-				}
-
-				$emailAddressOfAttendee = $this->getEMailAddressOfAttendee($attendee);
-				if ($emailAddressOfAttendee !== null) {
-					$properties = [];
-
-					$langProp = $attendee->offsetGet('LANG');
-					if ($langProp instanceof VObject\Parameter && $langProp->getValue() !== null) {
-						$properties['LANG'] = $langProp->getValue();
-					}
-
-					$emailAddresses[$emailAddressOfAttendee] = $properties;
-				}
-			}
-		}
-
-		if (isset($vevent->ORGANIZER) && $this->hasAttendeeMailURI($vevent->ORGANIZER)) {
-			$organizerEmailAddress = $this->getEMailAddressOfAttendee($vevent->ORGANIZER);
-			if ($organizerEmailAddress !== null) {
-				$emailAddresses[$organizerEmailAddress] = [];
-			}
-		}
-
-		return $emailAddresses;
-	}
-
-	private function getCUTypeOfAttendee(VObject\Property $attendee):string {
-		$cuType = $attendee->offsetGet('CUTYPE');
-		if ($cuType instanceof VObject\Parameter) {
-			return strtoupper($cuType->getValue());
-		}
-
-		return 'INDIVIDUAL';
-	}
-
-	private function getPartstatOfAttendee(VObject\Property $attendee):string {
-		$partstat = $attendee->offsetGet('PARTSTAT');
-		if ($partstat instanceof VObject\Parameter) {
-			return strtoupper($partstat->getValue());
-		}
-
-		return 'NEEDS-ACTION';
-	}
-
-	private function hasAttendeeMailURI(VObject\Property $attendee): bool {
-		return stripos($attendee->getValue(), 'mailto:') === 0;
-	}
-
-	private function getEMailAddressOfAttendee(VObject\Property $attendee): ?string {
-		if (!$this->hasAttendeeMailURI($attendee)) {
-			return null;
-		}
-		$attendeeEMail = substr($attendee->getValue(), 7);
-		if (!$this->emailValidator->isValid($attendeeEMail)) {
-			return null;
-		}
-
-		return $attendeeEMail;
-	}
-
-	/**
-	 * @param IUser[] $users
-	 * @return array<string, array{LANG?: string}>
-	 */
-	private function getEMailAddressesOfAllUsersWithWriteAccessToCalendar(array $users):array {
-		$emailAddresses = [];
-
-		foreach ($users as $user) {
-			$emailAddress = $user->getEMailAddress();
-			if ($emailAddress) {
-				$lang = $this->l10nFactory->getUserLanguage($user);
-				if ($lang) {
-					$emailAddresses[$emailAddress] = [
-						'LANG' => $lang,
-					];
-				} else {
-					$emailAddresses[$emailAddress] = [];
-				}
-			}
-		}
-
-		return $emailAddresses;
-	}
-
-	/**
-	 * @throws \Exception
-	 */
-	private function generateDateString(IL10N $l10n, VEvent $vevent): string {
-		$isAllDay = $vevent->DTSTART instanceof Property\ICalendar\Date;
-
-		/** @var Property\ICalendar\Date | Property\ICalendar\DateTime $dtstart */
-		/** @var Property\ICalendar\Date | Property\ICalendar\DateTime $dtend */
-		/** @var \DateTimeImmutable $dtstartDt */
-		$dtstartDt = $vevent->DTSTART->getDateTime();
-		/** @var \DateTimeImmutable $dtendDt */
-		$dtendDt = $this->getDTEndFromEvent($vevent)->getDateTime();
-
-		$diff = $dtstartDt->diff($dtendDt);
-
-		$dtstartDt = new \DateTime($dtstartDt->format(\DateTimeInterface::ATOM));
-		$dtendDt = new \DateTime($dtendDt->format(\DateTimeInterface::ATOM));
-
-		if ($isAllDay) {
-			// One day event
-			if ($diff->days === 1) {
-				return $this->getDateString($l10n, $dtstartDt);
-			}
-
-			return implode(' - ', [
-				$this->getDateString($l10n, $dtstartDt),
-				$this->getDateString($l10n, $dtendDt),
-			]);
-		}
-
-		$startTimezone = $endTimezone = null;
-		if (!$vevent->DTSTART->isFloating()) {
-			$startTimezone = $vevent->DTSTART->getDateTime()->getTimezone()->getName();
-			$endTimezone = $this->getDTEndFromEvent($vevent)->getDateTime()->getTimezone()->getName();
-		}
-
-		$localeStart = implode(', ', [
-			$this->getWeekDayName($l10n, $dtstartDt),
-			$this->getDateTimeString($l10n, $dtstartDt)
-		]);
-
-		// always show full date with timezone if timezones are different
-		if ($startTimezone !== $endTimezone) {
-			$localeEnd = implode(', ', [
-				$this->getWeekDayName($l10n, $dtendDt),
-				$this->getDateTimeString($l10n, $dtendDt)
-			]);
-
-			return $localeStart
-				. ' (' . $startTimezone . ') '
-				. ' - '
-				. $localeEnd
-				. ' (' . $endTimezone . ')';
-		}
-
-		// Show only the time if the day is the same
-		$localeEnd = $this->isDayEqual($dtstartDt, $dtendDt)
-			? $this->getTimeString($l10n, $dtendDt)
-			: implode(', ', [
-				$this->getWeekDayName($l10n, $dtendDt),
-				$this->getDateTimeString($l10n, $dtendDt)
-			]);
-
-		return $localeStart
-			. ' - '
-			. $localeEnd
-			. ' (' . $startTimezone . ')';
-	}
-
-	private function isDayEqual(DateTime $dtStart,
-		DateTime $dtEnd):bool {
-		return $dtStart->format('Y-m-d') === $dtEnd->format('Y-m-d');
-	}
-
-	private function getWeekDayName(IL10N $l10n, DateTime $dt):string {
-		return (string)$l10n->l('weekdayName', $dt, ['width' => 'abbreviated']);
-	}
-
-	private function getDateString(IL10N $l10n, DateTime $dt):string {
-		return (string)$l10n->l('date', $dt, ['width' => 'medium']);
-	}
-
-	private function getDateTimeString(IL10N $l10n, DateTime $dt):string {
-		return (string)$l10n->l('datetime', $dt, ['width' => 'medium|short']);
-	}
-
-	private function getTimeString(IL10N $l10n, DateTime $dt):string {
-		return (string)$l10n->l('time', $dt, ['width' => 'short']);
-	}
-
-	private function getTitleFromVEvent(VEvent $vevent, IL10N $l10n):string {
-		if (isset($vevent->SUMMARY)) {
-			return (string)$vevent->SUMMARY;
-		}
-
-		return $l10n->t('Untitled event');
-	}
+    /** @var string */
+    public const NOTIFICATION_TYPE = 'EMAIL';
+
+    public function __construct(
+        IConfig $config,
+        private IMailer $mailer,
+        LoggerInterface $logger,
+        L10NFactory $l10nFactory,
+        IURLGenerator $urlGenerator,
+        private IEmailValidator $emailValidator,
+    ) {
+        parent::__construct($logger, $l10nFactory, $urlGenerator, $config);
+    }
+
+    /**
+     * Send out notification via email
+     *
+     * @param VEvent $vevent
+     * @param string|null $calendarDisplayName
+     * @param string[] $principalEmailAddresses
+     * @param array $users
+     * @throws \Exception
+     */
+    public function send(VEvent $vevent,
+        ?string $calendarDisplayName,
+        array $principalEmailAddresses,
+        array $users = []):void {
+        $fallbackLanguage = $this->getFallbackLanguage();
+
+        $organizerEmailAddress = null;
+        if (isset($vevent->ORGANIZER)) {
+            $organizerEmailAddress = $this->getEMailAddressOfAttendee($vevent->ORGANIZER);
+        }
+
+        $emailAddressesOfSharees = $this->getEMailAddressesOfAllUsersWithWriteAccessToCalendar($users);
+        $emailAddressesOfAttendees = [];
+        if (count($principalEmailAddresses) === 0
+            || ($organizerEmailAddress && in_array($organizerEmailAddress, $principalEmailAddresses, true))
+        ) {
+            $emailAddressesOfAttendees = $this->getAllEMailAddressesFromEvent($vevent);
+        }
+
+        // Quote from php.net:
+        // If the input arrays have the same string keys, then the later value for that key will overwrite the previous one.
+        // => if there are duplicate email addresses, it will always take the system value
+        $emailAddresses = array_merge(
+            $emailAddressesOfAttendees,
+            $emailAddressesOfSharees
+        );
+
+        $sortedByLanguage = $this->sortEMailAddressesByLanguage($emailAddresses, $fallbackLanguage);
+        $organizer = $this->getOrganizerEMailAndNameFromEvent($vevent);
+
+        foreach ($sortedByLanguage as $lang => $emailAddresses) {
+            if (!$this->hasL10NForLang($lang)) {
+                $lang = $fallbackLanguage;
+            }
+            $l10n = $this->getL10NForLang($lang);
+            $fromEMail = Util::getDefaultEmailAddress('reminders-noreply');
+
+            $template = $this->mailer->createEMailTemplate('dav.calendarReminder');
+            $template->addHeader();
+            $this->addSubjectAndHeading($template, $l10n, $vevent);
+            $this->addBulletList($template, $l10n, $calendarDisplayName ?? $this->getCalendarDisplayNameFallback($lang), $vevent);
+            $template->addFooter();
+
+            foreach ($emailAddresses as $emailAddress) {
+                if (!$this->emailValidator->isValid($emailAddress)) {
+                    $this->logger->error('Email address {address} for reminder notification is incorrect', ['app' => 'dav', 'address' => $emailAddress]);
+                    continue;
+                }
+
+                $message = $this->mailer->createMessage();
+                $message->setFrom([$fromEMail]);
+                if ($organizer) {
+                    $message->setReplyTo($organizer);
+                }
+                $message->setTo([$emailAddress]);
+                $message->useTemplate($template);
+                $message->setAutoSubmitted(AutoSubmitted::VALUE_AUTO_GENERATED);
+
+                try {
+                    $failed = $this->mailer->send($message);
+                    if ($failed) {
+                        $this->logger->error('Unable to deliver message to {failed}', ['app' => 'dav', 'failed' => implode(', ', $failed)]);
+                    }
+                } catch (\Exception $ex) {
+                    $this->logger->error($ex->getMessage(), ['app' => 'dav', 'exception' => $ex]);
+                }
+            }
+        }
+    }
+
+    /**
+     * @param IEMailTemplate $template
+     * @param IL10N $l10n
+     * @param VEvent $vevent
+     */
+    private function addSubjectAndHeading(IEMailTemplate $template, IL10N $l10n, VEvent $vevent):void {
+        $template->setSubject('Notification: ' . $this->getTitleFromVEvent($vevent, $l10n));
+        $template->addHeading($this->getTitleFromVEvent($vevent, $l10n));
+    }
+
+    /**
+     * @param IEMailTemplate $template
+     * @param IL10N $l10n
+     * @param string $calendarDisplayName
+     * @param array $eventData
+     */
+    private function addBulletList(IEMailTemplate $template,
+        IL10N $l10n,
+        string $calendarDisplayName,
+        VEvent $vevent):void {
+        $template->addBodyListItem($calendarDisplayName, $l10n->t('Calendar:'),
+            $this->getAbsoluteImagePath('actions/info.png'));
+
+        $template->addBodyListItem($this->generateDateString($l10n, $vevent), $l10n->t('Date:'),
+            $this->getAbsoluteImagePath('places/calendar.png'));
+
+        if (isset($vevent->LOCATION)) {
+            $template->addBodyListItem((string)$vevent->LOCATION, $l10n->t('Where:'),
+                $this->getAbsoluteImagePath('actions/address.png'));
+        }
+        if (isset($vevent->DESCRIPTION)) {
+            $template->addBodyListItem((string)$vevent->DESCRIPTION, $l10n->t('Description:'),
+                $this->getAbsoluteImagePath('actions/more.png'));
+        }
+    }
+
+    private function getAbsoluteImagePath(string $path):string {
+        return $this->urlGenerator->getAbsoluteURL(
+            $this->urlGenerator->imagePath('core', $path)
+        );
+    }
+
+    /**
+     * @param VEvent $vevent
+     * @return array|null
+     */
+    private function getOrganizerEMailAndNameFromEvent(VEvent $vevent):?array {
+        if (!$vevent->ORGANIZER) {
+            return null;
+        }
+
+        $organizer = $vevent->ORGANIZER;
+        if (strcasecmp($organizer->getValue(), 'mailto:') !== 0) {
+            return null;
+        }
+
+        $organizerEMail = substr($organizer->getValue(), 7);
+
+        if (!$this->emailValidator->isValid($organizerEMail)) {
+            return null;
+        }
+
+        $name = $organizer->offsetGet('CN');
+        if ($name instanceof Parameter) {
+            return [$organizerEMail => $name];
+        }
+
+        return [$organizerEMail];
+    }
+
+    /**
+     * @param array<string, array{LANG?: string}> $emails
+     * @return array<string, string[]>
+     */
+    private function sortEMailAddressesByLanguage(array $emails,
+        string $defaultLanguage):array {
+        $sortedByLanguage = [];
+
+        foreach ($emails as $emailAddress => $parameters) {
+            if (isset($parameters['LANG'])) {
+                $lang = $parameters['LANG'];
+            } else {
+                $lang = $defaultLanguage;
+            }
+
+            if (!isset($sortedByLanguage[$lang])) {
+                $sortedByLanguage[$lang] = [];
+            }
+
+            $sortedByLanguage[$lang][] = $emailAddress;
+        }
+
+        return $sortedByLanguage;
+    }
+
+    /**
+     * @param VEvent $vevent
+     * @return array<string, array{LANG?: string}>
+     */
+    private function getAllEMailAddressesFromEvent(VEvent $vevent):array {
+        $emailAddresses = [];
+
+        if (isset($vevent->ATTENDEE)) {
+            foreach ($vevent->ATTENDEE as $attendee) {
+                if (!($attendee instanceof VObject\Property)) {
+                    continue;
+                }
+
+                $cuType = $this->getCUTypeOfAttendee($attendee);
+                if (\in_array($cuType, ['RESOURCE', 'ROOM', 'UNKNOWN'])) {
+                    // Don't send emails to things
+                    continue;
+                }
+
+                $partstat = $this->getPartstatOfAttendee($attendee);
+                if ($partstat === 'DECLINED') {
+                    // Don't send out emails to people who declined
+                    continue;
+                }
+                if ($partstat === 'DELEGATED') {
+                    $delegates = $attendee->offsetGet('DELEGATED-TO');
+                    if (!($delegates instanceof VObject\Parameter)) {
+                        continue;
+                    }
+
+                    $emailAddressesOfDelegates = $delegates->getParts();
+                    foreach ($emailAddressesOfDelegates as $addressesOfDelegate) {
+                        if (strcasecmp($addressesOfDelegate, 'mailto:') === 0) {
+                            $delegateEmail = substr($addressesOfDelegate, 7);
+                            if ($this->emailValidator->isValid($delegateEmail)) {
+                                $emailAddresses[$delegateEmail] = [];
+                            }
+                        }
+                    }
+
+                    continue;
+                }
+
+                $emailAddressOfAttendee = $this->getEMailAddressOfAttendee($attendee);
+                if ($emailAddressOfAttendee !== null) {
+                    $properties = [];
+
+                    $langProp = $attendee->offsetGet('LANG');
+                    if ($langProp instanceof VObject\Parameter && $langProp->getValue() !== null) {
+                        $properties['LANG'] = $langProp->getValue();
+                    }
+
+                    $emailAddresses[$emailAddressOfAttendee] = $properties;
+                }
+            }
+        }
+
+        if (isset($vevent->ORGANIZER) && $this->hasAttendeeMailURI($vevent->ORGANIZER)) {
+            $organizerEmailAddress = $this->getEMailAddressOfAttendee($vevent->ORGANIZER);
+            if ($organizerEmailAddress !== null) {
+                $emailAddresses[$organizerEmailAddress] = [];
+            }
+        }
+
+        return $emailAddresses;
+    }
+
+    private function getCUTypeOfAttendee(VObject\Property $attendee):string {
+        $cuType = $attendee->offsetGet('CUTYPE');
+        if ($cuType instanceof VObject\Parameter) {
+            return strtoupper($cuType->getValue());
+        }
+
+        return 'INDIVIDUAL';
+    }
+
+    private function getPartstatOfAttendee(VObject\Property $attendee):string {
+        $partstat = $attendee->offsetGet('PARTSTAT');
+        if ($partstat instanceof VObject\Parameter) {
+            return strtoupper($partstat->getValue());
+        }
+
+        return 'NEEDS-ACTION';
+    }
+
+    private function hasAttendeeMailURI(VObject\Property $attendee): bool {
+        return stripos($attendee->getValue(), 'mailto:') === 0;
+    }
+
+    private function getEMailAddressOfAttendee(VObject\Property $attendee): ?string {
+        if (!$this->hasAttendeeMailURI($attendee)) {
+            return null;
+        }
+        $attendeeEMail = substr($attendee->getValue(), 7);
+        if (!$this->emailValidator->isValid($attendeeEMail)) {
+            return null;
+        }
+
+        return $attendeeEMail;
+    }
+
+    /**
+     * @param IUser[] $users
+     * @return array<string, array{LANG?: string}>
+     */
+    private function getEMailAddressesOfAllUsersWithWriteAccessToCalendar(array $users):array {
+        $emailAddresses = [];
+
+        foreach ($users as $user) {
+            $emailAddress = $user->getEMailAddress();
+            if ($emailAddress) {
+                $lang = $this->l10nFactory->getUserLanguage($user);
+                if ($lang) {
+                    $emailAddresses[$emailAddress] = [
+                        'LANG' => $lang,
+                    ];
+                } else {
+                    $emailAddresses[$emailAddress] = [];
+                }
+            }
+        }
+
+        return $emailAddresses;
+    }
+
+    /**
+     * @throws \Exception
+     */
+    private function generateDateString(IL10N $l10n, VEvent $vevent): string {
+        $isAllDay = $vevent->DTSTART instanceof Property\ICalendar\Date;
+
+        /** @var Property\ICalendar\Date | Property\ICalendar\DateTime $dtstart */
+        /** @var Property\ICalendar\Date | Property\ICalendar\DateTime $dtend */
+        /** @var \DateTimeImmutable $dtstartDt */
+        $dtstartDt = $vevent->DTSTART->getDateTime();
+        /** @var \DateTimeImmutable $dtendDt */
+        $dtendDt = $this->getDTEndFromEvent($vevent)->getDateTime();
+
+        $diff = $dtstartDt->diff($dtendDt);
+
+        $dtstartDt = new \DateTime($dtstartDt->format(\DateTimeInterface::ATOM));
+        $dtendDt = new \DateTime($dtendDt->format(\DateTimeInterface::ATOM));
+
+        if ($isAllDay) {
+            // One day event
+            if ($diff->days === 1) {
+                return $this->getDateString($l10n, $dtstartDt);
+            }
+
+            return implode(' - ', [
+                $this->getDateString($l10n, $dtstartDt),
+                $this->getDateString($l10n, $dtendDt),
+            ]);
+        }
+
+        $startTimezone = $endTimezone = null;
+        if (!$vevent->DTSTART->isFloating()) {
+            $startTimezone = $vevent->DTSTART->getDateTime()->getTimezone()->getName();
+            $endTimezone = $this->getDTEndFromEvent($vevent)->getDateTime()->getTimezone()->getName();
+        }
+
+        $localeStart = implode(', ', [
+            $this->getWeekDayName($l10n, $dtstartDt),
+            $this->getDateTimeString($l10n, $dtstartDt)
+        ]);
+
+        // always show full date with timezone if timezones are different
+        if ($startTimezone !== $endTimezone) {
+            $localeEnd = implode(', ', [
+                $this->getWeekDayName($l10n, $dtendDt),
+                $this->getDateTimeString($l10n, $dtendDt)
+            ]);
+
+            return $localeStart
+                . ' (' . $startTimezone . ') '
+                . ' - '
+                . $localeEnd
+                . ' (' . $endTimezone . ')';
+        }
+
+        // Show only the time if the day is the same
+        $localeEnd = $this->isDayEqual($dtstartDt, $dtendDt)
+            ? $this->getTimeString($l10n, $dtendDt)
+            : implode(', ', [
+                $this->getWeekDayName($l10n, $dtendDt),
+                $this->getDateTimeString($l10n, $dtendDt)
+            ]);
+
+        return $localeStart
+            . ' - '
+            . $localeEnd
+            . ' (' . $startTimezone . ')';
+    }
+
+    private function isDayEqual(DateTime $dtStart,
+        DateTime $dtEnd):bool {
+        return $dtStart->format('Y-m-d') === $dtEnd->format('Y-m-d');
+    }
+
+    private function getWeekDayName(IL10N $l10n, DateTime $dt):string {
+        return (string)$l10n->l('weekdayName', $dt, ['width' => 'abbreviated']);
+    }
+
+    private function getDateString(IL10N $l10n, DateTime $dt):string {
+        return (string)$l10n->l('date', $dt, ['width' => 'medium']);
+    }
+
+    private function getDateTimeString(IL10N $l10n, DateTime $dt):string {
+        return (string)$l10n->l('datetime', $dt, ['width' => 'medium|short']);
+    }
+
+    private function getTimeString(IL10N $l10n, DateTime $dt):string {
+        return (string)$l10n->l('time', $dt, ['width' => 'short']);
+    }
+
+    private function getTitleFromVEvent(VEvent $vevent, IL10N $l10n):string {
+        if (isset($vevent->SUMMARY)) {
+            return (string)$vevent->SUMMARY;
+        }
+
+        return $l10n->t('Untitled event');
+    }
 }