nextcloud / server

apps/settings/lib/Controller/AppSettingsController.php

Indentation +502 added lines, -502 removed lines

@@ -56,507 +56,507 @@
 
 class AppSettingsController extends Controller {
 
-	/** @var \OCP\IL10N */
-	private $l10n;
-	/** @var IConfig */
-	private $config;
-	/** @var INavigationManager */
-	private $navigationManager;
-	/** @var IAppManager */
-	private $appManager;
-	/** @var CategoryFetcher */
-	private $categoryFetcher;
-	/** @var AppFetcher */
-	private $appFetcher;
-	/** @var IFactory */
-	private $l10nFactory;
-	/** @var BundleFetcher */
-	private $bundleFetcher;
-	/** @var Installer */
-	private $installer;
-	/** @var IURLGenerator */
-	private $urlGenerator;
-	/** @var ILogger */
-	private $logger;
-
-	/** @var array */
-	private $allApps = [];
-
-	/**
-	 * @param string $appName
-	 * @param IRequest $request
-	 * @param IL10N $l10n
-	 * @param IConfig $config
-	 * @param INavigationManager $navigationManager
-	 * @param IAppManager $appManager
-	 * @param CategoryFetcher $categoryFetcher
-	 * @param AppFetcher $appFetcher
-	 * @param IFactory $l10nFactory
-	 * @param BundleFetcher $bundleFetcher
-	 * @param Installer $installer
-	 * @param IURLGenerator $urlGenerator
-	 * @param ILogger $logger
-	 */
-	public function __construct(string $appName,
-								IRequest $request,
-								IL10N $l10n,
-								IConfig $config,
-								INavigationManager $navigationManager,
-								IAppManager $appManager,
-								CategoryFetcher $categoryFetcher,
-								AppFetcher $appFetcher,
-								IFactory $l10nFactory,
-								BundleFetcher $bundleFetcher,
-								Installer $installer,
-								IURLGenerator $urlGenerator,
-								ILogger $logger) {
-		parent::__construct($appName, $request);
-		$this->l10n = $l10n;
-		$this->config = $config;
-		$this->navigationManager = $navigationManager;
-		$this->appManager = $appManager;
-		$this->categoryFetcher = $categoryFetcher;
-		$this->appFetcher = $appFetcher;
-		$this->l10nFactory = $l10nFactory;
-		$this->bundleFetcher = $bundleFetcher;
-		$this->installer = $installer;
-		$this->urlGenerator = $urlGenerator;
-		$this->logger = $logger;
-	}
-
-	/**
-	 * @NoCSRFRequired
-	 *
-	 * @return TemplateResponse
-	 */
-	public function viewApps(): TemplateResponse {
-		\OC_Util::addScript('settings', 'apps');
-		$params = [];
-		$params['appstoreEnabled'] = $this->config->getSystemValue('appstoreenabled', true) === true;
-		$params['updateCount'] = count($this->getAppsWithUpdates());
-		$params['developerDocumentation'] = $this->urlGenerator->linkToDocs('developer-manual');
-		$params['bundles'] = $this->getBundles();
-		$this->navigationManager->setActiveEntry('core_apps');
-
-		$templateResponse = new TemplateResponse('settings', 'settings-vue', ['serverData' => $params]);
-		$policy = new ContentSecurityPolicy();
-		$policy->addAllowedImageDomain('https://usercontent.apps.nextcloud.com');
-		$templateResponse->setContentSecurityPolicy($policy);
-
-		return $templateResponse;
-	}
-
-	private function getAppsWithUpdates() {
-		$appClass = new \OC_App();
-		$apps = $appClass->listAllApps();
-		foreach($apps as $key => $app) {
-			$newVersion = $this->installer->isUpdateAvailable($app['id']);
-			if($newVersion === false) {
-				unset($apps[$key]);
-			}
-		}
-		return $apps;
-	}
-
-	private function getBundles() {
-		$result = [];
-		$bundles = $this->bundleFetcher->getBundles();
-		foreach ($bundles as $bundle) {
-			$result[] = [
-				'name' => $bundle->getName(),
-				'id' => $bundle->getIdentifier(),
-				'appIdentifiers' => $bundle->getAppIdentifiers()
-			];
-		}
-		return $result;
-
-	}
-
-	/**
-	 * Get all available categories
-	 *
-	 * @return JSONResponse
-	 */
-	public function listCategories(): JSONResponse {
-		return new JSONResponse($this->getAllCategories());
-	}
-
-	private function getAllCategories() {
-		$currentLanguage = substr($this->l10nFactory->findLanguage(), 0, 2);
-
-		$formattedCategories = [];
-		$categories = $this->categoryFetcher->get();
-		foreach($categories as $category) {
-			$formattedCategories[] = [
-				'id' => $category['id'],
-				'ident' => $category['id'],
-				'displayName' => isset($category['translations'][$currentLanguage]['name']) ? $category['translations'][$currentLanguage]['name'] : $category['translations']['en']['name'],
-			];
-		}
-
-		return $formattedCategories;
-	}
-
-	private function fetchApps() {
-		$appClass = new \OC_App();
-		$apps = $appClass->listAllApps();
-		foreach ($apps as $app) {
-			$app['installed'] = true;
-			$this->allApps[$app['id']] = $app;
-		}
-
-		$apps = $this->getAppsForCategory('');
-		foreach ($apps as $app) {
-			$app['appstore'] = true;
-			if (!array_key_exists($app['id'], $this->allApps)) {
-				$this->allApps[$app['id']] = $app;
-			} else {
-				$this->allApps[$app['id']] = array_merge($app, $this->allApps[$app['id']]);
-			}
-		}
-
-		// add bundle information
-		$bundles = $this->bundleFetcher->getBundles();
-		foreach($bundles as $bundle) {
-			foreach($bundle->getAppIdentifiers() as $identifier) {
-				foreach($this->allApps as &$app) {
-					if($app['id'] === $identifier) {
-						$app['bundleIds'][] = $bundle->getIdentifier();
-						continue;
-					}
-				}
-			}
-		}
-	}
-
-	private function getAllApps() {
-		return $this->allApps;
-	}
-	/**
-	 * Get all available apps in a category
-	 *
-	 * @param string $category
-	 * @return JSONResponse
-	 * @throws \Exception
-	 */
-	public function listApps(): JSONResponse {
-
-		$this->fetchApps();
-		$apps = $this->getAllApps();
-
-		$dependencyAnalyzer = new DependencyAnalyzer(new Platform($this->config), $this->l10n);
-
-		// Extend existing app details
-		$apps = array_map(function ($appData) use ($dependencyAnalyzer) {
-			if (isset($appData['appstoreData'])) {
-				$appstoreData = $appData['appstoreData'];
-				$appData['screenshot'] = isset($appstoreData['screenshots'][0]['url']) ? 'https://usercontent.apps.nextcloud.com/' . base64_encode($appstoreData['screenshots'][0]['url']) : '';
-				$appData['category'] = $appstoreData['categories'];
-			}
-
-			$newVersion = $this->installer->isUpdateAvailable($appData['id']);
-			if($newVersion) {
-				$appData['update'] = $newVersion;
-			}
-
-			// fix groups to be an array
-			$groups = [];
-			if (is_string($appData['groups'])) {
-				$groups = json_decode($appData['groups']);
-			}
-			$appData['groups'] = $groups;
-			$appData['canUnInstall'] = !$appData['active'] && $appData['removable'];
-
-			// fix licence vs license
-			if (isset($appData['license']) && !isset($appData['licence'])) {
-				$appData['licence'] = $appData['license'];
-			}
-
-			$ignoreMaxApps = $this->config->getSystemValue('app_install_overwrite', []);
-			if (!is_array($ignoreMaxApps)) {
-				$this->logger->warning('The value given for app_install_overwrite is not an array. Ignoring...');
-				$ignoreMaxApps = [];
-			}
-			$ignoreMax = in_array($appData['id'], $ignoreMaxApps);
-
-			// analyse dependencies
-			$missing = $dependencyAnalyzer->analyze($appData, $ignoreMax);
-			$appData['canInstall'] = empty($missing);
-			$appData['missingDependencies'] = $missing;
-
-			$appData['missingMinOwnCloudVersion'] = !isset($appData['dependencies']['nextcloud']['@attributes']['min-version']);
-			$appData['missingMaxOwnCloudVersion'] = !isset($appData['dependencies']['nextcloud']['@attributes']['max-version']);
-			$appData['isCompatible'] = $dependencyAnalyzer->isMarkedCompatible($appData);
-
-			return $appData;
-		}, $apps);
-
-		usort($apps, [$this, 'sortApps']);
-
-		return new JSONResponse(['apps' => $apps, 'status' => 'success']);
-	}
-
-	/**
-	 * Get all apps for a category from the app store
-	 *
-	 * @param string $requestedCategory
-	 * @return array
-	 * @throws \Exception
-	 */
-	private function getAppsForCategory($requestedCategory = ''): array {
-		$versionParser = new VersionParser();
-		$formattedApps = [];
-		$apps = $this->appFetcher->get();
-		foreach($apps as $app) {
-			// Skip all apps not in the requested category
-			if ($requestedCategory !== '') {
-				$isInCategory = false;
-				foreach($app['categories'] as $category) {
-					if($category === $requestedCategory) {
-						$isInCategory = true;
-					}
-				}
-				if(!$isInCategory) {
-					continue;
-				}
-			}
-
-			if (!isset($app['releases'][0]['rawPlatformVersionSpec'])) {
-				continue;
-			}
-			$nextCloudVersion = $versionParser->getVersion($app['releases'][0]['rawPlatformVersionSpec']);
-			$nextCloudVersionDependencies = [];
-			if($nextCloudVersion->getMinimumVersion() !== '') {
-				$nextCloudVersionDependencies['nextcloud']['@attributes']['min-version'] = $nextCloudVersion->getMinimumVersion();
-			}
-			if($nextCloudVersion->getMaximumVersion() !== '') {
-				$nextCloudVersionDependencies['nextcloud']['@attributes']['max-version'] = $nextCloudVersion->getMaximumVersion();
-			}
-			$phpVersion = $versionParser->getVersion($app['releases'][0]['rawPhpVersionSpec']);
-			$existsLocally = \OC_App::getAppPath($app['id']) !== false;
-			$phpDependencies = [];
-			if($phpVersion->getMinimumVersion() !== '') {
-				$phpDependencies['php']['@attributes']['min-version'] = $phpVersion->getMinimumVersion();
-			}
-			if($phpVersion->getMaximumVersion() !== '') {
-				$phpDependencies['php']['@attributes']['max-version'] = $phpVersion->getMaximumVersion();
-			}
-			if(isset($app['releases'][0]['minIntSize'])) {
-				$phpDependencies['php']['@attributes']['min-int-size'] = $app['releases'][0]['minIntSize'];
-			}
-			$authors = '';
-			foreach($app['authors'] as $key => $author) {
-				$authors .= $author['name'];
-				if($key !== count($app['authors']) - 1) {
-					$authors .= ', ';
-				}
-			}
-
-			$currentLanguage = substr(\OC::$server->getL10NFactory()->findLanguage(), 0, 2);
-			$enabledValue = $this->config->getAppValue($app['id'], 'enabled', 'no');
-			$groups = null;
-			if($enabledValue !== 'no' && $enabledValue !== 'yes') {
-				$groups = $enabledValue;
-			}
-
-			$currentVersion = '';
-			if($this->appManager->isInstalled($app['id'])) {
-				$currentVersion = $this->appManager->getAppVersion($app['id']);
-			} else {
-				$currentLanguage = $app['releases'][0]['version'];
-			}
-
-			$formattedApps[] = [
-				'id' => $app['id'],
-				'name' => isset($app['translations'][$currentLanguage]['name']) ? $app['translations'][$currentLanguage]['name'] : $app['translations']['en']['name'],
-				'description' => isset($app['translations'][$currentLanguage]['description']) ? $app['translations'][$currentLanguage]['description'] : $app['translations']['en']['description'],
-				'summary' => isset($app['translations'][$currentLanguage]['summary']) ? $app['translations'][$currentLanguage]['summary'] : $app['translations']['en']['summary'],
-				'license' => $app['releases'][0]['licenses'],
-				'author' => $authors,
-				'shipped' => false,
-				'version' => $currentVersion,
-				'default_enable' => '',
-				'types' => [],
-				'documentation' => [
-					'admin' => $app['adminDocs'],
-					'user' => $app['userDocs'],
-					'developer' => $app['developerDocs']
-				],
-				'website' => $app['website'],
-				'bugs' => $app['issueTracker'],
-				'detailpage' => $app['website'],
-				'dependencies' => array_merge(
-					$nextCloudVersionDependencies,
-					$phpDependencies
-				),
-				'level' => ($app['isFeatured'] === true) ? 200 : 100,
-				'missingMaxOwnCloudVersion' => false,
-				'missingMinOwnCloudVersion' => false,
-				'canInstall' => true,
-				'screenshot' => isset($app['screenshots'][0]['url']) ? 'https://usercontent.apps.nextcloud.com/'.base64_encode($app['screenshots'][0]['url']) : '',
-				'score' => $app['ratingOverall'],
-				'ratingNumOverall' => $app['ratingNumOverall'],
-				'ratingNumThresholdReached' => $app['ratingNumOverall'] > 5,
-				'removable' => $existsLocally,
-				'active' => $this->appManager->isEnabledForUser($app['id']),
-				'needsDownload' => !$existsLocally,
-				'groups' => $groups,
-				'fromAppStore' => true,
-				'appstoreData' => $app,
-			];
-		}
-
-		return $formattedApps;
-	}
-
-	/**
-	 * @PasswordConfirmationRequired
-	 *
-	 * @param string $appId
-	 * @param array $groups
-	 * @return JSONResponse
-	 */
-	public function enableApp(string $appId, array $groups = []): JSONResponse {
-		return $this->enableApps([$appId], $groups);
-	}
-
-	/**
-	 * Enable one or more apps
-	 *
-	 * apps will be enabled for specific groups only if $groups is defined
-	 *
-	 * @PasswordConfirmationRequired
-	 * @param array $appIds
-	 * @param array $groups
-	 * @return JSONResponse
-	 */
-	public function enableApps(array $appIds, array $groups = []): JSONResponse {
-		try {
-			$updateRequired = false;
-
-			foreach ($appIds as $appId) {
-				$appId = OC_App::cleanAppId($appId);
-
-				// Check if app is already downloaded
-				/** @var Installer $installer */
-				$installer = \OC::$server->query(Installer::class);
-				$isDownloaded = $installer->isDownloaded($appId);
-
-				if(!$isDownloaded) {
-					$installer->downloadApp($appId);
-				}
-
-				$installer->installApp($appId);
-
-				if (count($groups) > 0) {
-					$this->appManager->enableAppForGroups($appId, $this->getGroupList($groups));
-				} else {
-					$this->appManager->enableApp($appId);
-				}
-				if (\OC_App::shouldUpgrade($appId)) {
-					$updateRequired = true;
-				}
-			}
-			return new JSONResponse(['data' => ['update_required' => $updateRequired]]);
-
-		} catch (\Exception $e) {
-			$this->logger->logException($e);
-			return new JSONResponse(['data' => ['message' => $e->getMessage()]], Http::STATUS_INTERNAL_SERVER_ERROR);
-		}
-	}
-
-	private function getGroupList(array $groups) {
-		$groupManager = \OC::$server->getGroupManager();
-		$groupsList = [];
-		foreach ($groups as $group) {
-			$groupItem = $groupManager->get($group);
-			if ($groupItem instanceof \OCP\IGroup) {
-				$groupsList[] = $groupManager->get($group);
-			}
-		}
-		return $groupsList;
-	}
-
-	/**
-	 * @PasswordConfirmationRequired
-	 *
-	 * @param string $appId
-	 * @return JSONResponse
-	 */
-	public function disableApp(string $appId): JSONResponse {
-		return $this->disableApps([$appId]);
-	}
-
-	/**
-	 * @PasswordConfirmationRequired
-	 *
-	 * @param array $appIds
-	 * @return JSONResponse
-	 */
-	public function disableApps(array $appIds): JSONResponse {
-		try {
-			foreach ($appIds as $appId) {
-				$appId = OC_App::cleanAppId($appId);
-				$this->appManager->disableApp($appId);
-			}
-			return new JSONResponse([]);
-		} catch (\Exception $e) {
-			$this->logger->logException($e);
-			return new JSONResponse(['data' => ['message' => $e->getMessage()]], Http::STATUS_INTERNAL_SERVER_ERROR);
-		}
-	}
-
-	/**
-	 * @PasswordConfirmationRequired
-	 *
-	 * @param string $appId
-	 * @return JSONResponse
-	 */
-	public function uninstallApp(string $appId): JSONResponse {
-		$appId = OC_App::cleanAppId($appId);
-		$result = $this->installer->removeApp($appId);
-		if($result !== false) {
-			$this->appManager->clearAppsCache();
-			return new JSONResponse(['data' => ['appid' => $appId]]);
-		}
-		return new JSONResponse(['data' => ['message' => $this->l10n->t('Couldn\'t remove app.')]], Http::STATUS_INTERNAL_SERVER_ERROR);
-	}
-
-	/**
-	 * @param string $appId
-	 * @return JSONResponse
-	 */
-	public function updateApp(string $appId): JSONResponse {
-		$appId = OC_App::cleanAppId($appId);
-
-		$this->config->setSystemValue('maintenance', true);
-		try {
-			$result = $this->installer->updateAppstoreApp($appId);
-			$this->config->setSystemValue('maintenance', false);
-		} catch (\Exception $ex) {
-			$this->config->setSystemValue('maintenance', false);
-			return new JSONResponse(['data' => ['message' => $ex->getMessage()]], Http::STATUS_INTERNAL_SERVER_ERROR);
-		}
-
-		if ($result !== false) {
-			return new JSONResponse(['data' => ['appid' => $appId]]);
-		}
-		return new JSONResponse(['data' => ['message' => $this->l10n->t('Couldn\'t update app.')]], Http::STATUS_INTERNAL_SERVER_ERROR);
-	}
-
-	private function sortApps($a, $b) {
-		$a = (string)$a['name'];
-		$b = (string)$b['name'];
-		if ($a === $b) {
-			return 0;
-		}
-		return ($a < $b) ? -1 : 1;
-	}
-
-	public function force(string $appId): JSONResponse {
-		$appId = OC_App::cleanAppId($appId);
-		$this->appManager->ignoreNextcloudRequirementForApp($appId);
-		return new JSONResponse();
-	}
+    /** @var \OCP\IL10N */
+    private $l10n;
+    /** @var IConfig */
+    private $config;
+    /** @var INavigationManager */
+    private $navigationManager;
+    /** @var IAppManager */
+    private $appManager;
+    /** @var CategoryFetcher */
+    private $categoryFetcher;
+    /** @var AppFetcher */
+    private $appFetcher;
+    /** @var IFactory */
+    private $l10nFactory;
+    /** @var BundleFetcher */
+    private $bundleFetcher;
+    /** @var Installer */
+    private $installer;
+    /** @var IURLGenerator */
+    private $urlGenerator;
+    /** @var ILogger */
+    private $logger;
+
+    /** @var array */
+    private $allApps = [];
+
+    /**
+     * @param string $appName
+     * @param IRequest $request
+     * @param IL10N $l10n
+     * @param IConfig $config
+     * @param INavigationManager $navigationManager
+     * @param IAppManager $appManager
+     * @param CategoryFetcher $categoryFetcher
+     * @param AppFetcher $appFetcher
+     * @param IFactory $l10nFactory
+     * @param BundleFetcher $bundleFetcher
+     * @param Installer $installer
+     * @param IURLGenerator $urlGenerator
+     * @param ILogger $logger
+     */
+    public function __construct(string $appName,
+                                IRequest $request,
+                                IL10N $l10n,
+                                IConfig $config,
+                                INavigationManager $navigationManager,
+                                IAppManager $appManager,
+                                CategoryFetcher $categoryFetcher,
+                                AppFetcher $appFetcher,
+                                IFactory $l10nFactory,
+                                BundleFetcher $bundleFetcher,
+                                Installer $installer,
+                                IURLGenerator $urlGenerator,
+                                ILogger $logger) {
+        parent::__construct($appName, $request);
+        $this->l10n = $l10n;
+        $this->config = $config;
+        $this->navigationManager = $navigationManager;
+        $this->appManager = $appManager;
+        $this->categoryFetcher = $categoryFetcher;
+        $this->appFetcher = $appFetcher;
+        $this->l10nFactory = $l10nFactory;
+        $this->bundleFetcher = $bundleFetcher;
+        $this->installer = $installer;
+        $this->urlGenerator = $urlGenerator;
+        $this->logger = $logger;
+    }
+
+    /**
+     * @NoCSRFRequired
+     *
+     * @return TemplateResponse
+     */
+    public function viewApps(): TemplateResponse {
+        \OC_Util::addScript('settings', 'apps');
+        $params = [];
+        $params['appstoreEnabled'] = $this->config->getSystemValue('appstoreenabled', true) === true;
+        $params['updateCount'] = count($this->getAppsWithUpdates());
+        $params['developerDocumentation'] = $this->urlGenerator->linkToDocs('developer-manual');
+        $params['bundles'] = $this->getBundles();
+        $this->navigationManager->setActiveEntry('core_apps');
+
+        $templateResponse = new TemplateResponse('settings', 'settings-vue', ['serverData' => $params]);
+        $policy = new ContentSecurityPolicy();
+        $policy->addAllowedImageDomain('https://usercontent.apps.nextcloud.com');
+        $templateResponse->setContentSecurityPolicy($policy);
+
+        return $templateResponse;
+    }
+
+    private function getAppsWithUpdates() {
+        $appClass = new \OC_App();
+        $apps = $appClass->listAllApps();
+        foreach($apps as $key => $app) {
+            $newVersion = $this->installer->isUpdateAvailable($app['id']);
+            if($newVersion === false) {
+                unset($apps[$key]);
+            }
+        }
+        return $apps;
+    }
+
+    private function getBundles() {
+        $result = [];
+        $bundles = $this->bundleFetcher->getBundles();
+        foreach ($bundles as $bundle) {
+            $result[] = [
+                'name' => $bundle->getName(),
+                'id' => $bundle->getIdentifier(),
+                'appIdentifiers' => $bundle->getAppIdentifiers()
+            ];
+        }
+        return $result;
+
+    }
+
+    /**
+     * Get all available categories
+     *
+     * @return JSONResponse
+     */
+    public function listCategories(): JSONResponse {
+        return new JSONResponse($this->getAllCategories());
+    }
+
+    private function getAllCategories() {
+        $currentLanguage = substr($this->l10nFactory->findLanguage(), 0, 2);
+
+        $formattedCategories = [];
+        $categories = $this->categoryFetcher->get();
+        foreach($categories as $category) {
+            $formattedCategories[] = [
+                'id' => $category['id'],
+                'ident' => $category['id'],
+                'displayName' => isset($category['translations'][$currentLanguage]['name']) ? $category['translations'][$currentLanguage]['name'] : $category['translations']['en']['name'],
+            ];
+        }
+
+        return $formattedCategories;
+    }
+
+    private function fetchApps() {
+        $appClass = new \OC_App();
+        $apps = $appClass->listAllApps();
+        foreach ($apps as $app) {
+            $app['installed'] = true;
+            $this->allApps[$app['id']] = $app;
+        }
+
+        $apps = $this->getAppsForCategory('');
+        foreach ($apps as $app) {
+            $app['appstore'] = true;
+            if (!array_key_exists($app['id'], $this->allApps)) {
+                $this->allApps[$app['id']] = $app;
+            } else {
+                $this->allApps[$app['id']] = array_merge($app, $this->allApps[$app['id']]);
+            }
+        }
+
+        // add bundle information
+        $bundles = $this->bundleFetcher->getBundles();
+        foreach($bundles as $bundle) {
+            foreach($bundle->getAppIdentifiers() as $identifier) {
+                foreach($this->allApps as &$app) {
+                    if($app['id'] === $identifier) {
+                        $app['bundleIds'][] = $bundle->getIdentifier();
+                        continue;
+                    }
+                }
+            }
+        }
+    }
+
+    private function getAllApps() {
+        return $this->allApps;
+    }
+    /**
+     * Get all available apps in a category
+     *
+     * @param string $category
+     * @return JSONResponse
+     * @throws \Exception
+     */
+    public function listApps(): JSONResponse {
+
+        $this->fetchApps();
+        $apps = $this->getAllApps();
+
+        $dependencyAnalyzer = new DependencyAnalyzer(new Platform($this->config), $this->l10n);
+
+        // Extend existing app details
+        $apps = array_map(function ($appData) use ($dependencyAnalyzer) {
+            if (isset($appData['appstoreData'])) {
+                $appstoreData = $appData['appstoreData'];
+                $appData['screenshot'] = isset($appstoreData['screenshots'][0]['url']) ? 'https://usercontent.apps.nextcloud.com/' . base64_encode($appstoreData['screenshots'][0]['url']) : '';
+                $appData['category'] = $appstoreData['categories'];
+            }
+
+            $newVersion = $this->installer->isUpdateAvailable($appData['id']);
+            if($newVersion) {
+                $appData['update'] = $newVersion;
+            }
+
+            // fix groups to be an array
+            $groups = [];
+            if (is_string($appData['groups'])) {
+                $groups = json_decode($appData['groups']);
+            }
+            $appData['groups'] = $groups;
+            $appData['canUnInstall'] = !$appData['active'] && $appData['removable'];
+
+            // fix licence vs license
+            if (isset($appData['license']) && !isset($appData['licence'])) {
+                $appData['licence'] = $appData['license'];
+            }
+
+            $ignoreMaxApps = $this->config->getSystemValue('app_install_overwrite', []);
+            if (!is_array($ignoreMaxApps)) {
+                $this->logger->warning('The value given for app_install_overwrite is not an array. Ignoring...');
+                $ignoreMaxApps = [];
+            }
+            $ignoreMax = in_array($appData['id'], $ignoreMaxApps);
+
+            // analyse dependencies
+            $missing = $dependencyAnalyzer->analyze($appData, $ignoreMax);
+            $appData['canInstall'] = empty($missing);
+            $appData['missingDependencies'] = $missing;
+
+            $appData['missingMinOwnCloudVersion'] = !isset($appData['dependencies']['nextcloud']['@attributes']['min-version']);
+            $appData['missingMaxOwnCloudVersion'] = !isset($appData['dependencies']['nextcloud']['@attributes']['max-version']);
+            $appData['isCompatible'] = $dependencyAnalyzer->isMarkedCompatible($appData);
+
+            return $appData;
+        }, $apps);
+
+        usort($apps, [$this, 'sortApps']);
+
+        return new JSONResponse(['apps' => $apps, 'status' => 'success']);
+    }
+
+    /**
+     * Get all apps for a category from the app store
+     *
+     * @param string $requestedCategory
+     * @return array
+     * @throws \Exception
+     */
+    private function getAppsForCategory($requestedCategory = ''): array {
+        $versionParser = new VersionParser();
+        $formattedApps = [];
+        $apps = $this->appFetcher->get();
+        foreach($apps as $app) {
+            // Skip all apps not in the requested category
+            if ($requestedCategory !== '') {
+                $isInCategory = false;
+                foreach($app['categories'] as $category) {
+                    if($category === $requestedCategory) {
+                        $isInCategory = true;
+                    }
+                }
+                if(!$isInCategory) {
+                    continue;
+                }
+            }
+
+            if (!isset($app['releases'][0]['rawPlatformVersionSpec'])) {
+                continue;
+            }
+            $nextCloudVersion = $versionParser->getVersion($app['releases'][0]['rawPlatformVersionSpec']);
+            $nextCloudVersionDependencies = [];
+            if($nextCloudVersion->getMinimumVersion() !== '') {
+                $nextCloudVersionDependencies['nextcloud']['@attributes']['min-version'] = $nextCloudVersion->getMinimumVersion();
+            }
+            if($nextCloudVersion->getMaximumVersion() !== '') {
+                $nextCloudVersionDependencies['nextcloud']['@attributes']['max-version'] = $nextCloudVersion->getMaximumVersion();
+            }
+            $phpVersion = $versionParser->getVersion($app['releases'][0]['rawPhpVersionSpec']);
+            $existsLocally = \OC_App::getAppPath($app['id']) !== false;
+            $phpDependencies = [];
+            if($phpVersion->getMinimumVersion() !== '') {
+                $phpDependencies['php']['@attributes']['min-version'] = $phpVersion->getMinimumVersion();
+            }
+            if($phpVersion->getMaximumVersion() !== '') {
+                $phpDependencies['php']['@attributes']['max-version'] = $phpVersion->getMaximumVersion();
+            }
+            if(isset($app['releases'][0]['minIntSize'])) {
+                $phpDependencies['php']['@attributes']['min-int-size'] = $app['releases'][0]['minIntSize'];
+            }
+            $authors = '';
+            foreach($app['authors'] as $key => $author) {
+                $authors .= $author['name'];
+                if($key !== count($app['authors']) - 1) {
+                    $authors .= ', ';
+                }
+            }
+
+            $currentLanguage = substr(\OC::$server->getL10NFactory()->findLanguage(), 0, 2);
+            $enabledValue = $this->config->getAppValue($app['id'], 'enabled', 'no');
+            $groups = null;
+            if($enabledValue !== 'no' && $enabledValue !== 'yes') {
+                $groups = $enabledValue;
+            }
+
+            $currentVersion = '';
+            if($this->appManager->isInstalled($app['id'])) {
+                $currentVersion = $this->appManager->getAppVersion($app['id']);
+            } else {
+                $currentLanguage = $app['releases'][0]['version'];
+            }
+
+            $formattedApps[] = [
+                'id' => $app['id'],
+                'name' => isset($app['translations'][$currentLanguage]['name']) ? $app['translations'][$currentLanguage]['name'] : $app['translations']['en']['name'],
+                'description' => isset($app['translations'][$currentLanguage]['description']) ? $app['translations'][$currentLanguage]['description'] : $app['translations']['en']['description'],
+                'summary' => isset($app['translations'][$currentLanguage]['summary']) ? $app['translations'][$currentLanguage]['summary'] : $app['translations']['en']['summary'],
+                'license' => $app['releases'][0]['licenses'],
+                'author' => $authors,
+                'shipped' => false,
+                'version' => $currentVersion,
+                'default_enable' => '',
+                'types' => [],
+                'documentation' => [
+                    'admin' => $app['adminDocs'],
+                    'user' => $app['userDocs'],
+                    'developer' => $app['developerDocs']
+                ],
+                'website' => $app['website'],
+                'bugs' => $app['issueTracker'],
+                'detailpage' => $app['website'],
+                'dependencies' => array_merge(
+                    $nextCloudVersionDependencies,
+                    $phpDependencies
+                ),
+                'level' => ($app['isFeatured'] === true) ? 200 : 100,
+                'missingMaxOwnCloudVersion' => false,
+                'missingMinOwnCloudVersion' => false,
+                'canInstall' => true,
+                'screenshot' => isset($app['screenshots'][0]['url']) ? 'https://usercontent.apps.nextcloud.com/'.base64_encode($app['screenshots'][0]['url']) : '',
+                'score' => $app['ratingOverall'],
+                'ratingNumOverall' => $app['ratingNumOverall'],
+                'ratingNumThresholdReached' => $app['ratingNumOverall'] > 5,
+                'removable' => $existsLocally,
+                'active' => $this->appManager->isEnabledForUser($app['id']),
+                'needsDownload' => !$existsLocally,
+                'groups' => $groups,
+                'fromAppStore' => true,
+                'appstoreData' => $app,
+            ];
+        }
+
+        return $formattedApps;
+    }
+
+    /**
+     * @PasswordConfirmationRequired
+     *
+     * @param string $appId
+     * @param array $groups
+     * @return JSONResponse
+     */
+    public function enableApp(string $appId, array $groups = []): JSONResponse {
+        return $this->enableApps([$appId], $groups);
+    }
+
+    /**
+     * Enable one or more apps
+     *
+     * apps will be enabled for specific groups only if $groups is defined
+     *
+     * @PasswordConfirmationRequired
+     * @param array $appIds
+     * @param array $groups
+     * @return JSONResponse
+     */
+    public function enableApps(array $appIds, array $groups = []): JSONResponse {
+        try {
+            $updateRequired = false;
+
+            foreach ($appIds as $appId) {
+                $appId = OC_App::cleanAppId($appId);
+
+                // Check if app is already downloaded
+                /** @var Installer $installer */
+                $installer = \OC::$server->query(Installer::class);
+                $isDownloaded = $installer->isDownloaded($appId);
+
+                if(!$isDownloaded) {
+                    $installer->downloadApp($appId);
+                }
+
+                $installer->installApp($appId);
+
+                if (count($groups) > 0) {
+                    $this->appManager->enableAppForGroups($appId, $this->getGroupList($groups));
+                } else {
+                    $this->appManager->enableApp($appId);
+                }
+                if (\OC_App::shouldUpgrade($appId)) {
+                    $updateRequired = true;
+                }
+            }
+            return new JSONResponse(['data' => ['update_required' => $updateRequired]]);
+
+        } catch (\Exception $e) {
+            $this->logger->logException($e);
+            return new JSONResponse(['data' => ['message' => $e->getMessage()]], Http::STATUS_INTERNAL_SERVER_ERROR);
+        }
+    }
+
+    private function getGroupList(array $groups) {
+        $groupManager = \OC::$server->getGroupManager();
+        $groupsList = [];
+        foreach ($groups as $group) {
+            $groupItem = $groupManager->get($group);
+            if ($groupItem instanceof \OCP\IGroup) {
+                $groupsList[] = $groupManager->get($group);
+            }
+        }
+        return $groupsList;
+    }
+
+    /**
+     * @PasswordConfirmationRequired
+     *
+     * @param string $appId
+     * @return JSONResponse
+     */
+    public function disableApp(string $appId): JSONResponse {
+        return $this->disableApps([$appId]);
+    }
+
+    /**
+     * @PasswordConfirmationRequired
+     *
+     * @param array $appIds
+     * @return JSONResponse
+     */
+    public function disableApps(array $appIds): JSONResponse {
+        try {
+            foreach ($appIds as $appId) {
+                $appId = OC_App::cleanAppId($appId);
+                $this->appManager->disableApp($appId);
+            }
+            return new JSONResponse([]);
+        } catch (\Exception $e) {
+            $this->logger->logException($e);
+            return new JSONResponse(['data' => ['message' => $e->getMessage()]], Http::STATUS_INTERNAL_SERVER_ERROR);
+        }
+    }
+
+    /**
+     * @PasswordConfirmationRequired
+     *
+     * @param string $appId
+     * @return JSONResponse
+     */
+    public function uninstallApp(string $appId): JSONResponse {
+        $appId = OC_App::cleanAppId($appId);
+        $result = $this->installer->removeApp($appId);
+        if($result !== false) {
+            $this->appManager->clearAppsCache();
+            return new JSONResponse(['data' => ['appid' => $appId]]);
+        }
+        return new JSONResponse(['data' => ['message' => $this->l10n->t('Couldn\'t remove app.')]], Http::STATUS_INTERNAL_SERVER_ERROR);
+    }
+
+    /**
+     * @param string $appId
+     * @return JSONResponse
+     */
+    public function updateApp(string $appId): JSONResponse {
+        $appId = OC_App::cleanAppId($appId);
+
+        $this->config->setSystemValue('maintenance', true);
+        try {
+            $result = $this->installer->updateAppstoreApp($appId);
+            $this->config->setSystemValue('maintenance', false);
+        } catch (\Exception $ex) {
+            $this->config->setSystemValue('maintenance', false);
+            return new JSONResponse(['data' => ['message' => $ex->getMessage()]], Http::STATUS_INTERNAL_SERVER_ERROR);
+        }
+
+        if ($result !== false) {
+            return new JSONResponse(['data' => ['appid' => $appId]]);
+        }
+        return new JSONResponse(['data' => ['message' => $this->l10n->t('Couldn\'t update app.')]], Http::STATUS_INTERNAL_SERVER_ERROR);
+    }
+
+    private function sortApps($a, $b) {
+        $a = (string)$a['name'];
+        $b = (string)$b['name'];
+        if ($a === $b) {
+            return 0;
+        }
+        return ($a < $b) ? -1 : 1;
+    }
+
+    public function force(string $appId): JSONResponse {
+        $appId = OC_App::cleanAppId($appId);
+        $this->appManager->ignoreNextcloudRequirementForApp($appId);
+        return new JSONResponse();
+    }
 
 }

Spacing +27 added lines, -27 removed lines

@@ -149,9 +149,9 @@ 
 	private function getAppsWithUpdates() {
 		$appClass = new \OC_App();
 		$apps = $appClass->listAllApps();
-		foreach($apps as $key => $app) {
+		foreach ($apps as $key => $app) {
 			$newVersion = $this->installer->isUpdateAvailable($app['id']);
-			if($newVersion === false) {
+			if ($newVersion === false) {
 				unset($apps[$key]);
 			}
 		}
@@ -186,7 +186,7 @@ 
 
 		$formattedCategories = [];
 		$categories = $this->categoryFetcher->get();
-		foreach($categories as $category) {
+		foreach ($categories as $category) {
 			$formattedCategories[] = [
 				'id' => $category['id'],
 				'ident' => $category['id'],
@@ -217,10 +217,10 @@ 
 
 		// add bundle information
 		$bundles = $this->bundleFetcher->getBundles();
-		foreach($bundles as $bundle) {
-			foreach($bundle->getAppIdentifiers() as $identifier) {
-				foreach($this->allApps as &$app) {
-					if($app['id'] === $identifier) {
+		foreach ($bundles as $bundle) {
+			foreach ($bundle->getAppIdentifiers() as $identifier) {
+				foreach ($this->allApps as &$app) {
+					if ($app['id'] === $identifier) {
 						$app['bundleIds'][] = $bundle->getIdentifier();
 						continue;
 					}
@@ -247,15 +247,15 @@ 
 		$dependencyAnalyzer = new DependencyAnalyzer(new Platform($this->config), $this->l10n);
 
 		// Extend existing app details
-		$apps = array_map(function ($appData) use ($dependencyAnalyzer) {
+		$apps = array_map(function($appData) use ($dependencyAnalyzer) {
 			if (isset($appData['appstoreData'])) {
 				$appstoreData = $appData['appstoreData'];
-				$appData['screenshot'] = isset($appstoreData['screenshots'][0]['url']) ? 'https://usercontent.apps.nextcloud.com/' . base64_encode($appstoreData['screenshots'][0]['url']) : '';
+				$appData['screenshot'] = isset($appstoreData['screenshots'][0]['url']) ? 'https://usercontent.apps.nextcloud.com/'.base64_encode($appstoreData['screenshots'][0]['url']) : '';
 				$appData['category'] = $appstoreData['categories'];
 			}
 
 			$newVersion = $this->installer->isUpdateAvailable($appData['id']);
-			if($newVersion) {
+			if ($newVersion) {
 				$appData['update'] = $newVersion;
 			}
 
@@ -307,16 +307,16 @@ 
 		$versionParser = new VersionParser();
 		$formattedApps = [];
 		$apps = $this->appFetcher->get();
-		foreach($apps as $app) {
+		foreach ($apps as $app) {
 			// Skip all apps not in the requested category
 			if ($requestedCategory !== '') {
 				$isInCategory = false;
-				foreach($app['categories'] as $category) {
-					if($category === $requestedCategory) {
+				foreach ($app['categories'] as $category) {
+					if ($category === $requestedCategory) {
 						$isInCategory = true;
 					}
 				}
-				if(!$isInCategory) {
+				if (!$isInCategory) {
 					continue;
 				}
 			}
@@ -326,28 +326,28 @@ 
 			}
 			$nextCloudVersion = $versionParser->getVersion($app['releases'][0]['rawPlatformVersionSpec']);
 			$nextCloudVersionDependencies = [];
-			if($nextCloudVersion->getMinimumVersion() !== '') {
+			if ($nextCloudVersion->getMinimumVersion() !== '') {
 				$nextCloudVersionDependencies['nextcloud']['@attributes']['min-version'] = $nextCloudVersion->getMinimumVersion();
 			}
-			if($nextCloudVersion->getMaximumVersion() !== '') {
+			if ($nextCloudVersion->getMaximumVersion() !== '') {
 				$nextCloudVersionDependencies['nextcloud']['@attributes']['max-version'] = $nextCloudVersion->getMaximumVersion();
 			}
 			$phpVersion = $versionParser->getVersion($app['releases'][0]['rawPhpVersionSpec']);
 			$existsLocally = \OC_App::getAppPath($app['id']) !== false;
 			$phpDependencies = [];
-			if($phpVersion->getMinimumVersion() !== '') {
+			if ($phpVersion->getMinimumVersion() !== '') {
 				$phpDependencies['php']['@attributes']['min-version'] = $phpVersion->getMinimumVersion();
 			}
-			if($phpVersion->getMaximumVersion() !== '') {
+			if ($phpVersion->getMaximumVersion() !== '') {
 				$phpDependencies['php']['@attributes']['max-version'] = $phpVersion->getMaximumVersion();
 			}
-			if(isset($app['releases'][0]['minIntSize'])) {
+			if (isset($app['releases'][0]['minIntSize'])) {
 				$phpDependencies['php']['@attributes']['min-int-size'] = $app['releases'][0]['minIntSize'];
 			}
 			$authors = '';
-			foreach($app['authors'] as $key => $author) {
+			foreach ($app['authors'] as $key => $author) {
 				$authors .= $author['name'];
-				if($key !== count($app['authors']) - 1) {
+				if ($key !== count($app['authors']) - 1) {
 					$authors .= ', ';
 				}
 			}
@@ -355,12 +355,12 @@ 
 			$currentLanguage = substr(\OC::$server->getL10NFactory()->findLanguage(), 0, 2);
 			$enabledValue = $this->config->getAppValue($app['id'], 'enabled', 'no');
 			$groups = null;
-			if($enabledValue !== 'no' && $enabledValue !== 'yes') {
+			if ($enabledValue !== 'no' && $enabledValue !== 'yes') {
 				$groups = $enabledValue;
 			}
 
 			$currentVersion = '';
-			if($this->appManager->isInstalled($app['id'])) {
+			if ($this->appManager->isInstalled($app['id'])) {
 				$currentVersion = $this->appManager->getAppVersion($app['id']);
 			} else {
 				$currentLanguage = $app['releases'][0]['version'];
@@ -442,7 +442,7 @@ 
 				$installer = \OC::$server->query(Installer::class);
 				$isDownloaded = $installer->isDownloaded($appId);
 
-				if(!$isDownloaded) {
+				if (!$isDownloaded) {
 					$installer->downloadApp($appId);
 				}
 
@@ -515,7 +515,7 @@ 
 	public function uninstallApp(string $appId): JSONResponse {
 		$appId = OC_App::cleanAppId($appId);
 		$result = $this->installer->removeApp($appId);
-		if($result !== false) {
+		if ($result !== false) {
 			$this->appManager->clearAppsCache();
 			return new JSONResponse(['data' => ['appid' => $appId]]);
 		}
@@ -545,8 +545,8 @@ 
 	}
 
 	private function sortApps($a, $b) {
-		$a = (string)$a['name'];
-		$b = (string)$b['name'];
+		$a = (string) $a['name'];
+		$b = (string) $b['name'];
 		if ($a === $b) {
 			return 0;
 		}

apps/workflowengine/lib/Check/AbstractStringCheck.php

Indentation +82 added lines, -82 removed lines

@@ -27,96 +27,96 @@
 
 abstract class AbstractStringCheck implements ICheck {
 
-	/** @var array[] Nested array: [Pattern => [ActualValue => Regex Result]] */
-	protected $matches;
+    /** @var array[] Nested array: [Pattern => [ActualValue => Regex Result]] */
+    protected $matches;
 
-	/** @var IL10N */
-	protected $l;
+    /** @var IL10N */
+    protected $l;
 
-	/**
-	 * @param IL10N $l
-	 */
-	public function __construct(IL10N $l) {
-		$this->l = $l;
-	}
+    /**
+     * @param IL10N $l
+     */
+    public function __construct(IL10N $l) {
+        $this->l = $l;
+    }
 
-	/**
-	 * @return string
-	 */
-	abstract protected function getActualValue();
+    /**
+     * @return string
+     */
+    abstract protected function getActualValue();
 
-	/**
-	 * @param string $operator
-	 * @param string $value
-	 * @return bool
-	 */
-	public function executeCheck($operator, $value) {
-		$actualValue = $this->getActualValue();
-		return $this->executeStringCheck($operator, $value, $actualValue);
-	}
+    /**
+     * @param string $operator
+     * @param string $value
+     * @return bool
+     */
+    public function executeCheck($operator, $value) {
+        $actualValue = $this->getActualValue();
+        return $this->executeStringCheck($operator, $value, $actualValue);
+    }
 
-	/**
-	 * @param string $operator
-	 * @param string $checkValue
-	 * @param string $actualValue
-	 * @return bool
-	 */
-	protected function executeStringCheck($operator, $checkValue, $actualValue) {
-		if ($operator === 'is') {
-			return $checkValue === $actualValue;
-		} else if ($operator === '!is') {
-			return $checkValue !== $actualValue;
-		} else {
-			$match = $this->match($checkValue, $actualValue);
-			if ($operator === 'matches') {
-				return $match === 1;
-			} else {
-				return $match === 0;
-			}
-		}
-	}
+    /**
+     * @param string $operator
+     * @param string $checkValue
+     * @param string $actualValue
+     * @return bool
+     */
+    protected function executeStringCheck($operator, $checkValue, $actualValue) {
+        if ($operator === 'is') {
+            return $checkValue === $actualValue;
+        } else if ($operator === '!is') {
+            return $checkValue !== $actualValue;
+        } else {
+            $match = $this->match($checkValue, $actualValue);
+            if ($operator === 'matches') {
+                return $match === 1;
+            } else {
+                return $match === 0;
+            }
+        }
+    }
 
-	/**
-	 * @param string $operator
-	 * @param string $value
-	 * @throws \UnexpectedValueException
-	 */
-	public function validateCheck($operator, $value) {
-		if (!in_array($operator, ['is', '!is', 'matches', '!matches'])) {
-			throw new \UnexpectedValueException($this->l->t('The given operator is invalid'), 1);
-		}
+    /**
+     * @param string $operator
+     * @param string $value
+     * @throws \UnexpectedValueException
+     */
+    public function validateCheck($operator, $value) {
+        if (!in_array($operator, ['is', '!is', 'matches', '!matches'])) {
+            throw new \UnexpectedValueException($this->l->t('The given operator is invalid'), 1);
+        }
 
-		if (in_array($operator, ['matches', '!matches']) &&
-			  @preg_match($value, null) === false) {
-			throw new \UnexpectedValueException($this->l->t('The given regular expression is invalid'), 2);
-		}
-	}
+        if (in_array($operator, ['matches', '!matches']) &&
+              @preg_match($value, null) === false) {
+            throw new \UnexpectedValueException($this->l->t('The given regular expression is invalid'), 2);
+        }
+    }
 
-	public function supportedEntities(): array {
-		// universal by default
-		return [];
-	}
+    public function supportedEntities(): array {
+        // universal by default
+        return [];
+    }
 
-	public function isAvailableForScope(int $scope): bool {
-		// admin only by default
-		return $scope === IManager::SCOPE_ADMIN;
-	}
+    public function isAvailableForScope(int $scope): bool {
+        // admin only by default
+        return $scope === IManager::SCOPE_ADMIN;
+    }
 
-	/**
-	 * @param string $pattern
-	 * @param string $subject
-	 * @return int|bool
-	 */
-	protected function match($pattern, $subject) {
-		$patternHash = md5($pattern);
-		$subjectHash = md5($subject);
-		if (isset($this->matches[$patternHash][$subjectHash])) {
-			return $this->matches[$patternHash][$subjectHash];
-		}
-		if (!isset($this->matches[$patternHash])) {
-			$this->matches[$patternHash] = [];
-		}
-		$this->matches[$patternHash][$subjectHash] = preg_match($pattern, $subject);
-		return $this->matches[$patternHash][$subjectHash];
-	}
+    /**
+     * @param string $pattern
+     * @param string $subject
+     * @return int|bool
+     */
+    protected function match($pattern, $subject) {
+        $patternHash = md5($pattern);
+        $subjectHash = md5($subject);
+        if (isset($this->matches[$patternHash][$subjectHash])) {
+            return $this->matches[$patternHash][$subjectHash];
+        }
+        if (!isset($this->matches[$patternHash])) {
+            $this->matches[$patternHash] = [];
+        }
+        $this->matches[$patternHash][$subjectHash] = preg_match($pattern, $subject);
+        return $this->matches[$patternHash][$subjectHash];
+    }
 }

apps/workflowengine/lib/Settings/ASettings.php

Indentation +152 added lines, -152 removed lines

@@ -41,156 +41,156 @@
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 
 abstract class ASettings implements ISettings {
-	/** @var IL10N */
-	private $l10n;
-
-	/** @var string */
-	private $appName;
-
-	/** @var EventDispatcherInterface */
-	private $eventDispatcher;
-
-	/** @var Manager */
-	protected $manager;
-
-	/** @var IInitialStateService */
-	private $initialStateService;
-
-	/** @var IConfig */
-	private $config;
-
-	/**
-	 * @param string $appName
-	 * @param IL10N $l
-	 * @param EventDispatcherInterface $eventDispatcher
-	 * @param Manager $manager
-	 * @param IInitialStateService $initialStateService
-	 * @param IConfig $config
-	 */
-	public function __construct(
-		$appName,
-		IL10N $l,
-		EventDispatcherInterface $eventDispatcher,
-		Manager $manager,
-		IInitialStateService $initialStateService,
-		IConfig $config
-	) {
-		$this->appName = $appName;
-		$this->l10n = $l;
-		$this->eventDispatcher = $eventDispatcher;
-		$this->manager = $manager;
-		$this->initialStateService = $initialStateService;
-		$this->config = $config;
-	}
-
-	abstract function getScope(): int;
-
-	/**
-	 * @return TemplateResponse
-	 */
-	public function getForm() {
-		$this->eventDispatcher->dispatch('OCP\WorkflowEngine::loadAdditionalSettingScripts');
-
-		$entities = $this->manager->getEntitiesList();
-		$this->initialStateService->provideInitialState(
-			Application::APP_ID,
-			'entities',
-			$this->entitiesToArray($entities)
-		);
-
-		$operators = $this->manager->getOperatorList();
-		$this->initialStateService->provideInitialState(
-			Application::APP_ID,
-			'operators',
-			$this->operatorsToArray($operators)
-		);
-
-		$checks = $this->manager->getCheckList();
-		$this->initialStateService->provideInitialState(
-			Application::APP_ID,
-			'checks',
-			$this->checksToArray($checks)
-		);
-
-		$this->initialStateService->provideInitialState(
-			Application::APP_ID,
-			'scope',
-			$this->getScope()
-		);
-
-		$this->initialStateService->provideInitialState(
-			Application::APP_ID,
-			'appstoreenabled',
-			$this->config->getSystemValueBool('appstoreenabled', true)
-		);
-
-		return new TemplateResponse(Application::APP_ID, 'settings', [], 'blank');
-	}
-
-	/**
-	 * @return string the section ID, e.g. 'sharing'
-	 */
-	public function getSection() {
-		return 'workflow';
-	}
-
-	/**
-	 * @return int whether the form should be rather on the top or bottom of
-	 * the admin section. The forms are arranged in ascending order of the
-	 * priority values. It is required to return a value between 0 and 100.
-	 *
-	 * E.g.: 70
-	 */
-	public function getPriority() {
-		return 0;
-	}
-
-	private function entitiesToArray(array $entities) {
-		return array_map(function (IEntity $entity) {
-			$events = array_map(function (IEntityEvent $entityEvent) {
-				return [
-					'eventName' => $entityEvent->getEventName(),
-					'displayName' => $entityEvent->getDisplayName()
-				];
-			}, $entity->getEvents());
-
-			return [
-				'id' => get_class($entity),
-				'icon' => $entity->getIcon(),
-				'name' => $entity->getName(),
-				'events' => $events,
-			];
-		}, $entities);
-	}
-
-	private function operatorsToArray(array $operators) {
-		$operators = array_filter($operators, function (IOperation $operator) {
-			return $operator->isAvailableForScope($this->getScope());
-		});
-
-		return array_map(function (IOperation $operator) {
-			return [
-				'id' => get_class($operator),
-				'icon' => $operator->getIcon(),
-				'name' => $operator->getDisplayName(),
-				'description' => $operator->getDescription(),
-				'fixedEntity' => $operator instanceof ISpecificOperation ? $operator->getEntityId() : '',
-				'isComplex' => $operator instanceof IComplexOperation,
-				'triggerHint' => $operator instanceof IComplexOperation ? $operator->getTriggerHint() : '',
-			];
-		}, $operators);
-	}
-
-	private function checksToArray(array $checks) {
-		$checks = array_filter($checks, function (ICheck $check) {
-			return $check->isAvailableForScope($this->getScope());
-		});
-
-		return array_map(function (ICheck $check) {
-			return [
-				'id' => get_class($check),
-				'supportedEntities' => $check->supportedEntities(),
-			];
-		}, $checks);
-	}
+    /** @var IL10N */
+    private $l10n;
+
+    /** @var string */
+    private $appName;
+
+    /** @var EventDispatcherInterface */
+    private $eventDispatcher;
+
+    /** @var Manager */
+    protected $manager;
+
+    /** @var IInitialStateService */
+    private $initialStateService;
+
+    /** @var IConfig */
+    private $config;
+
+    /**
+     * @param string $appName
+     * @param IL10N $l
+     * @param EventDispatcherInterface $eventDispatcher
+     * @param Manager $manager
+     * @param IInitialStateService $initialStateService
+     * @param IConfig $config
+     */
+    public function __construct(
+        $appName,
+        IL10N $l,
+        EventDispatcherInterface $eventDispatcher,
+        Manager $manager,
+        IInitialStateService $initialStateService,
+        IConfig $config
+    ) {
+        $this->appName = $appName;
+        $this->l10n = $l;
+        $this->eventDispatcher = $eventDispatcher;
+        $this->manager = $manager;
+        $this->initialStateService = $initialStateService;
+        $this->config = $config;
+    }
+
+    abstract function getScope(): int;
+
+    /**
+     * @return TemplateResponse
+     */
+    public function getForm() {
+        $this->eventDispatcher->dispatch('OCP\WorkflowEngine::loadAdditionalSettingScripts');
+
+        $entities = $this->manager->getEntitiesList();
+        $this->initialStateService->provideInitialState(
+            Application::APP_ID,
+            'entities',
+            $this->entitiesToArray($entities)
+        );
+
+        $operators = $this->manager->getOperatorList();
+        $this->initialStateService->provideInitialState(
+            Application::APP_ID,
+            'operators',
+            $this->operatorsToArray($operators)
+        );
+
+        $checks = $this->manager->getCheckList();
+        $this->initialStateService->provideInitialState(
+            Application::APP_ID,
+            'checks',
+            $this->checksToArray($checks)
+        );
+
+        $this->initialStateService->provideInitialState(
+            Application::APP_ID,
+            'scope',
+            $this->getScope()
+        );
+
+        $this->initialStateService->provideInitialState(
+            Application::APP_ID,
+            'appstoreenabled',
+            $this->config->getSystemValueBool('appstoreenabled', true)
+        );
+
+        return new TemplateResponse(Application::APP_ID, 'settings', [], 'blank');
+    }
+
+    /**
+     * @return string the section ID, e.g. 'sharing'
+     */
+    public function getSection() {
+        return 'workflow';
+    }
+
+    /**
+     * @return int whether the form should be rather on the top or bottom of
+     * the admin section. The forms are arranged in ascending order of the
+     * priority values. It is required to return a value between 0 and 100.
+     *
+     * E.g.: 70
+     */
+    public function getPriority() {
+        return 0;
+    }
+
+    private function entitiesToArray(array $entities) {
+        return array_map(function (IEntity $entity) {
+            $events = array_map(function (IEntityEvent $entityEvent) {
+                return [
+                    'eventName' => $entityEvent->getEventName(),
+                    'displayName' => $entityEvent->getDisplayName()
+                ];
+            }, $entity->getEvents());
+
+            return [
+                'id' => get_class($entity),
+                'icon' => $entity->getIcon(),
+                'name' => $entity->getName(),
+                'events' => $events,
+            ];
+        }, $entities);
+    }
+
+    private function operatorsToArray(array $operators) {
+        $operators = array_filter($operators, function (IOperation $operator) {
+            return $operator->isAvailableForScope($this->getScope());
+        });
+
+        return array_map(function (IOperation $operator) {
+            return [
+                'id' => get_class($operator),
+                'icon' => $operator->getIcon(),
+                'name' => $operator->getDisplayName(),
+                'description' => $operator->getDescription(),
+                'fixedEntity' => $operator instanceof ISpecificOperation ? $operator->getEntityId() : '',
+                'isComplex' => $operator instanceof IComplexOperation,
+                'triggerHint' => $operator instanceof IComplexOperation ? $operator->getTriggerHint() : '',
+            ];
+        }, $operators);
+    }
+
+    private function checksToArray(array $checks) {
+        $checks = array_filter($checks, function (ICheck $check) {
+            return $check->isAvailableForScope($this->getScope());
+        });
+
+        return array_map(function (ICheck $check) {
+            return [
+                'id' => get_class($check),
+                'supportedEntities' => $check->supportedEntities(),
+            ];
+        }, $checks);
+    }
 }

Spacing +6 added lines, -6 removed lines

@@ -146,8 +146,8 @@ 
 	}
 
 	private function entitiesToArray(array $entities) {
-		return array_map(function (IEntity $entity) {
-			$events = array_map(function (IEntityEvent $entityEvent) {
+		return array_map(function(IEntity $entity) {
+			$events = array_map(function(IEntityEvent $entityEvent) {
 				return [
 					'eventName' => $entityEvent->getEventName(),
 					'displayName' => $entityEvent->getDisplayName()
@@ -164,11 +164,11 @@ 
 	}
 
 	private function operatorsToArray(array $operators) {
-		$operators = array_filter($operators, function (IOperation $operator) {
+		$operators = array_filter($operators, function(IOperation $operator) {
 			return $operator->isAvailableForScope($this->getScope());
 		});
 
-		return array_map(function (IOperation $operator) {
+		return array_map(function(IOperation $operator) {
 			return [
 				'id' => get_class($operator),
 				'icon' => $operator->getIcon(),
@@ -182,11 +182,11 @@ 
 	}
 
 	private function checksToArray(array $checks) {
-		$checks = array_filter($checks, function (ICheck $check) {
+		$checks = array_filter($checks, function(ICheck $check) {
 			return $check->isAvailableForScope($this->getScope());
 		});
 
-		return array_map(function (ICheck $check) {
+		return array_map(function(ICheck $check) {
 			return [
 				'id' => get_class($check),
 				'supportedEntities' => $check->supportedEntities(),

apps/accessibility/lib/Controller/ConfigController.php

Indentation +116 added lines, -116 removed lines

@@ -40,121 +40,121 @@
 
 class ConfigController extends OCSController {
 
-	/** @var string */
-	protected $appName;
-
-	/** @var string */
-	protected $userId;
-
-	/** @var string */
-	protected $serverRoot;
-
-	/** @var IConfig */
-	private $config;
-
-	/** @var IUserSession */
-	private $userSession;
-
-	/** @var AccessibilityProvider */
-	private $accessibilityProvider;
-
-	/**
-	 * Config constructor.
-	 *
-	 * @param string $appName
-	 * @param IRequest $request
-	 * @param IConfig $config
-	 * @param IUserSession $userSession
-	 * @param AccessibilityProvider $accessibilityProvider
-	 */
-	public function __construct(string $appName,
-								IRequest $request,
-								IConfig $config,
-								IUserSession $userSession,
-								AccessibilityProvider $accessibilityProvider) {
-		parent::__construct($appName, $request);
-		$this->appName               = $appName;
-		$this->config                = $config;
-		$this->userSession           = $userSession;
-		$this->accessibilityProvider = $accessibilityProvider;
-		$this->userId				 = $userSession->getUser()->getUID();
-	}
-
-	/**
-	 * @NoAdminRequired
-	 *
-	 * Get user accessibility config
-	 *
-	 * @param string $key theme or font
-	 * @return DataResponse
-	 */
-	public function getConfig(): DataResponse {
-		return new DataResponse([
-			'highcontrast' => $this->config->getUserValue($this->userId, $this->appName, 'highcontrast', false),
-			'theme' => $this->config->getUserValue($this->userId, $this->appName, 'theme', false),
-			'font' => $this->config->getUserValue($this->userId, $this->appName, 'font', false)
-		]);
-	}
-
-	/**
-	 * @NoAdminRequired
-	 *
-	 * Set theme or font config
-	 *
-	 * @param string $key theme or font
-	 * @return DataResponse
-	 * @throws Exception
-	 */
-	public function setConfig(string $key, $value): DataResponse {
-		if ($key === 'theme' || $key === 'font' || $key === 'highcontrast') {
-
-			if ($value === false || $value === '') {
-				throw new OCSBadRequestException('Invalid value: ' . $value);
-			}
-
-			$themes = $this->accessibilityProvider->getThemes();
-			$highcontrast = [$this->accessibilityProvider->getHighContrast()];
-			$fonts  = $this->accessibilityProvider->getFonts();
-
-			$availableOptions = array_map(function ($option) {
-				return $option['id'];
-			}, array_merge($themes, $highcontrast, $fonts));
-
-			if (in_array($value, $availableOptions)) {
-				$this->config->setUserValue($this->userId, $this->appName, $key, $value);
-				return new DataResponse();
-			}
-
-			throw new OCSBadRequestException('Invalid value: ' . $value);
-		}
-
-		throw new OCSBadRequestException('Invalid key: ' . $key);
-	}
-
-	/**
-	 * @NoAdminRequired
-	 *
-	 * Unset theme or font config
-	 *
-	 * @param string $key theme or font
-	 * @return DataResponse
-	 * @throws Exception
-	 */
-	public function deleteConfig(string $key): DataResponse {
-		if ($key === 'theme' || $key === 'font' || $key === 'highcontrast') {
-
-			$this->config->deleteUserValue($this->userId, $this->appName, $key);
-			$userValues = $this->config->getUserKeys($this->userId, $this->appName);
-
-			// remove hash if no settings selected
-			if (count($userValues) === 1 && $userValues[0] === 'icons-css') {
-				$this->config->deleteUserValue($this->userId, $this->appName, 'icons-css');
-			}
-
-			return new DataResponse();
-		}
-
-		throw new OCSBadRequestException('Invalid key: ' . $key);
-	}
+    /** @var string */
+    protected $appName;
+
+    /** @var string */
+    protected $userId;
+
+    /** @var string */
+    protected $serverRoot;
+
+    /** @var IConfig */
+    private $config;
+
+    /** @var IUserSession */
+    private $userSession;
+
+    /** @var AccessibilityProvider */
+    private $accessibilityProvider;
+
+    /**
+     * Config constructor.
+     *
+     * @param string $appName
+     * @param IRequest $request
+     * @param IConfig $config
+     * @param IUserSession $userSession
+     * @param AccessibilityProvider $accessibilityProvider
+     */
+    public function __construct(string $appName,
+                                IRequest $request,
+                                IConfig $config,
+                                IUserSession $userSession,
+                                AccessibilityProvider $accessibilityProvider) {
+        parent::__construct($appName, $request);
+        $this->appName               = $appName;
+        $this->config                = $config;
+        $this->userSession           = $userSession;
+        $this->accessibilityProvider = $accessibilityProvider;
+        $this->userId				 = $userSession->getUser()->getUID();
+    }
+
+    /**
+     * @NoAdminRequired
+     *
+     * Get user accessibility config
+     *
+     * @param string $key theme or font
+     * @return DataResponse
+     */
+    public function getConfig(): DataResponse {
+        return new DataResponse([
+            'highcontrast' => $this->config->getUserValue($this->userId, $this->appName, 'highcontrast', false),
+            'theme' => $this->config->getUserValue($this->userId, $this->appName, 'theme', false),
+            'font' => $this->config->getUserValue($this->userId, $this->appName, 'font', false)
+        ]);
+    }
+
+    /**
+     * @NoAdminRequired
+     *
+     * Set theme or font config
+     *
+     * @param string $key theme or font
+     * @return DataResponse
+     * @throws Exception
+     */
+    public function setConfig(string $key, $value): DataResponse {
+        if ($key === 'theme' || $key === 'font' || $key === 'highcontrast') {
+
+            if ($value === false || $value === '') {
+                throw new OCSBadRequestException('Invalid value: ' . $value);
+            }
+
+            $themes = $this->accessibilityProvider->getThemes();
+            $highcontrast = [$this->accessibilityProvider->getHighContrast()];
+            $fonts  = $this->accessibilityProvider->getFonts();
+
+            $availableOptions = array_map(function ($option) {
+                return $option['id'];
+            }, array_merge($themes, $highcontrast, $fonts));
+
+            if (in_array($value, $availableOptions)) {
+                $this->config->setUserValue($this->userId, $this->appName, $key, $value);
+                return new DataResponse();
+            }
+
+            throw new OCSBadRequestException('Invalid value: ' . $value);
+        }
+
+        throw new OCSBadRequestException('Invalid key: ' . $key);
+    }
+
+    /**
+     * @NoAdminRequired
+     *
+     * Unset theme or font config
+     *
+     * @param string $key theme or font
+     * @return DataResponse
+     * @throws Exception
+     */
+    public function deleteConfig(string $key): DataResponse {
+        if ($key === 'theme' || $key === 'font' || $key === 'highcontrast') {
+
+            $this->config->deleteUserValue($this->userId, $this->appName, $key);
+            $userValues = $this->config->getUserKeys($this->userId, $this->appName);
+
+            // remove hash if no settings selected
+            if (count($userValues) === 1 && $userValues[0] === 'icons-css') {
+                $this->config->deleteUserValue($this->userId, $this->appName, 'icons-css');
+            }
+
+            return new DataResponse();
+        }
+
+        throw new OCSBadRequestException('Invalid key: ' . $key);
+    }
 
 }

Spacing +6 added lines, -6 removed lines

@@ -77,7 +77,7 @@ 
 		$this->config                = $config;
 		$this->userSession           = $userSession;
 		$this->accessibilityProvider = $accessibilityProvider;
-		$this->userId				 = $userSession->getUser()->getUID();
+		$this->userId = $userSession->getUser()->getUID();
 	}
 
 	/**
@@ -109,14 +109,14 @@ 
 		if ($key === 'theme' || $key === 'font' || $key === 'highcontrast') {
 
 			if ($value === false || $value === '') {
-				throw new OCSBadRequestException('Invalid value: ' . $value);
+				throw new OCSBadRequestException('Invalid value: '.$value);
 			}
 
 			$themes = $this->accessibilityProvider->getThemes();
 			$highcontrast = [$this->accessibilityProvider->getHighContrast()];
 			$fonts  = $this->accessibilityProvider->getFonts();
 
-			$availableOptions = array_map(function ($option) {
+			$availableOptions = array_map(function($option) {
 				return $option['id'];
 			}, array_merge($themes, $highcontrast, $fonts));
 
@@ -125,10 +125,10 @@ 
 				return new DataResponse();
 			}
 
-			throw new OCSBadRequestException('Invalid value: ' . $value);
+			throw new OCSBadRequestException('Invalid value: '.$value);
 		}
 
-		throw new OCSBadRequestException('Invalid key: ' . $key);
+		throw new OCSBadRequestException('Invalid key: '.$key);
 	}
 
 	/**
@@ -154,7 +154,7 @@ 
 			return new DataResponse();
 		}
 
-		throw new OCSBadRequestException('Invalid key: ' . $key);
+		throw new OCSBadRequestException('Invalid key: '.$key);
 	}
 
 }

apps/accessibility/lib/Controller/AccessibilityController.php

Indentation +256 added lines, -256 removed lines

@@ -53,271 +53,271 @@
 
 class AccessibilityController extends Controller {
 
-	/** @var string */
-	protected $appName;
-
-	/** @var string */
-	protected $serverRoot;
-
-	/** @var IConfig */
-	private $config;
-
-	/** @var IUserManager */
-	private $userManager;
-
-	/** @var ILogger */
-	private $logger;
-
-	/** @var IURLGenerator */
-	private $urlGenerator;
-
-	/** @var ITimeFactory */
-	protected $timeFactory;
-
-	/** @var IUserSession */
-	private $userSession;
-
-	/** @var IAppManager */
-	private $appManager;
-
-	/** @var IconsCacher */
-	protected $iconsCacher;
-
-	/** @var \OC_Defaults */
-	private $defaults;
-
-	/** @var null|string */
-	private $injectedVariables;
-
-	/**
-	 * Account constructor.
-	 *
-	 * @param string $appName
-	 * @param IRequest $request
-	 * @param IConfig $config
-	 * @param IUserManager $userManager
-	 * @param ILogger $logger
-	 * @param IURLGenerator $urlGenerator
-	 * @param ITimeFactory $timeFactory
-	 * @param IUserSession $userSession
-	 * @param IAppManager $appManager
-	 * @param \OC_Defaults $defaults
-	 */
-	public function __construct(string $appName,
-								IRequest $request,
-								IConfig $config,
-								IUserManager $userManager,
-								ILogger $logger,
-								IURLGenerator $urlGenerator,
-								ITimeFactory $timeFactory,
-								IUserSession $userSession,
-								IAppManager $appManager,
-								IconsCacher $iconsCacher,
-								\OC_Defaults $defaults) {
-		parent::__construct($appName, $request);
-		$this->appName      = $appName;
-		$this->config       = $config;
-		$this->userManager  = $userManager;
-		$this->logger       = $logger;
-		$this->urlGenerator = $urlGenerator;
-		$this->timeFactory  = $timeFactory;
-		$this->userSession  = $userSession;
-		$this->appManager   = $appManager;
-		$this->iconsCacher  = $iconsCacher;
-		$this->defaults     = $defaults;
-
-		$this->serverRoot = \OC::$SERVERROOT;
-		$this->appRoot    = $this->appManager->getAppPath($this->appName);
-	}
-
-	/**
-	 * @NoAdminRequired
-	 * @NoCSRFRequired
-	 * @NoSameSiteCookieRequired
-	 *
-	 * @return DataDisplayResponse
-	 */
-	public function getCss(): DataDisplayResponse {
-		$css        = '';
-		$imports    = '';
-		$userValues = $this->getUserValues();
-
-		foreach ($userValues as $key => $scssFile) {
-			if ($scssFile !== false) {
-				if ($scssFile === 'highcontrast' && in_array('dark', $userValues)) {
-					$scssFile .= 'dark';
-				}
-				$imports .= '@import "' . $scssFile . '";';
-			}
-		}
-
-		if ($imports !== '') {
-			$scss = new Compiler();
-			$scss->setImportPaths([
-				$this->appRoot . '/css/',
-				$this->serverRoot . '/core/css/'
-			]);
-
-			// Continue after throw
-			$scss->setIgnoreErrors(true);
-			$scss->setFormatter(Crunched::class);
-
-			// Import theme, variables and compile css4 variables
-			try {
-				$css .= $scss->compile(
-					$imports .
-					$this->getInjectedVariables() .
-					'@import "variables.scss";' .
-					'@import "css-variables.scss";'
-				);
-			} catch (ParserException $e) {
-				$this->logger->error($e->getMessage(), ['app' => 'core']);
-			}
-		}
-
-		// We don't want to override vars with url since path is different
-		$css = $this->filterOutRule('/--[a-z-:]+url\([^;]+\)/mi', $css);
-
-		// Rebase all urls
-		$appWebRoot = substr($this->appRoot, strlen($this->serverRoot) - strlen(\OC::$WEBROOT));
-		$css        = $this->rebaseUrls($css, $appWebRoot . '/css');
-
-		if (in_array('dark', $userValues) && $this->iconsCacher->getCachedList() && $this->iconsCacher->getCachedList()->getSize() > 0) {
-			$iconsCss = $this->invertSvgIconsColor($this->iconsCacher->getCachedList()->getContent());
-			$css = $css . $iconsCss;
-		}
-
-		$response = new DataDisplayResponse($css, Http::STATUS_OK, ['Content-Type' => 'text/css']);
-
-		// Set cache control
-		$ttl = 31536000;
-		$response->addHeader('Cache-Control', 'max-age=' . $ttl . ', immutable');
-		$expires = new \DateTime();
-		$expires->setTimestamp($this->timeFactory->getTime());
-		$expires->add(new \DateInterval('PT' . $ttl . 'S'));
-		$response->addHeader('Expires', $expires->format(\DateTime::RFC1123));
-		$response->addHeader('Pragma', 'cache');
-
-		// store current cache hash
-		$this->config->setUserValue($this->userSession->getUser()->getUID(), $this->appName, 'icons-css', md5($css));
-
-		return $response;
-	}
-
-	/**
-	 * @NoCSRFRequired
-	 * @PublicPage
-	 * @NoSameSiteCookieRequired
-	 *
-	 * @return DataDownloadResponse
-	 */
-	public function getJavascript(): DataDownloadResponse {
-		$user = $this->userSession->getUser();
-
-		if ($user === null) {
-			$theme = false;
-			$highcontrast = false;
-		} else {
-			$theme = $this->config->getUserValue($user->getUID(), $this->appName, 'theme', false);
-			$highcontrast = $this->config->getUserValue($user->getUID(), $this->appName, 'highcontrast', false) !== false;
-		}
-		if ($theme !== false) {
-			$responseJS = '(function() {
+    /** @var string */
+    protected $appName;
+
+    /** @var string */
+    protected $serverRoot;
+
+    /** @var IConfig */
+    private $config;
+
+    /** @var IUserManager */
+    private $userManager;
+
+    /** @var ILogger */
+    private $logger;
+
+    /** @var IURLGenerator */
+    private $urlGenerator;
+
+    /** @var ITimeFactory */
+    protected $timeFactory;
+
+    /** @var IUserSession */
+    private $userSession;
+
+    /** @var IAppManager */
+    private $appManager;
+
+    /** @var IconsCacher */
+    protected $iconsCacher;
+
+    /** @var \OC_Defaults */
+    private $defaults;
+
+    /** @var null|string */
+    private $injectedVariables;
+
+    /**
+     * Account constructor.
+     *
+     * @param string $appName
+     * @param IRequest $request
+     * @param IConfig $config
+     * @param IUserManager $userManager
+     * @param ILogger $logger
+     * @param IURLGenerator $urlGenerator
+     * @param ITimeFactory $timeFactory
+     * @param IUserSession $userSession
+     * @param IAppManager $appManager
+     * @param \OC_Defaults $defaults
+     */
+    public function __construct(string $appName,
+                                IRequest $request,
+                                IConfig $config,
+                                IUserManager $userManager,
+                                ILogger $logger,
+                                IURLGenerator $urlGenerator,
+                                ITimeFactory $timeFactory,
+                                IUserSession $userSession,
+                                IAppManager $appManager,
+                                IconsCacher $iconsCacher,
+                                \OC_Defaults $defaults) {
+        parent::__construct($appName, $request);
+        $this->appName      = $appName;
+        $this->config       = $config;
+        $this->userManager  = $userManager;
+        $this->logger       = $logger;
+        $this->urlGenerator = $urlGenerator;
+        $this->timeFactory  = $timeFactory;
+        $this->userSession  = $userSession;
+        $this->appManager   = $appManager;
+        $this->iconsCacher  = $iconsCacher;
+        $this->defaults     = $defaults;
+
+        $this->serverRoot = \OC::$SERVERROOT;
+        $this->appRoot    = $this->appManager->getAppPath($this->appName);
+    }
+
+    /**
+     * @NoAdminRequired
+     * @NoCSRFRequired
+     * @NoSameSiteCookieRequired
+     *
+     * @return DataDisplayResponse
+     */
+    public function getCss(): DataDisplayResponse {
+        $css        = '';
+        $imports    = '';
+        $userValues = $this->getUserValues();
+
+        foreach ($userValues as $key => $scssFile) {
+            if ($scssFile !== false) {
+                if ($scssFile === 'highcontrast' && in_array('dark', $userValues)) {
+                    $scssFile .= 'dark';
+                }
+                $imports .= '@import "' . $scssFile . '";';
+            }
+        }
+
+        if ($imports !== '') {
+            $scss = new Compiler();
+            $scss->setImportPaths([
+                $this->appRoot . '/css/',
+                $this->serverRoot . '/core/css/'
+            ]);
+
+            // Continue after throw
+            $scss->setIgnoreErrors(true);
+            $scss->setFormatter(Crunched::class);
+
+            // Import theme, variables and compile css4 variables
+            try {
+                $css .= $scss->compile(
+                    $imports .
+                    $this->getInjectedVariables() .
+                    '@import "variables.scss";' .
+                    '@import "css-variables.scss";'
+                );
+            } catch (ParserException $e) {
+                $this->logger->error($e->getMessage(), ['app' => 'core']);
+            }
+        }
+
+        // We don't want to override vars with url since path is different
+        $css = $this->filterOutRule('/--[a-z-:]+url\([^;]+\)/mi', $css);
+
+        // Rebase all urls
+        $appWebRoot = substr($this->appRoot, strlen($this->serverRoot) - strlen(\OC::$WEBROOT));
+        $css        = $this->rebaseUrls($css, $appWebRoot . '/css');
+
+        if (in_array('dark', $userValues) && $this->iconsCacher->getCachedList() && $this->iconsCacher->getCachedList()->getSize() > 0) {
+            $iconsCss = $this->invertSvgIconsColor($this->iconsCacher->getCachedList()->getContent());
+            $css = $css . $iconsCss;
+        }
+
+        $response = new DataDisplayResponse($css, Http::STATUS_OK, ['Content-Type' => 'text/css']);
+
+        // Set cache control
+        $ttl = 31536000;
+        $response->addHeader('Cache-Control', 'max-age=' . $ttl . ', immutable');
+        $expires = new \DateTime();
+        $expires->setTimestamp($this->timeFactory->getTime());
+        $expires->add(new \DateInterval('PT' . $ttl . 'S'));
+        $response->addHeader('Expires', $expires->format(\DateTime::RFC1123));
+        $response->addHeader('Pragma', 'cache');
+
+        // store current cache hash
+        $this->config->setUserValue($this->userSession->getUser()->getUID(), $this->appName, 'icons-css', md5($css));
+
+        return $response;
+    }
+
+    /**
+     * @NoCSRFRequired
+     * @PublicPage
+     * @NoSameSiteCookieRequired
+     *
+     * @return DataDownloadResponse
+     */
+    public function getJavascript(): DataDownloadResponse {
+        $user = $this->userSession->getUser();
+
+        if ($user === null) {
+            $theme = false;
+            $highcontrast = false;
+        } else {
+            $theme = $this->config->getUserValue($user->getUID(), $this->appName, 'theme', false);
+            $highcontrast = $this->config->getUserValue($user->getUID(), $this->appName, 'highcontrast', false) !== false;
+        }
+        if ($theme !== false) {
+            $responseJS = '(function() {
 	OCA.Accessibility = {
 		highcontrast: ' . json_encode($highcontrast) . ',
 		theme: ' . json_encode($theme) . ',
 	};
 	document.body.classList.add(' . json_encode($theme) . ');
 })();';
-		} else {
-			$responseJS = '(function() {
+        } else {
+            $responseJS = '(function() {
 	OCA.Accessibility = {
 		highcontrast: ' . json_encode($highcontrast) . ',
 		theme: ' . json_encode($theme) . ',
 	};
 })();';
-		}
-		$response = new DataDownloadResponse($responseJS, 'javascript', 'text/javascript');
-		$response->cacheFor(3600);
-		return $response;
-	}
-
-	/**
-	 * Return an array with the user theme & font settings
-	 *
-	 * @return array
-	 */
-	private function getUserValues(): array {
-		$userTheme = $this->config->getUserValue($this->userSession->getUser()->getUID(), $this->appName, 'theme', false);
-		$userFont  = $this->config->getUserValue($this->userSession->getUser()->getUID(), $this->appName, 'font', false);
-		$userHighContrast = $this->config->getUserValue($this->userSession->getUser()->getUID(), $this->appName, 'highcontrast', false);
-
-		return [$userTheme, $userHighContrast, $userFont];
-	}
-
-	/**
-	 * Remove all matches from the $rule regex
-	 *
-	 * @param string $rule regex to match
-	 * @param string $css string to parse
-	 * @return string
-	 */
-	private function filterOutRule(string $rule, string $css): string {
-		return preg_replace($rule, '', $css);
-	}
-
-	/**
-	 * Add the correct uri prefix to make uri valid again
-	 *
-	 * @param string $css
-	 * @param string $webDir
-	 * @return string
-	 */
-	private function rebaseUrls(string $css, string $webDir): string {
-		$re    = '/url\([\'"]([^\/][\.\w?=\/-]*)[\'"]\)/x';
-		$subst = 'url(\'' . $webDir . '/$1\')';
-
-		return preg_replace($re, $subst, $css);
-	}
-
-	/**
-	 * Remove all matches from the $rule regex
-	 *
-	 * @param string $css string to parse
-	 * @return string
-	 */
-	private function invertSvgIconsColor(string $css) {
-		return str_replace(
-			['color=000&', 'color=fff&', 'color=***&'],
-			['color=***&', 'color=000&', 'color=fff&'],
-			str_replace(
-				['color=000000&', 'color=ffffff&', 'color=******&'],
-				['color=******&', 'color=000000&', 'color=ffffff&'],
-				$css
-			)
-		);
-	}
-
-	/**
-	 * @return string SCSS code for variables from OC_Defaults
-	 */
-	private function getInjectedVariables(): string {
-		if ($this->injectedVariables !== null) {
-			return $this->injectedVariables;
-		}
-		$variables = '';
-		foreach ($this->defaults->getScssVariables() as $key => $value) {
-			$variables .= '$' . $key . ': ' . $value . ';';
-		}
-
-		// check for valid variables / otherwise fall back to defaults
-		try {
-			$scss = new Compiler();
-			$scss->compile($variables);
-			$this->injectedVariables = $variables;
-		} catch (ParserException $e) {
-			$this->logger->logException($e, ['app' => 'core']);
-		}
-		return $variables;
-	}
+        }
+        $response = new DataDownloadResponse($responseJS, 'javascript', 'text/javascript');
+        $response->cacheFor(3600);
+        return $response;
+    }
+
+    /**
+     * Return an array with the user theme & font settings
+     *
+     * @return array
+     */
+    private function getUserValues(): array {
+        $userTheme = $this->config->getUserValue($this->userSession->getUser()->getUID(), $this->appName, 'theme', false);
+        $userFont  = $this->config->getUserValue($this->userSession->getUser()->getUID(), $this->appName, 'font', false);
+        $userHighContrast = $this->config->getUserValue($this->userSession->getUser()->getUID(), $this->appName, 'highcontrast', false);
+
+        return [$userTheme, $userHighContrast, $userFont];
+    }
+
+    /**
+     * Remove all matches from the $rule regex
+     *
+     * @param string $rule regex to match
+     * @param string $css string to parse
+     * @return string
+     */
+    private function filterOutRule(string $rule, string $css): string {
+        return preg_replace($rule, '', $css);
+    }
+
+    /**
+     * Add the correct uri prefix to make uri valid again
+     *
+     * @param string $css
+     * @param string $webDir
+     * @return string
+     */
+    private function rebaseUrls(string $css, string $webDir): string {
+        $re    = '/url\([\'"]([^\/][\.\w?=\/-]*)[\'"]\)/x';
+        $subst = 'url(\'' . $webDir . '/$1\')';
+
+        return preg_replace($re, $subst, $css);
+    }
+
+    /**
+     * Remove all matches from the $rule regex
+     *
+     * @param string $css string to parse
+     * @return string
+     */
+    private function invertSvgIconsColor(string $css) {
+        return str_replace(
+            ['color=000&', 'color=fff&', 'color=***&'],
+            ['color=***&', 'color=000&', 'color=fff&'],
+            str_replace(
+                ['color=000000&', 'color=ffffff&', 'color=******&'],
+                ['color=******&', 'color=000000&', 'color=ffffff&'],
+                $css
+            )
+        );
+    }
+
+    /**
+     * @return string SCSS code for variables from OC_Defaults
+     */
+    private function getInjectedVariables(): string {
+        if ($this->injectedVariables !== null) {
+            return $this->injectedVariables;
+        }
+        $variables = '';
+        foreach ($this->defaults->getScssVariables() as $key => $value) {
+            $variables .= '$' . $key . ': ' . $value . ';';
+        }
+
+        // check for valid variables / otherwise fall back to defaults
+        try {
+            $scss = new Compiler();
+            $scss->compile($variables);
+            $this->injectedVariables = $variables;
+        } catch (ParserException $e) {
+            $this->logger->logException($e, ['app' => 'core']);
+        }
+        return $variables;
+    }
 }

apps/accessibility/lib/Migration/RepairUserConfig.php

Indentation +47 added lines, -47 removed lines

@@ -35,56 +35,56 @@
 
 class RepairUserConfig implements IRepairStep {
 
-	/** @var IUserManager */
-	protected $userManager;
+    /** @var IUserManager */
+    protected $userManager;
 
-	/** @var IConfig */
-	protected $config;
+    /** @var IConfig */
+    protected $config;
 
-	/**
-	 * MigrateUserConfig constructor.
-	 *
-	 * @param IConfig $config
-	 * @param IUserManager $userManager
-	 */
-	public function __construct(IConfig $config,
-								IUserManager $userManager) {
-		$this->config = $config;
-		$this->userManager = $userManager;
-	}
+    /**
+     * MigrateUserConfig constructor.
+     *
+     * @param IConfig $config
+     * @param IUserManager $userManager
+     */
+    public function __construct(IConfig $config,
+                                IUserManager $userManager) {
+        $this->config = $config;
+        $this->userManager = $userManager;
+    }
 
-	/**
-	 * Returns the step's name
-	 *
-	 * @return string
-	 * @since 9.1.0
-	 */
-	public function getName() {
-		return 'Migrate old user config';
-	}
+    /**
+     * Returns the step's name
+     *
+     * @return string
+     * @since 9.1.0
+     */
+    public function getName() {
+        return 'Migrate old user config';
+    }
 
-	/**
-	 * Run repair step.
-	 * Must throw exception on error.
-	 *
-	 * @param IOutput $output
-	 * @throws \Exception in case of failure
-	 * @since 9.1.0
-	 */
-	public function run(IOutput $output) {
-		$output->startProgress();
-		$this->userManager->callForSeenUsers(function (IUser $user) use ($output) {
-			$theme = $this->config->getUserValue($user->getUID(), Application::APP_NAME, 'theme', false);
-			if ($theme === 'themedark') {
-				$this->config->setUserValue($user->getUID(), Application::APP_NAME, 'theme', 'dark');
-			}
-			if ($theme === 'themehighcontrast') {
-				$this->config->setUserValue($user->getUID(), Application::APP_NAME, 'highcontrast', 'highcontrast');
-				$this->config->deleteUserValue($user->getUID(), Application::APP_NAME, 'theme');
-			}
-			$output->advance();
-		});
-		$output->finishProgress();
-	}
+    /**
+     * Run repair step.
+     * Must throw exception on error.
+     *
+     * @param IOutput $output
+     * @throws \Exception in case of failure
+     * @since 9.1.0
+     */
+    public function run(IOutput $output) {
+        $output->startProgress();
+        $this->userManager->callForSeenUsers(function (IUser $user) use ($output) {
+            $theme = $this->config->getUserValue($user->getUID(), Application::APP_NAME, 'theme', false);
+            if ($theme === 'themedark') {
+                $this->config->setUserValue($user->getUID(), Application::APP_NAME, 'theme', 'dark');
+            }
+            if ($theme === 'themehighcontrast') {
+                $this->config->setUserValue($user->getUID(), Application::APP_NAME, 'highcontrast', 'highcontrast');
+                $this->config->deleteUserValue($user->getUID(), Application::APP_NAME, 'theme');
+            }
+            $output->advance();
+        });
+        $output->finishProgress();
+    }
 
 }

Spacing +1 added lines, -1 removed lines

@@ -73,7 +73,7 @@
 	 */
 	public function run(IOutput $output) {
 		$output->startProgress();
-		$this->userManager->callForSeenUsers(function (IUser $user) use ($output) {
+		$this->userManager->callForSeenUsers(function(IUser $user) use ($output) {
 			$theme = $this->config->getUserValue($user->getUID(), Application::APP_NAME, 'theme', false);
 			if ($theme === 'themedark') {
 				$this->config->setUserValue($user->getUID(), Application::APP_NAME, 'theme', 'dark');

apps/files_sharing/lib/AppInfo/Application.php

Indentation +238 added lines, -238 removed lines

@@ -66,242 +66,242 @@
 
 class Application extends App {
 
-	const APP_ID = 'files_sharing';
-
-	public function __construct(array $urlParams = []) {
-		parent::__construct(self::APP_ID, $urlParams);
-
-		$container = $this->getContainer();
-
-		/** @var IServerContainer $server */
-		$server = $container->getServer();
-
-		/** @var IEventDispatcher $dispatcher */
-		$dispatcher = $container->query(IEventDispatcher::class);
-		$mountProviderCollection = $server->getMountProviderCollection();
-		$notifications = $server->getNotificationManager();
-
-		/**
-		 * Controllers
-		 */
-		$container->registerService('ShareController', function (SimpleContainer $c) use ($server) {
-			$federatedSharingApp = new \OCA\FederatedFileSharing\AppInfo\Application();
-			return new ShareController(
-				$c->query('AppName'),
-				$c->query('Request'),
-				$server->getConfig(),
-				$server->getURLGenerator(),
-				$server->getUserManager(),
-				$server->getLogger(),
-				$server->getActivityManager(),
-				$server->getShareManager(),
-				$server->getSession(),
-				$server->getPreviewManager(),
-				$server->getRootFolder(),
-				$federatedSharingApp->getFederatedShareProvider(),
-				$server->getEventDispatcher(),
-				$server->getL10N($c->query('AppName')),
-				$server->query(Defaults::class)
-			);
-		});
-		$container->registerService('ExternalSharesController', function (SimpleContainer $c) {
-			return new ExternalSharesController(
-				$c->query('AppName'),
-				$c->query('Request'),
-				$c->query('ExternalManager'),
-				$c->query('HttpClientService')
-			);
-		});
-
-		/**
-		 * Core class wrappers
-		 */
-		$container->registerService('HttpClientService', function (SimpleContainer $c) use ($server) {
-			return $server->getHTTPClientService();
-		});
-		$container->registerService(ICloudIdManager::class, function (SimpleContainer $c) use ($server) {
-			return $server->getCloudIdManager();
-		});
-		$container->registerService('ExternalManager', function (SimpleContainer $c) use ($server) {
-			$user = $server->getUserSession()->getUser();
-			$uid = $user ? $user->getUID() : null;
-			return new \OCA\Files_Sharing\External\Manager(
-				$server->getDatabaseConnection(),
-				\OC\Files\Filesystem::getMountManager(),
-				\OC\Files\Filesystem::getLoader(),
-				$server->getHTTPClientService(),
-				$server->getNotificationManager(),
-				$server->query(\OCP\OCS\IDiscoveryService::class),
-				$server->getCloudFederationProviderManager(),
-				$server->getCloudFederationFactory(),
-				$server->getGroupManager(),
-				$server->getUserManager(),
-				$uid
-			);
-		});
-		$container->registerAlias(Manager::class, 'ExternalManager');
-
-		/**
-		 * Middleware
-		 */
-		$container->registerService('SharingCheckMiddleware', function (SimpleContainer $c) use ($server) {
-			return new SharingCheckMiddleware(
-				$c->query('AppName'),
-				$server->getConfig(),
-				$server->getAppManager(),
-				$server->query(IControllerMethodReflector::class),
-				$server->getShareManager(),
-				$server->getRequest()
-			);
-		});
-
-		$container->registerService(ShareInfoMiddleware::class, function () use ($server) {
-			return new ShareInfoMiddleware(
-				$server->getShareManager()
-			);
-		});
-
-		// Execute middlewares
-		$container->registerMiddleWare('SharingCheckMiddleware');
-		$container->registerMiddleWare(OCSShareAPIMiddleware::class);
-		$container->registerMiddleWare(ShareInfoMiddleware::class);
-
-		$container->registerService('MountProvider', function (IContainer $c) {
-			/** @var \OCP\IServerContainer $server */
-			$server = $c->query('ServerContainer');
-			return new MountProvider(
-				$server->getConfig(),
-				$server->getShareManager(),
-				$server->getLogger()
-			);
-		});
-
-		$container->registerService('ExternalMountProvider', function (IContainer $c) {
-			/** @var \OCP\IServerContainer $server */
-			$server = $c->query('ServerContainer');
-			return new \OCA\Files_Sharing\External\MountProvider(
-				$server->getDatabaseConnection(),
-				function () use ($c) {
-					return $c->query('ExternalManager');
-				},
-				$server->getCloudIdManager()
-			);
-		});
-
-		/**
-		 * Register capabilities
-		 */
-		$container->registerCapability(Capabilities::class);
-
-		$notifications->registerNotifierService(Notifier::class);
-
-		$this->registerMountProviders($mountProviderCollection);
-		$this->registerEventsScripts($dispatcher);
-		$this->setupSharingMenus();
-
-		/**
-		 * Always add main sharing script
-		 */
-		Util::addScript(self::APP_ID, 'dist/main');
-	}
-
-	protected function registerMountProviders(IMountProviderCollection $mountProviderCollection) {
-		$mountProviderCollection->registerProvider($this->getContainer()->query('MountProvider'));
-		$mountProviderCollection->registerProvider($this->getContainer()->query('ExternalMountProvider'));
-	}
-
-	protected function registerEventsScripts(IEventDispatcher $dispatcher) {
-		// sidebar and files scripts
-		$dispatcher->addServiceListener(LoadAdditionalScriptsEvent::class, LoadAdditionalListener::class);
-		$dispatcher->addServiceListener(LoadSidebar::class, LoadSidebarListener::class);
-		$dispatcher->addServiceListener(ShareCreatedEvent::class, ShareInteractionListener::class);
-		$dispatcher->addListener('\OCP\Collaboration\Resources::loadAdditionalScripts', function () {
-			\OCP\Util::addScript('files_sharing', 'dist/collaboration');
-		});
-		$dispatcher->addServiceListener(ShareCreatedEvent::class, UserShareAcceptanceListener::class);
-		$dispatcher->addServiceListener(UserAddedEvent::class, UserAddedToGroupListener::class);
-
-		// notifications api to accept incoming user shares
-		$dispatcher->addListener('OCP\Share::postShare', function (GenericEvent $event) {
-			/** @var Listener $listener */
-			$listener = $this->getContainer()->query(Listener::class);
-			$listener->shareNotification($event);
-		});
-		$dispatcher->addListener(IGroup::class . '::postAddUser', function (GenericEvent $event) {
-			/** @var Listener $listener */
-			$listener = $this->getContainer()->query(Listener::class);
-			$listener->userAddedToGroup($event);
-		});
-	}
-
-	protected function setupSharingMenus() {
-		$config = \OC::$server->getConfig();
-		$l = \OC::$server->getL10N('files_sharing');
-
-		if ($config->getAppValue('core', 'shareapi_enabled', 'yes') !== 'yes') {
-			return;
-		}
-
-		$sharingSublistArray = [];
-
-		if (\OCP\Util::isSharingDisabledForUser() === false) {
-			array_push($sharingSublistArray, [
-				'id' => 'sharingout',
-				'appname' => 'files_sharing',
-				'script' => 'list.php',
-				'order' => 16,
-				'name' => $l->t('Shared with others'),
-			]);
-		}
-
-		array_push($sharingSublistArray, [
-			'id' => 'sharingin',
-			'appname' => 'files_sharing',
-			'script' => 'list.php',
-			'order' => 15,
-			'name' => $l->t('Shared with you'),
-		]);
-
-		if (\OCP\Util::isSharingDisabledForUser() === false) {
-			// Check if sharing by link is enabled
-			if ($config->getAppValue('core', 'shareapi_allow_links', 'yes') === 'yes') {
-				array_push($sharingSublistArray, [
-					'id' => 'sharinglinks',
-					'appname' => 'files_sharing',
-					'script' => 'list.php',
-					'order' => 17,
-					'name' => $l->t('Shared by link'),
-				]);
-			}
-		}
-
-		array_push($sharingSublistArray, [
-			'id' => 'deletedshares',
-			'appname' => 'files_sharing',
-			'script' => 'list.php',
-			'order' => 19,
-			'name' => $l->t('Deleted shares'),
-		]);
-
-		array_push($sharingSublistArray, [
-			'id' => 'pendingshares',
-			'appname' => 'files_sharing',
-			'script' => 'list.php',
-			'order' => 19,
-			'name' => $l->t('Pending shares'),
-		]);
-
-
-		// show_Quick_Access stored as string
-		\OCA\Files\App::getNavigationManager()->add([
-			'id' => 'shareoverview',
-			'appname' => 'files_sharing',
-			'script' => 'list.php',
-			'order' => 18,
-			'name' => $l->t('Shares'),
-			'classes' => 'collapsible',
-			'sublist' => $sharingSublistArray,
-			'expandedState' => 'show_sharing_menu'
-		]);
-	}
+    const APP_ID = 'files_sharing';
+
+    public function __construct(array $urlParams = []) {
+        parent::__construct(self::APP_ID, $urlParams);
+
+        $container = $this->getContainer();
+
+        /** @var IServerContainer $server */
+        $server = $container->getServer();
+
+        /** @var IEventDispatcher $dispatcher */
+        $dispatcher = $container->query(IEventDispatcher::class);
+        $mountProviderCollection = $server->getMountProviderCollection();
+        $notifications = $server->getNotificationManager();
+
+        /**
+         * Controllers
+         */
+        $container->registerService('ShareController', function (SimpleContainer $c) use ($server) {
+            $federatedSharingApp = new \OCA\FederatedFileSharing\AppInfo\Application();
+            return new ShareController(
+                $c->query('AppName'),
+                $c->query('Request'),
+                $server->getConfig(),
+                $server->getURLGenerator(),
+                $server->getUserManager(),
+                $server->getLogger(),
+                $server->getActivityManager(),
+                $server->getShareManager(),
+                $server->getSession(),
+                $server->getPreviewManager(),
+                $server->getRootFolder(),
+                $federatedSharingApp->getFederatedShareProvider(),
+                $server->getEventDispatcher(),
+                $server->getL10N($c->query('AppName')),
+                $server->query(Defaults::class)
+            );
+        });
+        $container->registerService('ExternalSharesController', function (SimpleContainer $c) {
+            return new ExternalSharesController(
+                $c->query('AppName'),
+                $c->query('Request'),
+                $c->query('ExternalManager'),
+                $c->query('HttpClientService')
+            );
+        });
+
+        /**
+         * Core class wrappers
+         */
+        $container->registerService('HttpClientService', function (SimpleContainer $c) use ($server) {
+            return $server->getHTTPClientService();
+        });
+        $container->registerService(ICloudIdManager::class, function (SimpleContainer $c) use ($server) {
+            return $server->getCloudIdManager();
+        });
+        $container->registerService('ExternalManager', function (SimpleContainer $c) use ($server) {
+            $user = $server->getUserSession()->getUser();
+            $uid = $user ? $user->getUID() : null;
+            return new \OCA\Files_Sharing\External\Manager(
+                $server->getDatabaseConnection(),
+                \OC\Files\Filesystem::getMountManager(),
+                \OC\Files\Filesystem::getLoader(),
+                $server->getHTTPClientService(),
+                $server->getNotificationManager(),
+                $server->query(\OCP\OCS\IDiscoveryService::class),
+                $server->getCloudFederationProviderManager(),
+                $server->getCloudFederationFactory(),
+                $server->getGroupManager(),
+                $server->getUserManager(),
+                $uid
+            );
+        });
+        $container->registerAlias(Manager::class, 'ExternalManager');
+
+        /**
+         * Middleware
+         */
+        $container->registerService('SharingCheckMiddleware', function (SimpleContainer $c) use ($server) {
+            return new SharingCheckMiddleware(
+                $c->query('AppName'),
+                $server->getConfig(),
+                $server->getAppManager(),
+                $server->query(IControllerMethodReflector::class),
+                $server->getShareManager(),
+                $server->getRequest()
+            );
+        });
+
+        $container->registerService(ShareInfoMiddleware::class, function () use ($server) {
+            return new ShareInfoMiddleware(
+                $server->getShareManager()
+            );
+        });
+
+        // Execute middlewares
+        $container->registerMiddleWare('SharingCheckMiddleware');
+        $container->registerMiddleWare(OCSShareAPIMiddleware::class);
+        $container->registerMiddleWare(ShareInfoMiddleware::class);
+
+        $container->registerService('MountProvider', function (IContainer $c) {
+            /** @var \OCP\IServerContainer $server */
+            $server = $c->query('ServerContainer');
+            return new MountProvider(
+                $server->getConfig(),
+                $server->getShareManager(),
+                $server->getLogger()
+            );
+        });
+
+        $container->registerService('ExternalMountProvider', function (IContainer $c) {
+            /** @var \OCP\IServerContainer $server */
+            $server = $c->query('ServerContainer');
+            return new \OCA\Files_Sharing\External\MountProvider(
+                $server->getDatabaseConnection(),
+                function () use ($c) {
+                    return $c->query('ExternalManager');
+                },
+                $server->getCloudIdManager()
+            );
+        });
+
+        /**
+         * Register capabilities
+         */
+        $container->registerCapability(Capabilities::class);
+
+        $notifications->registerNotifierService(Notifier::class);
+
+        $this->registerMountProviders($mountProviderCollection);
+        $this->registerEventsScripts($dispatcher);
+        $this->setupSharingMenus();
+
+        /**
+         * Always add main sharing script
+         */
+        Util::addScript(self::APP_ID, 'dist/main');
+    }
+
+    protected function registerMountProviders(IMountProviderCollection $mountProviderCollection) {
+        $mountProviderCollection->registerProvider($this->getContainer()->query('MountProvider'));
+        $mountProviderCollection->registerProvider($this->getContainer()->query('ExternalMountProvider'));
+    }
+
+    protected function registerEventsScripts(IEventDispatcher $dispatcher) {
+        // sidebar and files scripts
+        $dispatcher->addServiceListener(LoadAdditionalScriptsEvent::class, LoadAdditionalListener::class);
+        $dispatcher->addServiceListener(LoadSidebar::class, LoadSidebarListener::class);
+        $dispatcher->addServiceListener(ShareCreatedEvent::class, ShareInteractionListener::class);
+        $dispatcher->addListener('\OCP\Collaboration\Resources::loadAdditionalScripts', function () {
+            \OCP\Util::addScript('files_sharing', 'dist/collaboration');
+        });
+        $dispatcher->addServiceListener(ShareCreatedEvent::class, UserShareAcceptanceListener::class);
+        $dispatcher->addServiceListener(UserAddedEvent::class, UserAddedToGroupListener::class);
+
+        // notifications api to accept incoming user shares
+        $dispatcher->addListener('OCP\Share::postShare', function (GenericEvent $event) {
+            /** @var Listener $listener */
+            $listener = $this->getContainer()->query(Listener::class);
+            $listener->shareNotification($event);
+        });
+        $dispatcher->addListener(IGroup::class . '::postAddUser', function (GenericEvent $event) {
+            /** @var Listener $listener */
+            $listener = $this->getContainer()->query(Listener::class);
+            $listener->userAddedToGroup($event);
+        });
+    }
+
+    protected function setupSharingMenus() {
+        $config = \OC::$server->getConfig();
+        $l = \OC::$server->getL10N('files_sharing');
+
+        if ($config->getAppValue('core', 'shareapi_enabled', 'yes') !== 'yes') {
+            return;
+        }
+
+        $sharingSublistArray = [];
+
+        if (\OCP\Util::isSharingDisabledForUser() === false) {
+            array_push($sharingSublistArray, [
+                'id' => 'sharingout',
+                'appname' => 'files_sharing',
+                'script' => 'list.php',
+                'order' => 16,
+                'name' => $l->t('Shared with others'),
+            ]);
+        }
+
+        array_push($sharingSublistArray, [
+            'id' => 'sharingin',
+            'appname' => 'files_sharing',
+            'script' => 'list.php',
+            'order' => 15,
+            'name' => $l->t('Shared with you'),
+        ]);
+
+        if (\OCP\Util::isSharingDisabledForUser() === false) {
+            // Check if sharing by link is enabled
+            if ($config->getAppValue('core', 'shareapi_allow_links', 'yes') === 'yes') {
+                array_push($sharingSublistArray, [
+                    'id' => 'sharinglinks',
+                    'appname' => 'files_sharing',
+                    'script' => 'list.php',
+                    'order' => 17,
+                    'name' => $l->t('Shared by link'),
+                ]);
+            }
+        }
+
+        array_push($sharingSublistArray, [
+            'id' => 'deletedshares',
+            'appname' => 'files_sharing',
+            'script' => 'list.php',
+            'order' => 19,
+            'name' => $l->t('Deleted shares'),
+        ]);
+
+        array_push($sharingSublistArray, [
+            'id' => 'pendingshares',
+            'appname' => 'files_sharing',
+            'script' => 'list.php',
+            'order' => 19,
+            'name' => $l->t('Pending shares'),
+        ]);
+
+
+        // show_Quick_Access stored as string
+        \OCA\Files\App::getNavigationManager()->add([
+            'id' => 'shareoverview',
+            'appname' => 'files_sharing',
+            'script' => 'list.php',
+            'order' => 18,
+            'name' => $l->t('Shares'),
+            'classes' => 'collapsible',
+            'sublist' => $sharingSublistArray,
+            'expandedState' => 'show_sharing_menu'
+        ]);
+    }
 }

Spacing +13 added lines, -13 removed lines

@@ -84,7 +84,7 @@ 
 		/**
 		 * Controllers
 		 */
-		$container->registerService('ShareController', function (SimpleContainer $c) use ($server) {
+		$container->registerService('ShareController', function(SimpleContainer $c) use ($server) {
 			$federatedSharingApp = new \OCA\FederatedFileSharing\AppInfo\Application();
 			return new ShareController(
 				$c->query('AppName'),
@@ -104,7 +104,7 @@ 
 				$server->query(Defaults::class)
 			);
 		});
-		$container->registerService('ExternalSharesController', function (SimpleContainer $c) {
+		$container->registerService('ExternalSharesController', function(SimpleContainer $c) {
 			return new ExternalSharesController(
 				$c->query('AppName'),
 				$c->query('Request'),
@@ -116,13 +116,13 @@ 
 		/**
 		 * Core class wrappers
 		 */
-		$container->registerService('HttpClientService', function (SimpleContainer $c) use ($server) {
+		$container->registerService('HttpClientService', function(SimpleContainer $c) use ($server) {
 			return $server->getHTTPClientService();
 		});
-		$container->registerService(ICloudIdManager::class, function (SimpleContainer $c) use ($server) {
+		$container->registerService(ICloudIdManager::class, function(SimpleContainer $c) use ($server) {
 			return $server->getCloudIdManager();
 		});
-		$container->registerService('ExternalManager', function (SimpleContainer $c) use ($server) {
+		$container->registerService('ExternalManager', function(SimpleContainer $c) use ($server) {
 			$user = $server->getUserSession()->getUser();
 			$uid = $user ? $user->getUID() : null;
 			return new \OCA\Files_Sharing\External\Manager(
@@ -144,7 +144,7 @@ 
 		/**
 		 * Middleware
 		 */
-		$container->registerService('SharingCheckMiddleware', function (SimpleContainer $c) use ($server) {
+		$container->registerService('SharingCheckMiddleware', function(SimpleContainer $c) use ($server) {
 			return new SharingCheckMiddleware(
 				$c->query('AppName'),
 				$server->getConfig(),
@@ -155,7 +155,7 @@ 
 			);
 		});
 
-		$container->registerService(ShareInfoMiddleware::class, function () use ($server) {
+		$container->registerService(ShareInfoMiddleware::class, function() use ($server) {
 			return new ShareInfoMiddleware(
 				$server->getShareManager()
 			);
@@ -166,7 +166,7 @@ 
 		$container->registerMiddleWare(OCSShareAPIMiddleware::class);
 		$container->registerMiddleWare(ShareInfoMiddleware::class);
 
-		$container->registerService('MountProvider', function (IContainer $c) {
+		$container->registerService('MountProvider', function(IContainer $c) {
 			/** @var \OCP\IServerContainer $server */
 			$server = $c->query('ServerContainer');
 			return new MountProvider(
@@ -176,12 +176,12 @@ 
 			);
 		});
 
-		$container->registerService('ExternalMountProvider', function (IContainer $c) {
+		$container->registerService('ExternalMountProvider', function(IContainer $c) {
 			/** @var \OCP\IServerContainer $server */
 			$server = $c->query('ServerContainer');
 			return new \OCA\Files_Sharing\External\MountProvider(
 				$server->getDatabaseConnection(),
-				function () use ($c) {
+				function() use ($c) {
 					return $c->query('ExternalManager');
 				},
 				$server->getCloudIdManager()
@@ -215,19 +215,19 @@ 
 		$dispatcher->addServiceListener(LoadAdditionalScriptsEvent::class, LoadAdditionalListener::class);
 		$dispatcher->addServiceListener(LoadSidebar::class, LoadSidebarListener::class);
 		$dispatcher->addServiceListener(ShareCreatedEvent::class, ShareInteractionListener::class);
-		$dispatcher->addListener('\OCP\Collaboration\Resources::loadAdditionalScripts', function () {
+		$dispatcher->addListener('\OCP\Collaboration\Resources::loadAdditionalScripts', function() {
 			\OCP\Util::addScript('files_sharing', 'dist/collaboration');
 		});
 		$dispatcher->addServiceListener(ShareCreatedEvent::class, UserShareAcceptanceListener::class);
 		$dispatcher->addServiceListener(UserAddedEvent::class, UserAddedToGroupListener::class);
 
 		// notifications api to accept incoming user shares
-		$dispatcher->addListener('OCP\Share::postShare', function (GenericEvent $event) {
+		$dispatcher->addListener('OCP\Share::postShare', function(GenericEvent $event) {
 			/** @var Listener $listener */
 			$listener = $this->getContainer()->query(Listener::class);
 			$listener->shareNotification($event);
 		});
-		$dispatcher->addListener(IGroup::class . '::postAddUser', function (GenericEvent $event) {
+		$dispatcher->addListener(IGroup::class.'::postAddUser', function(GenericEvent $event) {
 			/** @var Listener $listener */
 			$listener = $this->getContainer()->query(Listener::class);
 			$listener->userAddedToGroup($event);

apps/files_sharing/lib/Controller/ShareesAPIController.php

Indentation +369 added lines, -369 removed lines

@@ -53,373 +53,373 @@
 
 class ShareesAPIController extends OCSController {
 
-	/** @var userId */
-	protected $userId;
-
-	/** @var IConfig */
-	protected $config;
-
-	/** @var IURLGenerator */
-	protected $urlGenerator;
-
-	/** @var IManager */
-	protected $shareManager;
-
-	/** @var int */
-	protected $offset = 0;
-
-	/** @var int */
-	protected $limit = 10;
-
-	/** @var array */
-	protected $result = [
-		'exact' => [
-			'users' => [],
-			'groups' => [],
-			'remotes' => [],
-			'remote_groups' => [],
-			'emails' => [],
-			'circles' => [],
-			'rooms' => [],
-		],
-		'users' => [],
-		'groups' => [],
-		'remotes' => [],
-		'remote_groups' => [],
-		'emails' => [],
-		'lookup' => [],
-		'circles' => [],
-		'rooms' => [],
-		'lookupEnabled' => false,
-	];
-
-	protected $reachedEndFor = [];
-	/** @var ISearch */
-	private $collaboratorSearch;
-
-	/**
-	 * @param string $UserId
-	 * @param string $appName
-	 * @param IRequest $request
-	 * @param IConfig $config
-	 * @param IURLGenerator $urlGenerator
-	 * @param IManager $shareManager
-	 * @param ISearch $collaboratorSearch
-	 */
-	public function __construct(
-		$UserId,
-		string $appName,
-		IRequest $request,
-		IConfig $config,
-		IURLGenerator $urlGenerator,
-		IManager $shareManager,
-		ISearch $collaboratorSearch
-	) {
-		parent::__construct($appName, $request);
-		$this->userId = $UserId;
-		$this->config = $config;
-		$this->urlGenerator = $urlGenerator;
-		$this->shareManager = $shareManager;
-		$this->collaboratorSearch = $collaboratorSearch;
-	}
-
-	/**
-	 * @NoAdminRequired
-	 *
-	 * @param string $search
-	 * @param string $itemType
-	 * @param int $page
-	 * @param int $perPage
-	 * @param int|int[] $shareType
-	 * @param bool $lookup
-	 * @return DataResponse
-	 * @throws OCSBadRequestException
-	 */
-	public function search(string $search = '', string $itemType = null, int $page = 1, int $perPage = 200, $shareType = null, bool $lookup = true): DataResponse {
-
-		// only search for string larger than a given threshold
-		$threshold = (int)$this->config->getSystemValue('sharing.minSearchStringLength', 0);
-		if (strlen($search) < $threshold) {
-			return new DataResponse($this->result);
-		}
-
-		// never return more than the max. number of results configured in the config.php
-		$maxResults = (int)$this->config->getSystemValue('sharing.maxAutocompleteResults', 0);
-		if ($maxResults > 0) {
-			$perPage = min($perPage, $maxResults);
-		}
-		if ($perPage <= 0) {
-			throw new OCSBadRequestException('Invalid perPage argument');
-		}
-		if ($page <= 0) {
-			throw new OCSBadRequestException('Invalid page');
-		}
-
-		$shareTypes = [
-			Share::SHARE_TYPE_USER,
-		];
-
-		if ($itemType === null) {
-			throw new OCSBadRequestException('Missing itemType');
-		} elseif ($itemType === 'file' || $itemType === 'folder') {
-			if ($this->shareManager->allowGroupSharing()) {
-				$shareTypes[] = Share::SHARE_TYPE_GROUP;
-			}
-
-			if ($this->isRemoteSharingAllowed($itemType)) {
-				$shareTypes[] = Share::SHARE_TYPE_REMOTE;
-			}
-
-			if ($this->isRemoteGroupSharingAllowed($itemType)) {
-				$shareTypes[] = Share::SHARE_TYPE_REMOTE_GROUP;
-			}
-
-			if ($this->shareManager->shareProviderExists(Share::SHARE_TYPE_EMAIL)) {
-				$shareTypes[] = Share::SHARE_TYPE_EMAIL;
-			}
-
-			if ($this->shareManager->shareProviderExists(Share::SHARE_TYPE_ROOM)) {
-				$shareTypes[] = Share::SHARE_TYPE_ROOM;
-			}
-		} else {
-			$shareTypes[] = Share::SHARE_TYPE_GROUP;
-			$shareTypes[] = Share::SHARE_TYPE_EMAIL;
-		}
-
-		// FIXME: DI
-		if (\OC::$server->getAppManager()->isEnabledForUser('circles') && class_exists('\OCA\Circles\ShareByCircleProvider')) {
-			$shareTypes[] = Share::SHARE_TYPE_CIRCLE;
-		}
-
-		if ($shareType !== null && is_array($shareType)) {
-			$shareTypes = array_intersect($shareTypes, $shareType);
-		} else if (is_numeric($shareType)) {
-			$shareTypes = array_intersect($shareTypes, [(int) $shareType]);
-		}
-		sort($shareTypes);
-
-		$this->limit = (int) $perPage;
-		$this->offset = $perPage * ($page - 1);
-
-		// In global scale mode we always search the loogup server
-		if ($this->config->getSystemValueBool('gs.enabled', false)) {
-			$lookup = true;
-			$this->result['lookupEnabled'] = true;
-		} else {
-			$this->result['lookupEnabled'] = $this->config->getAppValue('files_sharing', 'lookupServerEnabled', 'yes') === 'yes';
-		}
-
-		list($result, $hasMoreResults) = $this->collaboratorSearch->search($search, $shareTypes, $lookup, $this->limit, $this->offset);
-
-		// extra treatment for 'exact' subarray, with a single merge expected keys might be lost
-		if(isset($result['exact'])) {
-			$result['exact'] = array_merge($this->result['exact'], $result['exact']);
-		}
-		$this->result = array_merge($this->result, $result);
-		$response = new DataResponse($this->result);
-
-		if ($hasMoreResults) {
-			$response->addHeader('Link', $this->getPaginationLink($page, [
-				'search' => $search,
-				'itemType' => $itemType,
-				'shareType' => $shareTypes,
-				'perPage' => $perPage,
-			]));
-		}
-
-		return $response;
-	}
-
-	/**
-	 * @param string $user
-	 * @param int $shareType
-	 *
-	 * @return Generator<array<string>>
-	 */
-	private function getAllShareesByType(string $user, int $shareType): Generator {
-		$offset = 0;
-		$pageSize = 50;
-
-		while (count($page = $this->shareManager->getSharesBy(
-			$user,
-			$shareType,
-			null,
-			false,
-			$pageSize,
-			$offset
-		))) {
-			foreach ($page as $share) {
-				yield [$share->getSharedWith(), $share->getSharedWithDisplayName() ?? $share->getSharedWith()];
-			}
-
-			$offset += $pageSize;
-		}
-	}
-
-	private function sortShareesByFrequency(array $sharees): array {
-		usort($sharees, function (array $s1, array $s2) {
-			return $s2['count'] - $s1['count'];
-		});
-		return $sharees;
-	}
-
-	private $searchResultTypeMap = [
-		Share::SHARE_TYPE_USER => 'users',
-		Share::SHARE_TYPE_GROUP => 'groups',
-		Share::SHARE_TYPE_REMOTE => 'remotes',
-		Share::SHARE_TYPE_REMOTE_GROUP => 'remote_groups',
-		Share::SHARE_TYPE_EMAIL => 'emails',
-	];
-
-	private function getAllSharees(string $user, array $shareTypes): ISearchResult {
-		$result = [];
-		foreach ($shareTypes as $shareType) {
-			$sharees = $this->getAllShareesByType($user, $shareType);
-			$shareTypeResults = [];
-			foreach ($sharees as list($sharee, $displayname)) {
-				if (!isset($this->searchResultTypeMap[$shareType])) {
-					continue;
-				}
-
-				if (!isset($shareTypeResults[$sharee])) {
-					$shareTypeResults[$sharee] = [
-						'count' => 1,
-						'label' => $displayname,
-						'value' => [
-							'shareType' => $shareType,
-							'shareWith' => $sharee,
-						],
-					];
-				} else {
-					$shareTypeResults[$sharee]['count']++;
-				}
-			}
-			$result = array_merge($result, array_values($shareTypeResults));
-		}
-
-		$top5 = array_slice(
-			$this->sortShareesByFrequency($result),
-			0,
-			5
-		);
-
-		$searchResult = new SearchResult();
-		foreach ($this->searchResultTypeMap as $int => $str) {
-			$searchResult->addResultSet(new SearchResultType($str), [], []);
-			foreach ($top5 as $x) {
-				if ($x['value']['shareType'] === $int) {
-					$searchResult->addResultSet(new SearchResultType($str), [], [$x]);
-				}
-			}
-		}
-		return $searchResult;
-	}
-
-	/**
-	 * @NoAdminRequired
-	 *
-	 * @param string $itemType
-	 * @return DataResponse
-	 * @throws OCSBadRequestException
-	 */
-	public function findRecommended(string $itemType = null, $shareType = null): DataResponse {
-		$shareTypes = [
-			Share::SHARE_TYPE_USER,
-		];
-
-		if ($itemType === null) {
-			throw new OCSBadRequestException('Missing itemType');
-		} elseif ($itemType === 'file' || $itemType === 'folder') {
-			if ($this->shareManager->allowGroupSharing()) {
-				$shareTypes[] = Share::SHARE_TYPE_GROUP;
-			}
-
-			if ($this->isRemoteSharingAllowed($itemType)) {
-				$shareTypes[] = Share::SHARE_TYPE_REMOTE;
-			}
-
-			if ($this->isRemoteGroupSharingAllowed($itemType)) {
-				$shareTypes[] = Share::SHARE_TYPE_REMOTE_GROUP;
-			}
-
-			if ($this->shareManager->shareProviderExists(Share::SHARE_TYPE_EMAIL)) {
-				$shareTypes[] = Share::SHARE_TYPE_EMAIL;
-			}
-
-			if ($this->shareManager->shareProviderExists(Share::SHARE_TYPE_ROOM)) {
-				$shareTypes[] = Share::SHARE_TYPE_ROOM;
-			}
-		} else {
-			$shareTypes[] = Share::SHARE_TYPE_GROUP;
-			$shareTypes[] = Share::SHARE_TYPE_EMAIL;
-		}
-
-		// FIXME: DI
-		if (\OC::$server->getAppManager()->isEnabledForUser('circles') && class_exists('\OCA\Circles\ShareByCircleProvider')) {
-			$shareTypes[] = Share::SHARE_TYPE_CIRCLE;
-		}
-
-		if (isset($_GET['shareType']) && is_array($_GET['shareType'])) {
-			$shareTypes = array_intersect($shareTypes, $_GET['shareType']);
-			sort($shareTypes);
-		} else if (is_numeric($shareType)) {
-			$shareTypes = array_intersect($shareTypes, [(int) $shareType]);
-			sort($shareTypes);
-		}
-
-		return new DataResponse(
-			$this->getAllSharees($this->userId, $shareTypes)->asArray()
-		);
-	}
-
-	/**
-	 * Method to get out the static call for better testing
-	 *
-	 * @param string $itemType
-	 * @return bool
-	 */
-	protected function isRemoteSharingAllowed(string $itemType): bool {
-		try {
-			// FIXME: static foo makes unit testing unnecessarily difficult
-			$backend = \OC\Share\Share::getBackend($itemType);
-			return $backend->isShareTypeAllowed(Share::SHARE_TYPE_REMOTE);
-		} catch (\Exception $e) {
-			return false;
-		}
-	}
-
-	protected function isRemoteGroupSharingAllowed(string $itemType): bool {
-		try {
-			// FIXME: static foo makes unit testing unnecessarily difficult
-			$backend = \OC\Share\Share::getBackend($itemType);
-			return $backend->isShareTypeAllowed(Share::SHARE_TYPE_REMOTE_GROUP);
-		} catch (\Exception $e) {
-			return false;
-		}
-	}
-
-
-	/**
-	 * Generates a bunch of pagination links for the current page
-	 *
-	 * @param int $page Current page
-	 * @param array $params Parameters for the URL
-	 * @return string
-	 */
-	protected function getPaginationLink(int $page, array $params): string {
-		if ($this->isV2()) {
-			$url = $this->urlGenerator->getAbsoluteURL('/ocs/v2.php/apps/files_sharing/api/v1/sharees') . '?';
-		} else {
-			$url = $this->urlGenerator->getAbsoluteURL('/ocs/v1.php/apps/files_sharing/api/v1/sharees') . '?';
-		}
-		$params['page'] = $page + 1;
-		return '<' . $url . http_build_query($params) . '>; rel="next"';
-	}
-
-	/**
-	 * @return bool
-	 */
-	protected function isV2(): bool {
-		return $this->request->getScriptName() === '/ocs/v2.php';
-	}
+    /** @var userId */
+    protected $userId;
+
+    /** @var IConfig */
+    protected $config;
+
+    /** @var IURLGenerator */
+    protected $urlGenerator;
+
+    /** @var IManager */
+    protected $shareManager;
+
+    /** @var int */
+    protected $offset = 0;
+
+    /** @var int */
+    protected $limit = 10;
+
+    /** @var array */
+    protected $result = [
+        'exact' => [
+            'users' => [],
+            'groups' => [],
+            'remotes' => [],
+            'remote_groups' => [],
+            'emails' => [],
+            'circles' => [],
+            'rooms' => [],
+        ],
+        'users' => [],
+        'groups' => [],
+        'remotes' => [],
+        'remote_groups' => [],
+        'emails' => [],
+        'lookup' => [],
+        'circles' => [],
+        'rooms' => [],
+        'lookupEnabled' => false,
+    ];
+
+    protected $reachedEndFor = [];
+    /** @var ISearch */
+    private $collaboratorSearch;
+
+    /**
+     * @param string $UserId
+     * @param string $appName
+     * @param IRequest $request
+     * @param IConfig $config
+     * @param IURLGenerator $urlGenerator
+     * @param IManager $shareManager
+     * @param ISearch $collaboratorSearch
+     */
+    public function __construct(
+        $UserId,
+        string $appName,
+        IRequest $request,
+        IConfig $config,
+        IURLGenerator $urlGenerator,
+        IManager $shareManager,
+        ISearch $collaboratorSearch
+    ) {
+        parent::__construct($appName, $request);
+        $this->userId = $UserId;
+        $this->config = $config;
+        $this->urlGenerator = $urlGenerator;
+        $this->shareManager = $shareManager;
+        $this->collaboratorSearch = $collaboratorSearch;
+    }
+
+    /**
+     * @NoAdminRequired
+     *
+     * @param string $search
+     * @param string $itemType
+     * @param int $page
+     * @param int $perPage
+     * @param int|int[] $shareType
+     * @param bool $lookup
+     * @return DataResponse
+     * @throws OCSBadRequestException
+     */
+    public function search(string $search = '', string $itemType = null, int $page = 1, int $perPage = 200, $shareType = null, bool $lookup = true): DataResponse {
+
+        // only search for string larger than a given threshold
+        $threshold = (int)$this->config->getSystemValue('sharing.minSearchStringLength', 0);
+        if (strlen($search) < $threshold) {
+            return new DataResponse($this->result);
+        }
+
+        // never return more than the max. number of results configured in the config.php
+        $maxResults = (int)$this->config->getSystemValue('sharing.maxAutocompleteResults', 0);
+        if ($maxResults > 0) {
+            $perPage = min($perPage, $maxResults);
+        }
+        if ($perPage <= 0) {
+            throw new OCSBadRequestException('Invalid perPage argument');
+        }
+        if ($page <= 0) {
+            throw new OCSBadRequestException('Invalid page');
+        }
+
+        $shareTypes = [
+            Share::SHARE_TYPE_USER,
+        ];
+
+        if ($itemType === null) {
+            throw new OCSBadRequestException('Missing itemType');
+        } elseif ($itemType === 'file' || $itemType === 'folder') {
+            if ($this->shareManager->allowGroupSharing()) {
+                $shareTypes[] = Share::SHARE_TYPE_GROUP;
+            }
+
+            if ($this->isRemoteSharingAllowed($itemType)) {
+                $shareTypes[] = Share::SHARE_TYPE_REMOTE;
+            }
+
+            if ($this->isRemoteGroupSharingAllowed($itemType)) {
+                $shareTypes[] = Share::SHARE_TYPE_REMOTE_GROUP;
+            }
+
+            if ($this->shareManager->shareProviderExists(Share::SHARE_TYPE_EMAIL)) {
+                $shareTypes[] = Share::SHARE_TYPE_EMAIL;
+            }
+
+            if ($this->shareManager->shareProviderExists(Share::SHARE_TYPE_ROOM)) {
+                $shareTypes[] = Share::SHARE_TYPE_ROOM;
+            }
+        } else {
+            $shareTypes[] = Share::SHARE_TYPE_GROUP;
+            $shareTypes[] = Share::SHARE_TYPE_EMAIL;
+        }
+
+        // FIXME: DI
+        if (\OC::$server->getAppManager()->isEnabledForUser('circles') && class_exists('\OCA\Circles\ShareByCircleProvider')) {
+            $shareTypes[] = Share::SHARE_TYPE_CIRCLE;
+        }
+
+        if ($shareType !== null && is_array($shareType)) {
+            $shareTypes = array_intersect($shareTypes, $shareType);
+        } else if (is_numeric($shareType)) {
+            $shareTypes = array_intersect($shareTypes, [(int) $shareType]);
+        }
+        sort($shareTypes);
+
+        $this->limit = (int) $perPage;
+        $this->offset = $perPage * ($page - 1);
+
+        // In global scale mode we always search the loogup server
+        if ($this->config->getSystemValueBool('gs.enabled', false)) {
+            $lookup = true;
+            $this->result['lookupEnabled'] = true;
+        } else {
+            $this->result['lookupEnabled'] = $this->config->getAppValue('files_sharing', 'lookupServerEnabled', 'yes') === 'yes';
+        }
+
+        list($result, $hasMoreResults) = $this->collaboratorSearch->search($search, $shareTypes, $lookup, $this->limit, $this->offset);
+
+        // extra treatment for 'exact' subarray, with a single merge expected keys might be lost
+        if(isset($result['exact'])) {
+            $result['exact'] = array_merge($this->result['exact'], $result['exact']);
+        }
+        $this->result = array_merge($this->result, $result);
+        $response = new DataResponse($this->result);
+
+        if ($hasMoreResults) {
+            $response->addHeader('Link', $this->getPaginationLink($page, [
+                'search' => $search,
+                'itemType' => $itemType,
+                'shareType' => $shareTypes,
+                'perPage' => $perPage,
+            ]));
+        }
+
+        return $response;
+    }
+
+    /**
+     * @param string $user
+     * @param int $shareType
+     *
+     * @return Generator<array<string>>
+     */
+    private function getAllShareesByType(string $user, int $shareType): Generator {
+        $offset = 0;
+        $pageSize = 50;
+
+        while (count($page = $this->shareManager->getSharesBy(
+            $user,
+            $shareType,
+            null,
+            false,
+            $pageSize,
+            $offset
+        ))) {
+            foreach ($page as $share) {
+                yield [$share->getSharedWith(), $share->getSharedWithDisplayName() ?? $share->getSharedWith()];
+            }
+
+            $offset += $pageSize;
+        }
+    }
+
+    private function sortShareesByFrequency(array $sharees): array {
+        usort($sharees, function (array $s1, array $s2) {
+            return $s2['count'] - $s1['count'];
+        });
+        return $sharees;
+    }
+
+    private $searchResultTypeMap = [
+        Share::SHARE_TYPE_USER => 'users',
+        Share::SHARE_TYPE_GROUP => 'groups',
+        Share::SHARE_TYPE_REMOTE => 'remotes',
+        Share::SHARE_TYPE_REMOTE_GROUP => 'remote_groups',
+        Share::SHARE_TYPE_EMAIL => 'emails',
+    ];
+
+    private function getAllSharees(string $user, array $shareTypes): ISearchResult {
+        $result = [];
+        foreach ($shareTypes as $shareType) {
+            $sharees = $this->getAllShareesByType($user, $shareType);
+            $shareTypeResults = [];
+            foreach ($sharees as list($sharee, $displayname)) {
+                if (!isset($this->searchResultTypeMap[$shareType])) {
+                    continue;
+                }
+
+                if (!isset($shareTypeResults[$sharee])) {
+                    $shareTypeResults[$sharee] = [
+                        'count' => 1,
+                        'label' => $displayname,
+                        'value' => [
+                            'shareType' => $shareType,
+                            'shareWith' => $sharee,
+                        ],
+                    ];
+                } else {
+                    $shareTypeResults[$sharee]['count']++;
+                }
+            }
+            $result = array_merge($result, array_values($shareTypeResults));
+        }
+
+        $top5 = array_slice(
+            $this->sortShareesByFrequency($result),
+            0,
+            5
+        );
+
+        $searchResult = new SearchResult();
+        foreach ($this->searchResultTypeMap as $int => $str) {
+            $searchResult->addResultSet(new SearchResultType($str), [], []);
+            foreach ($top5 as $x) {
+                if ($x['value']['shareType'] === $int) {
+                    $searchResult->addResultSet(new SearchResultType($str), [], [$x]);
+                }
+            }
+        }
+        return $searchResult;
+    }
+
+    /**
+     * @NoAdminRequired
+     *
+     * @param string $itemType
+     * @return DataResponse
+     * @throws OCSBadRequestException
+     */
+    public function findRecommended(string $itemType = null, $shareType = null): DataResponse {
+        $shareTypes = [
+            Share::SHARE_TYPE_USER,
+        ];
+
+        if ($itemType === null) {
+            throw new OCSBadRequestException('Missing itemType');
+        } elseif ($itemType === 'file' || $itemType === 'folder') {
+            if ($this->shareManager->allowGroupSharing()) {
+                $shareTypes[] = Share::SHARE_TYPE_GROUP;
+            }
+
+            if ($this->isRemoteSharingAllowed($itemType)) {
+                $shareTypes[] = Share::SHARE_TYPE_REMOTE;
+            }
+
+            if ($this->isRemoteGroupSharingAllowed($itemType)) {
+                $shareTypes[] = Share::SHARE_TYPE_REMOTE_GROUP;
+            }
+
+            if ($this->shareManager->shareProviderExists(Share::SHARE_TYPE_EMAIL)) {
+                $shareTypes[] = Share::SHARE_TYPE_EMAIL;
+            }
+
+            if ($this->shareManager->shareProviderExists(Share::SHARE_TYPE_ROOM)) {
+                $shareTypes[] = Share::SHARE_TYPE_ROOM;
+            }
+        } else {
+            $shareTypes[] = Share::SHARE_TYPE_GROUP;
+            $shareTypes[] = Share::SHARE_TYPE_EMAIL;
+        }
+
+        // FIXME: DI
+        if (\OC::$server->getAppManager()->isEnabledForUser('circles') && class_exists('\OCA\Circles\ShareByCircleProvider')) {
+            $shareTypes[] = Share::SHARE_TYPE_CIRCLE;
+        }
+
+        if (isset($_GET['shareType']) && is_array($_GET['shareType'])) {
+            $shareTypes = array_intersect($shareTypes, $_GET['shareType']);
+            sort($shareTypes);
+        } else if (is_numeric($shareType)) {
+            $shareTypes = array_intersect($shareTypes, [(int) $shareType]);
+            sort($shareTypes);
+        }
+
+        return new DataResponse(
+            $this->getAllSharees($this->userId, $shareTypes)->asArray()
+        );
+    }
+
+    /**
+     * Method to get out the static call for better testing
+     *
+     * @param string $itemType
+     * @return bool
+     */
+    protected function isRemoteSharingAllowed(string $itemType): bool {
+        try {
+            // FIXME: static foo makes unit testing unnecessarily difficult
+            $backend = \OC\Share\Share::getBackend($itemType);
+            return $backend->isShareTypeAllowed(Share::SHARE_TYPE_REMOTE);
+        } catch (\Exception $e) {
+            return false;
+        }
+    }
+
+    protected function isRemoteGroupSharingAllowed(string $itemType): bool {
+        try {
+            // FIXME: static foo makes unit testing unnecessarily difficult
+            $backend = \OC\Share\Share::getBackend($itemType);
+            return $backend->isShareTypeAllowed(Share::SHARE_TYPE_REMOTE_GROUP);
+        } catch (\Exception $e) {
+            return false;
+        }
+    }
+
+
+    /**
+     * Generates a bunch of pagination links for the current page
+     *
+     * @param int $page Current page
+     * @param array $params Parameters for the URL
+     * @return string
+     */
+    protected function getPaginationLink(int $page, array $params): string {
+        if ($this->isV2()) {
+            $url = $this->urlGenerator->getAbsoluteURL('/ocs/v2.php/apps/files_sharing/api/v1/sharees') . '?';
+        } else {
+            $url = $this->urlGenerator->getAbsoluteURL('/ocs/v1.php/apps/files_sharing/api/v1/sharees') . '?';
+        }
+        $params['page'] = $page + 1;
+        return '<' . $url . http_build_query($params) . '>; rel="next"';
+    }
+
+    /**
+     * @return bool
+     */
+    protected function isV2(): bool {
+        return $this->request->getScriptName() === '/ocs/v2.php';
+    }
 }

Spacing +7 added lines, -7 removed lines

@@ -138,13 +138,13 @@ 
 	public function search(string $search = '', string $itemType = null, int $page = 1, int $perPage = 200, $shareType = null, bool $lookup = true): DataResponse {
 
 		// only search for string larger than a given threshold
-		$threshold = (int)$this->config->getSystemValue('sharing.minSearchStringLength', 0);
+		$threshold = (int) $this->config->getSystemValue('sharing.minSearchStringLength', 0);
 		if (strlen($search) < $threshold) {
 			return new DataResponse($this->result);
 		}
 
 		// never return more than the max. number of results configured in the config.php
-		$maxResults = (int)$this->config->getSystemValue('sharing.maxAutocompleteResults', 0);
+		$maxResults = (int) $this->config->getSystemValue('sharing.maxAutocompleteResults', 0);
 		if ($maxResults > 0) {
 			$perPage = min($perPage, $maxResults);
 		}
@@ -212,7 +212,7 @@ 
 		list($result, $hasMoreResults) = $this->collaboratorSearch->search($search, $shareTypes, $lookup, $this->limit, $this->offset);
 
 		// extra treatment for 'exact' subarray, with a single merge expected keys might be lost
-		if(isset($result['exact'])) {
+		if (isset($result['exact'])) {
 			$result['exact'] = array_merge($this->result['exact'], $result['exact']);
 		}
 		$this->result = array_merge($this->result, $result);
@@ -257,7 +257,7 @@ 
 	}
 
 	private function sortShareesByFrequency(array $sharees): array {
-		usort($sharees, function (array $s1, array $s2) {
+		usort($sharees, function(array $s1, array $s2) {
 			return $s2['count'] - $s1['count'];
 		});
 		return $sharees;
@@ -408,12 +408,12 @@ 
 	 */
 	protected function getPaginationLink(int $page, array $params): string {
 		if ($this->isV2()) {
-			$url = $this->urlGenerator->getAbsoluteURL('/ocs/v2.php/apps/files_sharing/api/v1/sharees') . '?';
+			$url = $this->urlGenerator->getAbsoluteURL('/ocs/v2.php/apps/files_sharing/api/v1/sharees').'?';
 		} else {
-			$url = $this->urlGenerator->getAbsoluteURL('/ocs/v1.php/apps/files_sharing/api/v1/sharees') . '?';
+			$url = $this->urlGenerator->getAbsoluteURL('/ocs/v1.php/apps/files_sharing/api/v1/sharees').'?';
 		}
 		$params['page'] = $page + 1;
-		return '<' . $url . http_build_query($params) . '>; rel="next"';
+		return '<'.$url.http_build_query($params).'>; rel="next"';
 	}
 
 	/**

apps/files_sharing/lib/Controller/ShareAPIController.php

Indentation +1576 added lines, -1576 removed lines

@@ -76,1584 +76,1584 @@
  */
 class ShareAPIController extends OCSController {
 
-	/** @var IManager */
-	private $shareManager;
-	/** @var IGroupManager */
-	private $groupManager;
-	/** @var IUserManager */
-	private $userManager;
-	/** @var IRootFolder */
-	private $rootFolder;
-	/** @var IURLGenerator */
-	private $urlGenerator;
-	/** @var string */
-	private $currentUser;
-	/** @var IL10N */
-	private $l;
-	/** @var \OCP\Files\Node */
-	private $lockedNode;
-	/** @var IConfig */
-	private $config;
-	/** @var IAppManager */
-	private $appManager;
-	/** @var IServerContainer */
-	private $serverContainer;
-
-	/**
-	 * Share20OCS constructor.
-	 *
-	 * @param string $appName
-	 * @param IRequest $request
-	 * @param IManager $shareManager
-	 * @param IGroupManager $groupManager
-	 * @param IUserManager $userManager
-	 * @param IRootFolder $rootFolder
-	 * @param IURLGenerator $urlGenerator
-	 * @param string $userId
-	 * @param IL10N $l10n
-	 * @param IConfig $config
-	 * @param IAppManager $appManager
-	 * @param IServerContainer $serverContainer
-	 */
-	public function __construct(
-		string $appName,
-		IRequest $request,
-		IManager $shareManager,
-		IGroupManager $groupManager,
-		IUserManager $userManager,
-		IRootFolder $rootFolder,
-		IURLGenerator $urlGenerator,
-		string $userId = null,
-		IL10N $l10n,
-		IConfig $config,
-		IAppManager $appManager,
-		IServerContainer $serverContainer
-	) {
-		parent::__construct($appName, $request);
-
-		$this->shareManager = $shareManager;
-		$this->userManager = $userManager;
-		$this->groupManager = $groupManager;
-		$this->request = $request;
-		$this->rootFolder = $rootFolder;
-		$this->urlGenerator = $urlGenerator;
-		$this->currentUser = $userId;
-		$this->l = $l10n;
-		$this->config = $config;
-		$this->appManager = $appManager;
-		$this->serverContainer = $serverContainer;
-	}
-
-	/**
-	 * Convert an IShare to an array for OCS output
-	 *
-	 * @param \OCP\Share\IShare $share
-	 * @param Node|null $recipientNode
-	 * @return array
-	 * @throws NotFoundException In case the node can't be resolved.
-	 *
-	 * @suppress PhanUndeclaredClassMethod
-	 */
-	protected function formatShare(\OCP\Share\IShare $share, Node $recipientNode = null): array {
-		$sharedBy = $this->userManager->get($share->getSharedBy());
-		$shareOwner = $this->userManager->get($share->getShareOwner());
-
-		$result = [
-			'id' => $share->getId(),
-			'share_type' => $share->getShareType(),
-			'uid_owner' => $share->getSharedBy(),
-			'displayname_owner' => $sharedBy !== null ? $sharedBy->getDisplayName() : $share->getSharedBy(),
-			// recipient permissions
-			'permissions' => $share->getPermissions(),
-			// current user permissions on this share
-			'can_edit' => $this->canEditShare($share),
-			'can_delete' => $this->canDeleteShare($share),
-			'stime' => $share->getShareTime()->getTimestamp(),
-			'parent' => null,
-			'expiration' => null,
-			'token' => null,
-			'uid_file_owner' => $share->getShareOwner(),
-			'note' => $share->getNote(),
-			'label' => $share->getLabel(),
-			'displayname_file_owner' => $shareOwner !== null ? $shareOwner->getDisplayName() : $share->getShareOwner(),
-		];
-
-		$userFolder = $this->rootFolder->getUserFolder($this->currentUser);
-		if ($recipientNode) {
-			$node = $recipientNode;
-		} else {
-			$nodes = $userFolder->getById($share->getNodeId());
-			if (empty($nodes)) {
-				// fallback to guessing the path
-				$node = $userFolder->get($share->getTarget());
-				if ($node === null || $share->getTarget() === '') {
-					throw new NotFoundException();
-				}
-			} else {
-				$node = reset($nodes);
-			}
-		}
-
-		$result['path'] = $userFolder->getRelativePath($node->getPath());
-		if ($node instanceof \OCP\Files\Folder) {
-			$result['item_type'] = 'folder';
-		} else {
-			$result['item_type'] = 'file';
-		}
-
-		$result['mimetype'] = $node->getMimetype();
-		$result['storage_id'] = $node->getStorage()->getId();
-		$result['storage'] = $node->getStorage()->getCache()->getNumericStorageId();
-		$result['item_source'] = $node->getId();
-		$result['file_source'] = $node->getId();
-		$result['file_parent'] = $node->getParent()->getId();
-		$result['file_target'] = $share->getTarget();
-
-		$expiration = $share->getExpirationDate();
-		if ($expiration !== null) {
-			$result['expiration'] = $expiration->format('Y-m-d 00:00:00');
-		}
-
-		if ($share->getShareType() === Share::SHARE_TYPE_USER) {
-			$sharedWith = $this->userManager->get($share->getSharedWith());
-			$result['share_with'] = $share->getSharedWith();
-			$result['share_with_displayname'] = $sharedWith !== null ? $sharedWith->getDisplayName() : $share->getSharedWith();
-		} else if ($share->getShareType() === Share::SHARE_TYPE_GROUP) {
-			$group = $this->groupManager->get($share->getSharedWith());
-			$result['share_with'] = $share->getSharedWith();
-			$result['share_with_displayname'] = $group !== null ? $group->getDisplayName() : $share->getSharedWith();
-		} else if ($share->getShareType() === IShare::TYPE_LINK) {
-
-			// "share_with" and "share_with_displayname" for passwords of link
-			// shares was deprecated in Nextcloud 15, use "password" instead.
-			$result['share_with'] = $share->getPassword();
-			$result['share_with_displayname'] = '(' . $this->l->t('Shared link') . ')';
-
-			$result['password'] = $share->getPassword();
-
-			$result['send_password_by_talk'] = $share->getSendPasswordByTalk();
-
-			$result['token'] = $share->getToken();
-			$result['url'] = $this->urlGenerator->linkToRouteAbsolute('files_sharing.sharecontroller.showShare', ['token' => $share->getToken()]);
-		} else if ($share->getShareType() === Share::SHARE_TYPE_REMOTE || $share->getShareType() === Share::SHARE_TYPE_REMOTE_GROUP) {
-			$result['share_with'] = $share->getSharedWith();
-			$result['share_with_displayname'] = $this->getDisplayNameFromAddressBook($share->getSharedWith(), 'CLOUD');
-			$result['token'] = $share->getToken();
-		} else if ($share->getShareType() === Share::SHARE_TYPE_EMAIL) {
-			$result['share_with'] = $share->getSharedWith();
-			$result['password'] = $share->getPassword();
-			$result['send_password_by_talk'] = $share->getSendPasswordByTalk();
-			$result['share_with_displayname'] = $this->getDisplayNameFromAddressBook($share->getSharedWith(), 'EMAIL');
-			$result['token'] = $share->getToken();
-		} else if ($share->getShareType() === Share::SHARE_TYPE_CIRCLE) {
-			// getSharedWith() returns either "name (type, owner)" or
-			// "name (type, owner) [id]", depending on the Circles app version.
-			$hasCircleId = (substr($share->getSharedWith(), -1) === ']');
-
-			$result['share_with_displayname'] = $share->getSharedWithDisplayName();
-			if (empty($result['share_with_displayname'])) {
-				$displayNameLength = ($hasCircleId ? strrpos($share->getSharedWith(), ' ') : strlen($share->getSharedWith()));
-				$result['share_with_displayname'] = substr($share->getSharedWith(), 0, $displayNameLength);
-			}
-
-			$result['share_with_avatar'] = $share->getSharedWithAvatar();
-
-			$shareWithStart = ($hasCircleId ? strrpos($share->getSharedWith(), '[') + 1 : 0);
-			$shareWithLength = ($hasCircleId ? -1 : strpos($share->getSharedWith(), ' '));
-			if (is_bool($shareWithLength)) {
-				$shareWithLength = -1;
-			}
-			$result['share_with'] = substr($share->getSharedWith(), $shareWithStart, $shareWithLength);
-		} else if ($share->getShareType() === Share::SHARE_TYPE_ROOM) {
-			$result['share_with'] = $share->getSharedWith();
-			$result['share_with_displayname'] = '';
-
-			try {
-				$result = array_merge($result, $this->getRoomShareHelper()->formatShare($share));
-			} catch (QueryException $e) {}
-		}
-
-
-		$result['mail_send'] = $share->getMailSend() ? 1 : 0;
-		$result['hide_download'] = $share->getHideDownload() ? 1 : 0;
-
-		return $result;
-	}
-
-	/**
-	 * Check if one of the users address books knows the exact property, if
-	 * yes we return the full name.
-	 *
-	 * @param string $query
-	 * @param string $property
-	 * @return string
-	 */
-	private function getDisplayNameFromAddressBook(string $query, string $property): string {
-		// FIXME: If we inject the contacts manager it gets initialized bofore any address books are registered
-		$result = \OC::$server->getContactsManager()->search($query, [$property]);
-		foreach ($result as $r) {
-			foreach ($r[$property] as $value) {
-				if ($value === $query) {
-					return $r['FN'];
-				}
-			}
-		}
-
-		return $query;
-	}
-
-	/**
-	 * Get a specific share by id
-	 *
-	 * @NoAdminRequired
-	 *
-	 * @param string $id
-	 * @return DataResponse
-	 * @throws OCSNotFoundException
-	 */
-	public function getShare(string $id): DataResponse {
-		try {
-			$share = $this->getShareById($id);
-		} catch (ShareNotFound $e) {
-			throw new OCSNotFoundException($this->l->t('Wrong share ID, share doesn\'t exist'));
-		}
-
-		try {
-			if ($this->canAccessShare($share)) {
-				$share = $this->formatShare($share);
-				return new DataResponse([$share]);
-			}
-		} catch (NotFoundException $e) {
-			// Fall trough
-		}
-
-		throw new OCSNotFoundException($this->l->t('Wrong share ID, share doesn\'t exist'));
-	}
-
-	/**
-	 * Delete a share
-	 *
-	 * @NoAdminRequired
-	 *
-	 * @param string $id
-	 * @return DataResponse
-	 * @throws OCSNotFoundException
-	 */
-	public function deleteShare(string $id): DataResponse {
-		try {
-			$share = $this->getShareById($id);
-		} catch (ShareNotFound $e) {
-			throw new OCSNotFoundException($this->l->t('Wrong share ID, share doesn\'t exist'));
-		}
-
-		try {
-			$this->lock($share->getNode());
-		} catch (LockedException $e) {
-			throw new OCSNotFoundException($this->l->t('Could not delete share'));
-		}
-
-		if (!$this->canAccessShare($share)) {
-			throw new OCSNotFoundException($this->l->t('Wrong share ID, share doesn\'t exist'));
-		}
-
-		// if it's a group share or a room share
-		// we don't delete the share, but only the
-		// mount point. Allowing it to be restored
-		// from the deleted shares
-		if ($this->canDeleteShareFromSelf($share)) {
-			$this->shareManager->deleteFromSelf($share, $this->currentUser);
-		} else {
-			if (!$this->canDeleteShare($share)) {
-				throw new OCSForbiddenException($this->l->t('Could not delete share'));
-			}
-
-			$this->shareManager->deleteShare($share);
-		}
-
-		return new DataResponse();
-	}
-
-	/**
-	 * @NoAdminRequired
-	 *
-	 * @param string $path
-	 * @param int $permissions
-	 * @param int $shareType
-	 * @param string $shareWith
-	 * @param string $publicUpload
-	 * @param string $password
-	 * @param string $sendPasswordByTalk
-	 * @param string $expireDate
-	 * @param string $label
-	 *
-	 * @return DataResponse
-	 * @throws NotFoundException
-	 * @throws OCSBadRequestException
-	 * @throws OCSException
-	 * @throws OCSForbiddenException
-	 * @throws OCSNotFoundException
-	 * @throws InvalidPathException
-	 * @suppress PhanUndeclaredClassMethod
-	 */
-	public function createShare(
-		string $path = null,
-		int $permissions = null,
-		int $shareType = -1,
-		string $shareWith = null,
-		string $publicUpload = 'false',
-		string $password = '',
-		string $sendPasswordByTalk = null,
-		string $expireDate = '',
-		string $label = ''
-	): DataResponse {
-		$share = $this->shareManager->newShare();
-
-		if ($permissions === null) {
-			$permissions = $this->config->getAppValue('core', 'shareapi_default_permissions', Constants::PERMISSION_ALL);
-		}
-
-		// Verify path
-		if ($path === null) {
-			throw new OCSNotFoundException($this->l->t('Please specify a file or folder path'));
-		}
-
-		$userFolder = $this->rootFolder->getUserFolder($this->currentUser);
-		try {
-			$path = $userFolder->get($path);
-		} catch (NotFoundException $e) {
-			throw new OCSNotFoundException($this->l->t('Wrong path, file/folder doesn\'t exist'));
-		}
-
-		$share->setNode($path);
-
-		try {
-			$this->lock($share->getNode());
-		} catch (LockedException $e) {
-			throw new OCSNotFoundException($this->l->t('Could not create share'));
-		}
-
-		if ($permissions < 0 || $permissions > Constants::PERMISSION_ALL) {
-			throw new OCSNotFoundException($this->l->t('invalid permissions'));
-		}
-
-		// Shares always require read permissions
-		$permissions |= Constants::PERMISSION_READ;
-
-		if ($path instanceof \OCP\Files\File) {
-			// Single file shares should never have delete or create permissions
-			$permissions &= ~Constants::PERMISSION_DELETE;
-			$permissions &= ~Constants::PERMISSION_CREATE;
-		}
-
-		/**
-		 * Hack for https://github.com/owncloud/core/issues/22587
-		 * We check the permissions via webdav. But the permissions of the mount point
-		 * do not equal the share permissions. Here we fix that for federated mounts.
-		 */
-		if ($path->getStorage()->instanceOfStorage(Storage::class)) {
-			$permissions &= ~($permissions & ~$path->getPermissions());
-		}
-
-		if ($shareType === Share::SHARE_TYPE_USER) {
-			// Valid user is required to share
-			if ($shareWith === null || !$this->userManager->userExists($shareWith)) {
-				throw new OCSNotFoundException($this->l->t('Please specify a valid user'));
-			}
-			$share->setSharedWith($shareWith);
-			$share->setPermissions($permissions);
-		} else if ($shareType === Share::SHARE_TYPE_GROUP) {
-			if (!$this->shareManager->allowGroupSharing()) {
-				throw new OCSNotFoundException($this->l->t('Group sharing is disabled by the administrator'));
-			}
-
-			// Valid group is required to share
-			if ($shareWith === null || !$this->groupManager->groupExists($shareWith)) {
-				throw new OCSNotFoundException($this->l->t('Please specify a valid group'));
-			}
-			$share->setSharedWith($shareWith);
-			$share->setPermissions($permissions);
-		} else if ($shareType === Share::SHARE_TYPE_LINK
-			|| $shareType === Share::SHARE_TYPE_EMAIL) {
-
-			// Can we even share links?
-			if (!$this->shareManager->shareApiAllowLinks()) {
-				throw new OCSNotFoundException($this->l->t('Public link sharing is disabled by the administrator'));
-			}
-
-			if ($publicUpload === 'true') {
-				// Check if public upload is allowed
-				if (!$this->shareManager->shareApiLinkAllowPublicUpload()) {
-					throw new OCSForbiddenException($this->l->t('Public upload disabled by the administrator'));
-				}
-
-				// Public upload can only be set for folders
-				if ($path instanceof \OCP\Files\File) {
-					throw new OCSNotFoundException($this->l->t('Public upload is only possible for publicly shared folders'));
-				}
-
-				$share->setPermissions(
-					Constants::PERMISSION_READ |
-					Constants::PERMISSION_CREATE |
-					Constants::PERMISSION_UPDATE |
-					Constants::PERMISSION_DELETE
-				);
-			} else {
-				$share->setPermissions(Constants::PERMISSION_READ);
-			}
-
-			// Set password
-			if ($password !== '') {
-				$share->setPassword($password);
-			}
-
-			// Only share by mail have a recipient
-			if ($shareType === Share::SHARE_TYPE_EMAIL) {
-				$share->setSharedWith($shareWith);
-			} else {
-				// Only link share have a label
-				if (!empty($label)) {
-					$share->setLabel($label);
-				}
-			}
-
-			if ($sendPasswordByTalk === 'true') {
-				if (!$this->appManager->isEnabledForUser('spreed')) {
-					throw new OCSForbiddenException($this->l->t('Sharing %s sending the password by Nextcloud Talk failed because Nextcloud Talk is not enabled', [$path->getPath()]));
-				}
-
-				$share->setSendPasswordByTalk(true);
-			}
-
-			//Expire date
-			if ($expireDate !== '') {
-				try {
-					$expireDate = $this->parseDate($expireDate);
-					$share->setExpirationDate($expireDate);
-				} catch (\Exception $e) {
-					throw new OCSNotFoundException($this->l->t('Invalid date, date format must be YYYY-MM-DD'));
-				}
-			}
-		} else if ($shareType === Share::SHARE_TYPE_REMOTE) {
-			if (!$this->shareManager->outgoingServer2ServerSharesAllowed()) {
-				throw new OCSForbiddenException($this->l->t('Sharing %1$s failed because the back end does not allow shares from type %2$s', [$path->getPath(), $shareType]));
-			}
-
-			$share->setSharedWith($shareWith);
-			$share->setPermissions($permissions);
-		} else if ($shareType === Share::SHARE_TYPE_REMOTE_GROUP) {
-			if (!$this->shareManager->outgoingServer2ServerGroupSharesAllowed()) {
-				throw new OCSForbiddenException($this->l->t('Sharing %1$s failed because the back end does not allow shares from type %2$s', [$path->getPath(), $shareType]));
-			}
-
-			$share->setSharedWith($shareWith);
-			$share->setPermissions($permissions);
-		} else if ($shareType === Share::SHARE_TYPE_CIRCLE) {
-			if (!\OC::$server->getAppManager()->isEnabledForUser('circles') || !class_exists('\OCA\Circles\ShareByCircleProvider')) {
-				throw new OCSNotFoundException($this->l->t('You cannot share to a Circle if the app is not enabled'));
-			}
-
-			$circle = \OCA\Circles\Api\v1\Circles::detailsCircle($shareWith);
-
-			// Valid circle is required to share
-			if ($circle === null) {
-				throw new OCSNotFoundException($this->l->t('Please specify a valid circle'));
-			}
-			$share->setSharedWith($shareWith);
-			$share->setPermissions($permissions);
-		} else if ($shareType === Share::SHARE_TYPE_ROOM) {
-			try {
-				$this->getRoomShareHelper()->createShare($share, $shareWith, $permissions, $expireDate);
-			} catch (QueryException $e) {
-				throw new OCSForbiddenException($this->l->t('Sharing %s failed because the back end does not support room shares', [$path->getPath()]));
-			}
-		} else {
-			throw new OCSBadRequestException($this->l->t('Unknown share type'));
-		}
-
-		$share->setShareType($shareType);
-		$share->setSharedBy($this->currentUser);
-
-		try {
-			$share = $this->shareManager->createShare($share);
-		} catch (GenericShareException $e) {
-			$code = $e->getCode() === 0 ? 403 : $e->getCode();
-			throw new OCSException($e->getHint(), $code);
-		} catch (\Exception $e) {
-			throw new OCSForbiddenException($e->getMessage(), $e);
-		}
-
-		$output = $this->formatShare($share);
-
-		return new DataResponse($output);
-	}
-
-	/**
-	 * @param null|Node $node
-	 * @param boolean $includeTags
-	 *
-	 * @return array
-	 */
-	private function getSharedWithMe($node, bool $includeTags): array {
-
-		$userShares = $this->shareManager->getSharedWith($this->currentUser, Share::SHARE_TYPE_USER, $node, -1, 0);
-		$groupShares = $this->shareManager->getSharedWith($this->currentUser, Share::SHARE_TYPE_GROUP, $node, -1, 0);
-		$circleShares = $this->shareManager->getSharedWith($this->currentUser, Share::SHARE_TYPE_CIRCLE, $node, -1, 0);
-		$roomShares = $this->shareManager->getSharedWith($this->currentUser, Share::SHARE_TYPE_ROOM, $node, -1, 0);
-
-		$shares = array_merge($userShares, $groupShares, $circleShares, $roomShares);
-
-		$shares = array_filter($shares, function (IShare $share) {
-			return $share->getShareOwner() !== $this->currentUser;
-		});
-
-		$formatted = [];
-		foreach ($shares as $share) {
-			if ($this->canAccessShare($share)) {
-				try {
-					$formatted[] = $this->formatShare($share);
-				} catch (NotFoundException $e) {
-					// Ignore this share
-				}
-			}
-		}
-
-		if ($includeTags) {
-			$formatted = Helper::populateTags($formatted, 'file_source', \OC::$server->getTagManager());
-		}
-
-		return $formatted;
-	}
-
-	/**
-	 * @param \OCP\Files\Node $folder
-	 *
-	 * @return array
-	 * @throws OCSBadRequestException
-	 * @throws NotFoundException
-	 */
-	private function getSharesInDir(Node $folder): array {
-		if (!($folder instanceof \OCP\Files\Folder)) {
-			throw new OCSBadRequestException($this->l->t('Not a directory'));
-		}
-
-		$nodes = $folder->getDirectoryListing();
-
-		/** @var \OCP\Share\IShare[] $shares */
-		$shares = array_reduce($nodes, function ($carry, $node) {
-			$carry = array_merge($carry, $this->getAllShares($node, true));
-			return $carry;
-		}, []);
-
-		// filter out duplicate shares
-		$known = [];
-
-
-		$formatted = $miniFormatted = [];
-		$resharingRight = false;
-		$known = [];
-		foreach ($shares as $share) {
-			if (in_array($share->getId(), $known) || $share->getSharedWith() === $this->currentUser) {
-				continue;
-			}
-
-			try {
-				$format = $this->formatShare($share);
-
-				$known[] = $share->getId();
-				$formatted[] = $format;
-				if ($share->getSharedBy() === $this->currentUser) {
-					$miniFormatted[] = $format;
-				}
-				if (!$resharingRight && $this->shareProviderResharingRights($this->currentUser, $share, $folder)) {
-					$resharingRight = true;
-				}
-			} catch (\Exception $e) {
-				//Ignore this share
-			}
-		}
-
-		if (!$resharingRight) {
-			$formatted = $miniFormatted;
-		}
-
-		return $formatted;
-	}
-
-	/**
-	 * The getShares function.
-	 *
-	 * @NoAdminRequired
-	 *
-	 * @param string $shared_with_me
-	 * @param string $reshares
-	 * @param string $subfiles
-	 * @param string $path
-	 *
-	 * - Get shares by the current user
-	 * - Get shares by the current user and reshares (?reshares=true)
-	 * - Get shares with the current user (?shared_with_me=true)
-	 * - Get shares for a specific path (?path=...)
-	 * - Get all shares in a folder (?subfiles=true&path=..)
-	 *
-	 * @param string $include_tags
-	 *
-	 * @return DataResponse
-	 * @throws NotFoundException
-	 * @throws OCSBadRequestException
-	 * @throws OCSNotFoundException
-	 */
-	public function getShares(
-		string $shared_with_me = 'false',
-		string $reshares = 'false',
-		string $subfiles = 'false',
-		string $path = '',
-		string $include_tags = 'false'
-	): DataResponse {
-
-		$node = null;
-		if ($path !== '') {
-			$userFolder = $this->rootFolder->getUserFolder($this->currentUser);
-			try {
-				$node = $userFolder->get($path);
-				$this->lock($node);
-			} catch (NotFoundException $e) {
-				throw new OCSNotFoundException(
-					$this->l->t('Wrong path, file/folder doesn\'t exist')
-				);
-			} catch (LockedException $e) {
-				throw new OCSNotFoundException($this->l->t('Could not lock node'));
-			}
-		}
-
-		$shares = $this->getFormattedShares(
-			$this->currentUser,
-			$node,
-			($shared_with_me === 'true'),
-			($reshares === 'true'),
-			($subfiles === 'true'),
-			($include_tags === 'true')
-		);
-
-		return new DataResponse($shares);
-	}
-
-
-	/**
-	 * @param string $viewer
-	 * @param Node $node
-	 * @param bool $sharedWithMe
-	 * @param bool $reShares
-	 * @param bool $subFiles
-	 * @param bool $includeTags
-	 *
-	 * @return array
-	 * @throws NotFoundException
-	 * @throws OCSBadRequestException
-	 */
-	private function getFormattedShares(
-		string $viewer, $node = null, bool $sharedWithMe = false, bool $reShares = false,
-		bool $subFiles = false, bool $includeTags = false
-	): array {
-
-		if ($sharedWithMe) {
-			return $this->getSharedWithMe($node, $includeTags);
-		}
-
-		if ($subFiles) {
-			return $this->getSharesInDir($node);
-		}
-
-		$shares = $this->getSharesFromNode($viewer, $node, $reShares);
-
-		$known = $formatted = $miniFormatted = [];
-		$resharingRight = false;
-		foreach ($shares as $share) {
-			try {
-				$share->getNode();
-			} catch (NotFoundException $e) {
-				/*
+    /** @var IManager */
+    private $shareManager;
+    /** @var IGroupManager */
+    private $groupManager;
+    /** @var IUserManager */
+    private $userManager;
+    /** @var IRootFolder */
+    private $rootFolder;
+    /** @var IURLGenerator */
+    private $urlGenerator;
+    /** @var string */
+    private $currentUser;
+    /** @var IL10N */
+    private $l;
+    /** @var \OCP\Files\Node */
+    private $lockedNode;
+    /** @var IConfig */
+    private $config;
+    /** @var IAppManager */
+    private $appManager;
+    /** @var IServerContainer */
+    private $serverContainer;
+
+    /**
+     * Share20OCS constructor.
+     *
+     * @param string $appName
+     * @param IRequest $request
+     * @param IManager $shareManager
+     * @param IGroupManager $groupManager
+     * @param IUserManager $userManager
+     * @param IRootFolder $rootFolder
+     * @param IURLGenerator $urlGenerator
+     * @param string $userId
+     * @param IL10N $l10n
+     * @param IConfig $config
+     * @param IAppManager $appManager
+     * @param IServerContainer $serverContainer
+     */
+    public function __construct(
+        string $appName,
+        IRequest $request,
+        IManager $shareManager,
+        IGroupManager $groupManager,
+        IUserManager $userManager,
+        IRootFolder $rootFolder,
+        IURLGenerator $urlGenerator,
+        string $userId = null,
+        IL10N $l10n,
+        IConfig $config,
+        IAppManager $appManager,
+        IServerContainer $serverContainer
+    ) {
+        parent::__construct($appName, $request);
+
+        $this->shareManager = $shareManager;
+        $this->userManager = $userManager;
+        $this->groupManager = $groupManager;
+        $this->request = $request;
+        $this->rootFolder = $rootFolder;
+        $this->urlGenerator = $urlGenerator;
+        $this->currentUser = $userId;
+        $this->l = $l10n;
+        $this->config = $config;
+        $this->appManager = $appManager;
+        $this->serverContainer = $serverContainer;
+    }
+
+    /**
+     * Convert an IShare to an array for OCS output
+     *
+     * @param \OCP\Share\IShare $share
+     * @param Node|null $recipientNode
+     * @return array
+     * @throws NotFoundException In case the node can't be resolved.
+     *
+     * @suppress PhanUndeclaredClassMethod
+     */
+    protected function formatShare(\OCP\Share\IShare $share, Node $recipientNode = null): array {
+        $sharedBy = $this->userManager->get($share->getSharedBy());
+        $shareOwner = $this->userManager->get($share->getShareOwner());
+
+        $result = [
+            'id' => $share->getId(),
+            'share_type' => $share->getShareType(),
+            'uid_owner' => $share->getSharedBy(),
+            'displayname_owner' => $sharedBy !== null ? $sharedBy->getDisplayName() : $share->getSharedBy(),
+            // recipient permissions
+            'permissions' => $share->getPermissions(),
+            // current user permissions on this share
+            'can_edit' => $this->canEditShare($share),
+            'can_delete' => $this->canDeleteShare($share),
+            'stime' => $share->getShareTime()->getTimestamp(),
+            'parent' => null,
+            'expiration' => null,
+            'token' => null,
+            'uid_file_owner' => $share->getShareOwner(),
+            'note' => $share->getNote(),
+            'label' => $share->getLabel(),
+            'displayname_file_owner' => $shareOwner !== null ? $shareOwner->getDisplayName() : $share->getShareOwner(),
+        ];
+
+        $userFolder = $this->rootFolder->getUserFolder($this->currentUser);
+        if ($recipientNode) {
+            $node = $recipientNode;
+        } else {
+            $nodes = $userFolder->getById($share->getNodeId());
+            if (empty($nodes)) {
+                // fallback to guessing the path
+                $node = $userFolder->get($share->getTarget());
+                if ($node === null || $share->getTarget() === '') {
+                    throw new NotFoundException();
+                }
+            } else {
+                $node = reset($nodes);
+            }
+        }
+
+        $result['path'] = $userFolder->getRelativePath($node->getPath());
+        if ($node instanceof \OCP\Files\Folder) {
+            $result['item_type'] = 'folder';
+        } else {
+            $result['item_type'] = 'file';
+        }
+
+        $result['mimetype'] = $node->getMimetype();
+        $result['storage_id'] = $node->getStorage()->getId();
+        $result['storage'] = $node->getStorage()->getCache()->getNumericStorageId();
+        $result['item_source'] = $node->getId();
+        $result['file_source'] = $node->getId();
+        $result['file_parent'] = $node->getParent()->getId();
+        $result['file_target'] = $share->getTarget();
+
+        $expiration = $share->getExpirationDate();
+        if ($expiration !== null) {
+            $result['expiration'] = $expiration->format('Y-m-d 00:00:00');
+        }
+
+        if ($share->getShareType() === Share::SHARE_TYPE_USER) {
+            $sharedWith = $this->userManager->get($share->getSharedWith());
+            $result['share_with'] = $share->getSharedWith();
+            $result['share_with_displayname'] = $sharedWith !== null ? $sharedWith->getDisplayName() : $share->getSharedWith();
+        } else if ($share->getShareType() === Share::SHARE_TYPE_GROUP) {
+            $group = $this->groupManager->get($share->getSharedWith());
+            $result['share_with'] = $share->getSharedWith();
+            $result['share_with_displayname'] = $group !== null ? $group->getDisplayName() : $share->getSharedWith();
+        } else if ($share->getShareType() === IShare::TYPE_LINK) {
+
+            // "share_with" and "share_with_displayname" for passwords of link
+            // shares was deprecated in Nextcloud 15, use "password" instead.
+            $result['share_with'] = $share->getPassword();
+            $result['share_with_displayname'] = '(' . $this->l->t('Shared link') . ')';
+
+            $result['password'] = $share->getPassword();
+
+            $result['send_password_by_talk'] = $share->getSendPasswordByTalk();
+
+            $result['token'] = $share->getToken();
+            $result['url'] = $this->urlGenerator->linkToRouteAbsolute('files_sharing.sharecontroller.showShare', ['token' => $share->getToken()]);
+        } else if ($share->getShareType() === Share::SHARE_TYPE_REMOTE || $share->getShareType() === Share::SHARE_TYPE_REMOTE_GROUP) {
+            $result['share_with'] = $share->getSharedWith();
+            $result['share_with_displayname'] = $this->getDisplayNameFromAddressBook($share->getSharedWith(), 'CLOUD');
+            $result['token'] = $share->getToken();
+        } else if ($share->getShareType() === Share::SHARE_TYPE_EMAIL) {
+            $result['share_with'] = $share->getSharedWith();
+            $result['password'] = $share->getPassword();
+            $result['send_password_by_talk'] = $share->getSendPasswordByTalk();
+            $result['share_with_displayname'] = $this->getDisplayNameFromAddressBook($share->getSharedWith(), 'EMAIL');
+            $result['token'] = $share->getToken();
+        } else if ($share->getShareType() === Share::SHARE_TYPE_CIRCLE) {
+            // getSharedWith() returns either "name (type, owner)" or
+            // "name (type, owner) [id]", depending on the Circles app version.
+            $hasCircleId = (substr($share->getSharedWith(), -1) === ']');
+
+            $result['share_with_displayname'] = $share->getSharedWithDisplayName();
+            if (empty($result['share_with_displayname'])) {
+                $displayNameLength = ($hasCircleId ? strrpos($share->getSharedWith(), ' ') : strlen($share->getSharedWith()));
+                $result['share_with_displayname'] = substr($share->getSharedWith(), 0, $displayNameLength);
+            }
+
+            $result['share_with_avatar'] = $share->getSharedWithAvatar();
+
+            $shareWithStart = ($hasCircleId ? strrpos($share->getSharedWith(), '[') + 1 : 0);
+            $shareWithLength = ($hasCircleId ? -1 : strpos($share->getSharedWith(), ' '));
+            if (is_bool($shareWithLength)) {
+                $shareWithLength = -1;
+            }
+            $result['share_with'] = substr($share->getSharedWith(), $shareWithStart, $shareWithLength);
+        } else if ($share->getShareType() === Share::SHARE_TYPE_ROOM) {
+            $result['share_with'] = $share->getSharedWith();
+            $result['share_with_displayname'] = '';
+
+            try {
+                $result = array_merge($result, $this->getRoomShareHelper()->formatShare($share));
+            } catch (QueryException $e) {}
+        }
+
+
+        $result['mail_send'] = $share->getMailSend() ? 1 : 0;
+        $result['hide_download'] = $share->getHideDownload() ? 1 : 0;
+
+        return $result;
+    }
+
+    /**
+     * Check if one of the users address books knows the exact property, if
+     * yes we return the full name.
+     *
+     * @param string $query
+     * @param string $property
+     * @return string
+     */
+    private function getDisplayNameFromAddressBook(string $query, string $property): string {
+        // FIXME: If we inject the contacts manager it gets initialized bofore any address books are registered
+        $result = \OC::$server->getContactsManager()->search($query, [$property]);
+        foreach ($result as $r) {
+            foreach ($r[$property] as $value) {
+                if ($value === $query) {
+                    return $r['FN'];
+                }
+            }
+        }
+
+        return $query;
+    }
+
+    /**
+     * Get a specific share by id
+     *
+     * @NoAdminRequired
+     *
+     * @param string $id
+     * @return DataResponse
+     * @throws OCSNotFoundException
+     */
+    public function getShare(string $id): DataResponse {
+        try {
+            $share = $this->getShareById($id);
+        } catch (ShareNotFound $e) {
+            throw new OCSNotFoundException($this->l->t('Wrong share ID, share doesn\'t exist'));
+        }
+
+        try {
+            if ($this->canAccessShare($share)) {
+                $share = $this->formatShare($share);
+                return new DataResponse([$share]);
+            }
+        } catch (NotFoundException $e) {
+            // Fall trough
+        }
+
+        throw new OCSNotFoundException($this->l->t('Wrong share ID, share doesn\'t exist'));
+    }
+
+    /**
+     * Delete a share
+     *
+     * @NoAdminRequired
+     *
+     * @param string $id
+     * @return DataResponse
+     * @throws OCSNotFoundException
+     */
+    public function deleteShare(string $id): DataResponse {
+        try {
+            $share = $this->getShareById($id);
+        } catch (ShareNotFound $e) {
+            throw new OCSNotFoundException($this->l->t('Wrong share ID, share doesn\'t exist'));
+        }
+
+        try {
+            $this->lock($share->getNode());
+        } catch (LockedException $e) {
+            throw new OCSNotFoundException($this->l->t('Could not delete share'));
+        }
+
+        if (!$this->canAccessShare($share)) {
+            throw new OCSNotFoundException($this->l->t('Wrong share ID, share doesn\'t exist'));
+        }
+
+        // if it's a group share or a room share
+        // we don't delete the share, but only the
+        // mount point. Allowing it to be restored
+        // from the deleted shares
+        if ($this->canDeleteShareFromSelf($share)) {
+            $this->shareManager->deleteFromSelf($share, $this->currentUser);
+        } else {
+            if (!$this->canDeleteShare($share)) {
+                throw new OCSForbiddenException($this->l->t('Could not delete share'));
+            }
+
+            $this->shareManager->deleteShare($share);
+        }
+
+        return new DataResponse();
+    }
+
+    /**
+     * @NoAdminRequired
+     *
+     * @param string $path
+     * @param int $permissions
+     * @param int $shareType
+     * @param string $shareWith
+     * @param string $publicUpload
+     * @param string $password
+     * @param string $sendPasswordByTalk
+     * @param string $expireDate
+     * @param string $label
+     *
+     * @return DataResponse
+     * @throws NotFoundException
+     * @throws OCSBadRequestException
+     * @throws OCSException
+     * @throws OCSForbiddenException
+     * @throws OCSNotFoundException
+     * @throws InvalidPathException
+     * @suppress PhanUndeclaredClassMethod
+     */
+    public function createShare(
+        string $path = null,
+        int $permissions = null,
+        int $shareType = -1,
+        string $shareWith = null,
+        string $publicUpload = 'false',
+        string $password = '',
+        string $sendPasswordByTalk = null,
+        string $expireDate = '',
+        string $label = ''
+    ): DataResponse {
+        $share = $this->shareManager->newShare();
+
+        if ($permissions === null) {
+            $permissions = $this->config->getAppValue('core', 'shareapi_default_permissions', Constants::PERMISSION_ALL);
+        }
+
+        // Verify path
+        if ($path === null) {
+            throw new OCSNotFoundException($this->l->t('Please specify a file or folder path'));
+        }
+
+        $userFolder = $this->rootFolder->getUserFolder($this->currentUser);
+        try {
+            $path = $userFolder->get($path);
+        } catch (NotFoundException $e) {
+            throw new OCSNotFoundException($this->l->t('Wrong path, file/folder doesn\'t exist'));
+        }
+
+        $share->setNode($path);
+
+        try {
+            $this->lock($share->getNode());
+        } catch (LockedException $e) {
+            throw new OCSNotFoundException($this->l->t('Could not create share'));
+        }
+
+        if ($permissions < 0 || $permissions > Constants::PERMISSION_ALL) {
+            throw new OCSNotFoundException($this->l->t('invalid permissions'));
+        }
+
+        // Shares always require read permissions
+        $permissions |= Constants::PERMISSION_READ;
+
+        if ($path instanceof \OCP\Files\File) {
+            // Single file shares should never have delete or create permissions
+            $permissions &= ~Constants::PERMISSION_DELETE;
+            $permissions &= ~Constants::PERMISSION_CREATE;
+        }
+
+        /**
+         * Hack for https://github.com/owncloud/core/issues/22587
+         * We check the permissions via webdav. But the permissions of the mount point
+         * do not equal the share permissions. Here we fix that for federated mounts.
+         */
+        if ($path->getStorage()->instanceOfStorage(Storage::class)) {
+            $permissions &= ~($permissions & ~$path->getPermissions());
+        }
+
+        if ($shareType === Share::SHARE_TYPE_USER) {
+            // Valid user is required to share
+            if ($shareWith === null || !$this->userManager->userExists($shareWith)) {
+                throw new OCSNotFoundException($this->l->t('Please specify a valid user'));
+            }
+            $share->setSharedWith($shareWith);
+            $share->setPermissions($permissions);
+        } else if ($shareType === Share::SHARE_TYPE_GROUP) {
+            if (!$this->shareManager->allowGroupSharing()) {
+                throw new OCSNotFoundException($this->l->t('Group sharing is disabled by the administrator'));
+            }
+
+            // Valid group is required to share
+            if ($shareWith === null || !$this->groupManager->groupExists($shareWith)) {
+                throw new OCSNotFoundException($this->l->t('Please specify a valid group'));
+            }
+            $share->setSharedWith($shareWith);
+            $share->setPermissions($permissions);
+        } else if ($shareType === Share::SHARE_TYPE_LINK
+            || $shareType === Share::SHARE_TYPE_EMAIL) {
+
+            // Can we even share links?
+            if (!$this->shareManager->shareApiAllowLinks()) {
+                throw new OCSNotFoundException($this->l->t('Public link sharing is disabled by the administrator'));
+            }
+
+            if ($publicUpload === 'true') {
+                // Check if public upload is allowed
+                if (!$this->shareManager->shareApiLinkAllowPublicUpload()) {
+                    throw new OCSForbiddenException($this->l->t('Public upload disabled by the administrator'));
+                }
+
+                // Public upload can only be set for folders
+                if ($path instanceof \OCP\Files\File) {
+                    throw new OCSNotFoundException($this->l->t('Public upload is only possible for publicly shared folders'));
+                }
+
+                $share->setPermissions(
+                    Constants::PERMISSION_READ |
+                    Constants::PERMISSION_CREATE |
+                    Constants::PERMISSION_UPDATE |
+                    Constants::PERMISSION_DELETE
+                );
+            } else {
+                $share->setPermissions(Constants::PERMISSION_READ);
+            }
+
+            // Set password
+            if ($password !== '') {
+                $share->setPassword($password);
+            }
+
+            // Only share by mail have a recipient
+            if ($shareType === Share::SHARE_TYPE_EMAIL) {
+                $share->setSharedWith($shareWith);
+            } else {
+                // Only link share have a label
+                if (!empty($label)) {
+                    $share->setLabel($label);
+                }
+            }
+
+            if ($sendPasswordByTalk === 'true') {
+                if (!$this->appManager->isEnabledForUser('spreed')) {
+                    throw new OCSForbiddenException($this->l->t('Sharing %s sending the password by Nextcloud Talk failed because Nextcloud Talk is not enabled', [$path->getPath()]));
+                }
+
+                $share->setSendPasswordByTalk(true);
+            }
+
+            //Expire date
+            if ($expireDate !== '') {
+                try {
+                    $expireDate = $this->parseDate($expireDate);
+                    $share->setExpirationDate($expireDate);
+                } catch (\Exception $e) {
+                    throw new OCSNotFoundException($this->l->t('Invalid date, date format must be YYYY-MM-DD'));
+                }
+            }
+        } else if ($shareType === Share::SHARE_TYPE_REMOTE) {
+            if (!$this->shareManager->outgoingServer2ServerSharesAllowed()) {
+                throw new OCSForbiddenException($this->l->t('Sharing %1$s failed because the back end does not allow shares from type %2$s', [$path->getPath(), $shareType]));
+            }
+
+            $share->setSharedWith($shareWith);
+            $share->setPermissions($permissions);
+        } else if ($shareType === Share::SHARE_TYPE_REMOTE_GROUP) {
+            if (!$this->shareManager->outgoingServer2ServerGroupSharesAllowed()) {
+                throw new OCSForbiddenException($this->l->t('Sharing %1$s failed because the back end does not allow shares from type %2$s', [$path->getPath(), $shareType]));
+            }
+
+            $share->setSharedWith($shareWith);
+            $share->setPermissions($permissions);
+        } else if ($shareType === Share::SHARE_TYPE_CIRCLE) {
+            if (!\OC::$server->getAppManager()->isEnabledForUser('circles') || !class_exists('\OCA\Circles\ShareByCircleProvider')) {
+                throw new OCSNotFoundException($this->l->t('You cannot share to a Circle if the app is not enabled'));
+            }
+
+            $circle = \OCA\Circles\Api\v1\Circles::detailsCircle($shareWith);
+
+            // Valid circle is required to share
+            if ($circle === null) {
+                throw new OCSNotFoundException($this->l->t('Please specify a valid circle'));
+            }
+            $share->setSharedWith($shareWith);
+            $share->setPermissions($permissions);
+        } else if ($shareType === Share::SHARE_TYPE_ROOM) {
+            try {
+                $this->getRoomShareHelper()->createShare($share, $shareWith, $permissions, $expireDate);
+            } catch (QueryException $e) {
+                throw new OCSForbiddenException($this->l->t('Sharing %s failed because the back end does not support room shares', [$path->getPath()]));
+            }
+        } else {
+            throw new OCSBadRequestException($this->l->t('Unknown share type'));
+        }
+
+        $share->setShareType($shareType);
+        $share->setSharedBy($this->currentUser);
+
+        try {
+            $share = $this->shareManager->createShare($share);
+        } catch (GenericShareException $e) {
+            $code = $e->getCode() === 0 ? 403 : $e->getCode();
+            throw new OCSException($e->getHint(), $code);
+        } catch (\Exception $e) {
+            throw new OCSForbiddenException($e->getMessage(), $e);
+        }
+
+        $output = $this->formatShare($share);
+
+        return new DataResponse($output);
+    }
+
+    /**
+     * @param null|Node $node
+     * @param boolean $includeTags
+     *
+     * @return array
+     */
+    private function getSharedWithMe($node, bool $includeTags): array {
+
+        $userShares = $this->shareManager->getSharedWith($this->currentUser, Share::SHARE_TYPE_USER, $node, -1, 0);
+        $groupShares = $this->shareManager->getSharedWith($this->currentUser, Share::SHARE_TYPE_GROUP, $node, -1, 0);
+        $circleShares = $this->shareManager->getSharedWith($this->currentUser, Share::SHARE_TYPE_CIRCLE, $node, -1, 0);
+        $roomShares = $this->shareManager->getSharedWith($this->currentUser, Share::SHARE_TYPE_ROOM, $node, -1, 0);
+
+        $shares = array_merge($userShares, $groupShares, $circleShares, $roomShares);
+
+        $shares = array_filter($shares, function (IShare $share) {
+            return $share->getShareOwner() !== $this->currentUser;
+        });
+
+        $formatted = [];
+        foreach ($shares as $share) {
+            if ($this->canAccessShare($share)) {
+                try {
+                    $formatted[] = $this->formatShare($share);
+                } catch (NotFoundException $e) {
+                    // Ignore this share
+                }
+            }
+        }
+
+        if ($includeTags) {
+            $formatted = Helper::populateTags($formatted, 'file_source', \OC::$server->getTagManager());
+        }
+
+        return $formatted;
+    }
+
+    /**
+     * @param \OCP\Files\Node $folder
+     *
+     * @return array
+     * @throws OCSBadRequestException
+     * @throws NotFoundException
+     */
+    private function getSharesInDir(Node $folder): array {
+        if (!($folder instanceof \OCP\Files\Folder)) {
+            throw new OCSBadRequestException($this->l->t('Not a directory'));
+        }
+
+        $nodes = $folder->getDirectoryListing();
+
+        /** @var \OCP\Share\IShare[] $shares */
+        $shares = array_reduce($nodes, function ($carry, $node) {
+            $carry = array_merge($carry, $this->getAllShares($node, true));
+            return $carry;
+        }, []);
+
+        // filter out duplicate shares
+        $known = [];
+
+
+        $formatted = $miniFormatted = [];
+        $resharingRight = false;
+        $known = [];
+        foreach ($shares as $share) {
+            if (in_array($share->getId(), $known) || $share->getSharedWith() === $this->currentUser) {
+                continue;
+            }
+
+            try {
+                $format = $this->formatShare($share);
+
+                $known[] = $share->getId();
+                $formatted[] = $format;
+                if ($share->getSharedBy() === $this->currentUser) {
+                    $miniFormatted[] = $format;
+                }
+                if (!$resharingRight && $this->shareProviderResharingRights($this->currentUser, $share, $folder)) {
+                    $resharingRight = true;
+                }
+            } catch (\Exception $e) {
+                //Ignore this share
+            }
+        }
+
+        if (!$resharingRight) {
+            $formatted = $miniFormatted;
+        }
+
+        return $formatted;
+    }
+
+    /**
+     * The getShares function.
+     *
+     * @NoAdminRequired
+     *
+     * @param string $shared_with_me
+     * @param string $reshares
+     * @param string $subfiles
+     * @param string $path
+     *
+     * - Get shares by the current user
+     * - Get shares by the current user and reshares (?reshares=true)
+     * - Get shares with the current user (?shared_with_me=true)
+     * - Get shares for a specific path (?path=...)
+     * - Get all shares in a folder (?subfiles=true&path=..)
+     *
+     * @param string $include_tags
+     *
+     * @return DataResponse
+     * @throws NotFoundException
+     * @throws OCSBadRequestException
+     * @throws OCSNotFoundException
+     */
+    public function getShares(
+        string $shared_with_me = 'false',
+        string $reshares = 'false',
+        string $subfiles = 'false',
+        string $path = '',
+        string $include_tags = 'false'
+    ): DataResponse {
+
+        $node = null;
+        if ($path !== '') {
+            $userFolder = $this->rootFolder->getUserFolder($this->currentUser);
+            try {
+                $node = $userFolder->get($path);
+                $this->lock($node);
+            } catch (NotFoundException $e) {
+                throw new OCSNotFoundException(
+                    $this->l->t('Wrong path, file/folder doesn\'t exist')
+                );
+            } catch (LockedException $e) {
+                throw new OCSNotFoundException($this->l->t('Could not lock node'));
+            }
+        }
+
+        $shares = $this->getFormattedShares(
+            $this->currentUser,
+            $node,
+            ($shared_with_me === 'true'),
+            ($reshares === 'true'),
+            ($subfiles === 'true'),
+            ($include_tags === 'true')
+        );
+
+        return new DataResponse($shares);
+    }
+
+
+    /**
+     * @param string $viewer
+     * @param Node $node
+     * @param bool $sharedWithMe
+     * @param bool $reShares
+     * @param bool $subFiles
+     * @param bool $includeTags
+     *
+     * @return array
+     * @throws NotFoundException
+     * @throws OCSBadRequestException
+     */
+    private function getFormattedShares(
+        string $viewer, $node = null, bool $sharedWithMe = false, bool $reShares = false,
+        bool $subFiles = false, bool $includeTags = false
+    ): array {
+
+        if ($sharedWithMe) {
+            return $this->getSharedWithMe($node, $includeTags);
+        }
+
+        if ($subFiles) {
+            return $this->getSharesInDir($node);
+        }
+
+        $shares = $this->getSharesFromNode($viewer, $node, $reShares);
+
+        $known = $formatted = $miniFormatted = [];
+        $resharingRight = false;
+        foreach ($shares as $share) {
+            try {
+                $share->getNode();
+            } catch (NotFoundException $e) {
+                /*
 				 * Ignore shares where we can't get the node
 				 * For example delted shares
 				 */
-				continue;
-			}
-
-			if (in_array($share->getId(), $known) || $share->getSharedWith() === $this->currentUser) {
-				continue;
-			}
-
-			$known[] = $share->getId();
-			try {
-				/** @var IShare $share */
-				$format = $this->formatShare($share, $node);
-				$formatted[] = $format;
-
-				// let's also build a list of shares created
-				// by the current user only, in case
-				// there is no resharing rights
-				if ($share->getSharedBy() === $this->currentUser) {
-					$miniFormatted[] = $format;
-				}
-
-				// check if one of those share is shared with me
-				// and if I have resharing rights on it
-				if (!$resharingRight && $this->shareProviderResharingRights($this->currentUser, $share, $node)) {
-					$resharingRight = true;
-				}
-			} catch (InvalidPathException | NotFoundException $e) {
-			}
-		}
-
-		if (!$resharingRight) {
-			$formatted = $miniFormatted;
-		}
-
-		if ($includeTags) {
-			$formatted =
-				Helper::populateTags($formatted, 'file_source', \OC::$server->getTagManager());
-		}
-
-		return $formatted;
-	}
-
-
-	/**
-	 * The getInheritedShares function.
-	 * returns all shares relative to a file, including parent folders shares rights.
-	 *
-	 * @NoAdminRequired
-	 *
-	 * @param string $path
-	 *
-	 * - Get shares by the current user
-	 * - Get shares by the current user and reshares (?reshares=true)
-	 * - Get shares with the current user (?shared_with_me=true)
-	 * - Get shares for a specific path (?path=...)
-	 * - Get all shares in a folder (?subfiles=true&path=..)
-	 *
-	 * @return DataResponse
-	 * @throws InvalidPathException
-	 * @throws NotFoundException
-	 * @throws OCSNotFoundException
-	 * @throws OCSBadRequestException
-	 * @throws SharingRightsException
-	 */
-	public function getInheritedShares(string $path): DataResponse {
-
-		// get Node from (string) path.
-		$userFolder = $this->rootFolder->getUserFolder($this->currentUser);
-		try {
-			$node = $userFolder->get($path);
-			$this->lock($node);
-		} catch (\OCP\Files\NotFoundException $e) {
-			throw new OCSNotFoundException($this->l->t('Wrong path, file/folder doesn\'t exist'));
-		} catch (LockedException $e) {
-			throw new OCSNotFoundException($this->l->t('Could not lock path'));
-		}
-
-		// current User has resharing rights ?
-		$this->confirmSharingRights($node);
-
-		// initiate real owner.
-		$owner = $node->getOwner()
-					  ->getUID();
-		if (!$this->userManager->userExists($owner)) {
-			return new DataResponse([]);
-		}
-
-		// get node based on the owner, fix owner in case of external storage
-		$userFolder = $this->rootFolder->getUserFolder($owner);
-		if ($node->getId() !== $userFolder->getId() && !$userFolder->isSubNode($node)) {
-			$owner = $node->getOwner()
-						  ->getUID();
-			$userFolder = $this->rootFolder->getUserFolder($owner);
-			$nodes = $userFolder->getById($node->getId());
-			$node = array_shift($nodes);
-		}
-		$basePath = $userFolder->getPath();
-
-		// generate node list for each parent folders
-		/** @var Node[] $nodes */
-		$nodes = [];
-		while ($node->getPath() !== $basePath) {
-			$node = $node->getParent();
-			$nodes[] = $node;
-		}
-
-		// for each nodes, retrieve shares.
-		$shares = [];
-		foreach ($nodes as $node) {
-			$getShares = $this->getFormattedShares($owner, $node, false, true);
-			$this->mergeFormattedShares($shares, $getShares);
-		}
-
-		return new DataResponse(array_values($shares));
-	}
-
-
-	/**
-	 * @NoAdminRequired
-	 *
-	 * @param string $id
-	 * @param int $permissions
-	 * @param string $password
-	 * @param string $sendPasswordByTalk
-	 * @param string $publicUpload
-	 * @param string $expireDate
-	 * @param string $note
-	 * @param string $label
-	 * @param string $hideDownload
-	 * @return DataResponse
-	 * @throws LockedException
-	 * @throws NotFoundException
-	 * @throws OCSBadRequestException
-	 * @throws OCSForbiddenException
-	 * @throws OCSNotFoundException
-	 */
-	public function updateShare(
-		string $id,
-		int $permissions = null,
-		string $password = null,
-		string $sendPasswordByTalk = null,
-		string $publicUpload = null,
-		string $expireDate = null,
-		string $note = null,
-		string $label = null,
-		string $hideDownload = null
-	): DataResponse {
-		try {
-			$share = $this->getShareById($id);
-		} catch (ShareNotFound $e) {
-			throw new OCSNotFoundException($this->l->t('Wrong share ID, share doesn\'t exist'));
-		}
-
-		$this->lock($share->getNode());
-
-		if (!$this->canAccessShare($share, false)) {
-			throw new OCSNotFoundException($this->l->t('Wrong share ID, share doesn\'t exist'));
-		}
-
-		if (!$this->canEditShare($share)) {
-			throw new OCSForbiddenException('You are not allowed to edit incoming shares');
-		}
-
-		if (
-			$permissions === null &&
-			$password === null &&
-			$sendPasswordByTalk === null &&
-			$publicUpload === null &&
-			$expireDate === null &&
-			$note === null &&
-			$label === null &&
-			$hideDownload === null
-		) {
-			throw new OCSBadRequestException($this->l->t('Wrong or no update parameter given'));
-		}
-
-		if ($note !== null) {
-			$share->setNote($note);
-		}
-
-		/**
-		 * expirationdate, password and publicUpload only make sense for link shares
-		 */
-		if ($share->getShareType() === Share::SHARE_TYPE_LINK
-			|| $share->getShareType() === Share::SHARE_TYPE_EMAIL) {
-
-			/**
-			 * We do not allow editing link shares that the current user
-			 * doesn't own. This is confusing and lead to errors when
-			 * someone else edit a password or expiration date without
-			 * the share owner knowing about it.
-			 * We only allow deletion
-			 */
-
-			if ($share->getSharedBy() !== $this->currentUser) {
-				throw new OCSForbiddenException('You are not allowed to edit link shares that you don\'t own');
-			}
-
-			// Update hide download state
-			if ($hideDownload === 'true') {
-				$share->setHideDownload(true);
-			} else if ($hideDownload === 'false') {
-				$share->setHideDownload(false);
-			}
-
-			$newPermissions = null;
-			if ($publicUpload === 'true') {
-				$newPermissions = Constants::PERMISSION_READ | Constants::PERMISSION_CREATE | Constants::PERMISSION_UPDATE | Constants::PERMISSION_DELETE;
-			} else if ($publicUpload === 'false') {
-				$newPermissions = Constants::PERMISSION_READ;
-			}
-
-			if ($permissions !== null) {
-				$newPermissions = (int) $permissions;
-				$newPermissions = $newPermissions & ~Constants::PERMISSION_SHARE;
-			}
-
-			if ($newPermissions !== null &&
-				!in_array($newPermissions, [
-					Constants::PERMISSION_READ,
-					Constants::PERMISSION_READ | Constants::PERMISSION_CREATE | Constants::PERMISSION_UPDATE, // legacy
-					Constants::PERMISSION_READ | Constants::PERMISSION_CREATE | Constants::PERMISSION_UPDATE | Constants::PERMISSION_DELETE, // correct
-					Constants::PERMISSION_CREATE, // hidden file list
-					Constants::PERMISSION_READ | Constants::PERMISSION_UPDATE, // allow to edit single files
-				], true)
-			) {
-				throw new OCSBadRequestException($this->l->t('Can\'t change permissions for public share links'));
-			}
-
-			if (
-				// legacy
-				$newPermissions === (Constants::PERMISSION_READ | Constants::PERMISSION_CREATE | Constants::PERMISSION_UPDATE) ||
-				// correct
-				$newPermissions === (Constants::PERMISSION_READ | Constants::PERMISSION_CREATE | Constants::PERMISSION_UPDATE | Constants::PERMISSION_DELETE)
-			) {
-				if (!$this->shareManager->shareApiLinkAllowPublicUpload()) {
-					throw new OCSForbiddenException($this->l->t('Public upload disabled by the administrator'));
-				}
-
-				if (!($share->getNode() instanceof \OCP\Files\Folder)) {
-					throw new OCSBadRequestException($this->l->t('Public upload is only possible for publicly shared folders'));
-				}
-
-				// normalize to correct public upload permissions
-				$newPermissions = Constants::PERMISSION_READ | Constants::PERMISSION_CREATE | Constants::PERMISSION_UPDATE | Constants::PERMISSION_DELETE;
-			}
-
-			if ($newPermissions !== null) {
-				$share->setPermissions($newPermissions);
-				$permissions = $newPermissions;
-			}
-
-			if ($expireDate === '') {
-				$share->setExpirationDate(null);
-			} else if ($expireDate !== null) {
-				try {
-					$expireDate = $this->parseDate($expireDate);
-				} catch (\Exception $e) {
-					throw new OCSBadRequestException($e->getMessage(), $e);
-				}
-				$share->setExpirationDate($expireDate);
-			}
-
-			if ($password === '') {
-				$share->setPassword(null);
-			} else if ($password !== null) {
-				$share->setPassword($password);
-			}
-
-			// only link shares have labels
-			if ($share->getShareType() === Share::SHARE_TYPE_LINK && $label !== null) {
-				$share->setLabel($label);
-			}
-
-			if ($sendPasswordByTalk === 'true') {
-				if (!$this->appManager->isEnabledForUser('spreed')) {
-					throw new OCSForbiddenException($this->l->t('Sharing sending the password by Nextcloud Talk failed because Nextcloud Talk is not enabled'));
-				}
-
-				$share->setSendPasswordByTalk(true);
-			} else if ($sendPasswordByTalk !== null) {
-				$share->setSendPasswordByTalk(false);
-			}
-		}
-
-		// NOT A LINK SHARE
-		else {
-			if ($permissions !== null) {
-				$permissions = (int) $permissions;
-				$share->setPermissions($permissions);
-			}
-
-			if ($expireDate === '') {
-				$share->setExpirationDate(null);
-			} else if ($expireDate !== null) {
-				try {
-					$expireDate = $this->parseDate($expireDate);
-				} catch (\Exception $e) {
-					throw new OCSBadRequestException($e->getMessage(), $e);
-				}
-				$share->setExpirationDate($expireDate);
-			}
-		}
-
-		try {
-			$share = $this->shareManager->updateShare($share);
-		} catch (GenericShareException $e) {
-			$code = $e->getCode() === 0 ? 403 : $e->getCode();
-			throw new OCSException($e->getHint(), $code);
-		} catch (\Exception $e) {
-			throw new OCSBadRequestException($e->getMessage(), $e);
-		}
-
-		return new DataResponse($this->formatShare($share));
-	}
-
-	/**
-	 * @NoAdminRequired
-	 */
-	public function pendingShares(): DataResponse {
-		$pendingShares = [];
-
-		$shareTypes = [
-			IShare::TYPE_USER,
-			IShare::TYPE_GROUP
-		];
-
-		foreach ($shareTypes as $shareType) {
-			$shares = $this->shareManager->getSharedWith($this->currentUser, $shareType, null, -1, 0);
-
-			foreach ($shares as $share) {
-				if ($share->getStatus() === IShare::STATUS_PENDING || $share->getStatus() === IShare::STATUS_REJECTED) {
-					$pendingShares[] = $share;
-				}
-			}
-		}
-
-		$result = array_filter(array_map(function (IShare $share) {
-			$userFolder = $this->rootFolder->getUserFolder($share->getSharedBy());
-			$nodes = $userFolder->getById($share->getNodeId());
-			if (empty($nodes)) {
-				// fallback to guessing the path
-				$node = $userFolder->get($share->getTarget());
-				if ($node === null || $share->getTarget() === '') {
-					return null;
-				}
-			} else {
-				$node = $nodes[0];
-			}
-
-			try {
-				$formattedShare = $this->formatShare($share, $node);
-				$formattedShare['status'] = $share->getStatus();
-				$formattedShare['path'] = $share->getNode()->getName();
-				$formattedShare['permissions'] = 0;
-				return $formattedShare;
-			} catch (NotFoundException $e) {
-				return null;
-			}
-		}, $pendingShares), function ($entry) {
-			return $entry !== null;
-		});
-
-		return new DataResponse($result);
-	}
-
-	/**
-	 * @NoAdminRequired
-	 *
-	 * @param string $id
-	 * @return DataResponse
-	 * @throws OCSNotFoundException
-	 * @throws OCSException
-	 * @throws OCSBadRequestException
-	 */
-	public function acceptShare(string $id): DataResponse {
-		try {
-			$share = $this->getShareById($id);
-		} catch (ShareNotFound $e) {
-			throw new OCSNotFoundException($this->l->t('Wrong share ID, share doesn\'t exist'));
-		}
-
-		if (!$this->canAccessShare($share)) {
-			throw new OCSNotFoundException($this->l->t('Wrong share ID, share doesn\'t exist'));
-		}
-
-		try {
-			$this->shareManager->acceptShare($share, $this->currentUser);
-		} catch (GenericShareException $e) {
-			$code = $e->getCode() === 0 ? 403 : $e->getCode();
-			throw new OCSException($e->getHint(), $code);
-		} catch (\Exception $e) {
-			throw new OCSBadRequestException($e->getMessage(), $e);
-		}
-
-		return new DataResponse();
-	}
-
-	/**
-	 * Does the user have read permission on the share
-	 *
-	 * @param \OCP\Share\IShare $share the share to check
-	 * @param boolean $checkGroups check groups as well?
-	 * @return boolean
-	 * @throws NotFoundException
-	 *
-	 * @suppress PhanUndeclaredClassMethod
-	 */
-	protected function canAccessShare(\OCP\Share\IShare $share, bool $checkGroups = true): bool {
-		// A file with permissions 0 can't be accessed by us. So Don't show it
-		if ($share->getPermissions() === 0) {
-			return false;
-		}
-
-		// Owner of the file and the sharer of the file can always get share
-		if ($share->getShareOwner() === $this->currentUser
-			|| $share->getSharedBy() === $this->currentUser) {
-			return true;
-		}
-
-		// If the share is shared with you, you can access it!
-		if ($share->getShareType() === Share::SHARE_TYPE_USER
-			&& $share->getSharedWith() === $this->currentUser) {
-			return true;
-		}
-
-		// Have reshare rights on the shared file/folder ?
-		// Does the currentUser have access to the shared file?
-		$userFolder = $this->rootFolder->getUserFolder($this->currentUser);
-		$files = $userFolder->getById($share->getNodeId());
-		if (!empty($files) && $this->shareProviderResharingRights($this->currentUser, $share, $files[0])) {
-			return true;
-		}
-
-		// If in the recipient group, you can see the share
-		if ($checkGroups && $share->getShareType() === Share::SHARE_TYPE_GROUP) {
-			$sharedWith = $this->groupManager->get($share->getSharedWith());
-			$user = $this->userManager->get($this->currentUser);
-			if ($user !== null && $sharedWith !== null && $sharedWith->inGroup($user)) {
-				return true;
-			}
-		}
-
-		if ($share->getShareType() === Share::SHARE_TYPE_CIRCLE) {
-			// TODO: have a sanity check like above?
-			return true;
-		}
-
-		if ($share->getShareType() === Share::SHARE_TYPE_ROOM) {
-			try {
-				return $this->getRoomShareHelper()->canAccessShare($share, $this->currentUser);
-			} catch (QueryException $e) {
-				return false;
-			}
-		}
-
-		return false;
-	}
-
-	/**
-	 * Does the user have edit permission on the share
-	 *
-	 * @param \OCP\Share\IShare $share the share to check
-	 * @return boolean
-	 */
-	protected function canEditShare(\OCP\Share\IShare $share): bool {
-		// A file with permissions 0 can't be accessed by us. So Don't show it
-		if ($share->getPermissions() === 0) {
-			return false;
-		}
-
-		// The owner of the file and the creator of the share
-		// can always edit the share
-		if ($share->getShareOwner() === $this->currentUser ||
-			$share->getSharedBy() === $this->currentUser
-		) {
-			return true;
-		}
-
-		//! we do NOT support some kind of `admin` in groups.
-		//! You cannot edit shares shared to a group you're
-		//! a member of if you're not the share owner or the file owner!
-
-		return false;
-	}
-
-	/**
-	 * Does the user have delete permission on the share
-	 *
-	 * @param \OCP\Share\IShare $share the share to check
-	 * @return boolean
-	 */
-	protected function canDeleteShare(\OCP\Share\IShare $share): bool {
-		// A file with permissions 0 can't be accessed by us. So Don't show it
-		if ($share->getPermissions() === 0) {
-			return false;
-		}
-
-		// if the user is the recipient, i can unshare
-		// the share with self
-		if ($share->getShareType() === Share::SHARE_TYPE_USER &&
-			$share->getSharedWith() === $this->currentUser
-		) {
-			return true;
-		}
-
-		// The owner of the file and the creator of the share
-		// can always delete the share
-		if ($share->getShareOwner() === $this->currentUser ||
-			$share->getSharedBy() === $this->currentUser
-		) {
-			return true;
-		}
-
-		return false;
-	}
-
-	/**
-	 * Does the user have delete permission on the share
-	 * This differs from the canDeleteShare function as it only
-	 * remove the share for the current user. It does NOT
-	 * completely delete the share but only the mount point.
-	 * It can then be restored from the deleted shares section.
-	 *
-	 * @param \OCP\Share\IShare $share the share to check
-	 * @return boolean
-	 *
-	 * @suppress PhanUndeclaredClassMethod
-	 */
-	protected function canDeleteShareFromSelf(\OCP\Share\IShare $share): bool {
-		if ($share->getShareType() !== IShare::TYPE_GROUP &&
-			$share->getShareType() !== IShare::TYPE_ROOM
-		) {
-			return false;
-		}
-
-		if ($share->getShareOwner() === $this->currentUser ||
-			$share->getSharedBy() === $this->currentUser
-		) {
-			// Delete the whole share, not just for self
-			return false;
-		}
-
-		// If in the recipient group, you can delete the share from self
-		if ($share->getShareType() === Share::SHARE_TYPE_GROUP) {
-			$sharedWith = $this->groupManager->get($share->getSharedWith());
-			$user = $this->userManager->get($this->currentUser);
-			if ($user !== null && $sharedWith !== null && $sharedWith->inGroup($user)) {
-				return true;
-			}
-		}
-
-		if ($share->getShareType() === Share::SHARE_TYPE_ROOM) {
-			try {
-				return $this->getRoomShareHelper()->canAccessShare($share, $this->currentUser);
-			} catch (QueryException $e) {
-				return false;
-			}
-		}
-
-		return false;
-	}
-
-	/**
-	 * Make sure that the passed date is valid ISO 8601
-	 * So YYYY-MM-DD
-	 * If not throw an exception
-	 *
-	 * @param string $expireDate
-	 *
-	 * @throws \Exception
-	 * @return \DateTime
-	 */
-	private function parseDate(string $expireDate): \DateTime {
-		try {
-			$date = new \DateTime($expireDate);
-		} catch (\Exception $e) {
-			throw new \Exception('Invalid date. Format must be YYYY-MM-DD');
-		}
-
-		if ($date === false) {
-			throw new \Exception('Invalid date. Format must be YYYY-MM-DD');
-		}
-
-		$date->setTime(0, 0, 0);
-
-		return $date;
-	}
-
-	/**
-	 * Since we have multiple providers but the OCS Share API v1 does
-	 * not support this we need to check all backends.
-	 *
-	 * @param string $id
-	 * @return \OCP\Share\IShare
-	 * @throws ShareNotFound
-	 */
-	private function getShareById(string $id): IShare {
-		$share = null;
-
-		// First check if it is an internal share.
-		try {
-			$share = $this->shareManager->getShareById('ocinternal:' . $id, $this->currentUser);
-			return $share;
-		} catch (ShareNotFound $e) {
-			// Do nothing, just try the other share type
-		}
-
-
-		try {
-			if ($this->shareManager->shareProviderExists(Share::SHARE_TYPE_CIRCLE)) {
-				$share = $this->shareManager->getShareById('ocCircleShare:' . $id, $this->currentUser);
-				return $share;
-			}
-		} catch (ShareNotFound $e) {
-			// Do nothing, just try the other share type
-		}
-
-		try {
-			if ($this->shareManager->shareProviderExists(Share::SHARE_TYPE_EMAIL)) {
-				$share = $this->shareManager->getShareById('ocMailShare:' . $id, $this->currentUser);
-				return $share;
-			}
-		} catch (ShareNotFound $e) {
-			// Do nothing, just try the other share type
-		}
-
-		try {
-			$share = $this->shareManager->getShareById('ocRoomShare:' . $id, $this->currentUser);
-			return $share;
-		} catch (ShareNotFound $e) {
-			// Do nothing, just try the other share type
-		}
-
-		if (!$this->shareManager->outgoingServer2ServerSharesAllowed()) {
-			throw new ShareNotFound();
-		}
-		$share = $this->shareManager->getShareById('ocFederatedSharing:' . $id, $this->currentUser);
-
-		return $share;
-	}
-
-	/**
-	 * Lock a Node
-	 *
-	 * @param \OCP\Files\Node $node
-	 * @throws LockedException
-	 */
-	private function lock(\OCP\Files\Node $node) {
-		$node->lock(ILockingProvider::LOCK_SHARED);
-		$this->lockedNode = $node;
-	}
-
-	/**
-	 * Cleanup the remaining locks
-	 * @throws @LockedException
-	 */
-	public function cleanup() {
-		if ($this->lockedNode !== null) {
-			$this->lockedNode->unlock(ILockingProvider::LOCK_SHARED);
-		}
-	}
-
-	/**
-	 * Returns the helper of ShareAPIController for room shares.
-	 *
-	 * If the Talk application is not enabled or the helper is not available
-	 * a QueryException is thrown instead.
-	 *
-	 * @return \OCA\Talk\Share\Helper\ShareAPIController
-	 * @throws QueryException
-	 */
-	private function getRoomShareHelper() {
-		if (!$this->appManager->isEnabledForUser('spreed')) {
-			throw new QueryException();
-		}
-
-		return $this->serverContainer->query('\OCA\Talk\Share\Helper\ShareAPIController');
-	}
-
-
-	/**
-	 * @param string $viewer
-	 * @param Node $node
-	 * @param bool $reShares
-	 *
-	 * @return IShare[]
-	 */
-	private function getSharesFromNode(string $viewer, $node, bool $reShares): array {
-
-		$providers = [
-			Share::SHARE_TYPE_USER,
-			Share::SHARE_TYPE_GROUP,
-			Share::SHARE_TYPE_LINK,
-			Share::SHARE_TYPE_EMAIL,
-			Share::SHARE_TYPE_EMAIL,
-			Share::SHARE_TYPE_CIRCLE,
-			Share::SHARE_TYPE_ROOM
-		];
-
-		// Should we assume that the (currentUser) viewer is the owner of the node !?
-		$shares = [];
-		foreach ($providers as $provider) {
-			if (!$this->shareManager->shareProviderExists($provider)) {
-				continue;
-			}
-
-			$providerShares =
-				$this->shareManager->getSharesBy($viewer, $provider, $node, $reShares, -1, 0);
-			$shares = array_merge($shares, $providerShares);
-		}
-
-		if ($this->shareManager->outgoingServer2ServerSharesAllowed()) {
-			$federatedShares = $this->shareManager->getSharesBy(
-				$this->currentUser, Share::SHARE_TYPE_REMOTE, $node, $reShares, -1, 0
-			);
-			$shares = array_merge($shares, $federatedShares);
-		}
-
-		if ($this->shareManager->outgoingServer2ServerGroupSharesAllowed()) {
-			$federatedShares = $this->shareManager->getSharesBy(
-				$this->currentUser, Share::SHARE_TYPE_REMOTE_GROUP, $node, $reShares, -1, 0
-			);
-			$shares = array_merge($shares, $federatedShares);
-		}
-
-		return $shares;
-	}
-
-
-	/**
-	 * @param Node $node
-	 *
-	 * @throws SharingRightsException
-	 */
-	private function confirmSharingRights(Node $node): void {
-		if (!$this->hasResharingRights($this->currentUser, $node)) {
-			throw new SharingRightsException('no sharing rights on this item');
-		}
-	}
-
-
-	/**
-	 * @param string $viewer
-	 * @param Node $node
-	 *
-	 * @return bool
-	 */
-	private function hasResharingRights($viewer, $node): bool {
-		if ($viewer === $node->getOwner()->getUID()) {
-			return true;
-		}
-
-		foreach ([$node, $node->getParent()] as $node) {
-			$shares = $this->getSharesFromNode($viewer, $node, true);
-			foreach ($shares as $share) {
-				try {
-					if ($this->shareProviderResharingRights($viewer, $share, $node)) {
-						return true;
-					}
-				} catch (InvalidPathException | NotFoundException $e) {
-				}
-			}
-		}
-
-		return false;
-	}
-
-
-	/**
-	 * Returns if we can find resharing rights in an IShare object for a specific user.
-	 *
-	 * @suppress PhanUndeclaredClassMethod
-	 *
-	 * @param string $userId
-	 * @param IShare $share
-	 * @param Node $node
-	 *
-	 * @return bool
-	 * @throws NotFoundException
-	 * @throws InvalidPathException
-	 */
-	private function shareProviderResharingRights(string $userId, IShare $share, $node): bool {
-		if ($share->getShareOwner() === $userId) {
-			return true;
-		}
-
-		// we check that current user have parent resharing rights on the current file
-		if ($node !== null && ($node->getPermissions() & Constants::PERMISSION_SHARE) !== 0) {
-			return true;
-		}
-
-		if ((\OCP\Constants::PERMISSION_SHARE & $share->getPermissions()) === 0) {
-			return false;
-		}
-
-		if ($share->getShareType() === \OCP\Share::SHARE_TYPE_USER && $share->getSharedWith() === $userId) {
-			return true;
-		}
-
-		if ($share->getShareType() === \OCP\Share::SHARE_TYPE_GROUP && $this->groupManager->isInGroup($userId, $share->getSharedWith())) {
-			return true;
-		}
-
-		if ($share->getShareType() === \OCP\Share::SHARE_TYPE_CIRCLE && \OC::$server->getAppManager()->isEnabledForUser('circles')
-			&& class_exists('\OCA\Circles\Api\v1\Circles')) {
-
-			$hasCircleId = (substr($share->getSharedWith(), -1) === ']');
-			$shareWithStart = ($hasCircleId ? strrpos($share->getSharedWith(), '[') + 1 : 0);
-			$shareWithLength = ($hasCircleId ? -1 : strpos($share->getSharedWith(), ' '));
-			if (is_bool($shareWithLength)) {
-				$shareWithLength = -1;
-			}
-			$sharedWith = substr($share->getSharedWith(), $shareWithStart, $shareWithLength);
-			try {
-				$member = \OCA\Circles\Api\v1\Circles::getMember($sharedWith, $userId, 1);
-				if ($member->getLevel() >= 4) {
-					return true;
-				}
-				return false;
-			} catch (QueryException $e) {
-				return false;
-			}
-		}
-
-		return false;
-	}
-
-	/**
-	 * Get all the shares for the current user
-	 *
-	 * @param Node|null $path
-	 * @param boolean $reshares
-	 * @return void
-	 */
-	private function getAllShares(?Node $path = null, bool $reshares = false) {
-		// Get all shares
-		$userShares = $this->shareManager->getSharesBy($this->currentUser, Share::SHARE_TYPE_USER, $path, $reshares, -1, 0);
-		$groupShares = $this->shareManager->getSharesBy($this->currentUser, Share::SHARE_TYPE_GROUP, $path, $reshares, -1, 0);
-		$linkShares = $this->shareManager->getSharesBy($this->currentUser, Share::SHARE_TYPE_LINK, $path, $reshares, -1, 0);
-
-		// EMAIL SHARES
-		$mailShares = $this->shareManager->getSharesBy($this->currentUser, Share::SHARE_TYPE_EMAIL, $path, $reshares, -1, 0);
-
-		// CIRCLE SHARES
-		$circleShares = $this->shareManager->getSharesBy($this->currentUser, Share::SHARE_TYPE_CIRCLE, $path, $reshares, -1, 0);
-
-		// TALK SHARES
-		$roomShares = $this->shareManager->getSharesBy($this->currentUser, Share::SHARE_TYPE_ROOM, $path, $reshares, -1, 0);
-
-		// FEDERATION
-		if ($this->shareManager->outgoingServer2ServerSharesAllowed()) {
-			$federatedShares = $this->shareManager->getSharesBy($this->currentUser, Share::SHARE_TYPE_REMOTE, $path, $reshares, -1, 0);
-		} else {
-			$federatedShares = [];
-		}
-		if ($this->shareManager->outgoingServer2ServerGroupSharesAllowed()) {
-			$federatedGroupShares = $this->shareManager->getSharesBy($this->currentUser, Share::SHARE_TYPE_REMOTE_GROUP, $path, $reshares, -1, 0);
-		} else {
-			$federatedGroupShares = [];
-		}
-
-		return array_merge($userShares, $groupShares, $linkShares, $mailShares, $circleShares, $roomShares, $federatedShares, $federatedGroupShares);
-	}
-
-
-	/**
-	 * merging already formatted shares.
-	 * We'll make an associative array to easily detect duplicate Ids.
-	 * Keys _needs_ to be removed after all shares are retrieved and merged.
-	 *
-	 * @param array $shares
-	 * @param array $newShares
-	 */
-	private function mergeFormattedShares(array &$shares, array $newShares) {
-		foreach ($newShares as $newShare) {
-			if (!array_key_exists($newShare['id'], $shares)) {
-				$shares[$newShare['id']] = $newShare;
-			}
-		}
-	}
+                continue;
+            }
+
+            if (in_array($share->getId(), $known) || $share->getSharedWith() === $this->currentUser) {
+                continue;
+            }
+
+            $known[] = $share->getId();
+            try {
+                /** @var IShare $share */
+                $format = $this->formatShare($share, $node);
+                $formatted[] = $format;
+
+                // let's also build a list of shares created
+                // by the current user only, in case
+                // there is no resharing rights
+                if ($share->getSharedBy() === $this->currentUser) {
+                    $miniFormatted[] = $format;
+                }
+
+                // check if one of those share is shared with me
+                // and if I have resharing rights on it
+                if (!$resharingRight && $this->shareProviderResharingRights($this->currentUser, $share, $node)) {
+                    $resharingRight = true;
+                }
+            } catch (InvalidPathException | NotFoundException $e) {
+            }
+        }
+
+        if (!$resharingRight) {
+            $formatted = $miniFormatted;
+        }
+
+        if ($includeTags) {
+            $formatted =
+                Helper::populateTags($formatted, 'file_source', \OC::$server->getTagManager());
+        }
+
+        return $formatted;
+    }
+
+
+    /**
+     * The getInheritedShares function.
+     * returns all shares relative to a file, including parent folders shares rights.
+     *
+     * @NoAdminRequired
+     *
+     * @param string $path
+     *
+     * - Get shares by the current user
+     * - Get shares by the current user and reshares (?reshares=true)
+     * - Get shares with the current user (?shared_with_me=true)
+     * - Get shares for a specific path (?path=...)
+     * - Get all shares in a folder (?subfiles=true&path=..)
+     *
+     * @return DataResponse
+     * @throws InvalidPathException
+     * @throws NotFoundException
+     * @throws OCSNotFoundException
+     * @throws OCSBadRequestException
+     * @throws SharingRightsException
+     */
+    public function getInheritedShares(string $path): DataResponse {
+
+        // get Node from (string) path.
+        $userFolder = $this->rootFolder->getUserFolder($this->currentUser);
+        try {
+            $node = $userFolder->get($path);
+            $this->lock($node);
+        } catch (\OCP\Files\NotFoundException $e) {
+            throw new OCSNotFoundException($this->l->t('Wrong path, file/folder doesn\'t exist'));
+        } catch (LockedException $e) {
+            throw new OCSNotFoundException($this->l->t('Could not lock path'));
+        }
+
+        // current User has resharing rights ?
+        $this->confirmSharingRights($node);
+
+        // initiate real owner.
+        $owner = $node->getOwner()
+                        ->getUID();
+        if (!$this->userManager->userExists($owner)) {
+            return new DataResponse([]);
+        }
+
+        // get node based on the owner, fix owner in case of external storage
+        $userFolder = $this->rootFolder->getUserFolder($owner);
+        if ($node->getId() !== $userFolder->getId() && !$userFolder->isSubNode($node)) {
+            $owner = $node->getOwner()
+                            ->getUID();
+            $userFolder = $this->rootFolder->getUserFolder($owner);
+            $nodes = $userFolder->getById($node->getId());
+            $node = array_shift($nodes);
+        }
+        $basePath = $userFolder->getPath();
+
+        // generate node list for each parent folders
+        /** @var Node[] $nodes */
+        $nodes = [];
+        while ($node->getPath() !== $basePath) {
+            $node = $node->getParent();
+            $nodes[] = $node;
+        }
+
+        // for each nodes, retrieve shares.
+        $shares = [];
+        foreach ($nodes as $node) {
+            $getShares = $this->getFormattedShares($owner, $node, false, true);
+            $this->mergeFormattedShares($shares, $getShares);
+        }
+
+        return new DataResponse(array_values($shares));
+    }
+
+
+    /**
+     * @NoAdminRequired
+     *
+     * @param string $id
+     * @param int $permissions
+     * @param string $password
+     * @param string $sendPasswordByTalk
+     * @param string $publicUpload
+     * @param string $expireDate
+     * @param string $note
+     * @param string $label
+     * @param string $hideDownload
+     * @return DataResponse
+     * @throws LockedException
+     * @throws NotFoundException
+     * @throws OCSBadRequestException
+     * @throws OCSForbiddenException
+     * @throws OCSNotFoundException
+     */
+    public function updateShare(
+        string $id,
+        int $permissions = null,
+        string $password = null,
+        string $sendPasswordByTalk = null,
+        string $publicUpload = null,
+        string $expireDate = null,
+        string $note = null,
+        string $label = null,
+        string $hideDownload = null
+    ): DataResponse {
+        try {
+            $share = $this->getShareById($id);
+        } catch (ShareNotFound $e) {
+            throw new OCSNotFoundException($this->l->t('Wrong share ID, share doesn\'t exist'));
+        }
+
+        $this->lock($share->getNode());
+
+        if (!$this->canAccessShare($share, false)) {
+            throw new OCSNotFoundException($this->l->t('Wrong share ID, share doesn\'t exist'));
+        }
+
+        if (!$this->canEditShare($share)) {
+            throw new OCSForbiddenException('You are not allowed to edit incoming shares');
+        }
+
+        if (
+            $permissions === null &&
+            $password === null &&
+            $sendPasswordByTalk === null &&
+            $publicUpload === null &&
+            $expireDate === null &&
+            $note === null &&
+            $label === null &&
+            $hideDownload === null
+        ) {
+            throw new OCSBadRequestException($this->l->t('Wrong or no update parameter given'));
+        }
+
+        if ($note !== null) {
+            $share->setNote($note);
+        }
+
+        /**
+         * expirationdate, password and publicUpload only make sense for link shares
+         */
+        if ($share->getShareType() === Share::SHARE_TYPE_LINK
+            || $share->getShareType() === Share::SHARE_TYPE_EMAIL) {
+
+            /**
+             * We do not allow editing link shares that the current user
+             * doesn't own. This is confusing and lead to errors when
+             * someone else edit a password or expiration date without
+             * the share owner knowing about it.
+             * We only allow deletion
+             */
+
+            if ($share->getSharedBy() !== $this->currentUser) {
+                throw new OCSForbiddenException('You are not allowed to edit link shares that you don\'t own');
+            }
+
+            // Update hide download state
+            if ($hideDownload === 'true') {
+                $share->setHideDownload(true);
+            } else if ($hideDownload === 'false') {
+                $share->setHideDownload(false);
+            }
+
+            $newPermissions = null;
+            if ($publicUpload === 'true') {
+                $newPermissions = Constants::PERMISSION_READ | Constants::PERMISSION_CREATE | Constants::PERMISSION_UPDATE | Constants::PERMISSION_DELETE;
+            } else if ($publicUpload === 'false') {
+                $newPermissions = Constants::PERMISSION_READ;
+            }
+
+            if ($permissions !== null) {
+                $newPermissions = (int) $permissions;
+                $newPermissions = $newPermissions & ~Constants::PERMISSION_SHARE;
+            }
+
+            if ($newPermissions !== null &&
+                !in_array($newPermissions, [
+                    Constants::PERMISSION_READ,
+                    Constants::PERMISSION_READ | Constants::PERMISSION_CREATE | Constants::PERMISSION_UPDATE, // legacy
+                    Constants::PERMISSION_READ | Constants::PERMISSION_CREATE | Constants::PERMISSION_UPDATE | Constants::PERMISSION_DELETE, // correct
+                    Constants::PERMISSION_CREATE, // hidden file list
+                    Constants::PERMISSION_READ | Constants::PERMISSION_UPDATE, // allow to edit single files
+                ], true)
+            ) {
+                throw new OCSBadRequestException($this->l->t('Can\'t change permissions for public share links'));
+            }
+
+            if (
+                // legacy
+                $newPermissions === (Constants::PERMISSION_READ | Constants::PERMISSION_CREATE | Constants::PERMISSION_UPDATE) ||
+                // correct
+                $newPermissions === (Constants::PERMISSION_READ | Constants::PERMISSION_CREATE | Constants::PERMISSION_UPDATE | Constants::PERMISSION_DELETE)
+            ) {
+                if (!$this->shareManager->shareApiLinkAllowPublicUpload()) {
+                    throw new OCSForbiddenException($this->l->t('Public upload disabled by the administrator'));
+                }
+
+                if (!($share->getNode() instanceof \OCP\Files\Folder)) {
+                    throw new OCSBadRequestException($this->l->t('Public upload is only possible for publicly shared folders'));
+                }
+
+                // normalize to correct public upload permissions
+                $newPermissions = Constants::PERMISSION_READ | Constants::PERMISSION_CREATE | Constants::PERMISSION_UPDATE | Constants::PERMISSION_DELETE;
+            }
+
+            if ($newPermissions !== null) {
+                $share->setPermissions($newPermissions);
+                $permissions = $newPermissions;
+            }
+
+            if ($expireDate === '') {
+                $share->setExpirationDate(null);
+            } else if ($expireDate !== null) {
+                try {
+                    $expireDate = $this->parseDate($expireDate);
+                } catch (\Exception $e) {
+                    throw new OCSBadRequestException($e->getMessage(), $e);
+                }
+                $share->setExpirationDate($expireDate);
+            }
+
+            if ($password === '') {
+                $share->setPassword(null);
+            } else if ($password !== null) {
+                $share->setPassword($password);
+            }
+
+            // only link shares have labels
+            if ($share->getShareType() === Share::SHARE_TYPE_LINK && $label !== null) {
+                $share->setLabel($label);
+            }
+
+            if ($sendPasswordByTalk === 'true') {
+                if (!$this->appManager->isEnabledForUser('spreed')) {
+                    throw new OCSForbiddenException($this->l->t('Sharing sending the password by Nextcloud Talk failed because Nextcloud Talk is not enabled'));
+                }
+
+                $share->setSendPasswordByTalk(true);
+            } else if ($sendPasswordByTalk !== null) {
+                $share->setSendPasswordByTalk(false);
+            }
+        }
+
+        // NOT A LINK SHARE
+        else {
+            if ($permissions !== null) {
+                $permissions = (int) $permissions;
+                $share->setPermissions($permissions);
+            }
+
+            if ($expireDate === '') {
+                $share->setExpirationDate(null);
+            } else if ($expireDate !== null) {
+                try {
+                    $expireDate = $this->parseDate($expireDate);
+                } catch (\Exception $e) {
+                    throw new OCSBadRequestException($e->getMessage(), $e);
+                }
+                $share->setExpirationDate($expireDate);
+            }
+        }
+
+        try {
+            $share = $this->shareManager->updateShare($share);
+        } catch (GenericShareException $e) {
+            $code = $e->getCode() === 0 ? 403 : $e->getCode();
+            throw new OCSException($e->getHint(), $code);
+        } catch (\Exception $e) {
+            throw new OCSBadRequestException($e->getMessage(), $e);
+        }
+
+        return new DataResponse($this->formatShare($share));
+    }
+
+    /**
+     * @NoAdminRequired
+     */
+    public function pendingShares(): DataResponse {
+        $pendingShares = [];
+
+        $shareTypes = [
+            IShare::TYPE_USER,
+            IShare::TYPE_GROUP
+        ];
+
+        foreach ($shareTypes as $shareType) {
+            $shares = $this->shareManager->getSharedWith($this->currentUser, $shareType, null, -1, 0);
+
+            foreach ($shares as $share) {
+                if ($share->getStatus() === IShare::STATUS_PENDING || $share->getStatus() === IShare::STATUS_REJECTED) {
+                    $pendingShares[] = $share;
+                }
+            }
+        }
+
+        $result = array_filter(array_map(function (IShare $share) {
+            $userFolder = $this->rootFolder->getUserFolder($share->getSharedBy());
+            $nodes = $userFolder->getById($share->getNodeId());
+            if (empty($nodes)) {
+                // fallback to guessing the path
+                $node = $userFolder->get($share->getTarget());
+                if ($node === null || $share->getTarget() === '') {
+                    return null;
+                }
+            } else {
+                $node = $nodes[0];
+            }
+
+            try {
+                $formattedShare = $this->formatShare($share, $node);
+                $formattedShare['status'] = $share->getStatus();
+                $formattedShare['path'] = $share->getNode()->getName();
+                $formattedShare['permissions'] = 0;
+                return $formattedShare;
+            } catch (NotFoundException $e) {
+                return null;
+            }
+        }, $pendingShares), function ($entry) {
+            return $entry !== null;
+        });
+
+        return new DataResponse($result);
+    }
+
+    /**
+     * @NoAdminRequired
+     *
+     * @param string $id
+     * @return DataResponse
+     * @throws OCSNotFoundException
+     * @throws OCSException
+     * @throws OCSBadRequestException
+     */
+    public function acceptShare(string $id): DataResponse {
+        try {
+            $share = $this->getShareById($id);
+        } catch (ShareNotFound $e) {
+            throw new OCSNotFoundException($this->l->t('Wrong share ID, share doesn\'t exist'));
+        }
+
+        if (!$this->canAccessShare($share)) {
+            throw new OCSNotFoundException($this->l->t('Wrong share ID, share doesn\'t exist'));
+        }
+
+        try {
+            $this->shareManager->acceptShare($share, $this->currentUser);
+        } catch (GenericShareException $e) {
+            $code = $e->getCode() === 0 ? 403 : $e->getCode();
+            throw new OCSException($e->getHint(), $code);
+        } catch (\Exception $e) {
+            throw new OCSBadRequestException($e->getMessage(), $e);
+        }
+
+        return new DataResponse();
+    }
+
+    /**
+     * Does the user have read permission on the share
+     *
+     * @param \OCP\Share\IShare $share the share to check
+     * @param boolean $checkGroups check groups as well?
+     * @return boolean
+     * @throws NotFoundException
+     *
+     * @suppress PhanUndeclaredClassMethod
+     */
+    protected function canAccessShare(\OCP\Share\IShare $share, bool $checkGroups = true): bool {
+        // A file with permissions 0 can't be accessed by us. So Don't show it
+        if ($share->getPermissions() === 0) {
+            return false;
+        }
+
+        // Owner of the file and the sharer of the file can always get share
+        if ($share->getShareOwner() === $this->currentUser
+            || $share->getSharedBy() === $this->currentUser) {
+            return true;
+        }
+
+        // If the share is shared with you, you can access it!
+        if ($share->getShareType() === Share::SHARE_TYPE_USER
+            && $share->getSharedWith() === $this->currentUser) {
+            return true;
+        }
+
+        // Have reshare rights on the shared file/folder ?
+        // Does the currentUser have access to the shared file?
+        $userFolder = $this->rootFolder->getUserFolder($this->currentUser);
+        $files = $userFolder->getById($share->getNodeId());
+        if (!empty($files) && $this->shareProviderResharingRights($this->currentUser, $share, $files[0])) {
+            return true;
+        }
+
+        // If in the recipient group, you can see the share
+        if ($checkGroups && $share->getShareType() === Share::SHARE_TYPE_GROUP) {
+            $sharedWith = $this->groupManager->get($share->getSharedWith());
+            $user = $this->userManager->get($this->currentUser);
+            if ($user !== null && $sharedWith !== null && $sharedWith->inGroup($user)) {
+                return true;
+            }
+        }
+
+        if ($share->getShareType() === Share::SHARE_TYPE_CIRCLE) {
+            // TODO: have a sanity check like above?
+            return true;
+        }
+
+        if ($share->getShareType() === Share::SHARE_TYPE_ROOM) {
+            try {
+                return $this->getRoomShareHelper()->canAccessShare($share, $this->currentUser);
+            } catch (QueryException $e) {
+                return false;
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * Does the user have edit permission on the share
+     *
+     * @param \OCP\Share\IShare $share the share to check
+     * @return boolean
+     */
+    protected function canEditShare(\OCP\Share\IShare $share): bool {
+        // A file with permissions 0 can't be accessed by us. So Don't show it
+        if ($share->getPermissions() === 0) {
+            return false;
+        }
+
+        // The owner of the file and the creator of the share
+        // can always edit the share
+        if ($share->getShareOwner() === $this->currentUser ||
+            $share->getSharedBy() === $this->currentUser
+        ) {
+            return true;
+        }
+
+        //! we do NOT support some kind of `admin` in groups.
+        //! You cannot edit shares shared to a group you're
+        //! a member of if you're not the share owner or the file owner!
+
+        return false;
+    }
+
+    /**
+     * Does the user have delete permission on the share
+     *
+     * @param \OCP\Share\IShare $share the share to check
+     * @return boolean
+     */
+    protected function canDeleteShare(\OCP\Share\IShare $share): bool {
+        // A file with permissions 0 can't be accessed by us. So Don't show it
+        if ($share->getPermissions() === 0) {
+            return false;
+        }
+
+        // if the user is the recipient, i can unshare
+        // the share with self
+        if ($share->getShareType() === Share::SHARE_TYPE_USER &&
+            $share->getSharedWith() === $this->currentUser
+        ) {
+            return true;
+        }
+
+        // The owner of the file and the creator of the share
+        // can always delete the share
+        if ($share->getShareOwner() === $this->currentUser ||
+            $share->getSharedBy() === $this->currentUser
+        ) {
+            return true;
+        }
+
+        return false;
+    }
+
+    /**
+     * Does the user have delete permission on the share
+     * This differs from the canDeleteShare function as it only
+     * remove the share for the current user. It does NOT
+     * completely delete the share but only the mount point.
+     * It can then be restored from the deleted shares section.
+     *
+     * @param \OCP\Share\IShare $share the share to check
+     * @return boolean
+     *
+     * @suppress PhanUndeclaredClassMethod
+     */
+    protected function canDeleteShareFromSelf(\OCP\Share\IShare $share): bool {
+        if ($share->getShareType() !== IShare::TYPE_GROUP &&
+            $share->getShareType() !== IShare::TYPE_ROOM
+        ) {
+            return false;
+        }
+
+        if ($share->getShareOwner() === $this->currentUser ||
+            $share->getSharedBy() === $this->currentUser
+        ) {
+            // Delete the whole share, not just for self
+            return false;
+        }
+
+        // If in the recipient group, you can delete the share from self
+        if ($share->getShareType() === Share::SHARE_TYPE_GROUP) {
+            $sharedWith = $this->groupManager->get($share->getSharedWith());
+            $user = $this->userManager->get($this->currentUser);
+            if ($user !== null && $sharedWith !== null && $sharedWith->inGroup($user)) {
+                return true;
+            }
+        }
+
+        if ($share->getShareType() === Share::SHARE_TYPE_ROOM) {
+            try {
+                return $this->getRoomShareHelper()->canAccessShare($share, $this->currentUser);
+            } catch (QueryException $e) {
+                return false;
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * Make sure that the passed date is valid ISO 8601
+     * So YYYY-MM-DD
+     * If not throw an exception
+     *
+     * @param string $expireDate
+     *
+     * @throws \Exception
+     * @return \DateTime
+     */
+    private function parseDate(string $expireDate): \DateTime {
+        try {
+            $date = new \DateTime($expireDate);
+        } catch (\Exception $e) {
+            throw new \Exception('Invalid date. Format must be YYYY-MM-DD');
+        }
+
+        if ($date === false) {
+            throw new \Exception('Invalid date. Format must be YYYY-MM-DD');
+        }
+
+        $date->setTime(0, 0, 0);
+
+        return $date;
+    }
+
+    /**
+     * Since we have multiple providers but the OCS Share API v1 does
+     * not support this we need to check all backends.
+     *
+     * @param string $id
+     * @return \OCP\Share\IShare
+     * @throws ShareNotFound
+     */
+    private function getShareById(string $id): IShare {
+        $share = null;
+
+        // First check if it is an internal share.
+        try {
+            $share = $this->shareManager->getShareById('ocinternal:' . $id, $this->currentUser);
+            return $share;
+        } catch (ShareNotFound $e) {
+            // Do nothing, just try the other share type
+        }
+
+
+        try {
+            if ($this->shareManager->shareProviderExists(Share::SHARE_TYPE_CIRCLE)) {
+                $share = $this->shareManager->getShareById('ocCircleShare:' . $id, $this->currentUser);
+                return $share;
+            }
+        } catch (ShareNotFound $e) {
+            // Do nothing, just try the other share type
+        }
+
+        try {
+            if ($this->shareManager->shareProviderExists(Share::SHARE_TYPE_EMAIL)) {
+                $share = $this->shareManager->getShareById('ocMailShare:' . $id, $this->currentUser);
+                return $share;
+            }
+        } catch (ShareNotFound $e) {
+            // Do nothing, just try the other share type
+        }
+
+        try {
+            $share = $this->shareManager->getShareById('ocRoomShare:' . $id, $this->currentUser);
+            return $share;
+        } catch (ShareNotFound $e) {
+            // Do nothing, just try the other share type
+        }
+
+        if (!$this->shareManager->outgoingServer2ServerSharesAllowed()) {
+            throw new ShareNotFound();
+        }
+        $share = $this->shareManager->getShareById('ocFederatedSharing:' . $id, $this->currentUser);
+
+        return $share;
+    }
+
+    /**
+     * Lock a Node
+     *
+     * @param \OCP\Files\Node $node
+     * @throws LockedException
+     */
+    private function lock(\OCP\Files\Node $node) {
+        $node->lock(ILockingProvider::LOCK_SHARED);
+        $this->lockedNode = $node;
+    }
+
+    /**
+     * Cleanup the remaining locks
+     * @throws @LockedException
+     */
+    public function cleanup() {
+        if ($this->lockedNode !== null) {
+            $this->lockedNode->unlock(ILockingProvider::LOCK_SHARED);
+        }
+    }
+
+    /**
+     * Returns the helper of ShareAPIController for room shares.
+     *
+     * If the Talk application is not enabled or the helper is not available
+     * a QueryException is thrown instead.
+     *
+     * @return \OCA\Talk\Share\Helper\ShareAPIController
+     * @throws QueryException
+     */
+    private function getRoomShareHelper() {
+        if (!$this->appManager->isEnabledForUser('spreed')) {
+            throw new QueryException();
+        }
+
+        return $this->serverContainer->query('\OCA\Talk\Share\Helper\ShareAPIController');
+    }
+
+
+    /**
+     * @param string $viewer
+     * @param Node $node
+     * @param bool $reShares
+     *
+     * @return IShare[]
+     */
+    private function getSharesFromNode(string $viewer, $node, bool $reShares): array {
+
+        $providers = [
+            Share::SHARE_TYPE_USER,
+            Share::SHARE_TYPE_GROUP,
+            Share::SHARE_TYPE_LINK,
+            Share::SHARE_TYPE_EMAIL,
+            Share::SHARE_TYPE_EMAIL,
+            Share::SHARE_TYPE_CIRCLE,
+            Share::SHARE_TYPE_ROOM
+        ];
+
+        // Should we assume that the (currentUser) viewer is the owner of the node !?
+        $shares = [];
+        foreach ($providers as $provider) {
+            if (!$this->shareManager->shareProviderExists($provider)) {
+                continue;
+            }
+
+            $providerShares =
+                $this->shareManager->getSharesBy($viewer, $provider, $node, $reShares, -1, 0);
+            $shares = array_merge($shares, $providerShares);
+        }
+
+        if ($this->shareManager->outgoingServer2ServerSharesAllowed()) {
+            $federatedShares = $this->shareManager->getSharesBy(
+                $this->currentUser, Share::SHARE_TYPE_REMOTE, $node, $reShares, -1, 0
+            );
+            $shares = array_merge($shares, $federatedShares);
+        }
+
+        if ($this->shareManager->outgoingServer2ServerGroupSharesAllowed()) {
+            $federatedShares = $this->shareManager->getSharesBy(
+                $this->currentUser, Share::SHARE_TYPE_REMOTE_GROUP, $node, $reShares, -1, 0
+            );
+            $shares = array_merge($shares, $federatedShares);
+        }
+
+        return $shares;
+    }
+
+
+    /**
+     * @param Node $node
+     *
+     * @throws SharingRightsException
+     */
+    private function confirmSharingRights(Node $node): void {
+        if (!$this->hasResharingRights($this->currentUser, $node)) {
+            throw new SharingRightsException('no sharing rights on this item');
+        }
+    }
+
+
+    /**
+     * @param string $viewer
+     * @param Node $node
+     *
+     * @return bool
+     */
+    private function hasResharingRights($viewer, $node): bool {
+        if ($viewer === $node->getOwner()->getUID()) {
+            return true;
+        }
+
+        foreach ([$node, $node->getParent()] as $node) {
+            $shares = $this->getSharesFromNode($viewer, $node, true);
+            foreach ($shares as $share) {
+                try {
+                    if ($this->shareProviderResharingRights($viewer, $share, $node)) {
+                        return true;
+                    }
+                } catch (InvalidPathException | NotFoundException $e) {
+                }
+            }
+        }
+
+        return false;
+    }
+
+
+    /**
+     * Returns if we can find resharing rights in an IShare object for a specific user.
+     *
+     * @suppress PhanUndeclaredClassMethod
+     *
+     * @param string $userId
+     * @param IShare $share
+     * @param Node $node
+     *
+     * @return bool
+     * @throws NotFoundException
+     * @throws InvalidPathException
+     */
+    private function shareProviderResharingRights(string $userId, IShare $share, $node): bool {
+        if ($share->getShareOwner() === $userId) {
+            return true;
+        }
+
+        // we check that current user have parent resharing rights on the current file
+        if ($node !== null && ($node->getPermissions() & Constants::PERMISSION_SHARE) !== 0) {
+            return true;
+        }
+
+        if ((\OCP\Constants::PERMISSION_SHARE & $share->getPermissions()) === 0) {
+            return false;
+        }
+
+        if ($share->getShareType() === \OCP\Share::SHARE_TYPE_USER && $share->getSharedWith() === $userId) {
+            return true;
+        }
+
+        if ($share->getShareType() === \OCP\Share::SHARE_TYPE_GROUP && $this->groupManager->isInGroup($userId, $share->getSharedWith())) {
+            return true;
+        }
+
+        if ($share->getShareType() === \OCP\Share::SHARE_TYPE_CIRCLE && \OC::$server->getAppManager()->isEnabledForUser('circles')
+            && class_exists('\OCA\Circles\Api\v1\Circles')) {
+
+            $hasCircleId = (substr($share->getSharedWith(), -1) === ']');
+            $shareWithStart = ($hasCircleId ? strrpos($share->getSharedWith(), '[') + 1 : 0);
+            $shareWithLength = ($hasCircleId ? -1 : strpos($share->getSharedWith(), ' '));
+            if (is_bool($shareWithLength)) {
+                $shareWithLength = -1;
+            }
+            $sharedWith = substr($share->getSharedWith(), $shareWithStart, $shareWithLength);
+            try {
+                $member = \OCA\Circles\Api\v1\Circles::getMember($sharedWith, $userId, 1);
+                if ($member->getLevel() >= 4) {
+                    return true;
+                }
+                return false;
+            } catch (QueryException $e) {
+                return false;
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * Get all the shares for the current user
+     *
+     * @param Node|null $path
+     * @param boolean $reshares
+     * @return void
+     */
+    private function getAllShares(?Node $path = null, bool $reshares = false) {
+        // Get all shares
+        $userShares = $this->shareManager->getSharesBy($this->currentUser, Share::SHARE_TYPE_USER, $path, $reshares, -1, 0);
+        $groupShares = $this->shareManager->getSharesBy($this->currentUser, Share::SHARE_TYPE_GROUP, $path, $reshares, -1, 0);
+        $linkShares = $this->shareManager->getSharesBy($this->currentUser, Share::SHARE_TYPE_LINK, $path, $reshares, -1, 0);
+
+        // EMAIL SHARES
+        $mailShares = $this->shareManager->getSharesBy($this->currentUser, Share::SHARE_TYPE_EMAIL, $path, $reshares, -1, 0);
+
+        // CIRCLE SHARES
+        $circleShares = $this->shareManager->getSharesBy($this->currentUser, Share::SHARE_TYPE_CIRCLE, $path, $reshares, -1, 0);
+
+        // TALK SHARES
+        $roomShares = $this->shareManager->getSharesBy($this->currentUser, Share::SHARE_TYPE_ROOM, $path, $reshares, -1, 0);
+
+        // FEDERATION
+        if ($this->shareManager->outgoingServer2ServerSharesAllowed()) {
+            $federatedShares = $this->shareManager->getSharesBy($this->currentUser, Share::SHARE_TYPE_REMOTE, $path, $reshares, -1, 0);
+        } else {
+            $federatedShares = [];
+        }
+        if ($this->shareManager->outgoingServer2ServerGroupSharesAllowed()) {
+            $federatedGroupShares = $this->shareManager->getSharesBy($this->currentUser, Share::SHARE_TYPE_REMOTE_GROUP, $path, $reshares, -1, 0);
+        } else {
+            $federatedGroupShares = [];
+        }
+
+        return array_merge($userShares, $groupShares, $linkShares, $mailShares, $circleShares, $roomShares, $federatedShares, $federatedGroupShares);
+    }
+
+
+    /**
+     * merging already formatted shares.
+     * We'll make an associative array to easily detect duplicate Ids.
+     * Keys _needs_ to be removed after all shares are retrieved and merged.
+     *
+     * @param array $shares
+     * @param array $newShares
+     */
+    private function mergeFormattedShares(array &$shares, array $newShares) {
+        foreach ($newShares as $newShare) {
+            if (!array_key_exists($newShare['id'], $shares)) {
+                $shares[$newShare['id']] = $newShare;
+            }
+        }
+    }
 
 }

Spacing +10 added lines, -10 removed lines

@@ -227,7 +227,7 @@ 
 			// "share_with" and "share_with_displayname" for passwords of link
 			// shares was deprecated in Nextcloud 15, use "password" instead.
 			$result['share_with'] = $share->getPassword();
-			$result['share_with_displayname'] = '(' . $this->l->t('Shared link') . ')';
+			$result['share_with_displayname'] = '('.$this->l->t('Shared link').')';
 
 			$result['password'] = $share->getPassword();
 
@@ -602,7 +602,7 @@ 
 
 		$shares = array_merge($userShares, $groupShares, $circleShares, $roomShares);
 
-		$shares = array_filter($shares, function (IShare $share) {
+		$shares = array_filter($shares, function(IShare $share) {
 			return $share->getShareOwner() !== $this->currentUser;
 		});
 
@@ -639,7 +639,7 @@ 
 		$nodes = $folder->getDirectoryListing();
 
 		/** @var \OCP\Share\IShare[] $shares */
-		$shares = array_reduce($nodes, function ($carry, $node) {
+		$shares = array_reduce($nodes, function($carry, $node) {
 			$carry = array_merge($carry, $this->getAllShares($node, true));
 			return $carry;
 		}, []);
@@ -1111,7 +1111,7 @@ 
 			}
 		}
 
-		$result = array_filter(array_map(function (IShare $share) {
+		$result = array_filter(array_map(function(IShare $share) {
 			$userFolder = $this->rootFolder->getUserFolder($share->getSharedBy());
 			$nodes = $userFolder->getById($share->getNodeId());
 			if (empty($nodes)) {
@@ -1133,7 +1133,7 @@ 
 			} catch (NotFoundException $e) {
 				return null;
 			}
-		}, $pendingShares), function ($entry) {
+		}, $pendingShares), function($entry) {
 			return $entry !== null;
 		});
 
@@ -1376,7 +1376,7 @@ 
 
 		// First check if it is an internal share.
 		try {
-			$share = $this->shareManager->getShareById('ocinternal:' . $id, $this->currentUser);
+			$share = $this->shareManager->getShareById('ocinternal:'.$id, $this->currentUser);
 			return $share;
 		} catch (ShareNotFound $e) {
 			// Do nothing, just try the other share type
@@ -1385,7 +1385,7 @@ 
 
 		try {
 			if ($this->shareManager->shareProviderExists(Share::SHARE_TYPE_CIRCLE)) {
-				$share = $this->shareManager->getShareById('ocCircleShare:' . $id, $this->currentUser);
+				$share = $this->shareManager->getShareById('ocCircleShare:'.$id, $this->currentUser);
 				return $share;
 			}
 		} catch (ShareNotFound $e) {
@@ -1394,7 +1394,7 @@ 
 
 		try {
 			if ($this->shareManager->shareProviderExists(Share::SHARE_TYPE_EMAIL)) {
-				$share = $this->shareManager->getShareById('ocMailShare:' . $id, $this->currentUser);
+				$share = $this->shareManager->getShareById('ocMailShare:'.$id, $this->currentUser);
 				return $share;
 			}
 		} catch (ShareNotFound $e) {
@@ -1402,7 +1402,7 @@ 
 		}
 
 		try {
-			$share = $this->shareManager->getShareById('ocRoomShare:' . $id, $this->currentUser);
+			$share = $this->shareManager->getShareById('ocRoomShare:'.$id, $this->currentUser);
 			return $share;
 		} catch (ShareNotFound $e) {
 			// Do nothing, just try the other share type
@@ -1411,7 +1411,7 @@ 
 		if (!$this->shareManager->outgoingServer2ServerSharesAllowed()) {
 			throw new ShareNotFound();
 		}
-		$share = $this->shareManager->getShareById('ocFederatedSharing:' . $id, $this->currentUser);
+		$share = $this->shareManager->getShareById('ocFederatedSharing:'.$id, $this->currentUser);
 
 		return $share;
 	}