Skip to content

Commit ae29dff

Browse files
fix: legacy WebDav url (#2577)
* fix: legacy WebDav url * remove other remote.php occurences * bump oc commit id # Conflicts: # .woodpecker.env * update opencloud commit --------- Co-authored-by: v.scharf <v.scharf@opencloud.eu>
1 parent e1c72ae commit ae29dff

5 files changed

Lines changed: 8 additions & 8 deletions

File tree

.woodpecker.env

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
# The version of OpenCloud to use in pipelines
2-
OPENCLOUD_COMMITID=c0418c23254f6d05c15eb2c528dfb728c93bf251
2+
OPENCLOUD_COMMITID=49726b8af8c428e9ca8ef30b01e5d668149ad250
33
OPENCLOUD_BRANCH=main

packages/web-client/src/helpers/space/functions.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -163,11 +163,11 @@ export function buildSpace(
163163
const webDavPath = urlJoin(data.webDavPath || buildWebDavSpacesPath(data.id), {
164164
leadingSlash: true
165165
})
166-
const webDavUrl = urlJoin(data.serverUrl, 'remote.php/dav', webDavPath)
166+
const webDavUrl = urlJoin(data.serverUrl, 'dav', webDavPath)
167167
const webDavTrashPath = urlJoin(data.webDavTrashPath || buildWebDavSpacesTrashPath(data.id), {
168168
leadingSlash: true
169169
})
170-
const webDavTrashUrl = urlJoin(data.serverUrl, 'remote.php/dav', webDavTrashPath)
170+
const webDavTrashUrl = urlJoin(data.serverUrl, 'dav', webDavTrashPath)
171171

172172
const s = {
173173
id: data.id,

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ export class DAV {
3737
public extraProps: string[]
3838

3939
constructor({ baseUrl, headers }: DAVOptions) {
40-
this.davPath = urlJoin(baseUrl, 'remote.php/dav')
40+
this.davPath = urlJoin(baseUrl, 'dav')
4141
this.client = createClient(this.davPath, {})
4242
this.headers = headers
4343
this.extraProps = []

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,9 @@ export const parseTusHeaders = (headers: Headers) => {
2828
export const parseMultiStatus = async (xmlBody: string) => {
2929
const parseFileName = (name: string) => {
3030
const decoded = decodeURIComponent(name)
31-
if (name?.startsWith('/remote.php/dav/')) {
32-
// strip out '/remote.php/dav/' from the beginning
33-
return urlJoin(decoded.replace('/remote.php/dav/', ''), {
31+
if (name?.startsWith('/dav/')) {
32+
// strip out '/dav/' from the beginning
33+
return urlJoin(decoded.replace('/dav/', ''), {
3434
leadingSlash: true,
3535
trailingSlash: false
3636
})

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ export class PreviewService {
121121

122122
const url = [
123123
this.configStore.serverUrl,
124-
'remote.php/dav',
124+
'dav',
125125
encodePath(resource.webDavPath),
126126
'?',
127127
this.buildQueryString({ etag: resource.etag, dimensions, processor })

0 commit comments

Comments
 (0)