Refactor private link handling

owncloud · Oct 10, 2022 · 7b21533 · 7b21533
1 parent dc8a92e
commit 7b21533
Show file tree

Hide file tree

Showing 12 changed files with 139 additions and 232 deletions.
diff --git a/packages/web-app-files/src/components/SideBar/Shares/FileLinks.vue b/packages/web-app-files/src/components/SideBar/Shares/FileLinks.vue
@@ -584,15 +584,15 @@ export default defineComponent({
           parseInt(this.share.permissions),
           this.highlightedFile.isFolder,
           this.hasPublicLinkEditing,
-          true,
+          this.hasPublicLinkAliasSupport,
           !!link.password
         )
       }
 
       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
@@ -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
@@ -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
@@ -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
diff --git a/packages/web-app-files/src/views/PrivateLink.vue b/packages/web-app-files/src/views/PrivateLink.vue
diff --git a/packages/web-runtime/src/pages/resolveAliasLink.vue b/packages/web-runtime/src/pages/resolveAliasLink.vue