Merge pull request #429 from Authenticator-Extension/fix-password-logic

improve password change and migrate logic

Author: mymindstorm

package-lock.json

@@ -47,6 +47,7 @@ export default Vue.extend({
       this.$store.commit("currentView/changeView", "LoadingPage");
       await this.$store.dispatch("accounts/changePassphrase", "");
       this.$store.commit("notification/alert", this.i18n.updateSuccess);
+      this.$store.commit("style/hideInfo");
       return;
     },
     async changePassphrase() {

src/components/Popup/SetPasswordPage.vue

@@ -13,10 +13,10 @@ interface IOTPEntry {
   update(): Promise<void>;
   next(): Promise<void>;
   applyEncryption(encryption: IEncryption): void;
-  changeEncryption(encryption: IEncryption): Promise<void>;
+  changeEncryption(encryption: IEncryption): void;
   delete(): Promise<void>;
   generate(): void;
-  genUUID(): Promise<void>;
+  genUUID(): void;
 }
 
 interface IEncryption {

src/definitions/otp.d.ts

@@ -84,7 +84,7 @@ export class OTPEntry implements IOTPEntry {
     return;
   }
 
-  async changeEncryption(encryption: Encryption) {
+  changeEncryption(encryption: Encryption) {
     if (!this.secret) {
       return;
     }
@@ -94,8 +94,6 @@ export class OTPEntry implements IOTPEntry {
     } else {
       this.encSecret = null;
     }
-
-    await this.update();
     return;
   }
 
@@ -130,10 +128,10 @@ export class OTPEntry implements IOTPEntry {
     return;
   }
 
-  async genUUID() {
-    await this.delete();
+  genUUID() {
+    // await this.delete();
     this.hash = uuid();
-    await this.create();
+    // await this.create();
   }
 
   generate() {

src/models/otp.ts

@@ -233,18 +233,27 @@ export class Accounts implements IModule {
               return;
             }
 
-            // store key
-            await BrowserStorage.set({
-              key: { enc: encKey, hash: encKeyHash }
-            });
             // change entry encryption to key and remove old hash
+            let oldKeys: string[] = [];
             for (const entry of state.state.entries) {
               await entry.changeEncryption(
                 new Encryption(wordArray.toString())
               );
-              await entry.genUUID();
+              oldKeys.push(entry.hash);
+              entry.genUUID();
             }
 
+            // store key
+            await BrowserStorage.set({
+              key: { enc: encKey, hash: encKeyHash }
+            });
+            await EntryStorage.set(state.state.entries);
+            await new Promise(resolve => {
+              BrowserStorage.remove(oldKeys, () => {
+                resolve();
+              });
+            });
+
             state.state.encryption.updateEncryptionPassword(
               wordArray.toString()
             );
@@ -320,16 +329,34 @@ export class Accounts implements IModule {
               return;
             }
 
-            // store key
-            await BrowserStorage.set({
-              key: { enc: encKey, hash: encKeyHash }
-            });
             // change entry encryption and regen hash
+            let removeHashes: string[] = [];
             for (const entry of state.state.entries) {
               await entry.changeEncryption(
                 new Encryption(wordArray.toString())
               );
-              await entry.genUUID();
+              // if not uuidv4 regen
+              if (
+                /[0-9A-F]{8}-[0-9A-F]{4}-4[0-9A-F]{3}-[89AB][0-9A-F]{3}-[0-9A-F]{12}/i.test(
+                  entry.hash
+                )
+              ) {
+                removeHashes.push(entry.hash);
+                entry.genUUID();
+              }
+            }
+
+            // store key
+            await BrowserStorage.set({
+              key: { enc: encKey, hash: encKeyHash }
+            });
+            await EntryStorage.set(state.state.entries);
+            if (removeHashes.length) {
+              await new Promise(resolve => {
+                BrowserStorage.remove(removeHashes, () => {
+                  resolve();
+                });
+              });
             }
 
             state.state.encryption.updateEncryptionPassword(
@@ -351,6 +378,7 @@ export class Accounts implements IModule {
             for (const entry of state.state.entries) {
               await entry.changeEncryption(new Encryption(""));
             }
+            await EntryStorage.set(state.state.entries);
 
             state.state.encryption.updateEncryptionPassword("");