[stable-4.2] fix: version downloads and remove downloadUrl dav property default

.woodpecker.env

@@ -1,3 +1,3 @@
 # The version of OpenCloud to use in pipelines
-OPENCLOUD_COMMITID=9e16bb9e2909a2af0d66ef2c6388e9b885e20f1c
+OPENCLOUD_COMMITID=cca5d1af043531dc84cb0aa3e67f9795b1a1caa3
 OPENCLOUD_BRANCH=main

packages/web-app-external/src/App.vue

@@ -81,6 +81,7 @@ import {
   FilePickerModal
 } from '@opencloud-eu/web-pkg'
 import FileNameModal from './components/FileNameModal.vue'
+import { DavProperty } from '@opencloud-eu/web-client/webdav'
 
 const { space, resource, isReadOnly } = defineProps<{
   space: SpaceResource
@@ -101,9 +102,8 @@ const appProviderService = useAppProviderService()
 const { makeRequest } = useRequest()
 const spacesStore = useSpacesStore()
 const sharesStore = useSharesStore()
-const { graphAuthenticated: graphClient } = useClientService()
+const { graphAuthenticated: graphClient, webdav } = useClientService()
 const { dispatchModal } = useModals()
-const { webdav } = useClientService()
 const { currentTheme } = useThemeStore()
 const { getParentFolderLink } = useFolderLink()
 
@@ -337,10 +337,12 @@ const handlePostMessagesCollabora = async (event: MessageEvent) => {
         customComponentAttrs: () => ({
           parentFolderLink: getParentFolderLink(resource),
           allowedFileTypes: ['image/png', 'image/gif', 'image/jpeg', 'image/svg'],
-          callbackFn: ({ resource }: { resource: Resource }) => {
-            postMessageToCollabora('Action_InsertGraphic', {
-              url: resource.downloadURL
+          callbackFn: async ({ resource }: { resource: Resource }) => {
+            const { downloadURL: url } = await webdav.getFileInfo(space, resource, {
+              davProperties: [DavProperty.DownloadURL]
             })
+
+            postMessageToCollabora('Action_InsertGraphic', { url })
           }
         }),
         focusTrapInitial: false

packages/web-client/src/webdav/constants/dav.ts

@@ -144,7 +144,6 @@ export abstract class DavProperties {
     DavProperty.ETag,
     DavProperty.MimeType,
     DavProperty.ResourceType,
-    DavProperty.DownloadURL,
     DavProperty.Tags,
     DavProperty.Audio,
     DavProperty.Location,

packages/web-client/src/webdav/getFileUrl.ts

@@ -4,10 +4,13 @@ import { GetFileContentsFactory } from './getFileContents'
 import { WebDavOptions } from './types'
 import { DAV, DAVRequestOptions } from './client'
 import { ocs } from '../ocs'
+import { GetFileInfoFactory } from './getFileInfo'
+import { DavProperty } from './constants'
 
 export const GetFileUrlFactory = (
   dav: DAV,
   getFileContentsFactory: ReturnType<typeof GetFileContentsFactory>,
+  getFileInfoFactory: ReturnType<typeof GetFileInfoFactory>,
   { axiosClient, baseUrl }: WebDavOptions
 ) => {
   return {
@@ -29,47 +32,45 @@ export const GetFileUrlFactory = (
         /** @deprecated this has no effect */
         signUrlTimeout?: number
         version?: string
+        /** @deprecated */
         doHeadRequest?: boolean
         username?: string
       } & DAVRequestOptions
     ): Promise<string> {
-      const inlineDisposition = disposition === 'inline'
-      let { downloadURL } = resource
-
-      if (!downloadURL && !inlineDisposition) {
-        // compute unsigned url
-        downloadURL = version
-          ? dav.getFileUrl(urlJoin('meta', resource.fileId, 'v', version))
-          : dav.getFileUrl(resource.webDavPath)
-
-        if (username) {
-          if (doHeadRequest) {
-            await axiosClient.head(downloadURL)
-          }
-
-          const ocsClient = ocs(baseUrl, axiosClient)
-          downloadURL = await ocsClient.signUrl(downloadURL, username)
-        }
-      }
-
       // FIXME: re-introduce query parameters
       // They are not supported by getFileContents() and as we don't need them right now, I'm disabling the feature completely for now
       //
-      // // Since the pre-signed url contains query parameters and the caller of this method
-      // // can also provide query parameters we have to combine them.
+      // Since the pre-signed url contains query parameters and the caller of this method
+      // can also provide query parameters we have to combine them.
       // const queryStr = qs.stringify(options.query || null)
       // const [url, signedQuery] = downloadURL.split('?')
       // const combinedQuery = [queryStr, signedQuery].filter(Boolean).join('&')
       // downloadURL = [url, combinedQuery].filter(Boolean).join('?')
-
-      if (inlineDisposition) {
+      if (disposition === 'inline') {
         const response = await getFileContentsFactory.getFileContents(space, resource, {
           responseType: 'blob',
           ...opts
         })
-        downloadURL = URL.createObjectURL(response.body)
+        return URL.createObjectURL(response.body)
+      }
+
+      if (version) {
+        if (!username) {
+          throw new Error('username is required for URL signing')
+        }
+        // FIXME: remove as soon as we remove client side url signing https://github.com/opencloud-eu/opencloud/issues/1197
+        const downloadURL = dav.getFileUrl(urlJoin('meta', resource.fileId, 'v', version))
+        const ocsClient = ocs(baseUrl, axiosClient)
+        return await ocsClient.signUrl(downloadURL, username)
+      }
+
+      if (resource.downloadURL) {
+        return resource.downloadURL
       }
 
+      const { downloadURL } = await getFileInfoFactory.getFileInfo(space, resource, {
+        davProperties: [DavProperty.DownloadURL]
+      })
       return downloadURL
     },
     revokeUrl: (url: string) => {

packages/web-client/src/webdav/index.ts

@@ -57,7 +57,12 @@ export const webdav = (baseURI: string, headers?: () => Headers): WebDAV => {
   const { getFileContents } = getFileContentsFactory
   const { putFileContents } = PutFileContentsFactory(dav, getFileInfoFactory, options)
 
-  const { getFileUrl, revokeUrl } = GetFileUrlFactory(dav, getFileContentsFactory, options)
+  const { getFileUrl, revokeUrl } = GetFileUrlFactory(
+    dav,
+    getFileContentsFactory,
+    getFileInfoFactory,
+    options
+  )
   const { getPublicFileUrl } = GetPublicFileUrlFactory(dav, options)
 
   const { copyFiles } = CopyFilesFactory(dav, options)

packages/web-client/src/webdav/listFiles.ts

@@ -128,7 +128,7 @@ export const ListFilesFactory = (
         const resources = webDavResources.map((r) => buildResource(r, dav.extraProps))
 
         const resourceIsSpace = fileId === space.id
-        if (fileId && !resourceIsSpace && fileId !== resources[0].fileId) {
+        if (fileId && !resourceIsSpace && resources[0].fileId && fileId !== resources[0].fileId) {
           return listFilesCorrectedPath()
         }
         return { resource: resources[0], children: resources.slice(1) } as ListFilesResult

packages/web-pkg/src/services/cache.ts

@@ -18,6 +18,7 @@ const avatarUrlCache = new Cache<
 >({ ttl: 10 * 1000, capacity: 250 })
 
 class CacheService {
+  /** @deprecated */
   public get avatarUrl() {
     return avatarUrlCache
   }

packages/web-pkg/src/services/folder/loaders/loaderSpace.ts

@@ -16,6 +16,7 @@ import { DriveItem } from '@opencloud-eu/web-client/graph/generated'
 import { isLocationSpacesActive, isLocationPublicActive } from '../../../router'
 import { getSharedDriveItem, setCurrentUserShareSpacePermissions } from '../../../helpers'
 import { useFileRouteReplace } from '../../../composables'
+import { DavProperties, DavProperty } from '@opencloud-eu/web-client/webdav'
 
 export class FolderLoaderSpace implements FolderLoader {
   public isEnabled(): boolean {
@@ -57,9 +58,14 @@ export class FolderLoaderSpace implements FolderLoader {
       try {
         resourcesStore.clearResourceList()
 
+        const davProperties = DavProperties.Default
+        if (isPublicSpaceResource(space)) {
+          // needed for public links for make previews work
+          davProperties.push(DavProperty.DownloadURL)
+        }
         // eslint-disable-next-line prefer-const
         let { resource: currentFolder, children: resources } = yield* call(
-          webdav.listFiles(space, { path, fileId }, { signal: signal1 })
+          webdav.listFiles(space, { path, fileId }, { signal: signal1, davProperties })
         )
         // if current folder has no id (= singe file public link) we must not correct the route
         if (currentFolder.id) {

packages/web-pkg/src/services/preview/previewService.ts

@@ -6,6 +6,7 @@ import { isPublicSpaceResource } from '@opencloud-eu/web-client'
 import { BuildQueryStringOptions, LoadPreviewOptions } from '.'
 import { AuthStore, ConfigStore, UserStore } from '../../composables' // @ts-ignore
 import { stringify } from 'qs'
+import { DavProperty } from '@opencloud-eu/web-client/webdav'
 
 export class PreviewService {
   clientService: ClientService
@@ -147,10 +148,17 @@ export class PreviewService {
     options: LoadPreviewOptions,
     signal?: AbortSignal
   ): Promise<string> {
-    const { resource, dimensions, processor } = options
+    const { space, resource, dimensions, processor } = options
+    let { downloadURL } = resource
+    if (!downloadURL) {
+      const { downloadURL: url } = await this.clientService.webdav.getFileInfo(space, resource, {
+        davProperties: [DavProperty.DownloadURL]
+      })
+      downloadURL = url
+    }
     // In a public context, i.e. public shares, the downloadURL contains a pre-signed url to
     // download the file.
-    const [url, signedQuery] = resource.downloadURL.split('?')
+    const [url, signedQuery] = downloadURL.split('?')
 
     // Since the pre-signed url contains query parameters and the caller of this method
     // can also provide query parameters we have to combine them.

packages/web-pkg/tests/unit/services/cache.spec.ts

@@ -7,10 +7,5 @@ describe('cache', () => {
       const filePreviewCache = cacheService.filePreview
       expect(filePreviewCache).toBeInstanceOf(Cache)
     })
-
-    test('avatarUrl', () => {
-      const avatarUrlCache = cacheService.avatarUrl
-      expect(avatarUrlCache).toBeInstanceOf(Cache)
-    })
   })
 })