diff --git a/changelog/unreleased/enhancement-internal-links b/changelog/unreleased/enhancement-internal-links
new file mode 100644
index 00000000000..0fbd43ace71
--- /dev/null
+++ b/changelog/unreleased/enhancement-internal-links
@@ -0,0 +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
diff --git a/changelog/unreleased/enhancement-private-links b/changelog/unreleased/enhancement-private-links
new file mode 100644
index 00000000000..eccb15f9e1a
--- /dev/null
+++ b/changelog/unreleased/enhancement-private-links
@@ -0,0 +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
diff --git a/deployments/examples/ocis_web/config/ocis/proxy.yaml b/deployments/examples/ocis_web/config/ocis/proxy.yaml
index e3244e00160..9e337df9b79 100644
--- a/deployments/examples/ocis_web/config/ocis/proxy.yaml
+++ b/deployments/examples/ocis_web/config/ocis/proxy.yaml
@@ -39,6 +39,10 @@ policies:
         endpoint: /ocs/v[12].php/config
         backend: http://localhost:9140
         unprotected: true
+      - type: regex
+        endpoint: /ocs/v[12].php/apps/files_sharing/api/v1/tokeninfo/unprotected
+        backend: http://localhost:9140
+        unprotected: true
       - endpoint: /ocs/
         backend: http://localhost:9140
       - type: query
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 f16375978ae..ad33e125311 100644
--- a/packages/web-app-files/src/components/SideBar/Shares/FileLinks.vue
+++ b/packages/web-app-files/src/components/SideBar/Shares/FileLinks.vue
@@ -19,7 +19,7 @@
       />
       <details-and-edit
         v-if="quicklink"
-        :available-role-options="availableRoleOptions"
+        :available-role-options="getAvailableRoleOptions(quicklink)"
         :can-rename="false"
         :expiration-date="expirationDate"
         :is-folder-share="highlightedFile.isFolder"
@@ -52,7 +52,7 @@
       >
         <name-and-copy :link="link" />
         <details-and-edit
-          :available-role-options="availableRoleOptions"
+          :available-role-options="getAvailableRoleOptions(link)"
           :can-rename="true"
           :expiration-date="expirationDate"
           :is-folder-share="highlightedFile.isFolder"
@@ -89,7 +89,7 @@
         >
           <name-and-copy :link="link" />
           <details-and-edit
-            :available-role-options="availableRoleOptions"
+            :available-role-options="getAvailableRoleOptions(link)"
             :expiration-date="expirationDate"
             :is-folder-share="true"
             :is-modifiable="false"
@@ -231,23 +231,6 @@ export default defineComponent({
       }
     },
 
-    availableRoleOptions() {
-      if (this.incomingParentShare.value && this.canCreatePublicLinks) {
-        return LinkShareRoles.filterByBitmask(
-          parseInt(this.incomingParentShare.value.permissions),
-          this.highlightedFile.isFolder,
-          this.hasPublicLinkEditing,
-          this.hasPublicLinkAliasSupport
-        )
-      }
-
-      return LinkShareRoles.list(
-        this.highlightedFile.isFolder,
-        this.hasPublicLinkEditing,
-        this.hasPublicLinkAliasSupport
-      )
-    },
-
     passwordEnforced() {
       return (
         this.capabilities.files_sharing.public.password?.enforced_for || {
@@ -384,7 +367,7 @@ export default defineComponent({
 
     isPasswordEnforcedFor(link) {
       const currentRole = LinkShareRoles.getByBitmask(
-        parseInt(link.permissions),
+        link.permissions,
         link.indirect || this.highlightedFile.isFolder
       )
 
@@ -593,6 +576,25 @@ export default defineComponent({
           status: 'danger'
         })
       }
+    },
+
+    getAvailableRoleOptions(link) {
+      if (this.share?.incoming && this.canCreatePublicLinks) {
+        return LinkShareRoles.filterByBitmask(
+          parseInt(this.share.permissions),
+          this.highlightedFile.isFolder,
+          this.hasPublicLinkEditing,
+          this.hasPublicLinkAliasSupport,
+          !!link.password
+        )
+      }
+
+      return LinkShareRoles.list(
+        this.highlightedFile.isFolder,
+        this.hasPublicLinkEditing,
+        this.hasPublicLinkAliasSupport,
+        !!link.password
+      )
     }
   }
 })
diff --git a/packages/web-app-files/src/components/SideBar/Shares/Links/DetailsAndEdit.vue b/packages/web-app-files/src/components/SideBar/Shares/Links/DetailsAndEdit.vue
index ffcd842e213..d15bcb26bf6 100644
--- a/packages/web-app-files/src/components/SideBar/Shares/Links/DetailsAndEdit.vue
+++ b/packages/web-app-files/src/components/SideBar/Shares/Links/DetailsAndEdit.vue
@@ -27,14 +27,11 @@
             <oc-button
               :id="`files-role-${roleOption.label.toLowerCase()}`"
               :class="{
-                selected: parseInt(link.permissions) === roleOption.bitmask(false),
-                'oc-background-primary-gradient':
-                  parseInt(link.permissions) === roleOption.bitmask(false)
+                selected: link.permissions === roleOption.bitmask(false),
+                'oc-background-primary-gradient': link.permissions === roleOption.bitmask(false)
               }"
               appearance="raw"
-              :variation="
-                parseInt(link.permissions) === roleOption.bitmask(false) ? 'inverse' : 'passive'
-              "
+              :variation="link.permissions === roleOption.bitmask(false) ? 'inverse' : 'passive'"
               justify-content="space-between"
               class="oc-p-s"
               @click="
@@ -58,10 +55,7 @@
                 </span>
               </span>
               <span class="oc-flex">
-                <oc-icon
-                  v-if="parseInt(link.permissions) === roleOption.bitmask(false)"
-                  name="check"
-                />
+                <oc-icon v-if="link.permissions === roleOption.bitmask(false)" name="check" />
               </span>
             </oc-button>
           </li>
@@ -183,7 +177,11 @@ import { basename } from 'path'
 import { DateTime } from 'luxon'
 import { mapActions, mapGetters } from 'vuex'
 import { createLocationSpaces } from '../../../../router'
-import { LinkShareRoles } from 'web-client/src/helpers/share'
+import {
+  linkRoleInternalFile,
+  linkRoleInternalFolder,
+  LinkShareRoles
+} from 'web-client/src/helpers/share'
 import { defineComponent } from '@vue/runtime-core'
 import { formatDateFromDateTime, formatRelativeDateFromDateTime } from 'web-pkg/src/helpers'
 import { SpaceResource } from 'web-client/src/helpers'
@@ -239,15 +237,15 @@ export default defineComponent({
   },
   computed: {
     ...mapGetters('runtime/spaces', ['spaces']),
+    currentLinkRole() {
+      return LinkShareRoles.getByBitmask(this.link.permissions, this.isFolderShare)
+    },
     currentLinkRoleDescription() {
-      return LinkShareRoles.getByBitmask(
-        parseInt(this.link.permissions),
-        this.isFolderShare
-      ).description(false)
+      return this.currentLinkRole.description(false)
     },
 
     currentLinkRoleLabel() {
-      return LinkShareRoles.getByBitmask(parseInt(this.link.permissions), this.isFolderShare).label
+      return this.currentLinkRole.label
     },
 
     editOptions() {
@@ -317,7 +315,7 @@ export default defineComponent({
           })
         }
       }
-      if (!this.isPasswordEnforced && !this.link.password) {
+      if (!this.isPasswordEnforced && !this.link.password && !this.isAliasLink) {
         result.push({
           id: 'add-password',
           title: this.$gettext('Add password'),
@@ -390,6 +388,10 @@ export default defineComponent({
 
     passwortProtectionTooltip() {
       return this.$gettext('This link is password-protected')
+    },
+
+    isAliasLink() {
+      return [linkRoleInternalFolder, linkRoleInternalFile].includes(this.currentLinkRole)
     }
   },
   watch: {
diff --git a/packages/web-app-files/src/helpers/resources.ts b/packages/web-app-files/src/helpers/resources.ts
index 66ac10c055f..667167e7cf6 100644
--- a/packages/web-app-files/src/helpers/resources.ts
+++ b/packages/web-app-files/src/helpers/resources.ts
@@ -357,8 +357,9 @@ export function buildSpaceShare(s, storageId): Share {
 
 function _buildLink(link): Share {
   let description = ''
+  const permissions = parseInt(link.permissions)
 
-  const role = LinkShareRoles.getByBitmask(parseInt(link.permissions), link.item_type === 'folder')
+  const role = LinkShareRoles.getByBitmask(permissions, link.item_type === 'folder')
   if (role) {
     description = role.label
   }
@@ -382,7 +383,7 @@ function _buildLink(link): Share {
     token: link.token as string,
     url: link.url,
     path: link.path,
-    permissions: link.permissions,
+    permissions,
     description,
     quicklink,
     stime: link.stime,
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-app-files/tests/unit/components/SideBar/Shares/FileLinks.spec.js b/packages/web-app-files/tests/unit/components/SideBar/Shares/FileLinks.spec.js
index ba92293c83b..97b1a716675 100644
--- a/packages/web-app-files/tests/unit/components/SideBar/Shares/FileLinks.spec.js
+++ b/packages/web-app-files/tests/unit/components/SideBar/Shares/FileLinks.spec.js
@@ -31,7 +31,7 @@ const defaultLinksList = [
     name: 'public link 1',
     url: 'some-link-1',
     path: '/file-1.txt',
-    permissions: '1'
+    permissions: 1
   },
   {
     id: '2',
@@ -39,7 +39,7 @@ const defaultLinksList = [
     name: 'public link 2',
     url: 'some-link-2',
     path: '/file-2.txt',
-    permissions: '1'
+    permissions: 1
   }
 ]
 
diff --git a/packages/web-app-files/tests/unit/components/SideBar/Shares/Links/DetailsAndEdit.spec.js b/packages/web-app-files/tests/unit/components/SideBar/Shares/Links/DetailsAndEdit.spec.js
index e168d97aeff..f6e224574a8 100644
--- a/packages/web-app-files/tests/unit/components/SideBar/Shares/Links/DetailsAndEdit.spec.js
+++ b/packages/web-app-files/tests/unit/components/SideBar/Shares/Links/DetailsAndEdit.spec.js
@@ -19,7 +19,7 @@ const availableRoleOptions = LinkShareRoles.list(false, true, true)
 const exampleLink = {
   name: 'Example link',
   url: 'https://some-url.com/abc',
-  permissions: '1'
+  permissions: 1
 }
 
 describe('DetailsAndEdit component', () => {
diff --git a/packages/web-app-files/tests/unit/views/PrivateLink.spec.ts b/packages/web-app-files/tests/unit/views/PrivateLink.spec.ts
deleted file mode 100644
index 5743a54fdc3..00000000000
--- a/packages/web-app-files/tests/unit/views/PrivateLink.spec.ts
+++ /dev/null
@@ -1,110 +0,0 @@
-import { shallowMount } from '@vue/test-utils'
-import { getRouter, getStore, localVue } from './views.setup'
-import PrivateLink from '@files/src/views/PrivateLink.vue'
-import fileFixtures from '../../../../../__fixtures__/files'
-
-localVue.prototype.$client.files = {
-  getPathForFileId: jest.fn(() => Promise.resolve('/lorem.txt'))
-}
-
-const theme = {
-  general: { slogan: 'some-slogan' }
-}
-
-const $route = {
-  params: {
-    fileId: '2147491323'
-  },
-  meta: {
-    title: 'Resolving private link'
-  }
-}
-
-const selectors = {
-  pageTitle: 'h1.oc-invisible-sr',
-  loader: '.oc-card-body',
-  errorTitle: '.oc-link-resolve-error-title'
-}
-
-describe('PrivateLink view', () => {
-  it.todo('adapt tests, see comment in Favorites.spec.ts...')
-  // afterEach(() => {
-  //   jest.clearAllMocks()
-  // })
-  //
-  // describe('when the page has loaded successfully', () => {
-  //   let wrapper
-  //   beforeEach(() => {
-  //     wrapper = getShallowWrapper()
-  //   })
-  //
-  //   it('should display the page title', () => {
-  //     expect(wrapper.find(selectors.pageTitle)).toMatchSnapshot()
-  //   })
-  //   it('should resolve the provided file id to a path', () => {
-  //     expect(wrapper.vm.$client.files.getPathForFileId).toHaveBeenCalledTimes(1)
-  //   })
-  // })
-  //
-  // describe('when the view is still loading', () => {
-  //   it('should display the loading text with the spinner', () => {
-  //     const wrapper = getShallowWrapper(true)
-  //
-  //     expect(wrapper.find(selectors.loader)).toMatchSnapshot()
-  //   })
-  // })
-  //
-  // describe('when there was an error', () => {
-  //   it('should display the error message', async () => {
-  //     jest.spyOn(console, 'error').mockImplementation(() => {})
-  //     const wrapper = getShallowWrapper(
-  //       false,
-  //       jest.fn(() => Promise.reject(Error('some error')))
-  //     )
-  //
-  //     await new Promise((resolve) => {
-  //       setTimeout(() => {
-  //         expect(wrapper.find(selectors.errorTitle)).toMatchSnapshot()
-  //         resolve()
-  //       }, 1)
-  //     })
-  //   })
-  // })
-  //
-  // describe('when the view has finished loading and there was no error', () => {
-  //   it('should not display the loading text and the error message', () => {
-  //     const wrapper = getShallowWrapper()
-  //
-  //     expect(wrapper).toMatchSnapshot()
-  //   })
-  // })
-})
-
-function getShallowWrapper(loading = false, getPathForFileIdMock = jest.fn()) {
-  return shallowMount(PrivateLink, {
-    localVue,
-    store: createStore(),
-    mocks: {
-      $route,
-      $router: getRouter({}),
-      $client: {
-        files: {
-          fileInfo: jest.fn().mockImplementation(() => Promise.resolve(fileFixtures['/'][4])),
-          getPathForFileId: getPathForFileIdMock
-        }
-      }
-    },
-    data() {
-      return {
-        loading
-      }
-    }
-  })
-}
-
-function createStore() {
-  return getStore({
-    slogan: theme.general.slogan,
-    user: { id: 1 }
-  })
-}
diff --git a/packages/web-client/src/helpers/share/role.ts b/packages/web-client/src/helpers/share/role.ts
index eacb954f069..2309dd81e58 100644
--- a/packages/web-client/src/helpers/share/role.ts
+++ b/packages/web-client/src/helpers/share/role.ts
@@ -364,9 +364,14 @@ export abstract class LinkShareRoles {
     linkRoleUploaderFolder
   ]
 
-  static list(isFolder: boolean, canEditFile = false, hasAliasLinks = false): ShareRole[] {
+  static list(
+    isFolder: boolean,
+    canEditFile = false,
+    hasAliasLinks = false,
+    hasPassword = false
+  ): ShareRole[] {
     return [
-      ...(hasAliasLinks ? [linkRoleInternalFile, linkRoleInternalFolder] : []),
+      ...(hasAliasLinks && !hasPassword ? [linkRoleInternalFile, linkRoleInternalFolder] : []),
       ...this.all,
       ...(canEditFile ? [linkRoleEditorFile] : [])
     ].filter((r) => r.folder === isFolder)
@@ -383,15 +388,17 @@ export abstract class LinkShareRoles {
    * @param isFolder
    * @param canEditFile
    * @param hasAliasLinks
+   * @param hasPassword
    */
   static filterByBitmask(
     bitmask: number,
     isFolder: boolean,
     canEditFile = false,
-    hasAliasLinks = false
+    hasAliasLinks = false,
+    hasPassword = false
   ): ShareRole[] {
     return [
-      ...(hasAliasLinks ? [linkRoleInternalFile, linkRoleInternalFolder] : []),
+      ...(hasAliasLinks && !hasPassword ? [linkRoleInternalFile, linkRoleInternalFolder] : []),
       ...this.all,
       ...(canEditFile ? [linkRoleEditorFile] : [])
     ].filter((r) => {
diff --git a/packages/web-client/src/types.ts b/packages/web-client/src/types.ts
index 7897b075c47..c61b0c62cfa 100644
--- a/packages/web-client/src/types.ts
+++ b/packages/web-client/src/types.ts
@@ -34,6 +34,8 @@ export type OwnCloudSdk = {
   shares: {
     getShare(...args): any
     getShares(...args): any
+    getProtectedTokenInfo(...args): any
+    getUnprotectedTokenInfo(...args): any
   }
   users: {
     getUser(...args): any
diff --git a/packages/web-runtime/package.json b/packages/web-runtime/package.json
index fbadaf36df3..c13482560de 100644
--- a/packages/web-runtime/package.json
+++ b/packages/web-runtime/package.json
@@ -25,7 +25,7 @@
     "marked": "^4.0.12",
     "oidc-client-ts": "^2.0.5",
     "owncloud-design-system": "14.0.0-alpha.22",
-    "owncloud-sdk": "~3.0.0-alpha.15",
+    "owncloud-sdk": "~3.0.0-alpha.17",
     "p-queue": "^6.6.2",
     "popper-max-size-modifier": "^0.2.0",
     "portal-vue": "^2.1.7",
diff --git a/packages/web-runtime/src/composables/tokenInfo/index.ts b/packages/web-runtime/src/composables/tokenInfo/index.ts
new file mode 100644
index 00000000000..e04af314e61
--- /dev/null
+++ b/packages/web-runtime/src/composables/tokenInfo/index.ts
@@ -0,0 +1 @@
+export * from './useLoadTokenInfo'
diff --git a/packages/web-runtime/src/composables/tokenInfo/useLoadTokenInfo.ts b/packages/web-runtime/src/composables/tokenInfo/useLoadTokenInfo.ts
new file mode 100644
index 00000000000..ae3daae975f
--- /dev/null
+++ b/packages/web-runtime/src/composables/tokenInfo/useLoadTokenInfo.ts
@@ -0,0 +1,31 @@
+import { unref } from '@vue/composition-api'
+import { useTask } from 'vue-concurrency'
+import { useClientService, useStore, useUserContext } from 'web-pkg/src/composables'
+
+export function useLoadTokenInfo(token) {
+  const { owncloudSdk } = useClientService()
+  const store = useStore()
+  const isUserContext = useUserContext({ store })
+
+  const loadTokenInfoTask = useTask(function* () {
+    let tokenInfo
+
+    try {
+      if (unref(isUserContext)) {
+        tokenInfo = yield owncloudSdk.shares.getProtectedTokenInfo(token)
+      } else {
+        tokenInfo = yield owncloudSdk.shares.getUnprotectedTokenInfo(token)
+      }
+    } catch (e) {
+      // backend doesn't support the token info endpoint
+      return {}
+    }
+    return {
+      ...tokenInfo,
+      alias_link: tokenInfo.alias_link === 'true',
+      password_protected: tokenInfo.password_protected === 'true'
+    }
+  })
+
+  return { loadTokenInfoTask }
+}
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 97ecea97472..eda944eeb24 100644
--- a/packages/web-runtime/src/pages/resolvePublicLink.vue
+++ b/packages/web-runtime/src/pages/resolvePublicLink.vue
@@ -2,7 +2,14 @@
   <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="isPasswordRequiredTask.isRunning || !isPasswordRequiredTask.last">
+      <template
+        v-if="
+          loadTokenInfoTask.isRunning ||
+          !loadTokenInfoTask.last ||
+          isPasswordRequiredTask.isRunning ||
+          !isPasswordRequiredTask.last
+        "
+      >
         <div class="oc-card-header">
           <h2 key="public-link-loading">
             <translate>Loading public link…</translate>
@@ -12,17 +19,22 @@
           <oc-spinner :aria-hidden="true" />
         </div>
       </template>
-      <template v-else-if="isPasswordRequiredTask.isError">
+      <template v-else-if="loadTokenInfoTask.isError || isPasswordRequiredTask.isError">
         <div class="oc-card-header oc-link-resolve-error-title">
           <h2 key="public-link-error">
             <translate>An error occurred while loading the public link</translate>
           </h2>
         </div>
         <div class="oc-card-body oc-link-resolve-error-message">
-          <p class="oc-text-xlarge">{{ isPasswordRequiredTask.last.error }}</p>
+          <p v-if="loadTokenInfoTask.isError" class="oc-text-xlarge">
+            {{ loadTokenInfoTask.last.error }}
+          </p>
+          <p v-if="isPasswordRequiredTask.isError" class="oc-text-xlarge">
+            {{ isPasswordRequiredTask.last.error }}
+          </p>
         </div>
       </template>
-      <template v-else-if="isPasswordRequiredTask.last.value">
+      <template v-else-if="isPasswordRequiredTask.last && isPasswordRequiredTask.last.value">
         <form @submit.prevent="resolvePublicLink(true)">
           <div class="oc-card-header">
             <h2>
@@ -69,11 +81,14 @@ import {
   useClientService,
   useRouteParam,
   useRouteQuery
-} from 'web-pkg/src/composables'
+} from "web-pkg/src/composables";
 import { useTask } from 'vue-concurrency'
 import { ref, unref, computed, defineComponent } from "@vue/composition-api";
 import { buildPublicSpaceResource, isPublicSpaceResource } from "web-client/src/helpers";
 import { buildWebDavPublicPath } from "files/src/helpers/resources";
+import isEmpty from "lodash-es/isEmpty";
+import { useLoadTokenInfo } from '../composables/tokenInfo'
+
 
 export default defineComponent({
   name: 'ResolvePublicLink',
@@ -88,7 +103,10 @@ export default defineComponent({
       webDavPath: buildWebDavPublicPath(unref(token), ''),
       ...(unref(password) && { publicLinkPassword: unref(password) })
     }))
-    const isPasswordRequiredTask = useTask(function* () {
+    const isPasswordRequiredTask = useTask(function* (signal, ref) {
+      if (!isEmpty(ref.tokenInfo)) {
+        return ref.tokenInfo.password_protected
+      }
       try {
         yield webdav.getFileInfo({ ...unref(publicLinkSpace), publicLinkPassword: null })
         return false
@@ -115,6 +133,7 @@ export default defineComponent({
       return false
     })
     return {
+      ...useLoadTokenInfo(unref(token)),
       redirectUrl: useRouteQuery('redirectUrl'),
       token,
       password,
@@ -123,6 +142,11 @@ export default defineComponent({
       wrongPassword
     }
   },
+  data() {
+    return {
+      tokenInfo: {}
+    }
+  },
   computed: {
     ...mapGetters(['configuration']),
 
@@ -142,13 +166,18 @@ export default defineComponent({
     }
   },
   async mounted() {
-    const passwordRequired = await this.isPasswordRequiredTask.perform()
-    if (!passwordRequired) {
+    this.tokenInfo = await this.loadTokenInfoTask.perform()
+    const passwordProtected = await this.isPasswordRequiredTask.perform(this)
+    if (!passwordProtected) {
       await this.resolvePublicLink(false)
     }
   },
   methods: {
     async resolvePublicLink(passwordRequired) {
+      if (this.tokenInfo?.alias_link) {
+        return this.$router.push({ name: 'resolvePrivateLink', params: { fileId: this.tokenInfo.id }})
+      }
+
       const publicLink = await this.loadPublicLinkTask.perform()
       if (this.loadPublicLinkTask.isError) {
         const e = this.loadPublicLinkTask.last.error
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 67ebc116a46..f13370168ac 100644
--- a/packages/web-runtime/src/router/index.ts
+++ b/packages/web-runtime/src/router/index.ts
@@ -6,6 +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 { setupAuthGuard } from './setupAuthGuard'
 import { patchRouter } from './patchCleanPath'
 
@@ -62,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') }
       },
       {
diff --git a/packages/web-runtime/tests/unit/pages/resolveFileLink.spec.ts b/packages/web-runtime/tests/unit/pages/resolveFileLink.spec.ts
new file mode 100644
index 00000000000..560deae782c
--- /dev/null
+++ b/packages/web-runtime/tests/unit/pages/resolveFileLink.spec.ts
@@ -0,0 +1,3 @@
+describe('resolveFileLink view', () => {
+  it.todo('Write tests')
+})
diff --git a/yarn.lock b/yarn.lock
index c451df93a1b..1c4b25e668f 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -9635,9 +9635,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"owncloud-sdk@npm:~3.0.0-alpha.15":
-  version: 3.0.0-alpha.15
-  resolution: "owncloud-sdk@npm:3.0.0-alpha.15"
+"owncloud-sdk@npm:~3.0.0-alpha.17":
+  version: 3.0.0-alpha.17
+  resolution: "owncloud-sdk@npm:3.0.0-alpha.17"
   peerDependencies:
     axios: ^0.27.2
     cross-fetch: ^3.0.6
@@ -9650,7 +9650,7 @@ __metadata:
   dependenciesMeta:
     "@pact-foundation/pact":
       built: true
-  checksum: 3892508b42965f5602fb985173185ee9799d41d0e719895ad574d4b8b2b15326d69bc14300c1d84b14422e4acb3f4de101fdce2f36fc52658c0fa8b17b76c614
+  checksum: 587157336c6af1c20f1ce1255b924334372a5d4a28918b93857200ecf4f99d31f2619a9a19687ff3eec4a3de830aa7e9aa754ac5a1ba844841afb8be90afed24
   languageName: node
   linkType: hard
 
@@ -13664,7 +13664,7 @@ __metadata:
     marked: ^4.0.12
     oidc-client-ts: ^2.0.5
     owncloud-design-system: 14.0.0-alpha.22
-    owncloud-sdk: ~3.0.0-alpha.15
+    owncloud-sdk: ~3.0.0-alpha.17
     p-queue: ^6.6.2
     popper-max-size-modifier: ^0.2.0
     portal-vue: ^2.1.7