for scan on QR code screen, import and keep on that screen

src/views/ContactsView.vue

@@ -325,6 +325,7 @@ import {
   isDid,
   RegisterVerifiableCredential,
   SERVICE_ID,
+  setVisibilityUtil,
 } from "@/libs/endorserServer";
 import * as libsUtil from "@/libs/util";
 import QuickNav from "@/components/QuickNav.vue";
@@ -344,7 +345,6 @@ export default class ContactsView extends Vue {
   activeDid = "";
   apiServer = "";
   contacts: Array<Contact> = [];
-  contactEndorserUrl = localStorage.getItem("contactEndorserUrl") || "";
   contactInput = "";
   contactEdit: Contact | null = null;
   contactNewName = "";
@@ -388,12 +388,18 @@ export default class ContactsView extends Vue {
     this.contacts = baseContacts.sort((a, b) =>
       (a.name || "").localeCompare(b.name || ""),
     );
+  }
 
-    if (this.contactEndorserUrl) {
-      await this.addContactFromScan(this.contactEndorserUrl);
-      localStorage.removeItem("contactEndorserUrl");
-      this.contactEndorserUrl = "";
-    }
+  danger(message: string, title: string = "Error", timeout = 5000) {
+    this.$notify(
+      {
+        group: "alert",
+        type: "danger",
+        title: title,
+        text: message,
+      },
+      timeout,
+    );
   }
 
   public async getIdentity(activeDid: string): Promise<IIdentifier> {
@@ -528,22 +534,14 @@ export default class ContactsView extends Vue {
           title: "Load Error",
           text: "Got an error loading your gives.",
         },
-        -1,
+        5000,
       );
     }
   }
 
   async onClickNewContact(): Promise<void> {
     if (!this.contactInput) {
-      this.$notify(
-        {
-          group: "alert",
-          type: "warning",
-          title: "No Contact",
-          text: "There was no contact info to add.",
-        },
-        3000,
-      );
+      this.danger("There was no contact info to add.", "No Contact");
       return;
     }
 
@@ -573,15 +571,7 @@ export default class ContactsView extends Vue {
           3000, // keeping it up so that the "visibility" message is seen
         );
       } catch (e) {
-        this.$notify(
-          {
-            group: "alert",
-            type: "danger",
-            title: "Contacts Maybe Added",
-            text: "An error occurred. Some contacts may have been added.",
-          },
-          -1,
-        );
+        this.danger("An error occurred. Some contacts may have been added.");
       }
 
       // .orderBy("name") wouldn't retrieve any entries with a blank name
@@ -697,30 +687,13 @@ export default class ContactsView extends Vue {
 
   async addContact(newContact: Contact) {
     if (!newContact.did) {
-      this.$notify(
-        {
-          group: "alert",
-          type: "danger",
-          title: "Incomplete Contact",
-          text: "Cannot add a contact without a DID.",
-        },
-        5000,
-      );
+      this.danger("Cannot add a contact without a DID.", "Incomplete Contact");
       return;
     }
     if (!isDid(newContact.did)) {
-      this.$notify(
-        {
-          group: "alert",
-          type: "danger",
-          title: "Invalid DID",
-          text: "The DID is not valid. It must begin with 'did:'",
-        },
-        5000,
-      );
+      this.danger("The DID must begin with 'did:'", "Invalid DID");
       return;
     }
-    newContact.seesMe = true; // since we will immediately set that on the server
     return db.contacts
       .add(newContact)
       .then(() => {
@@ -737,6 +710,7 @@ export default class ContactsView extends Vue {
         } else {
           addedMessage = "They were added.";
         }
+        this.contactInput = "";
         if (this.isRegistered) {
           this.$notify(
             {
@@ -771,15 +745,7 @@ export default class ContactsView extends Vue {
           message +=
             " Check that the contact doesn't conflict with any you already have.";
         }
-        this.$notify(
-          {
-            group: "alert",
-            type: "danger",
-            title: "Contact Not Added",
-            text: message,
-          },
-          -1,
-        );
+        this.danger(message, "Contact Not Added", -1);
       });
   }
 
@@ -962,63 +928,42 @@ export default class ContactsView extends Vue {
     visibility: boolean,
     showSuccessAlert: boolean,
   ) {
-    const url =
-      this.apiServer +
-      "/api/report/" +
-      (visibility ? "canSeeMe" : "cannotSeeMe");
-    const identity = await this.getIdentity(this.activeDid);
-    const headers = await this.getHeaders(identity);
-    const payload = JSON.stringify({ did: contact.did });
-
-    try {
-      const resp = await this.axios.post(url, payload, { headers });
-      if (resp.status === 200) {
-        if (showSuccessAlert) {
-          this.$notify(
-            {
-              group: "alert",
-              type: "success",
-              title: "Visibility Set",
-              text:
-                this.nameForDid(this.contacts, contact.did) +
-                " can " +
-                (visibility ? "" : "not ") +
-                "see your activity.",
-            },
-            3000,
-          );
-        }
-        contact.seesMe = visibility;
-        db.contacts.update(contact.did, { seesMe: visibility });
-      } else {
-        console.error(
-          "Got some bad server response when setting visibility: ",
-          resp.status,
-          resp,
-        );
-        const message =
-          resp.data.error?.message || "Got some error setting visibility.";
+    const result = await setVisibilityUtil(
+      this.activeDid,
+      this.apiServer,
+      this.axios,
+      db,
+      contact,
+      visibility,
+    );
+    if (result.success) {
+      if (showSuccessAlert) {
         this.$notify(
           {
             group: "alert",
-            type: "danger",
-            title: "Error Setting Visibility",
-            text: message,
+            type: "success",
+            title: "Visibility Set",
+            text:
+              (contact.name || "That user") +
+              " can " +
+              (visibility ? "" : "not ") +
+              "see your activity.",
           },
-          5000,
+          3000,
         );
       }
-    } catch (err) {
-      console.error("Got some error when setting visibility:", err);
+    } else if (result.error) {
       this.$notify(
         {
           group: "alert",
           type: "danger",
           title: "Error Setting Visibility",
-          text: "Check connectivity and try again.",
+          text: result.error as string,
         },
         5000,
       );
+    } else {
+      console.error("Got strange result from setting visibility:", result);
     }
   }
 
@@ -1087,7 +1032,8 @@ export default class ContactsView extends Vue {
 
   private nameForContact(contact?: Contact, capitalize?: boolean): string {
     return (
-      (contact?.name as string) || (capitalize ? "T" : "t") + "his unnamed user"
+      (contact?.name as string) ||
+      (capitalize ? "This" : "this") + " unnamed user"
     );
   }