From 996dc8af5027154cdec314cd34667d6956a790f3 Mon Sep 17 00:00:00 2001
From: Benedikt Kulmann <benedikt@kulmann.biz>
Date: Tue, 11 Oct 2022 23:49:42 +0200
Subject: [PATCH 1/3] feat: resolve private links into shares

---
 .../src/helpers/resource/resource.ts          | 12 ++-
 .../web-app-files/src/helpers/resources.ts    | 10 +-
 .../web-client/src/helpers/resource/types.ts  |  1 +
 .../web-client/src/helpers/space/functions.ts | 10 +-
 .../web-client/src/helpers/space/types.ts     | 21 ++++
 .../web-runtime/src/pages/resolveFileLink.vue | 98 +++++++++++++++----
 6 files changed, 128 insertions(+), 24 deletions(-)

diff --git a/packages/web-app-files/src/helpers/resource/resource.ts b/packages/web-app-files/src/helpers/resource/resource.ts
index db1ddc3d5d4..cf99fa8f141 100644
--- a/packages/web-app-files/src/helpers/resource/resource.ts
+++ b/packages/web-app-files/src/helpers/resource/resource.ts
@@ -1,11 +1,19 @@
 import { Resource } from 'web-client'
 import fileExtensions from '../extensions/fileExtensions'
 
-export const extractStorageId = (id?: string): string => {
+const extractIdSegment = (id: string, index: number): string => {
   if (!id || typeof id !== 'string') {
     return ''
   }
-  return id.indexOf('!') >= 0 ? id.split('!')[0] : ''
+  return id.indexOf('!') >= 0 ? id.split('!')[index] : ''
+}
+
+export const extractStorageId = (id?: string): string => {
+  return extractIdSegment(id, 0)
+}
+
+export const extractNodeId = (id?: string): string => {
+  return extractIdSegment(id, 1)
 }
 
 export const extractNameWithoutExtension = (resource?: Resource): string => {
diff --git a/packages/web-app-files/src/helpers/resources.ts b/packages/web-app-files/src/helpers/resources.ts
index 667167e7cf6..b8125487b34 100644
--- a/packages/web-app-files/src/helpers/resources.ts
+++ b/packages/web-app-files/src/helpers/resources.ts
@@ -14,7 +14,7 @@ import {
   spaceRoleManager,
   spaceRoleViewer
 } from 'web-client/src/helpers/share'
-import { extractExtensionFromFile, extractStorageId } from './resource'
+import { extractExtensionFromFile, extractNodeId, extractStorageId } from './resource'
 import { buildWebDavSpacesPath, extractDomSelector } from 'web-client/src/helpers/resource'
 import { Resource, SpaceResource, SHARE_JAIL_ID } from 'web-client/src/helpers'
 import { urlJoin } from 'web-pkg/src/utils'
@@ -44,7 +44,7 @@ export function buildResource(resource): Resource {
   }
 
   const id = resource.fileInfo[DavProperty.FileId]
-  return {
+  const r = {
     id,
     fileId: id,
     storageId: extractStorageId(id),
@@ -106,6 +106,12 @@ export function buildResource(resource): Resource {
     },
     getDomSelector: () => extractDomSelector(id)
   }
+  Object.defineProperty(r, 'nodeId', {
+    get() {
+      return extractNodeId(this.id)
+    }
+  })
+  return r
 }
 
 export function buildWebDavPublicPath(publicLinkToken, path = '') {
diff --git a/packages/web-client/src/helpers/resource/types.ts b/packages/web-client/src/helpers/resource/types.ts
index 3c6e6a93aba..cce534a51f5 100644
--- a/packages/web-client/src/helpers/resource/types.ts
+++ b/packages/web-client/src/helpers/resource/types.ts
@@ -6,6 +6,7 @@ export interface Resource {
   fileId?: string
   parentFolderId?: string
   storageId?: string
+  readonly nodeId?: string
   name?: string
   path: string
   webDavPath?: string
diff --git a/packages/web-client/src/helpers/space/functions.ts b/packages/web-client/src/helpers/space/functions.ts
index 56bef530e7f..7953f7ef3b2 100644
--- a/packages/web-client/src/helpers/space/functions.ts
+++ b/packages/web-client/src/helpers/space/functions.ts
@@ -5,6 +5,7 @@ import { PublicSpaceResource, ShareSpaceResource, SpaceResource, SHARE_JAIL_ID }
 import { DavProperty } from 'web-pkg/src/constants'
 import { buildWebDavPublicPath } from 'files/src/helpers/resources'
 import { urlJoin } from 'web-pkg/src/utils'
+import { extractNodeId } from 'files/src/helpers/resource'
 
 export function buildPublicSpaceResource(data): PublicSpaceResource {
   const publicLinkPassword = data.publicLinkPassword
@@ -94,7 +95,7 @@ export function buildSpace(data): SpaceResource {
   })
   const webDavUrl = urlJoin(data.serverUrl, 'remote.php/dav', webDavPath)
 
-  return {
+  const s = {
     id: data.id,
     fileId: data.id,
     storageId: data.id,
@@ -125,6 +126,7 @@ export function buildSpace(data): SpaceResource {
     ownerDisplayName: '',
     ownerId: data.owner?.user?.id,
     disabled,
+    root: data.root,
     spaceQuota: data.quota,
     spaceRoles,
     spaceImageData,
@@ -197,4 +199,10 @@ export function buildSpace(data): SpaceResource {
       return urlJoin(this.webDavUrl, resource.path)
     }
   }
+  Object.defineProperty(s, 'nodeId', {
+    get() {
+      return extractNodeId(this.id)
+    }
+  })
+  return s
 }
diff --git a/packages/web-client/src/helpers/space/types.ts b/packages/web-client/src/helpers/space/types.ts
index 5ab8306513e..90a7e9537a8 100644
--- a/packages/web-client/src/helpers/space/types.ts
+++ b/packages/web-client/src/helpers/space/types.ts
@@ -10,9 +10,21 @@ import { Resource } from '../resource'
 
 export const SHARE_JAIL_ID = 'a0ca6a90-a365-4782-871e-d44447bbc668'
 
+export interface SpaceResourceRemoteItem {
+  id: string
+  name: string
+}
+
+export interface SpaceResourceRoot {
+  id: string
+  remoteItem: SpaceResourceRemoteItem
+  webDavUrl: string
+}
+
 export interface SpaceResource extends Resource {
   disabled?: boolean
   webDavUrl: string
+  root: SpaceResourceRoot
   getWebDavUrl(resource: Resource): string
   getDriveAliasAndItem(resource: Resource): string
 }
@@ -39,6 +51,15 @@ export const isShareSpaceResource = (resource: Resource): resource is ShareSpace
   return resource.driveType === 'share'
 }
 
+export interface MountPointSpaceResource extends SpaceResource {
+  __mountPointSpaceResource?: any
+}
+export const isMountPointSpaceResource = (
+  resource: Resource
+): resource is MountPointSpaceResource => {
+  return resource.driveType === 'mountpoint'
+}
+
 export interface PublicSpaceResource extends SpaceResource {
   publicLinkPassword?: string
   publicLinkItemType?: string
diff --git a/packages/web-runtime/src/pages/resolveFileLink.vue b/packages/web-runtime/src/pages/resolveFileLink.vue
index 47a6ed0c7b1..718d65a1f72 100644
--- a/packages/web-runtime/src/pages/resolveFileLink.vue
+++ b/packages/web-runtime/src/pages/resolveFileLink.vue
@@ -31,21 +31,34 @@
   </div>
 </template>
 
-<script type="ts">
+<script lang="ts">
 import {
   useRoute,
   useRouteParam,
   useStore,
   useTranslations,
-  useRouter, queryItemAsString, useCapabilitySpacesEnabled
-} from "web-pkg/src/composables";
-import { unref, defineComponent, computed, onMounted } from "@vue/composition-api";
-import { clientService } from "web-pkg/src/services";
-import { createLocationSpaces } from "files/src/router";
-import {dirname} from "path";
-import {createFileRouteOptions} from "web-pkg/src/helpers/router";
-import {useTask} from "vue-concurrency";
-import {isPersonalSpaceResource} from "web-client/src/helpers";
+  useRouter,
+  queryItemAsString,
+  useCapabilitySpacesEnabled
+} from 'web-pkg/src/composables'
+import { unref, defineComponent, computed, onMounted } from '@vue/composition-api'
+import { clientService } from 'web-pkg/src/services'
+import { createLocationSpaces } from 'files/src/router'
+import { dirname } from 'path'
+import { createFileRouteOptions } from 'web-pkg/src/helpers/router'
+import { useTask } from 'vue-concurrency'
+import {
+  buildShareSpaceResource,
+  buildSpace,
+  buildWebDavSpacesPath,
+  isMountPointSpaceResource,
+  isPersonalSpaceResource,
+  Resource,
+  SpaceResource
+} from 'web-client/src/helpers'
+import { DavProperty } from 'web-pkg/src/constants'
+import { urlJoin } from 'web-pkg/src/utils'
+import { configurationManager } from 'web-pkg/src/configuration'
 
 export default defineComponent({
   name: 'ResolveFileLink',
@@ -67,17 +80,37 @@ export default defineComponent({
     })
 
     const resolveFileLinkTask = useTask(function* (signal, id) {
-      let path = yield clientService.owncloudSdk.files.getPathForFileId(id)
-      const matchingSpace = getMatchingSpace(id)
-      if (!matchingSpace) {
-        return
-      }
+      let path, resource
+      let matchingSpace = getMatchingSpace(id)
+      if (matchingSpace) {
+        path = yield clientService.owncloudSdk.files.getPathForFileId(id)
+        resource = yield clientService.webdav.getFileInfo(matchingSpace, { path })
+      } else {
+        // no matching space found => the file doesn't lie in own spaces => it's a share.
+        // do PROPFINDs on parents until root of accepted share is found in `mountpoint` spaces
+        let mountPoint = findMatchingMountPoint(id)
+        resource = yield fetchFileInfoById(id)
+        const sharePathSegments = mountPoint ? [] : [resource.name]
+        let tmpResource = resource
+        while (!mountPoint) {
+          tmpResource = yield fetchFileInfoById(tmpResource.parentFolderId)
+          mountPoint = findMatchingMountPoint(tmpResource.id)
+          if (!mountPoint) {
+            sharePathSegments.unshift(tmpResource.name)
+          }
+        }
 
-      const resource = yield clientService.webdav.getFileInfo(matchingSpace, { path })
+        matchingSpace = buildShareSpaceResource({
+          shareId: mountPoint.nodeId,
+          shareName: mountPoint.name,
+          serverUrl: configurationManager.serverUrl
+        })
+        path = urlJoin(...sharePathSegments)
+      }
 
       let fileId
       let scrollTo
-      if (resource.type !== 'file') {
+      if (resource.type === 'folder') {
         fileId = resource.fileId
       } else {
         fileId = resource.parentFolderId
@@ -95,16 +128,43 @@ export default defineComponent({
 
     const getMatchingSpace = (id) => {
       if (!unref(hasSpaces)) {
-        return store.getters['runtime/spaces/spaces'].find((space) => isPersonalSpaceResource(space))
+        return store.getters['runtime/spaces/spaces'].find((space) =>
+          isPersonalSpaceResource(space)
+        )
       }
       return store.getters['runtime/spaces/spaces'].find((space) => id.startsWith(space.id))
     }
 
+    const fetchFileInfoById = async (id: string | number): Promise<Resource> => {
+      const space = buildSpace({
+        id,
+        webDavPath: buildWebDavSpacesPath(id)
+      })
+      return await clientService.webdav.getFileInfo(
+        space,
+        {},
+        {
+          davProperties: [
+            DavProperty.FileId,
+            DavProperty.FileParent,
+            DavProperty.Name,
+            DavProperty.ResourceType
+          ]
+        }
+      )
+    }
+
+    const findMatchingMountPoint = (id: string | number): SpaceResource => {
+      return store.getters['runtime/spaces/spaces'].find(
+        (space) => isMountPointSpaceResource(space) && space.root?.remoteItem?.id === id
+      )
+    }
+
     const loading = computed(() => {
       return !resolveFileLinkTask.last || resolveFileLinkTask.isRunning
     })
 
-    const errorMessage = computed( () => {
+    const errorMessage = computed(() => {
       if (resolveFileLinkTask.isError) {
         return resolveFileLinkTask.last.error
       }

From bc39b802f9a4770547f45381f437f5dc6ca370f1 Mon Sep 17 00:00:00 2001
From: Benedikt Kulmann <benedikt@kulmann.biz>
Date: Tue, 11 Oct 2022 23:56:57 +0200
Subject: [PATCH 2/3] refactor: rename resolveFileLink to resolvePrivateLink

---
 .../{resolveFileLink.vue => resolvePrivateLink.vue}  | 12 ++++++------
 packages/web-runtime/src/router/index.ts             |  4 ++--
 .../tests/unit/pages/resolveFileLink.spec.ts         |  3 ---
 .../tests/unit/pages/resolvePrivateLink.spec.ts      |  3 +++
 4 files changed, 11 insertions(+), 11 deletions(-)
 rename packages/web-runtime/src/pages/{resolveFileLink.vue => resolvePrivateLink.vue} (94%)
 delete mode 100644 packages/web-runtime/tests/unit/pages/resolveFileLink.spec.ts
 create mode 100644 packages/web-runtime/tests/unit/pages/resolvePrivateLink.spec.ts

diff --git a/packages/web-runtime/src/pages/resolveFileLink.vue b/packages/web-runtime/src/pages/resolvePrivateLink.vue
similarity index 94%
rename from packages/web-runtime/src/pages/resolveFileLink.vue
rename to packages/web-runtime/src/pages/resolvePrivateLink.vue
index 718d65a1f72..fced25a0eb3 100644
--- a/packages/web-runtime/src/pages/resolveFileLink.vue
+++ b/packages/web-runtime/src/pages/resolvePrivateLink.vue
@@ -61,7 +61,7 @@ import { urlJoin } from 'web-pkg/src/utils'
 import { configurationManager } from 'web-pkg/src/configuration'
 
 export default defineComponent({
-  name: 'ResolveFileLink',
+  name: 'ResolvePrivateLink',
   setup() {
     const store = useStore()
     const router = useRouter()
@@ -76,10 +76,10 @@ export default defineComponent({
     })
 
     onMounted(() => {
-      resolveFileLinkTask.perform(queryItemAsString(unref(id)))
+      resolvePrivateLinkTask.perform(queryItemAsString(unref(id)))
     })
 
-    const resolveFileLinkTask = useTask(function* (signal, id) {
+    const resolvePrivateLinkTask = useTask(function* (signal, id) {
       let path, resource
       let matchingSpace = getMatchingSpace(id)
       if (matchingSpace) {
@@ -161,12 +161,12 @@ export default defineComponent({
     }
 
     const loading = computed(() => {
-      return !resolveFileLinkTask.last || resolveFileLinkTask.isRunning
+      return !resolvePrivateLinkTask.last || resolvePrivateLinkTask.isRunning
     })
 
     const errorMessage = computed(() => {
-      if (resolveFileLinkTask.isError) {
-        return resolveFileLinkTask.last.error
+      if (resolvePrivateLinkTask.isError) {
+        return resolvePrivateLinkTask.last.error
       }
       return null
     })
diff --git a/packages/web-runtime/src/router/index.ts b/packages/web-runtime/src/router/index.ts
index f13370168ac..c67209564f6 100644
--- a/packages/web-runtime/src/router/index.ts
+++ b/packages/web-runtime/src/router/index.ts
@@ -6,7 +6,7 @@ import LoginPage from '../pages/login.vue'
 import LogoutPage from '../pages/logout.vue'
 import OidcCallbackPage from '../pages/oidcCallback.vue'
 import ResolvePublicLinkPage from '../pages/resolvePublicLink.vue'
-import ResolveFileLinkPage from '../pages/resolveFileLink.vue'
+import ResolvePrivateLinkPage from '../pages/resolvePrivateLink.vue'
 import { setupAuthGuard } from './setupAuthGuard'
 import { patchRouter } from './patchCleanPath'
 
@@ -63,7 +63,7 @@ export const router = patchRouter(
       {
         path: '/f/:fileId',
         name: 'resolvePrivateLink',
-        component: ResolveFileLinkPage,
+        component: ResolvePrivateLinkPage,
         meta: { title: $gettext('Private link') }
       },
       {
diff --git a/packages/web-runtime/tests/unit/pages/resolveFileLink.spec.ts b/packages/web-runtime/tests/unit/pages/resolveFileLink.spec.ts
deleted file mode 100644
index 560deae782c..00000000000
--- a/packages/web-runtime/tests/unit/pages/resolveFileLink.spec.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-describe('resolveFileLink view', () => {
-  it.todo('Write tests')
-})
diff --git a/packages/web-runtime/tests/unit/pages/resolvePrivateLink.spec.ts b/packages/web-runtime/tests/unit/pages/resolvePrivateLink.spec.ts
new file mode 100644
index 00000000000..c1b9986a4ed
--- /dev/null
+++ b/packages/web-runtime/tests/unit/pages/resolvePrivateLink.spec.ts
@@ -0,0 +1,3 @@
+describe('resolvePrivateLink view', () => {
+  it.todo('Write tests')
+})

From fdb811f952fb75fb5761639f5a3e506afef760f3 Mon Sep 17 00:00:00 2001
From: Benedikt Kulmann <benedikt@kulmann.biz>
Date: Tue, 11 Oct 2022 23:58:44 +0200
Subject: [PATCH 3/3] docs: adjust changelog items

---
 changelog/unreleased/enhancement-internal-links | 4 ++--
 changelog/unreleased/enhancement-private-links  | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/changelog/unreleased/enhancement-internal-links b/changelog/unreleased/enhancement-internal-links
index 0fbd43ace71..9ed9064733a 100644
--- a/changelog/unreleased/enhancement-internal-links
+++ b/changelog/unreleased/enhancement-internal-links
@@ -1,8 +1,8 @@
 Enhancement: Resolve internal links
 
 Public links with the role "internal" can now be resolved.
-Note: Internal links to shares can not be resolved as of now. This will follow in a subsequent PR.
 
-https://github.com/owncloud/web/pull/7405
 https://github.com/owncloud/web/issues/7304
 https://github.com/owncloud/web/issues/6844
+https://github.com/owncloud/web/pull/7405
+https://github.com/owncloud/web/pull/7769
diff --git a/changelog/unreleased/enhancement-private-links b/changelog/unreleased/enhancement-private-links
index eccb15f9e1a..01b599f3d97 100644
--- a/changelog/unreleased/enhancement-private-links
+++ b/changelog/unreleased/enhancement-private-links
@@ -1,7 +1,7 @@
 Enhancement: Resolve private links
 
 Private links can now be resolved.
-Note: Private links to shares in oCIS can not be resolved as of now. This will follow in a subsequent PR.
 
-https://github.com/owncloud/web/pull/7405
 https://github.com/owncloud/web/issues/7707
+https://github.com/owncloud/web/pull/7405
+https://github.com/owncloud/web/pull/7769