fix(files_external): basic auth user storage trigger

Signed-off-by: John Molakvoæ <skjnldsv@protonmail.com>
nextcloud · Oct 10, 2023 · ae29608 · ae29608
1 parent e6d0105
commit ae29608
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 6 deletions.
diff --git a/apps/files_external/lib/Controller/ApiController.php b/apps/files_external/lib/Controller/ApiController.php
@@ -126,6 +126,7 @@ public function getUserMounts(): DataResponse {
 
 	/**
 	 * @NoAdminRequired
+	 * @NoCSRFRequired
 	 *
 	 * Ask for credentials using a browser's native basic auth prompt
 	 * Then returns it if provided

diff --git a/apps/files_external/src/actions/enterCredentialsAction.ts b/apps/files_external/src/actions/enterCredentialsAction.ts
@@ -75,11 +75,13 @@ export const action = new FileAction({
 
 	async exec(node: Node) {
 		// always resolve auth request, we'll process the data afterwards
-		const response = await axios.get(generateOcsUrl('/apps/files_external/api/v1/auth'), {
-			validateStatus: () => true,
+		// Using fetch as axios have integrated auth handling and X-Requested-With header
+		const response = await fetch(generateOcsUrl('/apps/files_external/api/v1/auth'), {
+			headers: new Headers({ Accept: 'application/json' }),
+			credentials: 'include',
 		})
 
-		const data = (response?.data || {}) as OCSAuthResponse
+		const data = (await response?.json() || {}) as OCSAuthResponse
 		if (data.ocs.data.user && data.ocs.data.password) {
 			const configResponse = await axios.put(generateUrl('apps/files_external/userglobalstorages/{id}', node.attributes), {
 				backendOptions: data.ocs.data,

diff --git a/dist/files_external-init.js b/dist/files_external-init.js
diff --git a/dist/files_external-init.js.map b/dist/files_external-init.js.map