Checks on resourceid (Public Links) (#2494)

Checks on resourceid (Public Links)
owncloud · Dec 10, 2019 · 6c9a647 · 6c9a647
2 parents 7d05cb0 + 0dc854e
commit 6c9a647
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 1 deletion.
diff --git a/apps/files/src/components/FileLink.vue b/apps/files/src/components/FileLink.vue
@@ -111,7 +111,7 @@ export default {
 
     $_links () {
       return this.links.filter(link => {
-        return parseInt(link.itemSource) === parseInt(this.highlightedFile.id)
+        return this.compareIds(link.itemSource, this.highlightedFile.id)
       })
     },
 

diff --git a/apps/files/src/mixins.js b/apps/files/src/mixins.js
@@ -101,6 +101,21 @@ export default {
         })
       })
     },
+    compareIds (a, b) {
+      if (!isNaN(a)) { // OC10 autoincrement id
+        return parseInt(a, 10) === parseInt(b, 10)
+      } else if (this.isOcisId(b)) {
+        return a === this.extractOpaqueId(b)
+      }
+
+      return false
+    },
+    isOcisId (id) {
+      return atob(id).split(':').length === 2
+    },
+    extractOpaqueId (id) {
+      return atob(id).split(':')[1]
+    },
     async $_ocUpload_addDropToQue (e) {
       const items = e.dataTransfer.items || e.dataTransfer.files