upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-06-10 09:13:19 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 54

fix: use the join function for merging davRootPath and path

Browse source 
Using the join function ensures, that also paths without a leading slash
a properly merged together. Extracted from
3978e056cf.

Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
This commit is contained in:
Daniel Kesselberg 2025-08-07 21:56:31 +02:00
parent dbf1b69717
commit ed8bd0a8ef
No known key found for this signature in database
GPG key ID: 4A81C29F63464E8F
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
apps/files/src/services/Files.ts
View file

@ -7,6 +7,7 @@ import type { FileStat, ResponseDataDetailed } from 'webdav'
import { CancelablePromise } from 'cancelable-promise'
import { davGetDefaultPropfind, davResultToNode, davRootPath } from '@nextcloud/files'
import { join } from 'path'
import { client } from './WebdavClient.ts'
import logger from '../logger.ts'
@ -17,11 +18,10 @@ import logger from '../logger.ts'
export const resultToNode = (node: FileStat): Node => davResultToNode(node)
export const getContents = (path = '/'): CancelablePromise<ContentsWithRoot> => {
path = join(davRootPath, path)
const controller = new AbortController()
const propfindPayload = davGetDefaultPropfind()
path = `${davRootPath}${path}`
return new CancelablePromise(async (resolve, reject, onCancel) => {
onCancel(() => controller.abort())
try {