Merge pull request #43359 from nextcloud/backport/43318/stable28

nextcloud · Feb 5, 2024 · 35934f3 · 35934f3
2 parents 7b7df96 + 34a5394
commit 35934f3
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 8 deletions.
diff --git a/apps/files/src/services/Files.ts b/apps/files/src/services/Files.ts
@@ -40,9 +40,14 @@ interface ResponseProps extends DAVResultResponseProps {
 }
 
 export const resultToNode = function(node: FileStat): File | Folder {
+	const userId = getCurrentUser()?.uid
+	if (!userId) {
+		throw new Error('No user id found')
+	}
+
 	const props = node.props as ResponseProps
 	const permissions = davParsePermissions(props?.permissions)
-	const owner = (props['owner-id'] || getCurrentUser()?.uid) as string
+	const owner = (props['owner-id'] || userId).toString()
 
 	const source = generateRemoteUrl('dav' + rootPath + node.filename)
 	const id = props?.fileid < 0
@@ -53,7 +58,7 @@ export const resultToNode = function(node: FileStat): File | Folder {
 		id,
 		source,
 		mtime: new Date(node.lastmod),
-		mime: node.mime as string,
+		mime: node.mime || 'application/octet-stream',
 		size: props?.size as number || 0,
 		permissions,
 		owner,

diff --git a/dist/files-init.js b/dist/files-init.js
diff --git a/dist/files-init.js.map b/dist/files-init.js.map
diff --git a/dist/systemtags-init.js b/dist/systemtags-init.js
diff --git a/dist/systemtags-init.js.map b/dist/systemtags-init.js.map