[full-ci] Sharing jail

.gitignore

@@ -26,6 +26,7 @@ dist
 
 reports
 tests/e2e/cucumber/report/cucumber_report.json
+tests/e2e/cucumber/reportGenerator/cucumber_report.json
 tests/ocis
 tests/testing-app
 

packages/web-app-files/src/components/AppBar/CreateAndUpload.vue

@@ -116,6 +116,7 @@ import ResourceUpload from './Upload/ResourceUpload.vue'
 import { defineComponent, getCurrentInstance, onMounted } from '@vue/composition-api'
 import { UppyResource, useUpload } from 'web-runtime/src/composables/upload'
 import { useUploadHelpers } from '../../composables/upload'
+import { SHARE_JAIL_ID } from '../../services/folder'
 
 export default defineComponent({
   components: {
@@ -153,6 +154,7 @@ export default defineComponent({
       isPublicLocation: useActiveLocation(isLocationPublicActive, 'files-public-files'),
       isSpacesProjectsLocation: useActiveLocation(isLocationSpacesActive, 'files-spaces-projects'),
       isSpacesProjectLocation: useActiveLocation(isLocationSpacesActive, 'files-spaces-project'),
+      isSpacesShareLocation: useActiveLocation(isLocationSpacesActive, 'files-spaces-share'),
       ...useAppDefaults({
         applicationName: 'files'
       })
@@ -386,6 +388,10 @@ export default defineComponent({
           path = buildWebDavSpacesPath(this.$route.params.storageId, path)
           await this.$client.files.createFolder(path)
           resource = await this.$client.files.fileInfo(path, DavProperties.Default)
+        } else if (this.isSpacesShareLocation) {
+          path = buildWebDavSpacesPath([SHARE_JAIL_ID, this.$route.query.shareId].join('!'), path)
+          await this.$client.files.createFolder(path)
+          resource = await this.$client.files.fileInfo(path, DavProperties.Default)
         } else {
           await this.$client.publicFiles.createFolder(path, null, this.publicLinkPassword)
           resource = await this.$client.publicFiles.getFileInfo(
@@ -475,6 +481,10 @@ export default defineComponent({
           path = buildWebDavSpacesPath(this.$route.params.storageId, path)
           await this.$client.files.putFileContents(path, '')
           resource = await this.$client.files.fileInfo(path, DavProperties.Default)
+        } else if (this.isSpacesShareLocation) {
+          path = buildWebDavSpacesPath([SHARE_JAIL_ID, this.$route.query.shareId].join('!'), path)
+          await this.$client.files.putFileContents(path, '')
+          resource = await this.$client.files.fileInfo(path, DavProperties.Default)
         } else {
           await this.$client.publicFiles.putFileContents('', path, this.publicLinkPassword, '')
           resource = await this.$client.publicFiles.getFileInfo(
@@ -547,6 +557,9 @@ export default defineComponent({
         } else if (this.isSpacesProjectLocation) {
           path = buildWebDavSpacesPath(this.$route.params.storageId, path)
           resource = await this.$client.files.fileInfo(path, DavProperties.Default)
+        } else if (this.isSpacesShareLocation) {
+          path = buildWebDavSpacesPath([SHARE_JAIL_ID, this.$route.query.shareId].join('!'), path)
+          resource = await this.$client.files.fileInfo(path, DavProperties.Default)
         } else {
           resource = await this.$client.publicFiles.getFileInfo(
             path,

packages/web-app-files/src/components/FilesList/ResourceTable.vue

@@ -171,13 +171,20 @@ import { EVENT_TROW_MOUNTED, EVENT_FILE_DROPPED } from '../../constants'
 import { SortDir } from '../../composables'
 import * as path from 'path'
 import { determineSortFields } from '../../helpers/ui/resourceTable'
-import { useCapabilitySpacesEnabled } from 'web-pkg/src/composables'
+import { useCapabilityShareJailEnabled } from 'web-pkg/src/composables'
 import Rename from '../../mixins/actions/rename'
 import { defineComponent, PropType } from '@vue/composition-api'
 import { extractDomSelector, Resource } from '../../helpers/resource'
 import { ShareTypes } from '../../helpers/share'
 import { createLocationSpaces } from '../../router'
 
+const mapResourceFields = (resource: Resource, mapping = {}) => {
+  return Object.keys(mapping).reduce((result, resourceKey) => {
+    result[mapping[resourceKey]] = resource[resourceKey]
+    return result
+  }, {})
+}
+
 export default defineComponent({
   mixins: [Rename],
   model: {
@@ -251,6 +258,33 @@ export default defineComponent({
       required: false,
       default: null
     },
+    /**
+     * Maps resource values to route params. Use `{ resourceFieldName: 'routeParamName' }` as format.
+     *
+     * An example would be `{ id: 'fileId' }` to map the value of the `id` field of a resource
+     * to the `fileId` param of the target route.
+     *
+     * Defaults to `{ storageId: 'storageId' } to map the value of the `storageId` field of a resource
+     * to the `storageId` param of the target route.
+     */
+    targetRouteParamMapping: {
+      type: Object,
+      required: false,
+      default: () => ({ storageId: 'storageId' })
+    },
+    /**
+     * Maps resource values to route query options. Use `{ resourceFieldName: 'routeQueryName' }` as format.
+     *
+     * An example would be `{ id: 'fileId' }` to map the value of the `id` field of a resource
+     * to the `fileId` query option of the target route.
+     *
+     * Defaults to an empty object because no query options are expected as default.
+     */
+    targetRouteQueryMapping: {
+      type: Object,
+      required: false,
+      default: () => ({})
+    },
     /**
      * Asserts whether clicking on the resource name triggers any action
      */
@@ -342,7 +376,7 @@ export default defineComponent({
   },
   setup() {
     return {
-      hasSpaces: useCapabilitySpacesEnabled()
+      hasShareJail: useCapabilityShareJailEnabled()
     }
   },
   data() {
@@ -532,32 +566,38 @@ export default defineComponent({
       this.openWithPanel('sharing-item')
     },
     folderLink(file) {
-      return this.createFolderLink(file.path, file.storageId)
+      return this.createFolderLink(file.path, file)
     },
     parentFolderLink(file) {
-      return this.createFolderLink(path.dirname(file.path), file.storageId)
+      return this.createFolderLink(path.dirname(file.path), file)
     },
-    createFolderLink(path, storageId) {
+    createFolderLink(path, resource) {
       if (this.targetRoute === null) {
         return {}
       }
 
-      const matchingSpace = this.getMatchingSpace(storageId)
+      const params = {
+        item: path.replace(/^\//, ''),
+        ...this.targetRoute.params,
+        ...mapResourceFields(resource, this.targetRouteParamMapping)
+      }
+      const query = {
+        ...this.targetRoute.query,
+        ...mapResourceFields(resource, this.targetRouteQueryMapping)
+      }
 
+      const matchingSpace = this.getMatchingSpace(resource.storageId)
       if (matchingSpace && matchingSpace?.driveType === 'project') {
         return createLocationSpaces('files-spaces-project', {
-          params: { storageId, item: path.replace(/^\//, '') || undefined }
+          params,
+          query
         })
       }
 
       return {
         name: this.targetRoute.name,
-        query: this.targetRoute.query,
-        params: {
-          item: path.replace(/^\//, '') || undefined,
-          ...this.targetRoute.params,
-          ...(storageId && { storageId })
-        }
+        params,
+        query
       }
     },
     fileDragged(file) {
@@ -705,12 +745,12 @@ export default defineComponent({
       return this.spaces.find((space) => space.id === storageId)
     },
     getDefaultParentFolderName(resource) {
-      if (!this.hasSpaces) {
+      if (!this.hasShareJail) {
         return this.$gettext('All files and folders')
       }
-      const matchingSpace = this.getMatchingSpace(resource.storageId)
 
-      if (matchingSpace && matchingSpace?.driveType === 'project') {
+      const matchingSpace = this.getMatchingSpace(resource.storageId)
+      if (matchingSpace?.driveType === 'project') {
         return matchingSpace.name
       }
 

packages/web-app-files/src/components/Search/Preview.vue

@@ -21,7 +21,7 @@ import Vue from 'vue'
 import { mapGetters, mapState } from 'vuex'
 import { createLocationSpaces } from '../../router'
 import path from 'path'
-import { useCapabilitySpacesEnabled } from 'web-pkg/src/composables'
+import { useCapabilityShareJailEnabled } from 'web-pkg/src/composables'
 
 const visibilityObserver = new VisibilityObserver()
 
@@ -43,7 +43,7 @@ export default {
   },
   setup() {
     return {
-      hasSpaces: useCapabilitySpacesEnabled(),
+      hasShareJail: useCapabilityShareJailEnabled(),
       resourceTargetLocation: createLocationSpaces('files-spaces-personal-home'),
       resourceTargetLocationSpace: createLocationSpaces('files-spaces-project')
     }
@@ -61,7 +61,7 @@ export default {
       return this.spaces.find((space) => space.id === this.resource.storageId)
     },
     defaultParentFolderName() {
-      if (!this.hasSpaces) {
+      if (!this.hasShareJail) {
         return this.$gettext('All files and folders')
       }
 

packages/web-app-files/src/components/SideBar/SideBar.vue

@@ -108,6 +108,9 @@ export default defineComponent({
         // root path `/` like for personal home doesn't exist for public links
         return pathSegments.length === 1
       }
+      if (isLocationSharesActive(this.$router, 'files-shares-with-me')) {
+        return !this.highlightedFile
+      }
       return !pathSegments.length
     },
     highlightedFileThumbnail() {

packages/web-app-files/src/helpers/breadcrumbs.ts

@@ -1,26 +1,30 @@
 import { bus } from 'web-pkg/src/instance'
+import { Location } from 'vue-router'
 
 export interface BreadcrumbItem {
   text: string
-  to?: string
+  to?: Location
   allowContextActions?: boolean
   onClick?: () => void
 }
 
 export const breadcrumbsFromPath = (
-  currentPath: string,
+  currentRoute: Location,
   resourcePath: string
 ): BreadcrumbItem[] => {
   const pathSplit = (p = '') => p.split('/').filter(Boolean)
-  const current = pathSplit(currentPath)
+  const current = pathSplit(currentRoute.path)
   const resource = pathSplit(resourcePath)
 
   return resource.map(
     (text, i) =>
       ({
         allowContextActions: true,
         text,
-        to: '/' + [...current].splice(0, current.length - resource.length + i + 1).join('/')
+        to: {
+          path: '/' + [...current].splice(0, current.length - resource.length + i + 1).join('/'),
+          query: currentRoute.query
+        }
       } as BreadcrumbItem)
   )
 }

packages/web-app-files/src/helpers/resources.ts

@@ -22,6 +22,7 @@ import {
   Resource
 } from './resource'
 import { User } from './user'
+import { SHARE_JAIL_ID } from '../services/folder'
 
 export function renameResource(resource, newName, newPath) {
   let resourcePath = '/' + newPath + newName
@@ -259,26 +260,26 @@ export function attachIndicators(resource, sharesTree) {
  * @param {Array} shares Shares to be transformed into unique resources
  * @param {Boolean} incomingShares Asserts whether the shares are incoming
  * @param {Boolean} allowSharePermission Asserts whether the reshare permission is available
- * @param {String} server The url of the backend
- * @param {String} token The access token of the authenticated user
+ * @param {Boolean} hasShareJail Asserts whether the share jail is available backend side
  */
 export function aggregateResourceShares(
   shares,
   incomingShares = false,
   allowSharePermission,
-  server,
-  token
+  hasShareJail
 ): Resource[] {
   if (incomingShares) {
     shares = addSharedWithToShares(shares)
     return orderBy(shares, ['file_target', 'permissions'], ['asc', 'desc']).map((share) =>
-      buildSharedResource(share, incomingShares, allowSharePermission)
+      buildSharedResource(share, incomingShares, allowSharePermission, hasShareJail)
     )
   }
 
   shares.sort((a, b) => a.path.localeCompare(b.path))
   const resources = addSharedWithToShares(shares)
-  return resources.map((share) => buildSharedResource(share, incomingShares, allowSharePermission))
+  return resources.map((share) =>
+    buildSharedResource(share, incomingShares, allowSharePermission, hasShareJail)
+  )
 }
 
 function addSharedWithToShares(shares) {
@@ -334,7 +335,12 @@ function addSharedWithToShares(shares) {
   return resources
 }
 
-export function buildSharedResource(share, incomingShares = false, allowSharePermission): Resource {
+export function buildSharedResource(
+  share,
+  incomingShares = false,
+  allowSharePermission = true,
+  hasShareJail = false
+): Resource {
   const isFolder = share.item_type === 'folder'
   const resource: Resource = {
     id: share.id,
@@ -365,8 +371,15 @@ export function buildSharedResource(share, incomingShares = false, allowSharePer
     resource.sharedWith = share.sharedWith || []
     resource.status = parseInt(share.state)
     resource.name = path.basename(share.file_target)
-    resource.path = share.file_target
-    resource.webDavPath = buildWebDavFilesPath(share.share_with, share.file_target)
+    if (hasShareJail) {
+      // FIXME, HACK 1: path needs to be '/' because the share has it's own webdav endpoint (we access it's root). should ideally be removed backend side.
+      // FIXME, HACK 2: webDavPath points to `files/<user>/Shares/xyz` but now needs to point to a shares webdav root. should ideally be changed backend side.
+      resource.path = '/'
+      resource.webDavPath = buildWebDavSpacesPath([SHARE_JAIL_ID, resource.id].join('!'), '/')
+    } else {
+      resource.path = share.file_target
+      resource.webDavPath = buildWebDavFilesPath(share.share_with, share.file_target)
+    }
     resource.canDownload = () => share.state === ShareStatus.accepted
     resource.canShare = () => SharePermissions.share.enabled(share.permissions)
     resource.canRename = () => SharePermissions.update.enabled(share.permissions)

packages/web-app-files/src/helpers/share/triggerShareAction.js

@@ -1,7 +1,7 @@
 import { buildSharedResource } from '../resources'
 import { ShareStatus } from './status'
 
-export async function triggerShareAction(resource, status, allowReSharing, $client) {
+export async function triggerShareAction(resource, status, hasReSharing, hasShareJail, $client) {
   const method = _getRequestMethod(status)
   if (!method) {
     throw new Error('invalid new share status')
@@ -24,7 +24,7 @@ export async function triggerShareAction(resource, status, allowReSharing, $clie
     response = await response.json()
     if (response.ocs.data.length > 0) {
       const share = response.ocs.data[0]
-      return buildSharedResource(share, true, allowReSharing)
+      return buildSharedResource(share, true, hasReSharing, hasShareJail)
     }
   }
 

packages/web-app-files/src/index.js

@@ -6,6 +6,7 @@ import PrivateLink from './views/PrivateLink.vue'
 import PublicFiles from './views/PublicFiles.vue'
 import PublicLink from './views/PublicLink.vue'
 import Personal from './views/Personal.vue'
+import SharedResource from './views/shares/SharedResource.vue'
 import SharedWithMe from './views/shares/SharedWithMe.vue'
 import SharedWithOthers from './views/shares/SharedWithOthers.vue'
 import SharedViaLink from './views/shares/SharedViaLink.vue'
@@ -65,7 +66,8 @@ const navItems = [
     icon: 'share-forward',
     route: {
       path: `/${appInfo.id}/shares`
-    }
+    },
+    activeFor: [{ path: `/${appInfo.id}/spaces/shares` }]
   },
   {
     name: $gettext('Spaces'),
@@ -75,7 +77,7 @@ const navItems = [
       path: `/${appInfo.id}/spaces/projects`
     },
     enabled(capabilities) {
-      return capabilities.spaces && capabilities.spaces.enabled === true
+      return capabilities.spaces && capabilities.spaces.projects === true
     }
   },
   {
@@ -103,6 +105,7 @@ export default {
     PublicFiles,
     PublicLink,
     SearchResults,
+    SharedResource,
     SharedViaLink,
     SharedWithMe,
     SharedWithOthers,