Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .woodpecker.env
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
# The version of OpenCloud to use in pipelines
OPENCLOUD_COMMITID=c0418c23254f6d05c15eb2c528dfb728c93bf251
OPENCLOUD_COMMITID=cff56490cb3572084aea9911cfe56ec9395c81a1
OPENCLOUD_BRANCH=main
4 changes: 2 additions & 2 deletions packages/web-client/src/helpers/space/functions.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion packages/web-client/src/webdav/client/dav.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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 = []
Expand Down
6 changes: 3 additions & 3 deletions packages/web-client/src/webdav/client/parsers.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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
})
Expand Down
2 changes: 1 addition & 1 deletion packages/web-pkg/src/services/preview/previewService.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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 })
Expand Down