diff --git a/.woodpecker.env b/.woodpecker.env index fb57afc9bd..69f9704e4e 100644 --- a/.woodpecker.env +++ b/.woodpecker.env @@ -1,3 +1,3 @@ # The version of OpenCloud to use in pipelines -OPENCLOUD_COMMITID=c0418c23254f6d05c15eb2c528dfb728c93bf251 +OPENCLOUD_COMMITID=49726b8af8c428e9ca8ef30b01e5d668149ad250 OPENCLOUD_BRANCH=main diff --git a/packages/web-client/src/helpers/space/functions.ts b/packages/web-client/src/helpers/space/functions.ts index 160bcaf2df..a1437d2fe0 100644 --- a/packages/web-client/src/helpers/space/functions.ts +++ b/packages/web-client/src/helpers/space/functions.ts @@ -163,11 +163,11 @@ export function buildSpace( const webDavPath = urlJoin(data.webDavPath || buildWebDavSpacesPath(data.id), { leadingSlash: true }) - const webDavUrl = urlJoin(data.serverUrl, 'remote.php/dav', webDavPath) + const webDavUrl = urlJoin(data.serverUrl, 'dav', webDavPath) const webDavTrashPath = urlJoin(data.webDavTrashPath || buildWebDavSpacesTrashPath(data.id), { leadingSlash: true }) - const webDavTrashUrl = urlJoin(data.serverUrl, 'remote.php/dav', webDavTrashPath) + const webDavTrashUrl = urlJoin(data.serverUrl, 'dav', webDavTrashPath) const s = { id: data.id, diff --git a/packages/web-client/src/webdav/client/dav.ts b/packages/web-client/src/webdav/client/dav.ts index ac90c70e06..a53c9dac17 100644 --- a/packages/web-client/src/webdav/client/dav.ts +++ b/packages/web-client/src/webdav/client/dav.ts @@ -37,7 +37,7 @@ export class DAV { public extraProps: string[] constructor({ baseUrl, headers }: DAVOptions) { - this.davPath = urlJoin(baseUrl, 'remote.php/dav') + this.davPath = urlJoin(baseUrl, 'dav') this.client = createClient(this.davPath, {}) this.headers = headers this.extraProps = [] diff --git a/packages/web-client/src/webdav/client/parsers.ts b/packages/web-client/src/webdav/client/parsers.ts index 2d719e7c38..acd51da005 100644 --- a/packages/web-client/src/webdav/client/parsers.ts +++ b/packages/web-client/src/webdav/client/parsers.ts @@ -28,9 +28,9 @@ export const parseTusHeaders = (headers: Headers) => { export const parseMultiStatus = async (xmlBody: string) => { const parseFileName = (name: string) => { const decoded = decodeURIComponent(name) - if (name?.startsWith('/remote.php/dav/')) { - // strip out '/remote.php/dav/' from the beginning - return urlJoin(decoded.replace('/remote.php/dav/', ''), { + if (name?.startsWith('/dav/')) { + // strip out '/dav/' from the beginning + return urlJoin(decoded.replace('/dav/', ''), { leadingSlash: true, trailingSlash: false }) diff --git a/packages/web-pkg/src/services/preview/previewService.ts b/packages/web-pkg/src/services/preview/previewService.ts index b2993f731b..c1c13e582a 100644 --- a/packages/web-pkg/src/services/preview/previewService.ts +++ b/packages/web-pkg/src/services/preview/previewService.ts @@ -121,7 +121,7 @@ export class PreviewService { const url = [ this.configStore.serverUrl, - 'remote.php/dav', + 'dav', encodePath(resource.webDavPath), '?', this.buildQueryString({ etag: resource.etag, dimensions, processor })