[full-ci] Resolve alias links

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

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

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

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
+      )
     }
   }
 })

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: {

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,

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,

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',

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,