nextcloud / server

lib/private/Installer.php

Indentation +548 added lines, -548 removed lines

@@ -52,552 +52,552 @@
  * This class provides the functionality needed to install, update and remove apps
  */
 class Installer {
-	/** @var AppFetcher */
-	private $appFetcher;
-	/** @var IClientService */
-	private $clientService;
-	/** @var ITempManager */
-	private $tempManager;
-	/** @var ILogger */
-	private $logger;
-	/** @var IConfig */
-	private $config;
-	/** @var array - for caching the result of app fetcher */
-	private $apps = null;
-	/** @var bool|null - for caching the result of the ready status */
-	private $isInstanceReadyForUpdates = null;
-
-	/**
-	 * @param AppFetcher $appFetcher
-	 * @param IClientService $clientService
-	 * @param ITempManager $tempManager
-	 * @param ILogger $logger
-	 * @param IConfig $config
-	 */
-	public function __construct(AppFetcher $appFetcher,
-								IClientService $clientService,
-								ITempManager $tempManager,
-								ILogger $logger,
-								IConfig $config) {
-		$this->appFetcher = $appFetcher;
-		$this->clientService = $clientService;
-		$this->tempManager = $tempManager;
-		$this->logger = $logger;
-		$this->config = $config;
-	}
-
-	/**
-	 * Installs an app that is located in one of the app folders already
-	 *
-	 * @param string $appId App to install
-	 * @throws \Exception
-	 * @return string app ID
-	 */
-	public function installApp($appId) {
-		$app = \OC_App::findAppInDirectories($appId);
-		if($app === false) {
-			throw new \Exception('App not found in any app directory');
-		}
-
-		$basedir = $app['path'].'/'.$appId;
-		$info = OC_App::getAppInfo($basedir.'/appinfo/info.xml', true);
-
-		$l = \OC::$server->getL10N('core');
-
-		if(!is_array($info)) {
-			throw new \Exception(
-				$l->t('App "%s" cannot be installed because appinfo file cannot be read.',
-					[$appId]
-				)
-			);
-		}
-
-		$version = implode('.', \OCP\Util::getVersion());
-		if (!\OC_App::isAppCompatible($version, $info)) {
-			throw new \Exception(
-				// TODO $l
-				$l->t('App "%s" cannot be installed because it is not compatible with this version of the server.',
-					[$info['name']]
-				)
-			);
-		}
-
-		// check for required dependencies
-		\OC_App::checkAppDependencies($this->config, $l, $info);
-		\OC_App::registerAutoloading($appId, $basedir);
-
-		//install the database
-		if(is_file($basedir.'/appinfo/database.xml')) {
-			if (\OC::$server->getConfig()->getAppValue($info['id'], 'installed_version') === null) {
-				OC_DB::createDbFromStructure($basedir.'/appinfo/database.xml');
-			} else {
-				OC_DB::updateDbFromStructure($basedir.'/appinfo/database.xml');
-			}
-		} else {
-			$ms = new \OC\DB\MigrationService($info['id'], \OC::$server->getDatabaseConnection());
-			$ms->migrate();
-		}
-
-		\OC_App::setupBackgroundJobs($info['background-jobs']);
-
-		//run appinfo/install.php
-		self::includeAppScript($basedir . '/appinfo/install.php');
-
-		$appData = OC_App::getAppInfo($appId);
-		OC_App::executeRepairSteps($appId, $appData['repair-steps']['install']);
-
-		//set the installed version
-		\OC::$server->getConfig()->setAppValue($info['id'], 'installed_version', OC_App::getAppVersion($info['id'], false));
-		\OC::$server->getConfig()->setAppValue($info['id'], 'enabled', 'no');
-
-		//set remote/public handlers
-		foreach($info['remote'] as $name=>$path) {
-			\OC::$server->getConfig()->setAppValue('core', 'remote_'.$name, $info['id'].'/'.$path);
-		}
-		foreach($info['public'] as $name=>$path) {
-			\OC::$server->getConfig()->setAppValue('core', 'public_'.$name, $info['id'].'/'.$path);
-		}
-
-		OC_App::setAppTypes($info['id']);
-
-		return $info['id'];
-	}
-
-	/**
-	 * Updates the specified app from the appstore
-	 *
-	 * @param string $appId
-	 * @return bool
-	 */
-	public function updateAppstoreApp($appId) {
-		if($this->isUpdateAvailable($appId)) {
-			try {
-				$this->downloadApp($appId);
-			} catch (\Exception $e) {
-				$this->logger->logException($e, [
-					'level' => ILogger::ERROR,
-					'app' => 'core',
-				]);
-				return false;
-			}
-			return OC_App::updateApp($appId);
-		}
-
-		return false;
-	}
-
-	/**
-	 * Downloads an app and puts it into the app directory
-	 *
-	 * @param string $appId
-	 *
-	 * @throws \Exception If the installation was not successful
-	 */
-	public function downloadApp($appId) {
-		$appId = strtolower($appId);
-
-		$apps = $this->appFetcher->get();
-		foreach($apps as $app) {
-			if($app['id'] === $appId) {
-				// Load the certificate
-				$certificate = new X509();
-				$certificate->loadCA(file_get_contents(__DIR__ . '/../../resources/codesigning/root.crt'));
-				$loadedCertificate = $certificate->loadX509($app['certificate']);
-
-				// Verify if the certificate has been revoked
-				$crl = new X509();
-				$crl->loadCA(file_get_contents(__DIR__ . '/../../resources/codesigning/root.crt'));
-				$crl->loadCRL(file_get_contents(__DIR__ . '/../../resources/codesigning/root.crl'));
-				if($crl->validateSignature() !== true) {
-					throw new \Exception('Could not validate CRL signature');
-				}
-				$csn = $loadedCertificate['tbsCertificate']['serialNumber']->toString();
-				$revoked = $crl->getRevoked($csn);
-				if ($revoked !== false) {
-					throw new \Exception(
-						sprintf(
-							'Certificate "%s" has been revoked',
-							$csn
-						)
-					);
-				}
-
-				// Verify if the certificate has been issued by the Nextcloud Code Authority CA
-				if($certificate->validateSignature() !== true) {
-					throw new \Exception(
-						sprintf(
-							'App with id %s has a certificate not issued by a trusted Code Signing Authority',
-							$appId
-						)
-					);
-				}
-
-				// Verify if the certificate is issued for the requested app id
-				$certInfo = openssl_x509_parse($app['certificate']);
-				if(!isset($certInfo['subject']['CN'])) {
-					throw new \Exception(
-						sprintf(
-							'App with id %s has a cert with no CN',
-							$appId
-						)
-					);
-				}
-				if($certInfo['subject']['CN'] !== $appId) {
-					throw new \Exception(
-						sprintf(
-							'App with id %s has a cert issued to %s',
-							$appId,
-							$certInfo['subject']['CN']
-						)
-					);
-				}
-
-				// Download the release
-				$tempFile = $this->tempManager->getTemporaryFile('.tar.gz');
-				$client = $this->clientService->newClient();
-				$client->get($app['releases'][0]['download'], ['save_to' => $tempFile]);
-
-				// Check if the signature actually matches the downloaded content
-				$certificate = openssl_get_publickey($app['certificate']);
-				$verified = (bool)openssl_verify(file_get_contents($tempFile), base64_decode($app['releases'][0]['signature']), $certificate, OPENSSL_ALGO_SHA512);
-				openssl_free_key($certificate);
-
-				if($verified === true) {
-					// Seems to match, let's proceed
-					$extractDir = $this->tempManager->getTemporaryFolder();
-					$archive = new TAR($tempFile);
-
-					if($archive) {
-						if (!$archive->extract($extractDir)) {
-							throw new \Exception(
-								sprintf(
-									'Could not extract app %s',
-									$appId
-								)
-							);
-						}
-						$allFiles = scandir($extractDir);
-						$folders = array_diff($allFiles, ['.', '..']);
-						$folders = array_values($folders);
-
-						if(count($folders) > 1) {
-							throw new \Exception(
-								sprintf(
-									'Extracted app %s has more than 1 folder',
-									$appId
-								)
-							);
-						}
-
-						// Check if appinfo/info.xml has the same app ID as well
-						$loadEntities = libxml_disable_entity_loader(false);
-						$xml = simplexml_load_file($extractDir . '/' . $folders[0] . '/appinfo/info.xml');
-						libxml_disable_entity_loader($loadEntities);
-						if((string)$xml->id !== $appId) {
-							throw new \Exception(
-								sprintf(
-									'App for id %s has a wrong app ID in info.xml: %s',
-									$appId,
-									(string)$xml->id
-								)
-							);
-						}
-
-						// Check if the version is lower than before
-						$currentVersion = OC_App::getAppVersion($appId);
-						$newVersion = (string)$xml->version;
-						if(version_compare($currentVersion, $newVersion) === 1) {
-							throw new \Exception(
-								sprintf(
-									'App for id %s has version %s and tried to update to lower version %s',
-									$appId,
-									$currentVersion,
-									$newVersion
-								)
-							);
-						}
-
-						$baseDir = OC_App::getInstallPath() . '/' . $appId;
-						// Remove old app with the ID if existent
-						OC_Helper::rmdirr($baseDir);
-						// Move to app folder
-						if(@mkdir($baseDir)) {
-							$extractDir .= '/' . $folders[0];
-							OC_Helper::copyr($extractDir, $baseDir);
-						}
-						OC_Helper::copyr($extractDir, $baseDir);
-						OC_Helper::rmdirr($extractDir);
-						return;
-					} else {
-						throw new \Exception(
-							sprintf(
-								'Could not extract app with ID %s to %s',
-								$appId,
-								$extractDir
-							)
-						);
-					}
-				} else {
-					// Signature does not match
-					throw new \Exception(
-						sprintf(
-							'App with id %s has invalid signature',
-							$appId
-						)
-					);
-				}
-			}
-		}
-
-		throw new \Exception(
-			sprintf(
-				'Could not download app %s',
-				$appId
-			)
-		);
-	}
-
-	/**
-	 * Check if an update for the app is available
-	 *
-	 * @param string $appId
-	 * @return string|false false or the version number of the update
-	 */
-	public function isUpdateAvailable($appId) {
-		if ($this->isInstanceReadyForUpdates === null) {
-			$installPath = OC_App::getInstallPath();
-			if ($installPath === false || $installPath === null) {
-				$this->isInstanceReadyForUpdates = false;
-			} else {
-				$this->isInstanceReadyForUpdates = true;
-			}
-		}
-
-		if ($this->isInstanceReadyForUpdates === false) {
-			return false;
-		}
-
-		if ($this->isInstalledFromGit($appId) === true) {
-			return false;
-		}
-
-		if ($this->apps === null) {
-			$this->apps = $this->appFetcher->get();
-		}
-
-		foreach($this->apps as $app) {
-			if($app['id'] === $appId) {
-				$currentVersion = OC_App::getAppVersion($appId);
-				$newestVersion = $app['releases'][0]['version'];
-				if ($currentVersion !== '0' && version_compare($newestVersion, $currentVersion, '>')) {
-					return $newestVersion;
-				} else {
-					return false;
-				}
-			}
-		}
-
-		return false;
-	}
-
-	/**
-	 * Check if app has been installed from git
-	 * @param string $name name of the application to remove
-	 * @return boolean
-	 *
-	 * The function will check if the path contains a .git folder
-	 */
-	private function isInstalledFromGit($appId) {
-		$app = \OC_App::findAppInDirectories($appId);
-		if($app === false) {
-			return false;
-		}
-		$basedir = $app['path'].'/'.$appId;
-		return file_exists($basedir.'/.git/');
-	}
-
-	/**
-	 * Check if app is already downloaded
-	 * @param string $name name of the application to remove
-	 * @return boolean
-	 *
-	 * The function will check if the app is already downloaded in the apps repository
-	 */
-	public function isDownloaded($name) {
-		foreach(\OC::$APPSROOTS as $dir) {
-			$dirToTest  = $dir['path'];
-			$dirToTest .= '/';
-			$dirToTest .= $name;
-			$dirToTest .= '/';
-
-			if (is_dir($dirToTest)) {
-				return true;
-			}
-		}
-
-		return false;
-	}
-
-	/**
-	 * Removes an app
-	 * @param string $appId ID of the application to remove
-	 * @return boolean
-	 *
-	 *
-	 * This function works as follows
-	 *   -# call uninstall repair steps
-	 *   -# removing the files
-	 *
-	 * The function will not delete preferences, tables and the configuration,
-	 * this has to be done by the function oc_app_uninstall().
-	 */
-	public function removeApp($appId) {
-		if($this->isDownloaded( $appId )) {
-			if (\OC::$server->getAppManager()->isShipped($appId)) {
-				return false;
-			}
-			$appDir = OC_App::getInstallPath() . '/' . $appId;
-			OC_Helper::rmdirr($appDir);
-			return true;
-		}else{
-			\OCP\Util::writeLog('core', 'can\'t remove app '.$appId.'. It is not installed.', ILogger::ERROR);
-
-			return false;
-		}
-
-	}
-
-	/**
-	 * Installs the app within the bundle and marks the bundle as installed
-	 *
-	 * @param Bundle $bundle
-	 * @throws \Exception If app could not get installed
-	 */
-	public function installAppBundle(Bundle $bundle) {
-		$appIds = $bundle->getAppIdentifiers();
-		foreach($appIds as $appId) {
-			if(!$this->isDownloaded($appId)) {
-				$this->downloadApp($appId);
-			}
-			$this->installApp($appId);
-			$app = new OC_App();
-			$app->enable($appId);
-		}
-		$bundles = json_decode($this->config->getAppValue('core', 'installed.bundles', json_encode([])), true);
-		$bundles[] = $bundle->getIdentifier();
-		$this->config->setAppValue('core', 'installed.bundles', json_encode($bundles));
-	}
-
-	/**
-	 * Installs shipped apps
-	 *
-	 * This function installs all apps found in the 'apps' directory that should be enabled by default;
-	 * @param bool $softErrors When updating we ignore errors and simply log them, better to have a
-	 *                         working ownCloud at the end instead of an aborted update.
-	 * @return array Array of error messages (appid => Exception)
-	 */
-	public static function installShippedApps($softErrors = false) {
-		$appManager = \OC::$server->getAppManager();
-		$config = \OC::$server->getConfig();
-		$errors = [];
-		foreach(\OC::$APPSROOTS as $app_dir) {
-			if($dir = opendir( $app_dir['path'] )) {
-				while( false !== ( $filename = readdir( $dir ))) {
-					if( $filename[0] !== '.' and is_dir($app_dir['path']."/$filename") ) {
-						if( file_exists( $app_dir['path']."/$filename/appinfo/info.xml" )) {
-							if($config->getAppValue($filename, "installed_version", null) === null) {
-								$info=OC_App::getAppInfo($filename);
-								$enabled = isset($info['default_enable']);
-								if (($enabled || in_array($filename, $appManager->getAlwaysEnabledApps()))
-									  && $config->getAppValue($filename, 'enabled') !== 'no') {
-									if ($softErrors) {
-										try {
-											Installer::installShippedApp($filename);
-										} catch (HintException $e) {
-											if ($e->getPrevious() instanceof TableExistsException) {
-												$errors[$filename] = $e;
-												continue;
-											}
-											throw $e;
-										}
-									} else {
-										Installer::installShippedApp($filename);
-									}
-									$config->setAppValue($filename, 'enabled', 'yes');
-								}
-							}
-						}
-					}
-				}
-				closedir( $dir );
-			}
-		}
-
-		return $errors;
-	}
-
-	/**
-	 * install an app already placed in the app folder
-	 * @param string $app id of the app to install
-	 * @return integer
-	 */
-	public static function installShippedApp($app) {
-		//install the database
-		$appPath = OC_App::getAppPath($app);
-		\OC_App::registerAutoloading($app, $appPath);
-
-		if(is_file("$appPath/appinfo/database.xml")) {
-			try {
-				OC_DB::createDbFromStructure("$appPath/appinfo/database.xml");
-			} catch (TableExistsException $e) {
-				throw new HintException(
-					'Failed to enable app ' . $app,
-					'Please ask for help via one of our <a href="https://nextcloud.com/support/" target="_blank" rel="noreferrer noopener">support channels</a>.',
-					0, $e
-				);
-			}
-		} else {
-			$ms = new \OC\DB\MigrationService($app, \OC::$server->getDatabaseConnection());
-			$ms->migrate();
-		}
-
-		//run appinfo/install.php
-		self::includeAppScript("$appPath/appinfo/install.php");
-
-		$info = OC_App::getAppInfo($app);
-		if (is_null($info)) {
-			return false;
-		}
-		\OC_App::setupBackgroundJobs($info['background-jobs']);
-
-		OC_App::executeRepairSteps($app, $info['repair-steps']['install']);
-
-		$config = \OC::$server->getConfig();
-
-		$config->setAppValue($app, 'installed_version', OC_App::getAppVersion($app));
-		if (array_key_exists('ocsid', $info)) {
-			$config->setAppValue($app, 'ocsid', $info['ocsid']);
-		}
-
-		//set remote/public handlers
-		foreach($info['remote'] as $name=>$path) {
-			$config->setAppValue('core', 'remote_'.$name, $app.'/'.$path);
-		}
-		foreach($info['public'] as $name=>$path) {
-			$config->setAppValue('core', 'public_'.$name, $app.'/'.$path);
-		}
-
-		OC_App::setAppTypes($info['id']);
-
-		return $info['id'];
-	}
-
-	/**
-	 * @param string $script
-	 */
-	private static function includeAppScript($script) {
-		if ( file_exists($script) ){
-			include $script;
-		}
-	}
+    /** @var AppFetcher */
+    private $appFetcher;
+    /** @var IClientService */
+    private $clientService;
+    /** @var ITempManager */
+    private $tempManager;
+    /** @var ILogger */
+    private $logger;
+    /** @var IConfig */
+    private $config;
+    /** @var array - for caching the result of app fetcher */
+    private $apps = null;
+    /** @var bool|null - for caching the result of the ready status */
+    private $isInstanceReadyForUpdates = null;
+
+    /**
+     * @param AppFetcher $appFetcher
+     * @param IClientService $clientService
+     * @param ITempManager $tempManager
+     * @param ILogger $logger
+     * @param IConfig $config
+     */
+    public function __construct(AppFetcher $appFetcher,
+                                IClientService $clientService,
+                                ITempManager $tempManager,
+                                ILogger $logger,
+                                IConfig $config) {
+        $this->appFetcher = $appFetcher;
+        $this->clientService = $clientService;
+        $this->tempManager = $tempManager;
+        $this->logger = $logger;
+        $this->config = $config;
+    }
+
+    /**
+     * Installs an app that is located in one of the app folders already
+     *
+     * @param string $appId App to install
+     * @throws \Exception
+     * @return string app ID
+     */
+    public function installApp($appId) {
+        $app = \OC_App::findAppInDirectories($appId);
+        if($app === false) {
+            throw new \Exception('App not found in any app directory');
+        }
+
+        $basedir = $app['path'].'/'.$appId;
+        $info = OC_App::getAppInfo($basedir.'/appinfo/info.xml', true);
+
+        $l = \OC::$server->getL10N('core');
+
+        if(!is_array($info)) {
+            throw new \Exception(
+                $l->t('App "%s" cannot be installed because appinfo file cannot be read.',
+                    [$appId]
+                )
+            );
+        }
+
+        $version = implode('.', \OCP\Util::getVersion());
+        if (!\OC_App::isAppCompatible($version, $info)) {
+            throw new \Exception(
+                // TODO $l
+                $l->t('App "%s" cannot be installed because it is not compatible with this version of the server.',
+                    [$info['name']]
+                )
+            );
+        }
+
+        // check for required dependencies
+        \OC_App::checkAppDependencies($this->config, $l, $info);
+        \OC_App::registerAutoloading($appId, $basedir);
+
+        //install the database
+        if(is_file($basedir.'/appinfo/database.xml')) {
+            if (\OC::$server->getConfig()->getAppValue($info['id'], 'installed_version') === null) {
+                OC_DB::createDbFromStructure($basedir.'/appinfo/database.xml');
+            } else {
+                OC_DB::updateDbFromStructure($basedir.'/appinfo/database.xml');
+            }
+        } else {
+            $ms = new \OC\DB\MigrationService($info['id'], \OC::$server->getDatabaseConnection());
+            $ms->migrate();
+        }
+
+        \OC_App::setupBackgroundJobs($info['background-jobs']);
+
+        //run appinfo/install.php
+        self::includeAppScript($basedir . '/appinfo/install.php');
+
+        $appData = OC_App::getAppInfo($appId);
+        OC_App::executeRepairSteps($appId, $appData['repair-steps']['install']);
+
+        //set the installed version
+        \OC::$server->getConfig()->setAppValue($info['id'], 'installed_version', OC_App::getAppVersion($info['id'], false));
+        \OC::$server->getConfig()->setAppValue($info['id'], 'enabled', 'no');
+
+        //set remote/public handlers
+        foreach($info['remote'] as $name=>$path) {
+            \OC::$server->getConfig()->setAppValue('core', 'remote_'.$name, $info['id'].'/'.$path);
+        }
+        foreach($info['public'] as $name=>$path) {
+            \OC::$server->getConfig()->setAppValue('core', 'public_'.$name, $info['id'].'/'.$path);
+        }
+
+        OC_App::setAppTypes($info['id']);
+
+        return $info['id'];
+    }
+
+    /**
+     * Updates the specified app from the appstore
+     *
+     * @param string $appId
+     * @return bool
+     */
+    public function updateAppstoreApp($appId) {
+        if($this->isUpdateAvailable($appId)) {
+            try {
+                $this->downloadApp($appId);
+            } catch (\Exception $e) {
+                $this->logger->logException($e, [
+                    'level' => ILogger::ERROR,
+                    'app' => 'core',
+                ]);
+                return false;
+            }
+            return OC_App::updateApp($appId);
+        }
+
+        return false;
+    }
+
+    /**
+     * Downloads an app and puts it into the app directory
+     *
+     * @param string $appId
+     *
+     * @throws \Exception If the installation was not successful
+     */
+    public function downloadApp($appId) {
+        $appId = strtolower($appId);
+
+        $apps = $this->appFetcher->get();
+        foreach($apps as $app) {
+            if($app['id'] === $appId) {
+                // Load the certificate
+                $certificate = new X509();
+                $certificate->loadCA(file_get_contents(__DIR__ . '/../../resources/codesigning/root.crt'));
+                $loadedCertificate = $certificate->loadX509($app['certificate']);
+
+                // Verify if the certificate has been revoked
+                $crl = new X509();
+                $crl->loadCA(file_get_contents(__DIR__ . '/../../resources/codesigning/root.crt'));
+                $crl->loadCRL(file_get_contents(__DIR__ . '/../../resources/codesigning/root.crl'));
+                if($crl->validateSignature() !== true) {
+                    throw new \Exception('Could not validate CRL signature');
+                }
+                $csn = $loadedCertificate['tbsCertificate']['serialNumber']->toString();
+                $revoked = $crl->getRevoked($csn);
+                if ($revoked !== false) {
+                    throw new \Exception(
+                        sprintf(
+                            'Certificate "%s" has been revoked',
+                            $csn
+                        )
+                    );
+                }
+
+                // Verify if the certificate has been issued by the Nextcloud Code Authority CA
+                if($certificate->validateSignature() !== true) {
+                    throw new \Exception(
+                        sprintf(
+                            'App with id %s has a certificate not issued by a trusted Code Signing Authority',
+                            $appId
+                        )
+                    );
+                }
+
+                // Verify if the certificate is issued for the requested app id
+                $certInfo = openssl_x509_parse($app['certificate']);
+                if(!isset($certInfo['subject']['CN'])) {
+                    throw new \Exception(
+                        sprintf(
+                            'App with id %s has a cert with no CN',
+                            $appId
+                        )
+                    );
+                }
+                if($certInfo['subject']['CN'] !== $appId) {
+                    throw new \Exception(
+                        sprintf(
+                            'App with id %s has a cert issued to %s',
+                            $appId,
+                            $certInfo['subject']['CN']
+                        )
+                    );
+                }
+
+                // Download the release
+                $tempFile = $this->tempManager->getTemporaryFile('.tar.gz');
+                $client = $this->clientService->newClient();
+                $client->get($app['releases'][0]['download'], ['save_to' => $tempFile]);
+
+                // Check if the signature actually matches the downloaded content
+                $certificate = openssl_get_publickey($app['certificate']);
+                $verified = (bool)openssl_verify(file_get_contents($tempFile), base64_decode($app['releases'][0]['signature']), $certificate, OPENSSL_ALGO_SHA512);
+                openssl_free_key($certificate);
+
+                if($verified === true) {
+                    // Seems to match, let's proceed
+                    $extractDir = $this->tempManager->getTemporaryFolder();
+                    $archive = new TAR($tempFile);
+
+                    if($archive) {
+                        if (!$archive->extract($extractDir)) {
+                            throw new \Exception(
+                                sprintf(
+                                    'Could not extract app %s',
+                                    $appId
+                                )
+                            );
+                        }
+                        $allFiles = scandir($extractDir);
+                        $folders = array_diff($allFiles, ['.', '..']);
+                        $folders = array_values($folders);
+
+                        if(count($folders) > 1) {
+                            throw new \Exception(
+                                sprintf(
+                                    'Extracted app %s has more than 1 folder',
+                                    $appId
+                                )
+                            );
+                        }
+
+                        // Check if appinfo/info.xml has the same app ID as well
+                        $loadEntities = libxml_disable_entity_loader(false);
+                        $xml = simplexml_load_file($extractDir . '/' . $folders[0] . '/appinfo/info.xml');
+                        libxml_disable_entity_loader($loadEntities);
+                        if((string)$xml->id !== $appId) {
+                            throw new \Exception(
+                                sprintf(
+                                    'App for id %s has a wrong app ID in info.xml: %s',
+                                    $appId,
+                                    (string)$xml->id
+                                )
+                            );
+                        }
+
+                        // Check if the version is lower than before
+                        $currentVersion = OC_App::getAppVersion($appId);
+                        $newVersion = (string)$xml->version;
+                        if(version_compare($currentVersion, $newVersion) === 1) {
+                            throw new \Exception(
+                                sprintf(
+                                    'App for id %s has version %s and tried to update to lower version %s',
+                                    $appId,
+                                    $currentVersion,
+                                    $newVersion
+                                )
+                            );
+                        }
+
+                        $baseDir = OC_App::getInstallPath() . '/' . $appId;
+                        // Remove old app with the ID if existent
+                        OC_Helper::rmdirr($baseDir);
+                        // Move to app folder
+                        if(@mkdir($baseDir)) {
+                            $extractDir .= '/' . $folders[0];
+                            OC_Helper::copyr($extractDir, $baseDir);
+                        }
+                        OC_Helper::copyr($extractDir, $baseDir);
+                        OC_Helper::rmdirr($extractDir);
+                        return;
+                    } else {
+                        throw new \Exception(
+                            sprintf(
+                                'Could not extract app with ID %s to %s',
+                                $appId,
+                                $extractDir
+                            )
+                        );
+                    }
+                } else {
+                    // Signature does not match
+                    throw new \Exception(
+                        sprintf(
+                            'App with id %s has invalid signature',
+                            $appId
+                        )
+                    );
+                }
+            }
+        }
+
+        throw new \Exception(
+            sprintf(
+                'Could not download app %s',
+                $appId
+            )
+        );
+    }
+
+    /**
+     * Check if an update for the app is available
+     *
+     * @param string $appId
+     * @return string|false false or the version number of the update
+     */
+    public function isUpdateAvailable($appId) {
+        if ($this->isInstanceReadyForUpdates === null) {
+            $installPath = OC_App::getInstallPath();
+            if ($installPath === false || $installPath === null) {
+                $this->isInstanceReadyForUpdates = false;
+            } else {
+                $this->isInstanceReadyForUpdates = true;
+            }
+        }
+
+        if ($this->isInstanceReadyForUpdates === false) {
+            return false;
+        }
+
+        if ($this->isInstalledFromGit($appId) === true) {
+            return false;
+        }
+
+        if ($this->apps === null) {
+            $this->apps = $this->appFetcher->get();
+        }
+
+        foreach($this->apps as $app) {
+            if($app['id'] === $appId) {
+                $currentVersion = OC_App::getAppVersion($appId);
+                $newestVersion = $app['releases'][0]['version'];
+                if ($currentVersion !== '0' && version_compare($newestVersion, $currentVersion, '>')) {
+                    return $newestVersion;
+                } else {
+                    return false;
+                }
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * Check if app has been installed from git
+     * @param string $name name of the application to remove
+     * @return boolean
+     *
+     * The function will check if the path contains a .git folder
+     */
+    private function isInstalledFromGit($appId) {
+        $app = \OC_App::findAppInDirectories($appId);
+        if($app === false) {
+            return false;
+        }
+        $basedir = $app['path'].'/'.$appId;
+        return file_exists($basedir.'/.git/');
+    }
+
+    /**
+     * Check if app is already downloaded
+     * @param string $name name of the application to remove
+     * @return boolean
+     *
+     * The function will check if the app is already downloaded in the apps repository
+     */
+    public function isDownloaded($name) {
+        foreach(\OC::$APPSROOTS as $dir) {
+            $dirToTest  = $dir['path'];
+            $dirToTest .= '/';
+            $dirToTest .= $name;
+            $dirToTest .= '/';
+
+            if (is_dir($dirToTest)) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * Removes an app
+     * @param string $appId ID of the application to remove
+     * @return boolean
+     *
+     *
+     * This function works as follows
+     *   -# call uninstall repair steps
+     *   -# removing the files
+     *
+     * The function will not delete preferences, tables and the configuration,
+     * this has to be done by the function oc_app_uninstall().
+     */
+    public function removeApp($appId) {
+        if($this->isDownloaded( $appId )) {
+            if (\OC::$server->getAppManager()->isShipped($appId)) {
+                return false;
+            }
+            $appDir = OC_App::getInstallPath() . '/' . $appId;
+            OC_Helper::rmdirr($appDir);
+            return true;
+        }else{
+            \OCP\Util::writeLog('core', 'can\'t remove app '.$appId.'. It is not installed.', ILogger::ERROR);
+
+            return false;
+        }
+
+    }
+
+    /**
+     * Installs the app within the bundle and marks the bundle as installed
+     *
+     * @param Bundle $bundle
+     * @throws \Exception If app could not get installed
+     */
+    public function installAppBundle(Bundle $bundle) {
+        $appIds = $bundle->getAppIdentifiers();
+        foreach($appIds as $appId) {
+            if(!$this->isDownloaded($appId)) {
+                $this->downloadApp($appId);
+            }
+            $this->installApp($appId);
+            $app = new OC_App();
+            $app->enable($appId);
+        }
+        $bundles = json_decode($this->config->getAppValue('core', 'installed.bundles', json_encode([])), true);
+        $bundles[] = $bundle->getIdentifier();
+        $this->config->setAppValue('core', 'installed.bundles', json_encode($bundles));
+    }
+
+    /**
+     * Installs shipped apps
+     *
+     * This function installs all apps found in the 'apps' directory that should be enabled by default;
+     * @param bool $softErrors When updating we ignore errors and simply log them, better to have a
+     *                         working ownCloud at the end instead of an aborted update.
+     * @return array Array of error messages (appid => Exception)
+     */
+    public static function installShippedApps($softErrors = false) {
+        $appManager = \OC::$server->getAppManager();
+        $config = \OC::$server->getConfig();
+        $errors = [];
+        foreach(\OC::$APPSROOTS as $app_dir) {
+            if($dir = opendir( $app_dir['path'] )) {
+                while( false !== ( $filename = readdir( $dir ))) {
+                    if( $filename[0] !== '.' and is_dir($app_dir['path']."/$filename") ) {
+                        if( file_exists( $app_dir['path']."/$filename/appinfo/info.xml" )) {
+                            if($config->getAppValue($filename, "installed_version", null) === null) {
+                                $info=OC_App::getAppInfo($filename);
+                                $enabled = isset($info['default_enable']);
+                                if (($enabled || in_array($filename, $appManager->getAlwaysEnabledApps()))
+                                      && $config->getAppValue($filename, 'enabled') !== 'no') {
+                                    if ($softErrors) {
+                                        try {
+                                            Installer::installShippedApp($filename);
+                                        } catch (HintException $e) {
+                                            if ($e->getPrevious() instanceof TableExistsException) {
+                                                $errors[$filename] = $e;
+                                                continue;
+                                            }
+                                            throw $e;
+                                        }
+                                    } else {
+                                        Installer::installShippedApp($filename);
+                                    }
+                                    $config->setAppValue($filename, 'enabled', 'yes');
+                                }
+                            }
+                        }
+                    }
+                }
+                closedir( $dir );
+            }
+        }
+
+        return $errors;
+    }
+
+    /**
+     * install an app already placed in the app folder
+     * @param string $app id of the app to install
+     * @return integer
+     */
+    public static function installShippedApp($app) {
+        //install the database
+        $appPath = OC_App::getAppPath($app);
+        \OC_App::registerAutoloading($app, $appPath);
+
+        if(is_file("$appPath/appinfo/database.xml")) {
+            try {
+                OC_DB::createDbFromStructure("$appPath/appinfo/database.xml");
+            } catch (TableExistsException $e) {
+                throw new HintException(
+                    'Failed to enable app ' . $app,
+                    'Please ask for help via one of our <a href="https://nextcloud.com/support/" target="_blank" rel="noreferrer noopener">support channels</a>.',
+                    0, $e
+                );
+            }
+        } else {
+            $ms = new \OC\DB\MigrationService($app, \OC::$server->getDatabaseConnection());
+            $ms->migrate();
+        }
+
+        //run appinfo/install.php
+        self::includeAppScript("$appPath/appinfo/install.php");
+
+        $info = OC_App::getAppInfo($app);
+        if (is_null($info)) {
+            return false;
+        }
+        \OC_App::setupBackgroundJobs($info['background-jobs']);
+
+        OC_App::executeRepairSteps($app, $info['repair-steps']['install']);
+
+        $config = \OC::$server->getConfig();
+
+        $config->setAppValue($app, 'installed_version', OC_App::getAppVersion($app));
+        if (array_key_exists('ocsid', $info)) {
+            $config->setAppValue($app, 'ocsid', $info['ocsid']);
+        }
+
+        //set remote/public handlers
+        foreach($info['remote'] as $name=>$path) {
+            $config->setAppValue('core', 'remote_'.$name, $app.'/'.$path);
+        }
+        foreach($info['public'] as $name=>$path) {
+            $config->setAppValue('core', 'public_'.$name, $app.'/'.$path);
+        }
+
+        OC_App::setAppTypes($info['id']);
+
+        return $info['id'];
+    }
+
+    /**
+     * @param string $script
+     */
+    private static function includeAppScript($script) {
+        if ( file_exists($script) ){
+            include $script;
+        }
+    }
 }

Spacing +50 added lines, -50 removed lines

@@ -95,7 +95,7 @@ 
 	 */
 	public function installApp($appId) {
 		$app = \OC_App::findAppInDirectories($appId);
-		if($app === false) {
+		if ($app === false) {
 			throw new \Exception('App not found in any app directory');
 		}
 
@@ -104,7 +104,7 @@ 
 
 		$l = \OC::$server->getL10N('core');
 
-		if(!is_array($info)) {
+		if (!is_array($info)) {
 			throw new \Exception(
 				$l->t('App "%s" cannot be installed because appinfo file cannot be read.',
 					[$appId]
@@ -127,7 +127,7 @@ 
 		\OC_App::registerAutoloading($appId, $basedir);
 
 		//install the database
-		if(is_file($basedir.'/appinfo/database.xml')) {
+		if (is_file($basedir.'/appinfo/database.xml')) {
 			if (\OC::$server->getConfig()->getAppValue($info['id'], 'installed_version') === null) {
 				OC_DB::createDbFromStructure($basedir.'/appinfo/database.xml');
 			} else {
@@ -141,7 +141,7 @@ 
 		\OC_App::setupBackgroundJobs($info['background-jobs']);
 
 		//run appinfo/install.php
-		self::includeAppScript($basedir . '/appinfo/install.php');
+		self::includeAppScript($basedir.'/appinfo/install.php');
 
 		$appData = OC_App::getAppInfo($appId);
 		OC_App::executeRepairSteps($appId, $appData['repair-steps']['install']);
@@ -151,10 +151,10 @@ 
 		\OC::$server->getConfig()->setAppValue($info['id'], 'enabled', 'no');
 
 		//set remote/public handlers
-		foreach($info['remote'] as $name=>$path) {
+		foreach ($info['remote'] as $name=>$path) {
 			\OC::$server->getConfig()->setAppValue('core', 'remote_'.$name, $info['id'].'/'.$path);
 		}
-		foreach($info['public'] as $name=>$path) {
+		foreach ($info['public'] as $name=>$path) {
 			\OC::$server->getConfig()->setAppValue('core', 'public_'.$name, $info['id'].'/'.$path);
 		}
 
@@ -170,7 +170,7 @@ 
 	 * @return bool
 	 */
 	public function updateAppstoreApp($appId) {
-		if($this->isUpdateAvailable($appId)) {
+		if ($this->isUpdateAvailable($appId)) {
 			try {
 				$this->downloadApp($appId);
 			} catch (\Exception $e) {
@@ -197,18 +197,18 @@ 
 		$appId = strtolower($appId);
 
 		$apps = $this->appFetcher->get();
-		foreach($apps as $app) {
-			if($app['id'] === $appId) {
+		foreach ($apps as $app) {
+			if ($app['id'] === $appId) {
 				// Load the certificate
 				$certificate = new X509();
-				$certificate->loadCA(file_get_contents(__DIR__ . '/../../resources/codesigning/root.crt'));
+				$certificate->loadCA(file_get_contents(__DIR__.'/../../resources/codesigning/root.crt'));
 				$loadedCertificate = $certificate->loadX509($app['certificate']);
 
 				// Verify if the certificate has been revoked
 				$crl = new X509();
-				$crl->loadCA(file_get_contents(__DIR__ . '/../../resources/codesigning/root.crt'));
-				$crl->loadCRL(file_get_contents(__DIR__ . '/../../resources/codesigning/root.crl'));
-				if($crl->validateSignature() !== true) {
+				$crl->loadCA(file_get_contents(__DIR__.'/../../resources/codesigning/root.crt'));
+				$crl->loadCRL(file_get_contents(__DIR__.'/../../resources/codesigning/root.crl'));
+				if ($crl->validateSignature() !== true) {
 					throw new \Exception('Could not validate CRL signature');
 				}
 				$csn = $loadedCertificate['tbsCertificate']['serialNumber']->toString();
@@ -223,7 +223,7 @@ 
 				}
 
 				// Verify if the certificate has been issued by the Nextcloud Code Authority CA
-				if($certificate->validateSignature() !== true) {
+				if ($certificate->validateSignature() !== true) {
 					throw new \Exception(
 						sprintf(
 							'App with id %s has a certificate not issued by a trusted Code Signing Authority',
@@ -234,7 +234,7 @@ 
 
 				// Verify if the certificate is issued for the requested app id
 				$certInfo = openssl_x509_parse($app['certificate']);
-				if(!isset($certInfo['subject']['CN'])) {
+				if (!isset($certInfo['subject']['CN'])) {
 					throw new \Exception(
 						sprintf(
 							'App with id %s has a cert with no CN',
@@ -242,7 +242,7 @@ 
 						)
 					);
 				}
-				if($certInfo['subject']['CN'] !== $appId) {
+				if ($certInfo['subject']['CN'] !== $appId) {
 					throw new \Exception(
 						sprintf(
 							'App with id %s has a cert issued to %s',
@@ -259,15 +259,15 @@ 
 
 				// Check if the signature actually matches the downloaded content
 				$certificate = openssl_get_publickey($app['certificate']);
-				$verified = (bool)openssl_verify(file_get_contents($tempFile), base64_decode($app['releases'][0]['signature']), $certificate, OPENSSL_ALGO_SHA512);
+				$verified = (bool) openssl_verify(file_get_contents($tempFile), base64_decode($app['releases'][0]['signature']), $certificate, OPENSSL_ALGO_SHA512);
 				openssl_free_key($certificate);
 
-				if($verified === true) {
+				if ($verified === true) {
 					// Seems to match, let's proceed
 					$extractDir = $this->tempManager->getTemporaryFolder();
 					$archive = new TAR($tempFile);
 
-					if($archive) {
+					if ($archive) {
 						if (!$archive->extract($extractDir)) {
 							throw new \Exception(
 								sprintf(
@@ -280,7 +280,7 @@ 
 						$folders = array_diff($allFiles, ['.', '..']);
 						$folders = array_values($folders);
 
-						if(count($folders) > 1) {
+						if (count($folders) > 1) {
 							throw new \Exception(
 								sprintf(
 									'Extracted app %s has more than 1 folder',
@@ -291,22 +291,22 @@ 
 
 						// Check if appinfo/info.xml has the same app ID as well
 						$loadEntities = libxml_disable_entity_loader(false);
-						$xml = simplexml_load_file($extractDir . '/' . $folders[0] . '/appinfo/info.xml');
+						$xml = simplexml_load_file($extractDir.'/'.$folders[0].'/appinfo/info.xml');
 						libxml_disable_entity_loader($loadEntities);
-						if((string)$xml->id !== $appId) {
+						if ((string) $xml->id !== $appId) {
 							throw new \Exception(
 								sprintf(
 									'App for id %s has a wrong app ID in info.xml: %s',
 									$appId,
-									(string)$xml->id
+									(string) $xml->id
 								)
 							);
 						}
 
 						// Check if the version is lower than before
 						$currentVersion = OC_App::getAppVersion($appId);
-						$newVersion = (string)$xml->version;
-						if(version_compare($currentVersion, $newVersion) === 1) {
+						$newVersion = (string) $xml->version;
+						if (version_compare($currentVersion, $newVersion) === 1) {
 							throw new \Exception(
 								sprintf(
 									'App for id %s has version %s and tried to update to lower version %s',
@@ -317,12 +317,12 @@ 
 							);
 						}
 
-						$baseDir = OC_App::getInstallPath() . '/' . $appId;
+						$baseDir = OC_App::getInstallPath().'/'.$appId;
 						// Remove old app with the ID if existent
 						OC_Helper::rmdirr($baseDir);
 						// Move to app folder
-						if(@mkdir($baseDir)) {
-							$extractDir .= '/' . $folders[0];
+						if (@mkdir($baseDir)) {
+							$extractDir .= '/'.$folders[0];
 							OC_Helper::copyr($extractDir, $baseDir);
 						}
 						OC_Helper::copyr($extractDir, $baseDir);
@@ -385,8 +385,8 @@ 
 			$this->apps = $this->appFetcher->get();
 		}
 
-		foreach($this->apps as $app) {
-			if($app['id'] === $appId) {
+		foreach ($this->apps as $app) {
+			if ($app['id'] === $appId) {
 				$currentVersion = OC_App::getAppVersion($appId);
 				$newestVersion = $app['releases'][0]['version'];
 				if ($currentVersion !== '0' && version_compare($newestVersion, $currentVersion, '>')) {
@@ -409,7 +409,7 @@ 
 	 */
 	private function isInstalledFromGit($appId) {
 		$app = \OC_App::findAppInDirectories($appId);
-		if($app === false) {
+		if ($app === false) {
 			return false;
 		}
 		$basedir = $app['path'].'/'.$appId;
@@ -424,7 +424,7 @@ 
 	 * The function will check if the app is already downloaded in the apps repository
 	 */
 	public function isDownloaded($name) {
-		foreach(\OC::$APPSROOTS as $dir) {
+		foreach (\OC::$APPSROOTS as $dir) {
 			$dirToTest  = $dir['path'];
 			$dirToTest .= '/';
 			$dirToTest .= $name;
@@ -452,14 +452,14 @@ 
 	 * this has to be done by the function oc_app_uninstall().
 	 */
 	public function removeApp($appId) {
-		if($this->isDownloaded( $appId )) {
+		if ($this->isDownloaded($appId)) {
 			if (\OC::$server->getAppManager()->isShipped($appId)) {
 				return false;
 			}
-			$appDir = OC_App::getInstallPath() . '/' . $appId;
+			$appDir = OC_App::getInstallPath().'/'.$appId;
 			OC_Helper::rmdirr($appDir);
 			return true;
-		}else{
+		} else {
 			\OCP\Util::writeLog('core', 'can\'t remove app '.$appId.'. It is not installed.', ILogger::ERROR);
 
 			return false;
@@ -475,8 +475,8 @@ 
 	 */
 	public function installAppBundle(Bundle $bundle) {
 		$appIds = $bundle->getAppIdentifiers();
-		foreach($appIds as $appId) {
-			if(!$this->isDownloaded($appId)) {
+		foreach ($appIds as $appId) {
+			if (!$this->isDownloaded($appId)) {
 				$this->downloadApp($appId);
 			}
 			$this->installApp($appId);
@@ -500,13 +500,13 @@ 
 		$appManager = \OC::$server->getAppManager();
 		$config = \OC::$server->getConfig();
 		$errors = [];
-		foreach(\OC::$APPSROOTS as $app_dir) {
-			if($dir = opendir( $app_dir['path'] )) {
-				while( false !== ( $filename = readdir( $dir ))) {
-					if( $filename[0] !== '.' and is_dir($app_dir['path']."/$filename") ) {
-						if( file_exists( $app_dir['path']."/$filename/appinfo/info.xml" )) {
-							if($config->getAppValue($filename, "installed_version", null) === null) {
-								$info=OC_App::getAppInfo($filename);
+		foreach (\OC::$APPSROOTS as $app_dir) {
+			if ($dir = opendir($app_dir['path'])) {
+				while (false !== ($filename = readdir($dir))) {
+					if ($filename[0] !== '.' and is_dir($app_dir['path']."/$filename")) {
+						if (file_exists($app_dir['path']."/$filename/appinfo/info.xml")) {
+							if ($config->getAppValue($filename, "installed_version", null) === null) {
+								$info = OC_App::getAppInfo($filename);
 								$enabled = isset($info['default_enable']);
 								if (($enabled || in_array($filename, $appManager->getAlwaysEnabledApps()))
 									  && $config->getAppValue($filename, 'enabled') !== 'no') {
@@ -529,7 +529,7 @@ 
 						}
 					}
 				}
-				closedir( $dir );
+				closedir($dir);
 			}
 		}
 
@@ -546,12 +546,12 @@ 
 		$appPath = OC_App::getAppPath($app);
 		\OC_App::registerAutoloading($app, $appPath);
 
-		if(is_file("$appPath/appinfo/database.xml")) {
+		if (is_file("$appPath/appinfo/database.xml")) {
 			try {
 				OC_DB::createDbFromStructure("$appPath/appinfo/database.xml");
 			} catch (TableExistsException $e) {
 				throw new HintException(
-					'Failed to enable app ' . $app,
+					'Failed to enable app '.$app,
 					'Please ask for help via one of our <a href="https://nextcloud.com/support/" target="_blank" rel="noreferrer noopener">support channels</a>.',
 					0, $e
 				);
@@ -580,10 +580,10 @@ 
 		}
 
 		//set remote/public handlers
-		foreach($info['remote'] as $name=>$path) {
+		foreach ($info['remote'] as $name=>$path) {
 			$config->setAppValue('core', 'remote_'.$name, $app.'/'.$path);
 		}
-		foreach($info['public'] as $name=>$path) {
+		foreach ($info['public'] as $name=>$path) {
 			$config->setAppValue('core', 'public_'.$name, $app.'/'.$path);
 		}
 
@@ -596,7 +596,7 @@ 
 	 * @param string $script
 	 */
 	private static function includeAppScript($script) {
-		if ( file_exists($script) ){
+		if (file_exists($script)) {
 			include $script;
 		}
 	}

settings/Controller/AppSettingsController.php

Indentation +484 added lines, -484 removed lines

@@ -58,489 +58,489 @@
  */
 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');
-		\OC_Util::addVendorScript('core', 'marked/marked.min');
-		$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['bundleId'] = $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) {
-			$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 = array();
-			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'];
-			}
-
-			// analyse dependencies
-			$missing = $dependencyAnalyzer->analyze($appData);
-			$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']);
-
-			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;
-				}
-			}
-
-			$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;
-	}
+    /** @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');
+        \OC_Util::addVendorScript('core', 'marked/marked.min');
+        $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['bundleId'] = $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) {
+            $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 = array();
+            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'];
+            }
+
+            // analyse dependencies
+            $missing = $dependencyAnalyzer->analyze($appData);
+            $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']);
+
+            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;
+                }
+            }
+
+            $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;
+    }
 
 }

Spacing +25 added lines, -25 removed lines

@@ -152,9 +152,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]);
 			}
 		}
@@ -189,7 +189,7 @@ 
 
 		$formattedCategories = [];
 		$categories = $this->categoryFetcher->get();
-		foreach($categories as $category) {
+		foreach ($categories as $category) {
 			$formattedCategories[] = [
 				'id' => $category['id'],
 				'ident' => $category['id'],
@@ -220,10 +220,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['bundleId'] = $bundle->getIdentifier();
 						continue;
 					}
@@ -256,7 +256,7 @@ 
 			$appData['category'] = $appstoreData['categories'];
 
 			$newVersion = $this->installer->isUpdateAvailable($appData['id']);
-			if($newVersion) {
+			if ($newVersion) {
 				$appData['update'] = $newVersion;
 			}
 
@@ -300,44 +300,44 @@ 
 		$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;
 				}
 			}
 
 			$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 .= ', ';
 				}
 			}
@@ -345,12 +345,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'];
@@ -432,7 +432,7 @@ 
 				$installer = \OC::$server->query(Installer::class);
 				$isDownloaded = $installer->isDownloaded($appId);
 
-				if(!$isDownloaded) {
+				if (!$isDownloaded) {
 					$installer->downloadApp($appId);
 				}
 
@@ -505,7 +505,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]]);
 		}
@@ -535,8 +535,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;
 		}