fix: internally resolved public links triggering default action (#9587)

Fixes an issue where internally resolved public links instantly triggered the default file action. This behavior is not intended to work for public links, even if they resolve into an internal space.
owncloud · Aug 23, 2023 · 4a9a17b · 4a9a17b
1 parent c472d7c
commit 4a9a17b
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 6 deletions.
diff --git a/changelog/unreleased/bugfix-internal-public-link-resolving b/changelog/unreleased/bugfix-internal-public-link-resolving
@@ -0,0 +1,6 @@
+Bugfix: Internal public link resolving
+
+An issue where internally resolved public links instantly triggered the default file action has been fixed.
+
+https://github.com/owncloud/web/pull/9587
+https://github.com/owncloud/web/issues/9578
diff --git a/packages/web-app-files/src/views/spaces/DriveResolver.vue b/packages/web-app-files/src/views/spaces/DriveResolver.vue
@@ -86,7 +86,6 @@ export default defineComponent({
           fileId: resourceId,
           path: resourcePath
         })
-
         return router.push(
           createLocationSpaces('files-spaces-generic', {
             params,
@@ -96,7 +95,11 @@ export default defineComponent({
       }
 
       // no internal space found -> share -> resolve via private link as it holds all the necessary logic
-      return router.push({ name: 'resolvePrivateLink', params: { fileId: unref(fileId) } })
+      return router.push({
+        name: 'resolvePrivateLink',
+        params: { fileId: unref(fileId) },
+        query: { openWithDefaultApp: 'false' }
+      })
     }
 
     onMounted(async () => {

diff --git a/packages/web-app-files/tests/unit/views/spaces/DriveResolver.spec.ts b/packages/web-app-files/tests/unit/views/spaces/DriveResolver.spec.ts
@@ -93,7 +93,10 @@ describe('DriveResolver view', () => {
 
     await wrapper.vm.$nextTick()
     expect(mocks.$router.push).toHaveBeenCalledWith(
-      expect.objectContaining({ name: 'resolvePrivateLink' })
+      expect.objectContaining({
+        name: 'resolvePrivateLink',
+        query: { openWithDefaultApp: 'false' }
+      })
     )
   })
 })

diff --git a/packages/web-runtime/src/pages/resolvePrivateLink.vue b/packages/web-runtime/src/pages/resolvePrivateLink.vue
@@ -87,6 +87,9 @@ export default defineComponent({
 
     const clientService = useClientService()
 
+    const openWithDefaultAppQuery = useRouteQuery('openWithDefaultApp')
+    const openWithDefaultApp = computed(() => queryItemAsString(unref(openWithDefaultAppQuery)))
+
     const detailsQuery = useRouteQuery('details')
     const details = computed(() => {
       return queryItemAsString(unref(detailsQuery))
@@ -163,9 +166,10 @@ export default defineComponent({
               ? matchingSpace.shareId
               : unref(resource).fileId,
           ...(unref(details) && { details: unref(details) }),
-          ...(configurationManager.options.openLinksWithDefaultApp && {
-            openWithDefaultApp: 'true'
-          })
+          ...(configurationManager.options.openLinksWithDefaultApp &&
+            unref(openWithDefaultApp) !== 'false' && {
+              openWithDefaultApp: 'true'
+            })
         }
       }
       router.push(location)