From b86323ec8335c50f190708d6e112fc8fe8b70525 Mon Sep 17 00:00:00 2001 From: Trent Larson Date: Tue, 11 Jul 2023 15:30:51 -0600 Subject: [PATCH] adjust didInfo so we can use DIDs and not identities, removing last of identities in memory --- src/libs/endorserServer.ts | 7 ++----- src/views/AccountViewView.vue | 1 - src/views/HomeView.vue | 13 ++++++------- src/views/NewIdentifierView.vue | 3 ++- src/views/ProjectViewView.vue | 23 ++++++++++------------- 5 files changed, 20 insertions(+), 27 deletions(-) diff --git a/src/libs/endorserServer.ts b/src/libs/endorserServer.ts index fb6e300..60455fb 100644 --- a/src/libs/endorserServer.ts +++ b/src/libs/endorserServer.ts @@ -82,11 +82,8 @@ export function isHiddenDid(did) { /** always returns text, maybe UNNAMED_VISIBLE or UNKNOWN_ENTITY **/ -export function didInfo(did, activeDid, identifiers, contacts) { - const myId: IIdentifier | undefined = R.find( - (i) => i.did === did, - identifiers, - ); +export function didInfo(did, activeDid, allMyDids, contacts) { + const myId: string | undefined = R.find(R.identity, allMyDids); if (myId) { return "You" + (myId.did !== activeDid ? " (Alt ID)" : ""); } else { diff --git a/src/views/AccountViewView.vue b/src/views/AccountViewView.vue index 5c0717c..7bb4fd9 100644 --- a/src/views/AccountViewView.vue +++ b/src/views/AccountViewView.vue @@ -293,7 +293,6 @@ import { useClipboard } from "@vueuse/core"; import { AppString } from "@/constants/app"; import { db, accountsDB } from "@/db"; -import { AccountsSchema } from "@/db/tables/accounts"; import { MASTER_SETTINGS_KEY } from "@/db/tables/settings"; import { accessToken } from "@/libs/crypto"; import { AxiosError } from "axios/index"; diff --git a/src/views/HomeView.vue b/src/views/HomeView.vue index b11fdef..08b6792 100644 --- a/src/views/HomeView.vue +++ b/src/views/HomeView.vue @@ -76,7 +76,6 @@ import { db, accountsDB } from "@/db"; import { MASTER_SETTINGS_KEY } from "@/db/tables/settings"; import { accessToken } from "@/libs/crypto"; import { createAndSubmitGive, didInfo } from "@/libs/endorserServer"; -import { Account } from "@/db/tables/accounts"; import { Contact } from "@/db/tables/contacts"; import AlertMessage from "@/components/AlertMessage"; import QuickNav from "@/components/QuickNav"; @@ -87,6 +86,7 @@ import QuickNav from "@/components/QuickNav"; export default class HomeView extends Vue { activeDid = ""; allContacts: Array = []; + allMyDids: Array = []; apiServer = ""; feedAllLoaded = false; feedData = []; @@ -130,7 +130,9 @@ export default class HomeView extends Vue { async created() { try { await accountsDB.open(); - this.allAccounts = await accountsDB.accounts.toArray(); + const allAccounts = await accountsDB.accounts.toArray(); + this.allMyDids = allAccounts.map((acc) => acc.did); + await db.open(); const settings = await db.settings.get(MASTER_SETTINGS_KEY); this.apiServer = settings?.apiServer || ""; @@ -227,16 +229,13 @@ export default class HomeView extends Vue { if (claim.claim) { claim = claim.claim; } - await accountsDB.open(); - const allAccounts = await accountsDB.accounts.toArray(); - // agent.did is for legacy data, before March 2023 const giverDid = claim.agent?.identifier || claim.agent?.did || giveRecord.issuer; const giverInfo = didInfo( giverDid, this.activeDid, - allAccounts, + this.allMyDids, this.allContacts, ); const gaveAmount = claim.object?.amountOfThisGood @@ -249,7 +248,7 @@ export default class HomeView extends Vue { didInfo( gaveRecipientId, this.activeDid, - allAccounts, + this.allMyDids, this.allContacts, ) : ""; diff --git a/src/views/NewIdentifierView.vue b/src/views/NewIdentifierView.vue index 8e840bf..ca4d71e 100644 --- a/src/views/NewIdentifierView.vue +++ b/src/views/NewIdentifierView.vue @@ -50,7 +50,6 @@ export default class AccountViewView extends Vue { loading = true; async mounted() { - await accountsDB.open(); const mnemonic = generateSeed(); // address is 0x... ETH address, without "did:eth:" const [address, privateHex, publicHex, derivationPath] = @@ -58,6 +57,8 @@ export default class AccountViewView extends Vue { const newId = newIdentifier(address, publicHex, privateHex, derivationPath); const identity = JSON.stringify(newId); + + await accountsDB.open(); await accountsDB.accounts.add({ dateCreated: new Date().toISOString(), derivationPath: derivationPath, diff --git a/src/views/ProjectViewView.vue b/src/views/ProjectViewView.vue index 8c733cf..9c14417 100644 --- a/src/views/ProjectViewView.vue +++ b/src/views/ProjectViewView.vue @@ -104,7 +104,7 @@
{{ - didInfo(give.agentDid, activeDid, accounts, allContacts) + didInfo(give.agentDid, activeDid, allMyDids, allContacts) }}
@@ -126,7 +126,7 @@
{{ - didInfo(give.agentDid, activeDid, accounts, allContacts) + didInfo(give.agentDid, activeDid, allMyDids, allContacts) }}
@@ -183,6 +183,7 @@ export default class ProjectViewView extends Vue { activeDid = ""; alertMessage = ""; alertTitle = ""; + allMyDids: Array = []; allContacts: Array = []; apiServer = ""; description = ""; @@ -191,17 +192,11 @@ export default class ProjectViewView extends Vue { givesByThis: Array = []; name = ""; issuer = ""; - numAccounts = 0; projectId = localStorage.getItem("projectId") || ""; // handle ID timeSince = ""; truncatedDesc = ""; truncateLength = 40; - async beforeCreate() { - await accountsDB.open(); - this.numAccounts = (await accountsDB.accounts?.count()) || 0; - } - async created() { await db.open(); const settings = await db.settings.get(MASTER_SETTINGS_KEY); @@ -209,9 +204,11 @@ export default class ProjectViewView extends Vue { this.apiServer = settings?.apiServer || ""; this.allContacts = await db.contacts.toArray(); - this.accounts = accountsDB.accounts; - const accountsArr = await this.accounts?.toArray(); - const account = accountsArr.find((acc) => acc.did === this.activeDid); + await accountsDB.open(); + const accounts = accountsDB.accounts; + const accountsArr = await accounts?.toArray(); + this.allMyDids = accountsArr.map((acc) => acc.did); + const account = accountsArr?.find((acc) => acc.did === this.activeDid); const identity = JSON.parse(account?.identity || "null"); this.LoadProject(identity); } @@ -250,8 +247,8 @@ export default class ProjectViewView extends Vue { } // Isn't there a better way to make this available to the template? - didInfo(did, activeDid, identities, contacts) { - return didInfo(did, activeDid, identities, contacts); + didInfo(did, activeDid, dids, contacts) { + return didInfo(did, activeDid, dids, contacts); } expandText() {