Fixed issue that would occur if you upgrade Passky server from previo…

…us versions.
Rabbit-Company · Sep 2, 2021 · 22785f1 · 22785f1
1 parent c18e9ac
commit 22785f1
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/js/default-functions.js b/js/default-functions.js
@@ -165,7 +165,11 @@ function refreshPasswords(){
                 let passwords = json['passwords'];
                 for(let i = 0; i < passwords.length; i++){
                     passwords[i].password = CryptoJS.AES.decrypt(passwords[i].password, localStorage.password).toString(CryptoJS.enc.Utf8);
-                    passwords[i].message = CryptoJS.AES.decrypt(passwords[i].message, localStorage.password).toString(CryptoJS.enc.Utf8);
+                    if(passwords[i].message == null || typeof(passwords[i].message) == 'undefined'){
+                        passwords[i].message = "";
+                    }else{
+                        passwords[i].message = CryptoJS.AES.decrypt(passwords[i].message, localStorage.password).toString(CryptoJS.enc.Utf8);
+                    }
                 }
                 localStorage.passwords = JSON.stringify(passwords);
             }else{

diff --git a/js/login.js b/js/login.js
@@ -146,7 +146,11 @@ function login_check(){
                 let passwords = json['passwords'];
                 for(let i = 0; i < passwords.length; i++){
                     passwords[i].password = CryptoJS.AES.decrypt(passwords[i].password, password).toString(CryptoJS.enc.Utf8);
-                    passwords[i].message = CryptoJS.AES.decrypt(passwords[i].message, password).toString(CryptoJS.enc.Utf8);
+                    if(passwords[i].message == null || typeof(passwords[i].message) == 'undefined'){
+                        passwords[i].message = "";
+                    }else{
+                        passwords[i].message = CryptoJS.AES.decrypt(passwords[i].message, password).toString(CryptoJS.enc.Utf8);
+                    }
                 }
                 localStorage.passwords = JSON.stringify(passwords);
             }else{