Fix option type for public token

owncloud · Nov 5, 2021 · 6ced5fc · 6ced5fc
1 parent 6dbda47
commit 6ced5fc
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 7 deletions.
diff --git a/packages/web-app-external/src/App.vue b/packages/web-app-external/src/App.vue
@@ -91,21 +91,24 @@ export default {
     await unauthenticatedUserReady(this.$router, this.$store)
 
     this.loading = true
-    const publicLinkPassword = this.publicLinkPassword
+
+    // build headers with respect to the actual auth situation
     const { 'public-token': publicToken } = this.$route.query
-    const token = this.getToken
+    const publicLinkPassword = this.publicLinkPassword
+    const accessToken = this.getToken
     const headers = {
       'X-Requested-With': 'XMLHttpRequest',
       ...(publicToken && { 'public-token': publicToken }),
       ...(publicLinkPassword && {
         Authorization:
           'Basic ' + Buffer.from(['public', publicLinkPassword].join(':')).toString('base64')
       }),
-      ...(token && {
-        Authorization: 'Bearer ' + token
+      ...(accessToken && {
+        Authorization: 'Bearer ' + accessToken
       })
     }
 
+    // fetch iframe params for app and file
     const configUrl = this.configuration.server
     const appOpenUrl = this.capabilities.files.app_providers[0].open_url.replace('/app', 'app')
     const url = configUrl + appOpenUrl + '?file_id=' + this.fileId + '&app_name=' + this.appName

diff --git a/packages/web-app-files/src/helpers/download/downloadAsArchive.ts b/packages/web-app-files/src/helpers/download/downloadAsArchive.ts
@@ -12,7 +12,7 @@ interface TriggerDownloadAsArchiveOptions {
   fileIds: string[]
   archiverService?: ArchiverService
   clientService?: ClientService
-  publicToken?: ClientService
+  publicToken?: string
 }
 
 export const triggerDownloadAsArchive = async (
@@ -35,8 +35,8 @@ export const triggerDownloadAsArchive = async (
   }
 
   const queryParams = [
-    ...options.fileIds.map((id) => `id=${id}`),
-    options.publicToken ? `public-token=${options.publicToken}` : ''
+    options.publicToken ? `public-token=${options.publicToken}` : '',
+    ...options.fileIds.map((id) => `id=${id}`)
   ].filter(Boolean)
   const archiverUrl = archiverService.url + '?' + queryParams.join('&')