fix: permanent link for share resources

changelog/unreleased/bugfix-permanent-link-for-shares

@@ -0,0 +1,6 @@
+Bugfix: Permanent link for shares
+
+We've fixed an issue where the permanent for shares could not be copied.
+
+https://github.com/owncloud/web/pull/12022
+https://github.com/owncloud/web/issues/12001

packages/web-client/src/helpers/share/functions.ts

@@ -91,10 +91,12 @@ export const getShareResourcePermissions = ({
 
 export function buildIncomingShareResource({
   driveItem,
-  graphRoles
+  graphRoles,
+  serverUrl
 }: {
   driveItem: DriveItem
   graphRoles: Record<string, ShareRole>
+  serverUrl: string
 }): IncomingShareResource {
   const resourceName = driveItem.name || driveItem.remoteItem.name
   const storageId = extractStorageId(driveItem.remoteItem.id)
@@ -154,6 +156,7 @@ export function buildIncomingShareResource({
     shareRoles,
     sharePermissions,
     outgoing: false,
+    privateLink: urlJoin(serverUrl, 'f', driveItem.remoteItem.id),
     canRename: () => driveItem['@client.synchronize'],
     canDownload: () => sharePermissions.includes(GraphSharePermission.readContent),
     canUpload: () => sharePermissions.includes(GraphSharePermission.createUpload),
@@ -174,10 +177,12 @@ export function buildIncomingShareResource({
 
 export function buildOutgoingShareResource({
   driveItem,
-  user
+  user,
+  serverUrl
 }: {
   driveItem: DriveItem
   user: User
+  serverUrl: string
 }): OutgoingShareResource {
   const storageId = extractStorageId(driveItem.id)
   const path = urlJoin(driveItem.parentReference.path, driveItem.name)
@@ -213,6 +218,7 @@ export function buildOutgoingShareResource({
     type: !!driveItem.folder ? 'folder' : 'file',
     mimeType: driveItem.file?.mimeType || 'httpd/unix-directory',
     outgoing: true,
+    privateLink: urlJoin(serverUrl, 'f', driveItem.id),
     canRename: () => true,
     canDownload: () => true,
     canUpload: () => true,

packages/web-client/tests/unit/helpers/share/functions.spec.ts

@@ -25,6 +25,7 @@ import {
   UnifiedRoleDefinition,
   User
 } from '../../../../src/graph/generated'
+import { urlJoin } from '../../../../src'
 
 describe('share helper functions', () => {
   describe('isShareResource', () => {
@@ -129,7 +130,7 @@ describe('share helper functions', () => {
     }
 
     it('sets ids based on the drive item, its first permission and parent reference', () => {
-      const result = buildIncomingShareResource({ driveItem, graphRoles })
+      const result = buildIncomingShareResource({ driveItem, graphRoles, serverUrl: '' })
 
       expect(result.id).toEqual(driveItem.id)
       expect(result.fileId).toEqual(driveItem.remoteItem.id)
@@ -140,23 +141,28 @@ describe('share helper functions', () => {
     it.each([true, false])('correctly detects if the resource is a folder', (isFolder) => {
       const item = { ...driveItem }
       item.folder = isFolder ? mock<DriveItem['folder']>() : undefined
-      const result = buildIncomingShareResource({ driveItem: item, graphRoles })
+      const result = buildIncomingShareResource({ driveItem: item, graphRoles, serverUrl: '' })
 
       expect(result.isFolder).toEqual(isFolder)
       expect(result.type).toEqual(isFolder ? 'folder' : 'file')
     })
     it('sets outgoing to false', () => {
-      const result = buildIncomingShareResource({ driveItem, graphRoles })
+      const result = buildIncomingShareResource({ driveItem, graphRoles, serverUrl: '' })
       expect(result.outgoing).toBeFalsy()
     })
     it('sets sharedBy based on the permission invitation', () => {
-      const result = buildIncomingShareResource({ driveItem, graphRoles })
+      const result = buildIncomingShareResource({ driveItem, graphRoles, serverUrl: '' })
       expect(result.sharedBy).toEqual([sharedBy])
     })
     it('sets sharedBy based on the permission invitation', () => {
-      const result = buildIncomingShareResource({ driveItem, graphRoles })
+      const result = buildIncomingShareResource({ driveItem, graphRoles, serverUrl: '' })
       expect(result.sharedWith).toEqual([{ ...sharedWith, shareType: ShareTypes.user.value }])
     })
+    it('constructs a private link', () => {
+      const serverUrl = 'https://example.com'
+      const result = buildIncomingShareResource({ driveItem, graphRoles, serverUrl })
+      expect(result.privateLink).toEqual(urlJoin(serverUrl, 'f', driveItem.remoteItem.id))
+    })
   })
 
   describe('buildOutgoingShareResource', () => {
@@ -174,29 +180,34 @@ describe('share helper functions', () => {
     const user = { id: '1', displayName: 'user1' } as User
 
     it('sets ids based on the drive item, its first permission and parent reference', () => {
-      const result = buildOutgoingShareResource({ driveItem, user })
+      const result = buildOutgoingShareResource({ driveItem, user, serverUrl: '' })
 
       expect(result.id).toEqual(driveItem.id)
       expect(result.fileId).toEqual(driveItem.id)
       expect(result.driveId).toEqual(driveItem.parentReference.driveId)
       expect(result.parentFolderId).toEqual(driveItem.parentReference.id)
     })
     it('sets outgoing to true', () => {
-      const result = buildOutgoingShareResource({ driveItem, user })
+      const result = buildOutgoingShareResource({ driveItem, user, serverUrl: '' })
       expect(result.outgoing).toBeTruthy()
     })
     it('sets the path based on the parent reference path and the drive item name', () => {
-      const result = buildOutgoingShareResource({ driveItem, user })
+      const result = buildOutgoingShareResource({ driveItem, user, serverUrl: '' })
       expect(result.path).toEqual(`${driveItem.parentReference.path}/${driveItem.name}`)
     })
     it.each([true, false])('correctly detects if the resource is a folder', (isFolder) => {
       const item = { ...driveItem }
       item.folder = isFolder ? mock<DriveItem['folder']>() : undefined
-      const result = buildOutgoingShareResource({ driveItem: item, user })
+      const result = buildOutgoingShareResource({ driveItem: item, user, serverUrl: '' })
 
       expect(result.isFolder).toEqual(isFolder)
       expect(result.type).toEqual(isFolder ? 'folder' : 'file')
     })
+    it('constructs a private link', () => {
+      const serverUrl = 'https://example.com'
+      const result = buildOutgoingShareResource({ driveItem, user, serverUrl })
+      expect(result.privateLink).toEqual(urlJoin(serverUrl, 'f', driveItem.id))
+    })
   })
 
   describe('buildCollaboratorShare', () => {

packages/web-pkg/src/components/AppTemplates/AppWrapper.vue

@@ -306,7 +306,8 @@ export default defineComponent({
                 ...fileInfo,
                 ...buildIncomingShareResource({
                   graphRoles: sharesStore.graphRoles,
-                  driveItem: sharedDriveItem
+                  driveItem: sharedDriveItem,
+                  serverUrl: configStore.serverUrl
                 }),
                 tags: fileInfo.tags // tags are always [] in Graph API, hence take them from webdav
               }

packages/web-pkg/src/services/folder/loaders/loaderSharedViaLink.ts

@@ -39,7 +39,13 @@ export class FolderLoaderSharedViaLink implements FolderLoader {
 
       const resources = value
         .filter((s) => s.permissions.some(({ link }) => !!link))
-        .map((driveItem) => buildOutgoingShareResource({ driveItem, user: userStore.user }))
+        .map((driveItem) =>
+          buildOutgoingShareResource({
+            driveItem,
+            user: userStore.user,
+            serverUrl: configStore.serverUrl
+          })
+        )
 
       resourcesStore.initResourceList({ currentFolder: null, resources })
     })

packages/web-pkg/src/services/folder/loaders/loaderSharedWithMe.ts

@@ -38,7 +38,11 @@ export class FolderLoaderSharedWithMe implements FolderLoader {
       )
 
       const resources = value.map((driveItem) =>
-        buildIncomingShareResource({ driveItem, graphRoles: sharesStore.graphRoles })
+        buildIncomingShareResource({
+          driveItem,
+          graphRoles: sharesStore.graphRoles,
+          serverUrl: configStore.serverUrl
+        })
       )
 
       resourcesStore.initResourceList({ currentFolder: null, resources })

packages/web-pkg/src/services/folder/loaders/loaderSharedWithOthers.ts

@@ -39,7 +39,13 @@ export class FolderLoaderSharedWithOthers implements FolderLoader {
 
       const resources = value
         .filter((s) => s.permissions.some(({ link }) => !link))
-        .map((driveItem) => buildOutgoingShareResource({ driveItem, user: userStore.user }))
+        .map((driveItem) =>
+          buildOutgoingShareResource({
+            driveItem,
+            user: userStore.user,
+            serverUrl: configStore.serverUrl
+          })
+        )
 
       resourcesStore.initResourceList({ currentFolder: null, resources })
     })

packages/web-pkg/src/services/folder/loaders/loaderSpace.ts

@@ -42,7 +42,8 @@ export class FolderLoaderSpace implements FolderLoader {
       userStore,
       authService,
       spacesStore,
-      sharesStore
+      sharesStore,
+      configStore
     } = context
     const { webdav, graphAuthenticated: graphClient } = clientService
     const { replaceInvalidFileRoute } = useFileRouteReplace({ router })
@@ -79,7 +80,8 @@ export class FolderLoaderSpace implements FolderLoader {
             if (sharedDriveItem) {
               currentFolder = buildIncomingShareResource({
                 graphRoles: sharesStore.graphRoles,
-                driveItem: sharedDriveItem
+                driveItem: sharedDriveItem,
+                serverUrl: configStore.serverUrl
               })
             }
           } else if (!isPersonalSpaceResource(space) && !isPublicSpaceResource(space)) {

packages/web-runtime/src/container/bootstrap.ts

@@ -754,6 +754,7 @@ export const registerSSEEventListeners = ({
     messageStore,
     userStore,
     sharesStore,
+    configStore,
     clientService,
     previewService,
     language,

packages/web-runtime/src/container/sse/shares.ts

@@ -123,6 +123,7 @@ export const onSSEShareCreatedEvent = async ({
   spacesStore,
   sharesStore,
   userStore,
+  configStore,
   clientService,
   router
 }: SSEEventOptions) => {
@@ -168,7 +169,11 @@ export const onSSEShareCreatedEvent = async ({
     if (!driveItem) {
       return
     }
-    const resource = buildIncomingShareResource({ driveItem, graphRoles: sharesStore.graphRoles })
+    const resource = buildIncomingShareResource({
+      driveItem,
+      graphRoles: sharesStore.graphRoles,
+      serverUrl: configStore.serverUrl
+    })
     return resourcesStore.upsertResource(resource)
   }
 
@@ -179,7 +184,11 @@ export const onSSEShareCreatedEvent = async ({
     if (!driveItem) {
       return
     }
-    const resource = buildOutgoingShareResource({ driveItem, user: userStore.user })
+    const resource = buildOutgoingShareResource({
+      driveItem,
+      user: userStore.user,
+      serverUrl: configStore.serverUrl
+    })
     return resourcesStore.upsertResource(resource)
   }
 }
@@ -189,6 +198,7 @@ export const onSSEShareUpdatedEvent = async ({
   sharesStore,
   clientService,
   userStore,
+  configStore,
   router
 }: SSEEventOptions) => {
   if (sseData.initiatorid === clientService.initiatorId) {
@@ -211,7 +221,11 @@ export const onSSEShareUpdatedEvent = async ({
     if (!driveItem) {
       return
     }
-    const resource = buildIncomingShareResource({ driveItem, graphRoles: sharesStore.graphRoles })
+    const resource = buildIncomingShareResource({
+      driveItem,
+      graphRoles: sharesStore.graphRoles,
+      serverUrl: configStore.serverUrl
+    })
     return resourcesStore.upsertResource(resource)
   }
 }
@@ -308,6 +322,7 @@ export const onSSELinkCreatedEvent = async ({
   resourcesStore,
   spacesStore,
   userStore,
+  configStore,
   clientService,
   router
 }: SSEEventOptions) => {
@@ -353,7 +368,11 @@ export const onSSELinkCreatedEvent = async ({
     if (!driveItem) {
       return
     }
-    const resource = buildOutgoingShareResource({ driveItem, user: userStore.user })
+    const resource = buildOutgoingShareResource({
+      driveItem,
+      user: userStore.user,
+      serverUrl: configStore.serverUrl
+    })
     return resourcesStore.upsertResource(resource)
   }
 }

packages/web-runtime/src/container/sse/types.ts

@@ -1,6 +1,7 @@
 import { z } from 'zod'
 import {
   ClientService,
+  ConfigStore,
   MessageStore,
   PreviewService,
   ResourcesStore,
@@ -29,6 +30,7 @@ export interface SSEEventOptions {
   userStore: UserStore
   messageStore: MessageStore
   sharesStore: SharesStore
+  configStore: ConfigStore
   clientService: ClientService
   previewService: PreviewService
   router: Router

packages/web-runtime/tests/unit/container/sse/files.spec.ts

@@ -1,6 +1,7 @@
 import {
   ClientService,
   PreviewService,
+  useConfigStore,
   useMessages,
   useResourcesStore,
   useSharesStore,
@@ -442,6 +443,7 @@ const getMocks = ({
   const messageStore = useMessages()
   const userStore = useUserStore()
   const sharesStore = useSharesStore()
+  const configStore = useConfigStore()
   const clientService = mockDeep<ClientService>({ initiatorId: 'local1' })
   const previewService = mockDeep<PreviewService>()
   const router = mockDeep<Router>()
@@ -457,6 +459,7 @@ const getMocks = ({
     messageStore,
     userStore,
     sharesStore,
+    configStore,
     clientService,
     previewService,
     resourceQueue,

packages/web-runtime/tests/unit/container/sse/helpers.spec.ts

@@ -3,6 +3,7 @@ import { createTestingPinia } from '@ownclouders/web-test-helpers'
 import {
   ClientService,
   PreviewService,
+  useConfigStore,
   useMessages,
   useResourcesStore,
   useSharesStore,
@@ -109,6 +110,7 @@ const getMocks = ({
   const spacesStore = useSpacesStore()
   const messageStore = useMessages()
   const userStore = useUserStore()
+  const configStore = useConfigStore()
   const sharesStore = useSharesStore()
   const clientService = mockDeep<ClientService>()
   const previewService = mockDeep<PreviewService>()
@@ -123,6 +125,7 @@ const getMocks = ({
     messageStore,
     userStore,
     sharesStore,
+    configStore,
     clientService,
     previewService,
     resourceQueue,

packages/web-runtime/tests/unit/container/sse/shares.spec.ts

@@ -2,6 +2,7 @@ import {
   ClientService,
   eventBus,
   PreviewService,
+  useConfigStore,
   useMessages,
   useResourcesStore,
   useSharesStore,
@@ -697,6 +698,7 @@ const getMocks = ({
   spacesStore.spaces = spaces
   const messageStore = useMessages()
   const userStore = useUserStore()
+  const configStore = useConfigStore()
   userStore.user = mockDeep<User>({ id: '1' })
   const sharesStore = useSharesStore()
   const clientService = mockDeep<ClientService>({ initiatorId: 'local1' })
@@ -734,6 +736,7 @@ const getMocks = ({
     messageStore,
     userStore,
     sharesStore,
+    configStore,
     clientService,
     previewService,
     resourceQueue,