From 7b215333b3ca50f5cbd106c8d7cf7194f0ebc9ce Mon Sep 17 00:00:00 2001
From: Jannik Stehle <jannik.stehle@gmail.com>
Date: Mon, 10 Oct 2022 17:01:33 +0200
Subject: [PATCH] Refactor private link handling

---
 .../components/SideBar/Shares/FileLinks.vue   |   4 +-
 packages/web-app-files/src/index.js           |   2 -
 .../web-app-files/src/router/deprecated.ts    |   6 +-
 packages/web-app-files/src/router/index.ts    |   8 --
 .../web-app-files/src/router/operations.ts    |  25 ----
 .../web-app-files/src/views/PrivateLink.vue   |  99 -------------
 .../src/pages/resolveAliasLink.vue            |  79 -----------
 .../web-runtime/src/pages/resolveFileLink.vue | 131 ++++++++++++++++++
 .../src/pages/resolvePublicLink.vue           |   2 +-
 packages/web-runtime/src/router/helpers.ts    |   1 -
 packages/web-runtime/src/router/index.ts      |  10 +-
 .../tests/unit/pages/resolveFileLink.spec.ts} |   4 +-
 12 files changed, 139 insertions(+), 232 deletions(-)
 delete mode 100644 packages/web-app-files/src/router/operations.ts
 delete mode 100644 packages/web-app-files/src/views/PrivateLink.vue
 delete mode 100644 packages/web-runtime/src/pages/resolveAliasLink.vue
 create mode 100644 packages/web-runtime/src/pages/resolveFileLink.vue
 rename packages/{web-app-files/tests/unit/views/PrivateLink.spec.ts => web-runtime/tests/unit/pages/resolveFileLink.spec.ts} (96%)

diff --git a/packages/web-app-files/src/components/SideBar/Shares/FileLinks.vue b/packages/web-app-files/src/components/SideBar/Shares/FileLinks.vue
index 8fb1b9bf8ff..ad33e125311 100644
--- a/packages/web-app-files/src/components/SideBar/Shares/FileLinks.vue
+++ b/packages/web-app-files/src/components/SideBar/Shares/FileLinks.vue
@@ -584,7 +584,7 @@ export default defineComponent({
           parseInt(this.share.permissions),
           this.highlightedFile.isFolder,
           this.hasPublicLinkEditing,
-          true,
+          this.hasPublicLinkAliasSupport,
           !!link.password
         )
       }
@@ -592,7 +592,7 @@ export default defineComponent({
       return LinkShareRoles.list(
         this.highlightedFile.isFolder,
         this.hasPublicLinkEditing,
-        true,
+        this.hasPublicLinkAliasSupport,
         !!link.password
       )
     }
diff --git a/packages/web-app-files/src/index.js b/packages/web-app-files/src/index.js
index f70bbb3bb2b..b1821ecb420 100644
--- a/packages/web-app-files/src/index.js
+++ b/packages/web-app-files/src/index.js
@@ -1,7 +1,6 @@
 import App from './App.vue'
 import Favorites from './views/Favorites.vue'
 import FilesDrop from './views/FilesDrop.vue'
-import PrivateLink from './views/PrivateLink.vue'
 import SharedWithMe from './views/shares/SharedWithMe.vue'
 import SharedWithOthers from './views/shares/SharedWithOthers.vue'
 import SharedViaLink from './views/shares/SharedViaLink.vue'
@@ -94,7 +93,6 @@ export default {
     App,
     Favorites,
     FilesDrop,
-    PrivateLink,
     SearchResults,
     Shares: {
       SharedViaLink,
diff --git a/packages/web-app-files/src/router/deprecated.ts b/packages/web-app-files/src/router/deprecated.ts
index 35dc6ca7768..8f7e4289c14 100644
--- a/packages/web-app-files/src/router/deprecated.ts
+++ b/packages/web-app-files/src/router/deprecated.ts
@@ -2,7 +2,6 @@ import VueRouter, { RouteConfig, Route, Location, RouteMeta } from 'vue-router'
 import { createLocationSpaces } from './spaces'
 import { createLocationShares } from './shares'
 import { createLocationCommon } from './common'
-import { createLocationOperations } from './operations'
 import { createLocationPublic } from './public'
 import { isLocationActive as isLocationActiveNoCompat } from './utils'
 import { createLocationTrash } from './trash'
@@ -90,10 +89,7 @@ export const buildRoutes = (): RouteConfig[] =>
     },
     {
       path: '/private-link/:fileId',
-      meta: {
-        auth: false
-      },
-      redirect: (to) => createLocationOperations('files-operations-resolver-private-link', to)
+      redirect: (to) => ({ name: 'resolvePrivateLink', params: { fileId: to.params.fileId } })
     },
     {
       path: '/public-link/:token',
diff --git a/packages/web-app-files/src/router/index.ts b/packages/web-app-files/src/router/index.ts
index 1be216a043d..25781c194ff 100644
--- a/packages/web-app-files/src/router/index.ts
+++ b/packages/web-app-files/src/router/index.ts
@@ -6,11 +6,6 @@ import {
   createLocationCommon
 } from './common'
 import { buildRoutes as buildDeprecatedRoutes, isLocationActive } from './deprecated'
-import {
-  buildRoutes as buildOperationsRoutes,
-  createLocationOperations,
-  isLocationOperationsActive
-} from './operations'
 import {
   buildRoutes as buildPublicRoutes,
   createLocationPublic,
@@ -45,7 +40,6 @@ const buildRoutes = (components: RouteComponents): RouteConfig[] => [
   ...buildSharesRoutes(components),
   ...buildPublicRoutes(components),
   ...buildSpacesRoutes(components),
-  ...buildOperationsRoutes(components),
   ...buildTrashRoutes(components),
   ...buildDeprecatedRoutes()
 ]
@@ -54,9 +48,7 @@ export {
   createLocationCommon,
   createLocationShares,
   createLocationSpaces,
-  createLocationOperations,
   createLocationPublic,
-  isLocationOperationsActive,
   isLocationCommonActive,
   isLocationSharesActive,
   isLocationSpacesActive,
diff --git a/packages/web-app-files/src/router/operations.ts b/packages/web-app-files/src/router/operations.ts
deleted file mode 100644
index a1d8d54c609..00000000000
--- a/packages/web-app-files/src/router/operations.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-import { RouteComponents } from './router'
-import { Location, RouteConfig } from 'vue-router'
-import { $gettext, createLocation, isLocationActiveDirector } from './utils'
-
-type operationsTypes = 'files-operations-resolver-private-link'
-
-export const createLocationOperations = (name: operationsTypes, location = {}): Location =>
-  createLocation(name, location)
-
-const locationResolverPrivateLink = createLocationOperations(
-  'files-operations-resolver-private-link'
-)
-
-export const isLocationOperationsActive = isLocationActiveDirector<operationsTypes>(
-  locationResolverPrivateLink
-)
-
-export const buildRoutes = (components: RouteComponents): RouteConfig[] => [
-  {
-    name: locationResolverPrivateLink.name,
-    path: '/ops/resolver/private-link/:fileId',
-    component: components.PrivateLink,
-    meta: { title: $gettext('Resolving private link') }
-  }
-]
diff --git a/packages/web-app-files/src/views/PrivateLink.vue b/packages/web-app-files/src/views/PrivateLink.vue
deleted file mode 100644
index d5299b09456..00000000000
--- a/packages/web-app-files/src/views/PrivateLink.vue
+++ /dev/null
@@ -1,99 +0,0 @@
-<template>
-  <div class="oc-height-1-1 oc-link-resolve">
-    <h1 class="oc-invisible-sr">{{ pageTitle }}</h1>
-    <div class="oc-card oc-border oc-rounded oc-position-center oc-text-center oc-width-large">
-      <template v-if="loading">
-        <div class="oc-card-header">
-          <h2 key="private-link-loading">
-            <translate>Resolving private link…</translate>
-          </h2>
-        </div>
-        <div class="oc-card-body">
-          <oc-spinner :aria-hidden="true" />
-        </div>
-      </template>
-      <template v-else-if="errorMessage">
-        <div class="oc-card-header oc-link-resolve-error-title">
-          <h2 key="private-link-error">
-            <translate>An error occurred while resolving the private link</translate>
-          </h2>
-        </div>
-        <div class="oc-card-body oc-link-resolve-error-message">
-          <p class="oc-text-xlarge">{{ errorMessage }}</p>
-        </div>
-      </template>
-      <div class="oc-card-footer">
-        <p>
-          {{ configuration.currentTheme.general.slogan }}
-        </p>
-      </div>
-    </div>
-  </div>
-</template>
-
-<script>
-import path from 'path'
-import { mapGetters } from 'vuex'
-import { buildResource, buildWebDavFilesPath } from '../helpers/resources'
-import { createLocationSpaces } from '../router'
-import { DavProperties } from 'web-pkg/src/constants'
-
-export default {
-  data() {
-    return {
-      loading: true,
-      errorMessage: null
-    }
-  },
-  computed: {
-    ...mapGetters(['configuration', 'user']),
-
-    pageTitle() {
-      return this.$gettext(this.$route.meta.title)
-    }
-  },
-  async mounted() {
-    // query server to translate fileId to real path
-    this.loading = true
-    try {
-      let resourcePath = await this.$client.files.getPathForFileId(this.$route.params.fileId)
-      resourcePath = buildWebDavFilesPath(this.user.id, resourcePath)
-      let resource = await this.$client.files.fileInfo(resourcePath, DavProperties.Default)
-      resource = buildResource(resource)
-
-      const driveAliasAndItem = ['personal', this.$store.getters.user.id]
-      const query = {}
-      if (resource.isFolder) {
-        // if folder: route directly into it
-        driveAliasAndItem.push(...[(resource.path || '').split('/').filter(Boolean)])
-      } else {
-        // if file: route into parent and highlight file
-        driveAliasAndItem.push(...[path.dirname(resource.path).split('/').filter(Boolean)])
-        query.scrollTo = resource.name
-      }
-      this.$router.push(
-        createLocationSpaces('files-spaces-generic', {
-          params: {
-            driveAliasAndItem: driveAliasAndItem.join('/')
-          },
-          query
-        })
-      )
-    } catch (error) {
-      console.error(error)
-      this.errorMessage = error
-    } finally {
-      this.loading = false
-    }
-  }
-}
-</script>
-
-<style lang="scss">
-.oc-link-resolve {
-  .oc-card-header h2,
-  .oc-card-footer p {
-    margin: 0;
-  }
-}
-</style>
diff --git a/packages/web-runtime/src/pages/resolveAliasLink.vue b/packages/web-runtime/src/pages/resolveAliasLink.vue
deleted file mode 100644
index 9fc874732cf..00000000000
--- a/packages/web-runtime/src/pages/resolveAliasLink.vue
+++ /dev/null
@@ -1,79 +0,0 @@
-<template>
-  <div></div>
-</template>
-
-<script type="ts">
-import {
-  useRoute,
-  useRouteParam,
-  useStore,
-  useTranslations,
-  useUserContext,
-  useRouter
-} from "web-pkg/src/composables";
-import { unref, ref, defineComponent, computed, onMounted } from "@vue/composition-api";
-import { authService } from "../services/auth";
-import { useLoadTokenInfo } from "../composables/tokenInfo";
-import { clientService } from "web-pkg/src/services";
-import { createLocationSpaces } from "files/src/router";
-import {urlJoin} from "web-pkg/src/utils";
-
-export default defineComponent({
-  name: 'ResolveAliasLink',
-  setup() {
-    const store = useStore()
-    const router = useRouter()
-    const route = useRoute()
-    const token = useRouteParam('token')
-    const { $gettext } = useTranslations()
-    const isUserContext = useUserContext({ store })
-    const { loadTokenInfoTask } = useLoadTokenInfo(unref(token))
-    const tokenInfo = ref(undefined)
-
-    onMounted(async () => {
-      if (!unref(isUserContext)) {
-        await authService.loginUser()
-        return router.push({ name: '/login' })
-      }
-
-      tokenInfo.value = await loadTokenInfoTask.perform()
-      resolveAliasLink()
-    })
-
-    const pageTitle = computed(() => $gettext(route.meta.title))
-
-    const resolveAliasLink = async () => {
-      const { id, storage_id: storageId, space_id: spaceId } = unref(tokenInfo)
-      const path = await clientService.owncloudSdk.files.getPathForFileId(id)
-      const matchingSpace = getMatchingSpace(`${storageId}$${spaceId}`)
-      const resource = await clientService.webdav.getFileInfo(matchingSpace, { path })
-
-      let driveAliasPath
-      let scrollTo
-      if (resource.type !== 'file') {
-        driveAliasPath = path
-        scrollTo = ''
-      }  else {
-        driveAliasPath = ''
-        scrollTo = path
-      }
-
-      const location = createLocationSpaces('files-spaces-generic', {
-        params: {
-          driveAliasAndItem: matchingSpace.getDriveAliasAndItem({ path: driveAliasPath })
-        },
-        query: { scrollTo: urlJoin(scrollTo, { leadingSlash: false }) }
-      })
-      return router.push(location)
-    }
-
-    const getMatchingSpace = (spaceId) => {
-      return store.getters['runtime/spaces/spaces'].find((space) => space.id === spaceId)
-    }
-
-    return {
-      pageTitle,
-    }
-  }
-})
-</script>
diff --git a/packages/web-runtime/src/pages/resolveFileLink.vue b/packages/web-runtime/src/pages/resolveFileLink.vue
new file mode 100644
index 00000000000..47a6ed0c7b1
--- /dev/null
+++ b/packages/web-runtime/src/pages/resolveFileLink.vue
@@ -0,0 +1,131 @@
+<template>
+  <div class="oc-height-1-1 oc-link-resolve">
+    <h1 class="oc-invisible-sr">{{ pageTitle }}</h1>
+    <div class="oc-card oc-border oc-rounded oc-position-center oc-text-center oc-width-large">
+      <template v-if="loading">
+        <div class="oc-card-header">
+          <h2 key="private-link-loading">
+            <translate>Resolving private link…</translate>
+          </h2>
+        </div>
+        <div class="oc-card-body">
+          <oc-spinner :aria-hidden="true" />
+        </div>
+      </template>
+      <template v-else-if="errorMessage">
+        <div class="oc-card-header oc-link-resolve-error-title">
+          <h2 key="private-link-error">
+            <translate>An error occurred while resolving the private link</translate>
+          </h2>
+        </div>
+        <div class="oc-card-body oc-link-resolve-error-message">
+          <p class="oc-text-xlarge">{{ errorMessage }}</p>
+        </div>
+      </template>
+      <div class="oc-card-footer">
+        <p>
+          {{ configuration.currentTheme.general.slogan }}
+        </p>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script type="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";
+
+export default defineComponent({
+  name: 'ResolveFileLink',
+  setup() {
+    const store = useStore()
+    const router = useRouter()
+    const route = useRoute()
+    const id = useRouteParam('fileId')
+    const { $gettext } = useTranslations()
+    const hasSpaces = useCapabilitySpacesEnabled(store)
+
+    const pageTitle = computed(() => $gettext(unref(route).meta.title))
+    const configuration = computed(() => {
+      return store.getters.configuration
+    })
+
+    onMounted(() => {
+      resolveFileLinkTask.perform(queryItemAsString(unref(id)))
+    })
+
+    const resolveFileLinkTask = useTask(function* (signal, id) {
+      let path = yield clientService.owncloudSdk.files.getPathForFileId(id)
+      const matchingSpace = getMatchingSpace(id)
+      if (!matchingSpace) {
+        return
+      }
+
+      const resource = yield clientService.webdav.getFileInfo(matchingSpace, { path })
+
+      let fileId
+      let scrollTo
+      if (resource.type !== 'file') {
+        fileId = resource.fileId
+      } else {
+        fileId = resource.parentFolderId
+        scrollTo = resource.name
+        path = dirname(path)
+      }
+
+      const { params, query } = createFileRouteOptions(matchingSpace, { fileId, path })
+      const location = createLocationSpaces('files-spaces-generic', {
+        params,
+        query: { ...query, ...(scrollTo && { scrollTo }) }
+      })
+      return router.push(location)
+    })
+
+    const getMatchingSpace = (id) => {
+      if (!unref(hasSpaces)) {
+        return store.getters['runtime/spaces/spaces'].find((space) => isPersonalSpaceResource(space))
+      }
+      return store.getters['runtime/spaces/spaces'].find((space) => id.startsWith(space.id))
+    }
+
+    const loading = computed(() => {
+      return !resolveFileLinkTask.last || resolveFileLinkTask.isRunning
+    })
+
+    const errorMessage = computed( () => {
+      if (resolveFileLinkTask.isError) {
+        return resolveFileLinkTask.last.error
+      }
+      return null
+    })
+
+    return {
+      pageTitle,
+      configuration,
+      errorMessage,
+      loading
+    }
+  }
+})
+</script>
+
+<style lang="scss">
+.oc-link-resolve {
+  .oc-card-header h2,
+  .oc-card-footer p {
+    margin: 0;
+  }
+}
+</style>
diff --git a/packages/web-runtime/src/pages/resolvePublicLink.vue b/packages/web-runtime/src/pages/resolvePublicLink.vue
index 2b41a04c1dc..95c6320dd35 100644
--- a/packages/web-runtime/src/pages/resolvePublicLink.vue
+++ b/packages/web-runtime/src/pages/resolvePublicLink.vue
@@ -175,7 +175,7 @@ export default defineComponent({
   methods: {
     async resolvePublicLink(passwordRequired) {
       if (this.tokenInfo?.alias_link) {
-        return this.$router.push({ name: `resolveAliasLink`, params: { token: this.token }})
+        return this.$router.push({ name: 'resolvePrivateLink', params: { fileId: this.tokenInfo.id }})
       }
 
       const publicLink = await this.loadPublicLinkTask.perform()
diff --git a/packages/web-runtime/src/router/helpers.ts b/packages/web-runtime/src/router/helpers.ts
index f9930e041d7..b6a0fdbce11 100644
--- a/packages/web-runtime/src/router/helpers.ts
+++ b/packages/web-runtime/src/router/helpers.ts
@@ -120,7 +120,6 @@ export const isAuthenticationRequired = (router: Router, to: Route): boolean =>
     'login',
     'oidcCallback',
     'oidcSilentRedirect',
-    'resolvePrivateLink',
     'resolvePublicLink',
     'accessDenied'
   ]
diff --git a/packages/web-runtime/src/router/index.ts b/packages/web-runtime/src/router/index.ts
index 89d29b7ce07..f13370168ac 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 ResolveAliasLinkPage from '../pages/resolveAliasLink.vue'
+import ResolveFileLinkPage from '../pages/resolveFileLink.vue'
 import { setupAuthGuard } from './setupAuthGuard'
 import { patchRouter } from './patchCleanPath'
 
@@ -63,7 +63,7 @@ export const router = patchRouter(
       {
         path: '/f/:fileId',
         name: 'resolvePrivateLink',
-        redirect: '/files/ops/resolver/private-link/:fileId',
+        component: ResolveFileLinkPage,
         meta: { title: $gettext('Private link') }
       },
       {
@@ -72,12 +72,6 @@ export const router = patchRouter(
         component: ResolvePublicLinkPage,
         meta: { title: $gettext('Public link') }
       },
-      {
-        path: '/alias/:token',
-        name: 'resolveAliasLink',
-        component: ResolveAliasLinkPage,
-        meta: { title: $gettext('Private link') }
-      },
       {
         path: '/access-denied',
         name: 'accessDenied',
diff --git a/packages/web-app-files/tests/unit/views/PrivateLink.spec.ts b/packages/web-runtime/tests/unit/pages/resolveFileLink.spec.ts
similarity index 96%
rename from packages/web-app-files/tests/unit/views/PrivateLink.spec.ts
rename to packages/web-runtime/tests/unit/pages/resolveFileLink.spec.ts
index 5743a54fdc3..0e53f17881e 100644
--- a/packages/web-app-files/tests/unit/views/PrivateLink.spec.ts
+++ b/packages/web-runtime/tests/unit/pages/resolveFileLink.spec.ts
@@ -1,6 +1,6 @@
 import { shallowMount } from '@vue/test-utils'
 import { getRouter, getStore, localVue } from './views.setup'
-import PrivateLink from '@files/src/views/PrivateLink.vue'
+import resolveFileLink from '../../../src/pages/resolveFileLink.vue'
 import fileFixtures from '../../../../../__fixtures__/files'
 
 localVue.prototype.$client.files = {
@@ -81,7 +81,7 @@ describe('PrivateLink view', () => {
 })
 
 function getShallowWrapper(loading = false, getPathForFileIdMock = jest.fn()) {
-  return shallowMount(PrivateLink, {
+  return shallowMount(resolveFileLink, {
     localVue,
     store: createStore(),
     mocks: {