Merge pull request 'allow choice of no identity (for testing)' (#32) from choose-no-id into master

Reviewed-on: trent_larson/kick-starter-for-time-pwa#32

src/components/World/components/objects/landmarks.js

@@ -22,17 +22,16 @@ export async function loadLandmarks(vue, world, scene, loop) {
     await accountsDB.open();
     const accounts = await accountsDB.accounts.toArray();
     const account = R.find((acc) => acc.did === activeDid, accounts);
-    const identity = JSON.parse(account?.identity || "undefined");
-    if (!identity) {
-      throw new Error("No identity found.");
-    }
-    const token = await accessToken(identity);
-
-    const url = apiServer + "/api/v2/report/claims?claimType=GiveAction";
     const headers = {
       "Content-Type": "application/json",
-      Authorization: "Bearer " + token,
     };
+    const identity = JSON.parse(account?.identity || "null");
+    if (identity) {
+      const token = await accessToken(identity);
+      headers["Authorization"] = "Bearer " + token;
+    }
+
+    const url = apiServer + "/api/v2/report/claims?claimType=GiveAction";
     const resp = await axios.get(url, { headers: headers });
     if (resp.status === 200) {
       const landmarks = resp.data.data;

src/libs/endorserServer.ts

@@ -3,6 +3,7 @@ import { IIdentifier } from "@veramo/core";
 import { accessToken, SimpleSigner } from "@/libs/crypto";
 import * as didJwt from "did-jwt";
 import { Axios, AxiosResponse } from "axios";
+import { Contact } from "@/db/tables/contacts";
 
 export const SCHEMA_ORG_CONTEXT = "https://schema.org";
 export const SERVICE_ID = "endorser.ch";
@@ -81,12 +82,15 @@ export function isHiddenDid(did) {
 /**
  always returns text, maybe UNNAMED_VISIBLE or UNKNOWN_ENTITY
  **/
-export function didInfo(did, identifiers, contacts) {
+export function didInfo(did, activeDid, identifiers, contacts) {
-  const myId = R.find((i) => i.did === did, identifiers);
+  const myId: IIdentifier | undefined = R.find(
+    (i) => i.did === did,
+    identifiers
+  );
   if (myId) {
-    return "You";
+    return "You" + (myId.did !== activeDid ? " (Alt ID)" : "");
   } else {
-    const contact = R.find((c) => c.did === did, contacts);
+    const contact: Contact | undefined = R.find((c) => c.did === did, contacts);
     if (contact) {
       return contact.name || "Someone Unnamed in Contacts";
     } else if (!did) {

src/views/AccountViewView.vue

@@ -243,6 +243,11 @@
 
     <div v-if="numAccounts > 0" class="flex py-2">
       Switch Identifier
+      <span>
+        <button class="text-blue-500 px-2" @click="switchAccount(0)">
+          None
+        </button>
+      </span>
       <span v-for="accountNum in numAccounts" :key="accountNum">
         <button class="text-blue-500 px-2" @click="switchAccount(accountNum)">
           #{{ accountNum }}
@@ -357,7 +362,9 @@ export default class AccountViewView extends Vue {
       const account = R.find((acc) => acc.did === this.activeDid, accounts);
       const identity = JSON.parse(account?.identity || "null");
       if (!identity) {
-        throw new Error("No identity found.");
+        this.limitsMessage = "No identity.";
+        this.loadingLimits = false;
+        return;
       }
       this.publicHex = identity.keys[0].publicKeyHex;
       this.publicBase64 = Buffer.from(this.publicHex, "hex").toString("base64");
@@ -423,7 +430,9 @@ export default class AccountViewView extends Vue {
     const account = R.find((acc) => acc.did === this.activeDid, accounts);
     const identity = JSON.parse(account?.identity || "null");
     if (!identity) {
-      throw new Error("No identity found.");
+      this.limitsMessage = "No identity.";
+      this.loadingLimits = false;
+      return;
     }
     const token = await accessToken(identity);
     const headers = {
@@ -451,19 +460,31 @@ export default class AccountViewView extends Vue {
   }
 
   async switchAccount(accountNum: number) {
-    await accountsDB.open();
+    // 0 means none
-    const accounts = await accountsDB.accounts.toArray();
+    if (accountNum === 0) {
-    const account = accounts[accountNum - 1];
+      await db.open();
+      db.settings.update(MASTER_SETTINGS_KEY, {
+        activeDid: undefined,
+      });
+      this.activeDid = "";
+      this.derivationPath = "";
+      this.publicHex = "";
+      this.publicBase64 = "";
+    } else {
+      await accountsDB.open();
+      const accounts = await accountsDB.accounts.toArray();
+      const account = accounts[accountNum - 1];
 
-    await db.open();
+      await db.open();
-    db.settings.update(MASTER_SETTINGS_KEY, {
+      db.settings.update(MASTER_SETTINGS_KEY, {
-      activeDid: account.did,
+        activeDid: account.did,
-    });
+      });
 
-    this.activeDid = account.did;
+      this.activeDid = account.did;
-    this.derivationPath = account.derivationPath;
+      this.derivationPath = account.derivationPath;
-    this.publicHex = account.publicKeyHex;
+      this.publicHex = account.publicKeyHex;
-    this.publicBase64 = Buffer.from(this.publicHex, "hex").toString("base64");
+      this.publicBase64 = Buffer.from(this.publicHex, "hex").toString("base64");
+    }
   }
 
   public showContactGivesClassNames() {

src/views/ContactsView.vue

@@ -199,9 +199,10 @@ import { AxiosError } from "axios";
 import * as didJwt from "did-jwt";
 import * as R from "ramda";
 import { IIdentifier } from "@veramo/core";
-
 import { Component, Vue } from "vue-facing-decorator";
+
 import { accountsDB, db } from "@/db";
+import AlertMessage from "@/components/AlertMessage";
 import { Contact } from "@/db/tables/contacts";
 import { MASTER_SETTINGS_KEY } from "@/db/tables/settings";
 import { accessToken, SimpleSigner } from "@/libs/crypto";

src/views/HomeView.vue

@@ -199,16 +199,27 @@ export default class HomeView extends Vue {
     }
 
     // agent.did is for legacy data, before March 2023
-    const giver =
+    const giverDid =
       claim.agent?.identifier || claim.agent?.did || giveRecord.issuer;
-    const giverInfo = didInfo(giver, this.allAccounts, this.allContacts);
+    const giverInfo = didInfo(
+      giverDid,
+      this.activeDid,
+      this.allAccounts,
+      this.allContacts
+    );
     const gaveAmount = claim.object?.amountOfThisGood
       ? this.displayAmount(claim.object.unitCode, claim.object.amountOfThisGood)
       : claim.description || "something unknown";
     // recipient.did is for legacy data, before March 2023
     const gaveRecipientId = claim.recipient?.identifier || claim.recipient?.did;
     const gaveRecipientInfo = gaveRecipientId
-      ? " to " + didInfo(gaveRecipientId, this.allAccounts, this.allContacts)
+      ? " to " +
+        didInfo(
+          gaveRecipientId,
+          this.activeDid,
+          this.allAccounts,
+          this.allContacts
+        )
       : "";
     return giverInfo + " gave " + gaveAmount + gaveRecipientInfo;
   }
@@ -242,7 +253,7 @@ export default class HomeView extends Vue {
    * @param hours may be 0
    */
   recordGive(giverDid, description, hours) {
-    if (this.activeDid == null) {
+    if (!this.activeDid) {
       this.alertTitle = "Error";
       this.alertMessage =
         "You must select an identity before you can record a give.";