Fix app enabling for groups and allow requesting all apps

Signed-off-by: Julius Härtl <jus@bitgrid.net>

settings/Controller/AppSettingsController.php

@@ -187,7 +187,7 @@ class AppSettingsController extends Controller {
 	 * @param string $requestedCategory
 	 * @return array
 	 */
-	private function getAppsForCategory($requestedCategory) {
+	private function getAppsForCategory($requestedCategory = '') {
 		$versionParser = new VersionParser();
 		$formattedApps = [];
 		$apps = $this->appFetcher->get();
@@ -197,14 +197,16 @@ class AppSettingsController extends Controller {
 			}
 
 			// Skip all apps not in the requested category
-			$isInCategory = false;
-			foreach($app['categories'] as $category) {
-				if($category === $requestedCategory) {
-					$isInCategory = true;
+			if ($requestedCategory !== '') {
+				$isInCategory = false;
+				foreach($app['categories'] as $category) {
+					if($category === $requestedCategory) {
+						$isInCategory = true;
+					}
+				}
+				if(!$isInCategory) {
+					continue;
 				}
-			}
-			if(!$isInCategory) {
-				continue;
 			}
 
 			$nextCloudVersion = $versionParser->getVersion($app['releases'][0]['rawPlatformVersionSpec']);
@@ -496,9 +498,10 @@ class AppSettingsController extends Controller {
 	 * @PasswordConfirmationRequired
 	 *
 	 * @param string $appId
+	 * @param array $groups
 	 * @return JSONResponse
 	 */
-	public function enableApp(string $appId, array $groups): JSONResponse {
+	public function enableApp(string $appId, array $groups = []): JSONResponse {
 		return $this->enableApps([$appId], $groups);
 	}
 

settings/routes.php

@@ -51,7 +51,10 @@ $application->registerRoutes($this, [
 		['name' => 'AppSettings#listApps', 'url' => '/settings/apps/list', 'verb' => 'GET'],
 
 		['name' => 'AppSettings#viewApps', 'url' => '/settings/apps/{category}', 'verb' => 'GET', 'defaults' => ['category' => '']],
+		['name' => 'AppSettings#viewApps', 'url' => '/settings/apps/{category}/{id}', 'verb' => 'GET', 'defaults' => ['category' => '', 'id' => '']],
+
 		['name' => 'AppSettings#enableApp', 'url' => '/settings/apps/enable/{appId}', 'verb' => 'GET'],
+		['name' => 'AppSettings#enableApp', 'url' => '/settings/apps/enable/{appId}', 'verb' => 'POST'],
 		['name' => 'AppSettings#enableApps', 'url' => '/settings/apps/enable', 'verb' => 'POST'],
 		['name' => 'AppSettings#disableApp', 'url' => '/settings/apps/disable/{appId}', 'verb' => 'GET'],
 		['name' => 'AppSettings#disableApps', 'url' => '/settings/apps/disable', 'verb' => 'POST'],