Merge pull request #21 from nextcloud/fix/non-root-nc-path

Makefile

@@ -20,6 +20,7 @@ composer:
 
 .PHONY: npm
 npm:
+	npm ci
 	npm run build
 
 .PHONY: clean

lib/Service/AppsService.php

@@ -8,10 +8,14 @@
 use OC;
 use OCP\App\AppPathNotFoundException;
 use OCP\App\IAppManager;
+use OCP\IURLGenerator;
 
 class AppsService {
 
-	public function __construct(private IAppManager $appManager) {
+	public function __construct(
+		private IAppManager $appManager,
+		private IURLGenerator $url,
+	) {
 	}
 
 	/**
@@ -45,7 +49,7 @@ public function findSupported(): array {
 	private function getSpecPath(string $app): ?string {
 		$scopeSuffix = '';
 		if ($app === 'core') {
-			$baseDir = OC::$SERVERROOT . DIRECTORY_SEPARATOR . "core";
+			$baseDir = OC::$SERVERROOT . DIRECTORY_SEPARATOR . 'core';
 		} else {
 			try {
 				if (str_contains($app, '-')) {
@@ -65,25 +69,34 @@ public function getSpec(string $app): string {
 		$data = json_decode(file_get_contents($this->getSpecPath($app)), true);
 
 		// Only give basic authentication as an option
-		$data["components"]["securitySchemes"] = [
-			"basic_auth" => [
-				"type" => "http",
-				"scheme" => "basic",
+		$data['components']['securitySchemes'] = [
+			'basic_auth' => [
+				'type' => 'http',
+				'scheme' => 'basic',
 			],
 		];
-		$data["security"] = [
+		$data['security'] = [
 			[
-				"basic_auth" => [],
+				'basic_auth' => [],
 			],
 		];
 		// Delete individual security requirements
-		foreach (array_keys($data["paths"]) as $path) {
-			foreach (array_keys($data["paths"][$path]) as $method) {
-				if (!in_array($method, ["delete", "get", "post", "put", "patch", "options"])) {
+		foreach (array_keys($data['paths']) as $path) {
+			foreach (array_keys($data['paths'][$path]) as $method) {
+				if (!in_array($method, ['delete', 'get', 'post', 'put', 'patch', 'options'])) {
 					continue;
 				}
-				$operation = &$data["paths"][$path][$method];
-				unset($operation["security"]);
+				$operation = &$data['paths'][$path][$method];
+				unset($operation['security']);
+			}
+		}
+		// fix paths when NC is accessed at a sub path
+		$webRoot = $this->url->getWebroot();
+		if ($webRoot !== '' && $webRoot !== '/') {
+			foreach (array_keys($data['paths']) as $path) {
+				$prefixedPath = $webRoot . $path;
+				$data['paths'][$prefixedPath] = $data['paths'][$path];
+				unset($data['paths'][$path]);
 			}
 		}