fix handling fragment query string in new secret links

Peergos · Jul 7, 2024 · 4a4a4bd · 4a4a4bd
1 parent 5906f11
commit 4a4a4bd
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 6 deletions.
diff --git a/src/components/App.vue b/src/components/App.vue
@@ -238,14 +238,22 @@ module.exports = {
                 var pw = props.linkpassword;
                 if (pw == null) {
                     pw = window.location.hash.substring(1);
-                    if (pw.includes("?"))
+                    if (pw.includes("?")) {
+                        const queryParams = new URLSearchParams(pw.substring(pw.indexOf("?") + 1));
+                        for (const [key, value] of queryParams) {
+                            if (value == "true")
+                                props[key] = true;
+                            else if (value == "false")
+                                props[key] = false;
+                            else if (key == "args")
+                                props[key] = JSON.parse(value);
+                            else 
+                                props[key] = value;
+                        }
                         pw = pw.substring(0, pw.indexOf("?"));
+                    }
                 }
                 props.linkpassword = pw;
-                if (fragment.indexOf("download=true") > 0)
-		    props.download = true;
-		if (fragment.indexOf("open=true") > 0)
-		    props.open = true;
                 if (props.app == null)
                     props.app = "Drive";
                 return props;

diff --git a/src/components/drive/SecretLink.vue b/src/components/drive/SecretLink.vue
@@ -137,7 +137,7 @@ module.exports = {
                 if (autoOpenOverride || link.autoOpen) {
                     args = "?open=true";
                     if (link.shareFolderWithFile) {
-                        args += "&path=" + link.path.substring(1);// do not pass starting '/'
+                        args += "&path=" + link.path;
                         args += "&args=%7B%22filename%22:%22" + link.filename + "%22%7D";
                     } else if (link.isFile) {
                         args += "&filename=" + link.filename;
@@ -207,6 +207,8 @@ module.exports = {
                 var path = this.link.path;
                 if (! path.endsWith("/"))
                     path = path+"/";
+                if (this.link.shareFolderWithFile)
+                    return path;
                 return path + this.link.filename;
             },
             onChange: function () {