fix(routes): Make API routes actually OCS based

Signed-off-by: provokateurin <kate@provokateurin.de>
nextcloud · Sep 9, 2024 · 749f800 · 749f800
1 parent 9ce4499
commit 749f800
Show file tree

Hide file tree

Showing 4 changed files with 89 additions and 90 deletions.
diff --git a/appinfo/routes.php b/appinfo/routes.php
@@ -5,88 +5,89 @@
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 
-return ['routes' => [
-	[
-		'name' => 'Folder#getFolders',
-		'url' => '/folders',
-		'verb' => 'GET'
-	],
-	[
-		'name' => 'Folder#getFolder',
-		'url' => '/folders/{id}',
-		'verb' => 'GET'
-	],
-	[
-		'name' => 'Folder#addFolder',
-		'url' => '/folders',
-		'verb' => 'POST'
-	],
-	[
-		'name' => 'Folder#removeFolder',
-		'url' => '/folders/{id}',
-		'verb' => 'DELETE'
-	],
-	[
-		'name' => 'Folder#setMountPoint',
-		'url' => '/folders/{id}',
-		'verb' => 'PUT'
-	],
-	[
-		'name' => 'Folder#addGroup',
-		'url' => '/folders/{id}/groups',
-		'verb' => 'POST'
-	],
-	[
-		'name' => 'Folder#removeGroup',
-		'url' => '/folders/{id}/groups/{group}',
-		'verb' => 'DELETE',
-		'requirements' => ['group' => '.+']
-	],
-	[
-		'name' => 'Folder#setPermissions',
-		'url' => '/folders/{id}/groups/{group}',
-		'verb' => 'POST',
-		'requirements' => ['group' => '.+']
-	],
-	[
-		'name' => 'Folder#setManageACL',
-		'url' => '/folders/{id}/manageACL',
-		'verb' => 'POST'
-	],
-	[
-		'name' => 'Folder#setQuota',
-		'url' => '/folders/{id}/quota',
-		'verb' => 'POST'
-	],
+return [
+	'ocs' => [
+		[
+			'name' => 'Folder#getFolders',
+			'url' => '/folders',
+			'verb' => 'GET'
+		],
+		[
+			'name' => 'Folder#getFolder',
+			'url' => '/folders/{id}',
+			'verb' => 'GET'
+		],
+		[
+			'name' => 'Folder#addFolder',
+			'url' => '/folders',
+			'verb' => 'POST'
+		],
+		[
+			'name' => 'Folder#removeFolder',
+			'url' => '/folders/{id}',
+			'verb' => 'DELETE'
+		],
+		[
+			'name' => 'Folder#setMountPoint',
+			'url' => '/folders/{id}',
+			'verb' => 'PUT'
+		],
+		[
+			'name' => 'Folder#addGroup',
+			'url' => '/folders/{id}/groups',
+			'verb' => 'POST'
+		],
+		[
+			'name' => 'Folder#removeGroup',
+			'url' => '/folders/{id}/groups/{group}',
+			'verb' => 'DELETE',
+			'requirements' => ['group' => '.+']
+		],
+		[
+			'name' => 'Folder#setPermissions',
+			'url' => '/folders/{id}/groups/{group}',
+			'verb' => 'POST',
+			'requirements' => ['group' => '.+']
+		],
+		[
+			'name' => 'Folder#setManageACL',
+			'url' => '/folders/{id}/manageACL',
+			'verb' => 'POST'
+		],
+		[
+			'name' => 'Folder#setQuota',
+			'url' => '/folders/{id}/quota',
+			'verb' => 'POST'
+		],
 
-	[
-		'name' => 'Folder#setACL',
-		'url' => '/folders/{id}/acl',
-		'verb' => 'POST'
-	],
-	[
-		'name' => 'Folder#renameFolder',
-		'url' => '/folders/{id}/mountpoint',
-		'verb' => 'POST'
-	],
-	[
-		'name' => 'Folder#aclMappingSearch',
-		'url' => '/folders/{id}/search',
-		'verb' => 'GET'
-	],
-	[
-		'name' => 'Delegation#getAllGroups',
-		'url' => 'delegation/groups',
-		'verb' => 'GET'
-	],
-	[
-		'name' => 'Delegation#getAllCircles',
-		'url' => 'delegation/circles',
-		'verb' => 'GET'
-	],
-	[
-		'name' => 'Delegation#getAuthorizedGroups',
-		'url' => '/delegation/authorized-groups',
-		'verb' => 'GET',
-	],
-]];
+		[
+			'name' => 'Folder#setACL',
+			'url' => '/folders/{id}/acl',
+			'verb' => 'POST'
+		],
+		[
+			'name' => 'Folder#renameFolder',
+			'url' => '/folders/{id}/mountpoint',
+			'verb' => 'POST'
+		],
+		[
+			'name' => 'Folder#aclMappingSearch',
+			'url' => '/folders/{id}/search',
+			'verb' => 'GET'
+		],
+		[
+			'name' => 'Delegation#getAllGroups',
+			'url' => 'delegation/groups',
+			'verb' => 'GET'
+		],
+		[
+			'name' => 'Delegation#getAllCircles',
+			'url' => 'delegation/circles',
+			'verb' => 'GET'
+		],
+		[
+			'name' => 'Delegation#getAuthorizedGroups',
+			'url' => '/delegation/authorized-groups',
+			'verb' => 'GET',
+		],
+	]];
diff --git a/src/components/SharingSidebarView.vue b/src/components/SharingSidebarView.vue
@@ -157,7 +157,7 @@
 <script>
 import axios from '@nextcloud/axios'
 import { showError } from '@nextcloud/dialogs'
-import { generateUrl } from '@nextcloud/router'
+import { generateOcsUrl } from '@nextcloud/router'
 import NcAvatar from '@nextcloud/vue/dist/Components/NcAvatar.js'
 import NcButton from '@nextcloud/vue/dist/Components/NcButton.js'
 import NcSelect from '@nextcloud/vue/dist/Components/NcSelect.js'
@@ -276,7 +276,7 @@ export default {
 			}
 			searchRequestCancelSource = axios.CancelToken.source()
 			this.isSearching = true
-			axios.get(generateUrl(`apps/groupfolders/folders/${this.groupFolderId}/search`) + '?format=json&search=' + query, {
+			axios.get(generateOcsUrl(`apps/groupfolders/folders/${this.groupFolderId}/search`) + '?format=json&search=' + query, {
 				cancelToken: searchRequestCancelSource.token,
 			}).then((result) => {
 				this.isSearching = false

diff --git a/src/settings/Api.ts b/src/settings/Api.ts
@@ -2,7 +2,7 @@
  * SPDX-FileCopyrightText: 2020 Nextcloud GmbH and Nextcloud contributors
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
-import { generateUrl } from '@nextcloud/router'
+import { generateUrl, generateOcsUrl } from '@nextcloud/router'
 import { OCSResult, AxiosOCSResult } from 'NC'
 import axios from '@nextcloud/axios'
 import Thenable = JQuery.Thenable;
@@ -47,7 +47,7 @@ export interface Folder {
 export class Api {
 
 	getUrl(endpoint: string): string {
-		return OC.generateUrl(`apps/groupfolders/${endpoint}`)
+		return generateOcsUrl(`apps/groupfolders/${endpoint}`)
 	}
 
 	listFolders(): Thenable<Folder[]> {

diff --git a/src/settings/Nextcloud.d.ts b/src/settings/Nextcloud.d.ts
@@ -44,8 +44,6 @@ declare namespace OC {
 		}
 	}
 
-	function generateUrl(url: string, parameters?: { [key: string]: string }, options?: EscapeOptions)
-
 	function linkToOCS(service: string, version: number): string;
 
 	function linkToRemote(path: string): string;