fix: use fileId for virtual personal space

owncloud · Oct 10, 2022 · d946efe · d946efe
1 parent e686245
commit d946efe
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 8 deletions.
diff --git a/packages/web-app-files/src/mixins/spaces/actions/deletedFiles.js b/packages/web-app-files/src/mixins/spaces/actions/deletedFiles.js
@@ -26,7 +26,7 @@ export default {
       return this.$router.push(
         createLocationTrash(
           'files-trash-generic',
-          createFileRouteOptions(this.space, { fileId: this.space.id })
+          createFileRouteOptions(this.space, { fileId: this.space.fileId })
         )
       )
     }

diff --git a/packages/web-app-files/src/mixins/spaces/actions/navigate.js b/packages/web-app-files/src/mixins/spaces/actions/navigate.js
@@ -35,7 +35,7 @@ export default {
       return this.$router.push(
         createLocationSpaces(
           'files-spaces-generic',
-          createFileRouteOptions(this.space, { fileId: this.space.id })
+          createFileRouteOptions(this.space, { fileId: this.space.fileId })
         )
       )
     }

diff --git a/packages/web-app-files/src/views/spaces/DriveRedirect.vue b/packages/web-app-files/src/views/spaces/DriveRedirect.vue
@@ -54,8 +54,7 @@ export default defineComponent({
     })
 
     const { params, query } = createFileRouteOptions(unref(personalSpace), {
-      path: unref(itemPath),
-      ...(['', '/'].includes(unref(itemPath)) && { fileId: unref(personalSpace).id })
+      path: unref(itemPath)
     })
 
     return (

diff --git a/packages/web-app-files/src/views/spaces/GenericSpace.vue b/packages/web-app-files/src/views/spaces/GenericSpace.vue
@@ -233,7 +233,7 @@ export default defineComponent({
       }
 
       let spaceBreadcrumbItem
-      let { params, query } = createFileRouteOptions(this.space, { fileId: this.space.id })
+      let { params, query } = createFileRouteOptions(this.space, { fileId: this.space.fileId })
       query = { ...this.$route.query, ...query }
       if (isPersonalSpaceResource(this.space)) {
         spaceBreadcrumbItem = {

diff --git a/packages/web-app-files/src/views/spaces/Projects.vue b/packages/web-app-files/src/views/spaces/Projects.vue
@@ -279,7 +279,7 @@ export default defineComponent({
         ? '#'
         : createLocationSpaces(
             'files-spaces-generic',
-            createFileRouteOptions(space, { path: '', fileId: space.id })
+            createFileRouteOptions(space, { path: '', fileId: space.fileId })
           )
     },
 

diff --git a/packages/web-client/src/webdav/listFiles.ts b/packages/web-client/src/webdav/listFiles.ts
@@ -62,6 +62,7 @@ export const ListFilesFactory = ({ sdk }: WebDavOptions) => {
         )
         const resources = webDavResources.map(buildResource)
         if (fileId && fileId !== resources[0].fileId) {
+          console.log('nono', path, fileId, resources[0].fileId)
           return listFilesCorrectedPath()
         }
         return resources

diff --git a/packages/web-runtime/src/index.ts b/packages/web-runtime/src/index.ts
@@ -33,6 +33,7 @@ import {
   isPublicSpaceResource,
   Resource
 } from 'web-client/src/helpers'
+import { WebDAV } from 'web-client/src/webdav'
 
 export const bootstrap = async (configurationPath: string): Promise<void> => {
   const runtimeConfiguration = await announceConfiguration(configurationPath)
@@ -88,13 +89,14 @@ export const renderSuccess = (): void => {
     (state, getters) => {
       return getters['runtime/auth/isUserContextReady']
     },
-    (userContextReady) => {
+    async (userContextReady) => {
       if (!userContextReady) {
         return
       }
+      const clientService = instance.$clientService
+
       // Load spaces to make them available across the application
       if (store.getters.capabilities?.spaces?.enabled) {
-        const clientService = instance.$clientService
         const graphClient = clientService.graphAuthenticated(
           store.getters.configuration.server,
           store.getters['runtime/auth/accessToken']
@@ -112,6 +114,10 @@ export const renderSuccess = (): void => {
         webDavPath: `/files/${user.id}`,
         serverUrl: configurationManager.serverUrl
       })
+      const personalHomeInfo = await (clientService.webdav as WebDAV).getFileInfo(space, {
+        path: ''
+      })
+      space.fileId = personalHomeInfo.fileId
       store.commit('runtime/spaces/ADD_SPACES', [space])
       store.commit('runtime/spaces/SET_SPACES_INITIALIZED', true)
     },