Fix mobile + url encoding issue (#1510)

(cherry picked from commit 6e8c15b)
bitwarden · Mar 2, 2022 · 90097b9 · 90097b9
1 parent aa42890
commit 90097b9
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/src/connectors/captcha.ts b/src/connectors/captcha.ts
@@ -47,7 +47,7 @@ async function start() {
 
   let decodedData: any;
   try {
-    decodedData = JSON.parse(b64Decode(data));
+    decodedData = JSON.parse(b64Decode(data, true));
   } catch (e) {
     error("Cannot parse data.");
     return;

diff --git a/src/connectors/common.ts b/src/connectors/common.ts
@@ -14,7 +14,11 @@ export function getQsParam(name: string) {
   return decodeURIComponent(results[2].replace(/\+/g, " "));
 }
 
-export function b64Decode(str: string) {
+export function b64Decode(str: string, spaceAsPlus = false) {
+  if (spaceAsPlus) {
+    str = str.replace(/ /g, "+");
+  }
+
   return decodeURIComponent(
     Array.prototype.map
       .call(atob(str), (c: string) => {