From 4a407b43aea61a5f33ae8ca20ef287c4634d7299 Mon Sep 17 00:00:00 2001
From: Matthew Aaron Raymer <matthew.raymer@anomalistdesign.com>
Date: Sat, 17 Dec 2022 13:32:00 +0800
Subject: [PATCH] Fix encrypt-decrypt issue.

---
 src/db/index.ts               | 21 +++++++++------------
 src/views/AccountViewView.vue |  7 ++++---
 2 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/src/db/index.ts b/src/db/index.ts
index cc6105b2..be9d9f4e 100644
--- a/src/db/index.ts
+++ b/src/db/index.ts
@@ -19,17 +19,14 @@ const schema = Object.assign({}, accountsSchema);
  * Needed to enable a special webpack setting to allow *await* below:
  *   https://stackoverflow.com/questions/72474803/error-the-top-level-await-experiment-is-not-enabled-set-experiments-toplevelaw
  */
-// if db already made, skip creation
-const exists = await BaseDexie.exists("kickStarter");
-if (exists == false) {
-  // create password and place password in localStorage
-  const secret =
-    localStorage.getItem("secret") || Encryption.createRandomEncryptionKey();
 
-  if (localStorage.getItem("secret") == null) {
-    localStorage.setItem("secret", secret);
-  }
-  console.log(secret);
-  encrypted(db, { secretKey: secret });
-  db.version(1).stores(schema);
+// create password and place password in localStorage
+const secret =
+  localStorage.getItem("secret") || Encryption.createRandomEncryptionKey();
+
+if (localStorage.getItem("secret") == null) {
+  localStorage.setItem("secret", secret);
 }
+console.log(secret);
+encrypted(db, { secretKey: secret });
+db.version(1).stores(schema);
diff --git a/src/views/AccountViewView.vue b/src/views/AccountViewView.vue
index 68efbe59..ccfcd1c5 100644
--- a/src/views/AccountViewView.vue
+++ b/src/views/AccountViewView.vue
@@ -225,7 +225,7 @@ export default class AccountViewView extends Vue {
     );
     try {
       await db.open();
-      const num_accounts = await db._allTables.accounts.count();
+      const num_accounts = await db.accounts.count();
       if (num_accounts === 0) {
         console.log("...");
         await db._allTables.accounts.add({
@@ -235,7 +235,7 @@ export default class AccountViewView extends Vue {
           dateCreated: new Date().getTime(),
         });
       }
-      const accounts = await db._allTables.accounts.toArray();
+      const accounts = await db.accounts.toArray();
       console.log(accounts[0]);
       const identity = JSON.parse(accounts[0].identity);
 
@@ -244,8 +244,9 @@ export default class AccountViewView extends Vue {
 
       //appStore.dispatch(appSlice.actions.addLog({log: false, msg: "... created new ID..."}))
       //appStore.dispatch(appSlice.actions.addLog({log: false, msg: "... stored new ID..."}))
-    } catch {
+    } catch (err) {
       console.log("Error!");
+      console.log(err);
     }
   }
 }