Encode dav path segments for direct preview

Signed-off-by: Vincent Petry <vincent@nextcloud.com>
nextcloud · May 27, 2021 · f1fb076 · f1fb076
1 parent 1720c4a
commit f1fb076
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 10 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -26,6 +26,7 @@
  "@nextcloud/initial-state": "^1.2.0",
  "@nextcloud/l10n": "^1.4.1",
  "@nextcloud/moment": "^1.1.1",
+ "@nextcloud/paths": "^2.0.0",
  "@nextcloud/router": "^1.2.0",
  "@nextcloud/vue": "^3.5.4",
  "@nextcloud/vue-dashboard": "^1.0.1",

diff --git a/src/components/MessagesList/MessagesGroup/Message/MessagePart/FilePreview.vue b/src/components/MessagesList/MessagesGroup/Message/MessagePart/FilePreview.vue
@@ -70,6 +70,7 @@ import ProgressBar from '@nextcloud/vue/dist/Components/ProgressBar'
 import Tooltip from '@nextcloud/vue/dist/Directives/Tooltip'
 import Close from 'vue-material-design-icons/Close'
 import { getCapabilities } from '@nextcloud/capabilities'
+import { encodePath } from '@nextcloud/paths'
 
 const PREVIEW_TYPE = {
  TEMPORARY: 0,
@@ -248,10 +249,10 @@ export default {
  // return direct image
  if (userId === null) {
  // guest mode, use public link download URL
- return this.link + '/download/' + this.name
+ return this.link + '/download/' + encodePath(this.name)
  } else {
  // use direct DAV URL
- return generateRemoteUrl(`dav/files/${userId}`) + this.internalAbsolutePath
+ return generateRemoteUrl(`dav/files/${userId}`) + encodePath(this.internalAbsolutePath)
  }
  }