Merge pull request #67 from Authenticator-Extension/master

mymindstorm · web-flow · commit 8710b0348398 · 2018-03-04T18:47:00.000-08:00
5.0.6 master to release
diff --git a/manifest-chrome.json b/manifest-chrome.json
@@ -2,7 +2,7 @@
     "manifest_version": 2,
     "name": "__MSG_extName__",
     "short_name": "__MSG_extShortName__",
-    "version": "5.0.5",
+    "version": "5.0.6",
     "default_locale": "en",
     "description": "__MSG_extDesc__",
     "icons": {
diff --git a/manifest-firefox.json b/manifest-firefox.json
@@ -2,7 +2,7 @@
     "manifest_version": 2,
     "name": "__MSG_extName__",
     "short_name": "__MSG_extShortName__",
-    "version": "5.0.5",
+    "version": "5.0.6",
     "default_locale": "en",
     "description": "__MSG_extDesc__",
     "applications": {
diff --git a/src/ui/entry.ts b/src/ui/entry.ts
@@ -56,7 +56,8 @@ function getBackupFile(entryData: {[hash: string]: OTPStorage}) {
   let json = JSON.stringify(entryData, null, 2);
   // for windows notepad
   json = json.replace(/\n/g, '\r\n');
-  const base64Data = btoa(json);
+  const base64Data =
+      CryptoJS.enc.Base64.stringify(CryptoJS.enc.Utf8.parse(json));
   return `data:application/octet-stream;base64,${base64Data}`;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,8 @@ function getBackupFile(entryData: {[hash: string]: OTPStorage}) {`
`56`	`56`	`let json = JSON.stringify(entryData, null, 2);`
`57`	`57`	`// for windows notepad`
`58`	`58`	`json = json.replace(/\n/g, '\r\n');`
`59`		`- const base64Data = btoa(json);`
	`59`	`+ const base64Data =`
	`60`	`+ CryptoJS.enc.Base64.stringify(CryptoJS.enc.Utf8.parse(json));`
`60`	`61`	return `data:application/octet-stream;base64,${base64Data}`;
`61`	`62`	`}`
`62`	`63`