Merge pull request #40644 from nextcloud/fix/noid/encode-uri-trashbin…

…-restore-files-delete-favorite fix: encode uri for delete, restore and favorite
nextcloud · Sep 29, 2023 · cfda046 · cfda046
2 parents db6a53b + 4f70324
commit cfda046
Show file tree

Hide file tree

Showing 24 changed files with 37 additions and 34 deletions.
diff --git a/apps/files/src/actions/favoriteAction.ts b/apps/files/src/actions/favoriteAction.ts
@@ -30,6 +30,7 @@ import StarOutlineSvg from '@mdi/svg/svg/star-outline.svg?raw'
 import StarSvg from '@mdi/svg/svg/star.svg?raw'
 
 import logger from '../logger.js'
+import { encodePath } from '@nextcloud/paths'
 
 // If any of the nodes is not favorited, we display the favorite action.
 const shouldFavorite = (nodes: Node[]): boolean => {
@@ -39,7 +40,7 @@ const shouldFavorite = (nodes: Node[]): boolean => {
 export const favoriteNode = async (node: Node, view: View, willFavorite: boolean): Promise<boolean> => {
 	try {
 		// TODO: migrate to webdav tags plugin
-		const url = generateUrl('/apps/files/api/v1/files') + node.path
+		const url = generateUrl('/apps/files/api/v1/files') + encodePath(node.path)
 		await axios.post(url, {
 			tags: willFavorite
 				? [window.OC.TAG_FAVORITE]

diff --git a/apps/files/src/services/Files.ts b/apps/files/src/services/Files.ts
@@ -30,6 +30,7 @@ import { getCurrentUser } from '@nextcloud/auth'
 import { getClient, rootPath } from './WebdavClient'
 import { hashCode } from '../utils/hashUtils'
 import logger from '../logger'
+import { encodePath } from '@nextcloud/paths'
 
 const client = getClient()
 
@@ -44,7 +45,7 @@ export const resultToNode = function(node: FileStat): File | Folder {
 	const permissions = davParsePermissions(props?.permissions)
 	const owner = getCurrentUser()?.uid as string
 
-	const source = generateRemoteUrl('dav' + rootPath + node.filename)
+	const source = generateRemoteUrl(encodePath('dav' + rootPath + node.filename))
 	const id = props?.fileid < 0
 		? hashCode(source)
 		: props?.fileid as number || 0

diff --git a/apps/files_trashbin/src/actions/restoreAction.ts b/apps/files_trashbin/src/actions/restoreAction.ts
@@ -28,6 +28,7 @@ import axios from '@nextcloud/axios'
 import History from '@mdi/svg/svg/history.svg?raw'
 
 import logger from '../../../files/src/logger.js'
+import { encodePath } from '@nextcloud/paths'
 
 registerFileAction(new FileAction({
 	id: 'restore',
@@ -50,7 +51,7 @@ registerFileAction(new FileAction({
 
 	async exec(node: Node) {
 		try {
-			const destination = generateRemoteUrl(encodeURI(`dav/trashbin/${getCurrentUser()?.uid}/restore/${node.basename}`))
+			const destination = generateRemoteUrl(encodePath(`dav/trashbin/${getCurrentUser()?.uid}/restore/${node.basename}`))
 			await axios({
 				method: 'MOVE',
 				url: node.source,

diff --git a/apps/files_trashbin/src/services/trashbin.ts b/apps/files_trashbin/src/services/trashbin.ts
@@ -46,7 +46,7 @@ const resultToNode = function(node: FileStat): File | Folder {
 
 	const nodeData = {
 		id: node.props?.fileid as number || 0,
-		source: generateRemoteUrl('dav' + rootPath + node.filename),
+		source: generateRemoteUrl(encodePath('dav' + rootPath + node.filename)),
 		// do not show the mtime column
 		// mtime: new Date(node.lastmod),
 		mime: node.mime as string,

diff --git a/dist/485-485.js b/dist/485-485.js
diff --git a/dist/485-485.js.map b/dist/485-485.js.map
diff --git a/dist/core-common.js b/dist/core-common.js
diff --git a/dist/core-common.js.map b/dist/core-common.js.map
diff --git a/dist/core-login.js b/dist/core-login.js
diff --git a/dist/core-login.js.map b/dist/core-login.js.map
diff --git a/dist/core-main.js b/dist/core-main.js
diff --git a/dist/core-main.js.map b/dist/core-main.js.map
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/files-sidebar.js b/dist/files-sidebar.js
diff --git a/dist/files-sidebar.js.map b/dist/files-sidebar.js.map
diff --git a/dist/files_sharing-files_sharing_tab.js b/dist/files_sharing-files_sharing_tab.js
diff --git a/dist/files_sharing-files_sharing_tab.js.map b/dist/files_sharing-files_sharing_tab.js.map
diff --git a/dist/files_trashbin-main.js b/dist/files_trashbin-main.js
diff --git a/dist/files_trashbin-main.js.map b/dist/files_trashbin-main.js.map
diff --git a/dist/files_versions-files_versions.js b/dist/files_versions-files_versions.js
diff --git a/dist/files_versions-files_versions.js.map b/dist/files_versions-files_versions.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