fixup! feat(scopes): List and access OpenAPI scopes

nextcloud · Nov 7, 2023 · f63c465 · f63c465
1 parent 9603e20
commit f63c465
Showing 1 changed file with 9 additions and 13 deletions.
diff --git a/lib/Service/AppsService.php b/lib/Service/AppsService.php
@@ -21,21 +21,17 @@ public function findSupported(): array {
 		$apis = ['core'];
 
 		foreach ($this->appManager->getInstalledApps() as $app) {
-			$path = $this->getSpecPath($app);
-			if ($path != null && file_exists($path)) {
-				$apis[] = $app;
-
-				try {
-					$baseDir = $this->appManager->getAppPath($app);
-					$iterator = new \DirectoryIterator($baseDir);
-					foreach ($iterator as $file) {
-						if (str_starts_with($file->getFilename(), 'openapi-')
-							&& str_ends_with($file->getFilename(), '.json')) {
-							$apis[] = $app . '-' . substr($file->getFilename(), 8, -5);
-						}
+			try {
+				$baseDir = $this->appManager->getAppPath($app);
+				$iterator = new \DirectoryIterator($baseDir);
+				foreach ($iterator as $file) {
+					if ($file->getFilename() == 'openapi.json') {
+						$apis[] = $app;
+					} else if (str_starts_with($file->getFilename(), 'openapi-') && str_ends_with($file->getFilename(), '.json')) {
+						$apis[] = $app . '-' . substr($file->getFilename(), 8, -5);
 					}
-				} catch (AppPathNotFoundException) {
 				}
+			} catch (AppPathNotFoundException) {
 			}
 		}
 		return $apis;