From bc1846a95a2e9ae6a7f0a4b9128671abf254aa81 Mon Sep 17 00:00:00 2001
From: Trent Larson <trent@trentlarson.com>
Date: Thu, 11 Jul 2024 19:43:56 -0600
Subject: [PATCH] consolidate getIdentity & remove dups

---
 src/views/ClaimAddRawView.vue       | 14 --------------
 src/views/ClaimView.vue             | 16 ----------------
 src/views/ConfirmGiftView.vue       | 16 ----------------
 src/views/ContactAmountsView.vue    | 19 ++-----------------
 src/views/ContactQRScanShowView.vue | 28 +++++-----------------------
 src/views/NewEditProjectView.vue    | 24 ++++--------------------
 src/views/ProjectViewView.vue       | 10 ----------
 src/views/ProjectsView.vue          | 18 +-----------------
 8 files changed, 12 insertions(+), 133 deletions(-)

diff --git a/src/views/ClaimAddRawView.vue b/src/views/ClaimAddRawView.vue
index 9dafe3d..4764f73 100644
--- a/src/views/ClaimAddRawView.vue
+++ b/src/views/ClaimAddRawView.vue
@@ -66,20 +66,6 @@ export default class ClaimAddRawView extends Vue {
     }
   }
 
-  public async getIdentity(activeDid: string): Promise<IIdentifier> {
-    await accountsDB.open();
-    const account = (await accountsDB.accounts
-      .where("did")
-      .equals(activeDid)
-      .first()) as Account;
-    const identity = JSON.parse(account?.identity || "null");
-
-    if (!identity) {
-      throw new Error("Cannot submit a claim without an identifier.");
-    }
-    return identity;
-  }
-
   async submitClaim() {
     const fullClaim = JSON.parse(this.claimStr);
     const result = await serverUtil.createAndSubmitClaim(
diff --git a/src/views/ClaimView.vue b/src/views/ClaimView.vue
index 2d48e67..6c1aedf 100644
--- a/src/views/ClaimView.vue
+++ b/src/views/ClaimView.vue
@@ -522,22 +522,6 @@ export default class ClaimView extends Vue {
     );
   }
 
-  public async getIdentity(activeDid: string): Promise<IIdentifier> {
-    await accountsDB.open();
-    const account = (await accountsDB.accounts
-      .where("did")
-      .equals(activeDid)
-      .first()) as Account;
-    const identity = JSON.parse(account?.identity || "null");
-
-    if (!identity) {
-      throw new Error(
-        "Attempted to load project records with no identifier available.",
-      );
-    }
-    return identity;
-  }
-
   // Isn't there a better way to make this available to the template?
   didInfo(did: string) {
     return serverUtil.didInfo(
diff --git a/src/views/ConfirmGiftView.vue b/src/views/ConfirmGiftView.vue
index 18e371e..47143ca 100644
--- a/src/views/ConfirmGiftView.vue
+++ b/src/views/ConfirmGiftView.vue
@@ -525,22 +525,6 @@ export default class ClaimView extends Vue {
     );
   }
 
-  public async getIdentity(activeDid: string): Promise<IIdentifier> {
-    await accountsDB.open();
-    const account = (await accountsDB.accounts
-      .where("did")
-      .equals(activeDid)
-      .first()) as Account;
-    const identity = JSON.parse(account?.identity || "null");
-
-    if (!identity) {
-      throw new Error(
-        "Attempted to load project records with no identifier available.",
-      );
-    }
-    return identity;
-  }
-
   // Isn't there a better way to make this available to the template?
   didInfo(did: string | undefined) {
     return serverUtil.didInfo(
diff --git a/src/views/ContactAmountsView.vue b/src/views/ContactAmountsView.vue
index 0482345..cefb27c 100644
--- a/src/views/ContactAmountsView.vue
+++ b/src/views/ContactAmountsView.vue
@@ -124,6 +124,7 @@ import {
   GiveVerifiableCredential,
   SCHEMA_ORG_CONTEXT,
 } from "@/libs/endorserServer";
+import * as libsUtil from "@/libs/util";
 
 @Component({ components: { QuickNav } })
 export default class ContactAmountssView extends Vue {
@@ -142,22 +143,6 @@ export default class ContactAmountssView extends Vue {
     this.numAccounts = await accountsDB.accounts.count();
   }
 
-  public async getIdentity(activeDid: string) {
-    await accountsDB.open();
-    const account = await accountsDB.accounts
-      .where("did")
-      .equals(activeDid)
-      .first();
-    const identity = JSON.parse((account?.identity as string) || "null");
-
-    if (!identity) {
-      throw new Error(
-        "Attempted to load Give records with no identifier available.",
-      );
-    }
-    return identity;
-  }
-
   async created() {
     try {
       await db.open();
@@ -190,7 +175,7 @@ export default class ContactAmountssView extends Vue {
 
   async loadGives(activeDid: string, contact: Contact) {
     try {
-      const identity = await this.getIdentity(this.activeDid);
+      const identity = await libsUtil.getIdentity(this.activeDid);
       let result: Array<GiveSummaryRecord> = [];
       const url =
         this.apiServer +
diff --git a/src/views/ContactQRScanShowView.vue b/src/views/ContactQRScanShowView.vue
index bf6c548..a748f98 100644
--- a/src/views/ContactQRScanShowView.vue
+++ b/src/views/ContactQRScanShowView.vue
@@ -72,7 +72,7 @@
 
 <script lang="ts">
 import { AxiosError } from "axios";
-import * as didJwt from "did-jwt";
+import { Buffer } from "buffer/";
 import { sha256 } from "ethereum-cryptography/sha256.js";
 import QRCodeVue3 from "qr-code-generator-vue3";
 import * as R from "ramda";
@@ -90,17 +90,16 @@ import {
   deriveAddress,
   getContactPayloadFromJwtUrl,
   nextDerivationPath,
-  SimpleSigner,
 } from "@/libs/crypto";
 import {
-  CONTACT_URL_PREFIX, createEndorserJwt,
+  CONTACT_URL_PREFIX,
+  createEndorserJwt,
   ENDORSER_JWT_URL_LOCATION,
   isDid,
   register,
   setVisibilityUtil,
 } from "@/libs/endorserServer";
-
-import { Buffer } from "buffer/";
+import * as libsUtil from "@/libs/util";
 
 @Component({
   components: {
@@ -133,7 +132,7 @@ export default class ContactQRScanShow extends Vue {
     const accounts = await accountsDB.accounts.toArray();
     const account = R.find((acc) => acc.did === this.activeDid, accounts);
     if (account) {
-      const identity = await this.getIdentity(this.activeDid);
+      const identity = await libsUtil.getIdentity(this.activeDid);
       const publicKeyHex = identity.keys[0].publicKeyHex;
       const publicEncKey = Buffer.from(publicKeyHex, "hex").toString("base64");
 
@@ -179,23 +178,6 @@ export default class ContactQRScanShow extends Vue {
     );
   }
 
-  public async getIdentity(activeDid: string) {
-    await accountsDB.open();
-    const accounts = await accountsDB.accounts.toArray();
-    const account: Account | undefined = R.find(
-      (acc) => acc.did === activeDid,
-      accounts,
-    );
-    const identity = JSON.parse((account?.identity as string) || "null");
-
-    if (!identity) {
-      throw new Error(
-        "Attempted to show contact info with no identifier available.",
-      );
-    }
-    return identity;
-  }
-
   /**
    *
    * @param content is the result of a QR scan, an array with one item with a rawValue property
diff --git a/src/views/NewEditProjectView.vue b/src/views/NewEditProjectView.vue
index edfb35d..b9ba94e 100644
--- a/src/views/NewEditProjectView.vue
+++ b/src/views/NewEditProjectView.vue
@@ -179,18 +179,18 @@ import { IIdentifier } from "@veramo/core";
 import { Component, Vue } from "vue-facing-decorator";
 import { LMap, LMarker, LTileLayer } from "@vue-leaflet/vue-leaflet";
 
+import ImageMethodDialog from "@/components/ImageMethodDialog.vue";
 import QuickNav from "@/components/QuickNav.vue";
 import { DEFAULT_IMAGE_API_SERVER, NotificationIface } from "@/constants/app";
 import { accountsDB, db } from "@/db/index";
 import { MASTER_SETTINGS_KEY } from "@/db/tables/settings";
 import { accessToken } from "@/libs/crypto";
-import * as libsUtil from "@/libs/util";
-import { useAppStore } from "@/store/app";
 import {
   createEndorserJwtVcFromClaim,
   PlanVerifiableCredential,
 } from "@/libs/endorserServer";
-import ImageMethodDialog from "@/components/ImageMethodDialog.vue";
+import * as libsUtil from "@/libs/util";
+import { useAppStore } from "@/store/app";
 
 @Component({
   components: { ImageMethodDialog, LMap, LMarker, LTileLayer, QuickNav },
@@ -231,22 +231,6 @@ export default class NewEditProjectView extends Vue {
 
   libsUtil = libsUtil;
 
-  public async getIdentity(activeDid: string) {
-    await accountsDB.open();
-    const account = await accountsDB.accounts
-      .where("did")
-      .equals(activeDid)
-      .first();
-    const identity = JSON.parse((account?.identity as string) || "null");
-
-    if (!identity) {
-      throw new Error(
-        "Attempted to load project records with no identifier available.",
-      );
-    }
-    return identity;
-  }
-
   async mounted() {
     await accountsDB.open();
     this.numAccounts = await accountsDB.accounts.count();
@@ -524,7 +508,7 @@ export default class NewEditProjectView extends Vue {
     if (this.numAccounts === 0) {
       console.error("Error: there is no account.");
     } else {
-      const identity = await this.getIdentity(this.activeDid);
+      const identity = await libsUtil.getIdentity(this.activeDid);
       this.saveProject(identity);
     }
   }
diff --git a/src/views/ProjectViewView.vue b/src/views/ProjectViewView.vue
index cee38a0..dc37032 100644
--- a/src/views/ProjectViewView.vue
+++ b/src/views/ProjectViewView.vue
@@ -492,16 +492,6 @@ export default class ProjectViewView extends Vue {
     this.loadProject(this.projectId, this.activeDid);
   }
 
-  public async getIdentity(activeDid: string) {
-    await accountsDB.open();
-    const account = (await accountsDB.accounts
-      .where("did")
-      .equals(activeDid)
-      .first()) as Account;
-    const identity = JSON.parse(account?.identity || "null");
-    return identity;
-  }
-
   onEditClick() {
     localStorage.setItem("projectId", this.projectId as string);
     const route = {
diff --git a/src/views/ProjectsView.vue b/src/views/ProjectsView.vue
index 198b3e8..4ff0c43 100644
--- a/src/views/ProjectsView.vue
+++ b/src/views/ProjectsView.vue
@@ -281,7 +281,7 @@ export default class ProjectsView extends Vue {
         console.error("No accounts found.");
         this.errNote("You need an identifier to load your projects.");
       } else {
-        this.currentIid = await this.getIdentity(activeDid);
+        this.currentIid = await libsUtil.getIdentity(activeDid);
         await this.loadOffers();
       }
     } catch (err) {
@@ -360,22 +360,6 @@ export default class ProjectsView extends Vue {
     await this.projectDataLoader(url, token);
   }
 
-  public async getIdentity(activeDid: string): Promise<IIdentifier> {
-    await accountsDB.open();
-    const account = await accountsDB.accounts
-      .where("did")
-      .equals(activeDid)
-      .first();
-    const identity = JSON.parse((account?.identity as string) || "null");
-
-    if (!identity) {
-      throw new Error(
-        "Attempted to load project records with no identifier available.",
-      );
-    }
-    return identity;
-  }
-
   /**
    * Handle clicking on a project entry found in the list
    * @param id of the project