Merge branch 'master' into gifting-periphery-improvements

src/libs/endorserServer.ts

@@ -979,7 +979,7 @@ export const createAndSubmitConfirmation = async (
   handleId: string | undefined,
   apiServer: string,
   axios: Axios,
-) => {
+): Promise<CreateAndSubmitClaimResult> => {
   const goodClaim = removeSchemaContext(
     removeVisibleToDids(
       addLastClaimOrHandleAsIdIfMissing(claim, lastClaimId, handleId),
@@ -1074,7 +1074,8 @@ export async function generateEndorserJwtUrlForAccount(
 
   const vcJwt = await createEndorserJwtForDid(account.did, contactInfo);
 
-  const viewPrefix = APP_SERVER + CONTACT_IMPORT_CONFIRM_URL_PATH_TIME_SAFARI;
+  const viewPrefix =
+    APP_SERVER + "/deep-link" + CONTACT_IMPORT_CONFIRM_URL_PATH_TIME_SAFARI;
   return viewPrefix + vcJwt;
 }
 

src/libs/fontawesome.ts

@@ -10,8 +10,8 @@ import {
   faArrowLeft,
   faArrowRight,
   faArrowRotateBackward,
-  faArrowUpRightFromSquare,
   faArrowUp,
+  faArrowUpRightFromSquare,
   faBan,
   faBitcoinSign,
   faBurst,
@@ -95,8 +95,8 @@ library.add(
   faArrowLeft,
   faArrowRight,
   faArrowRotateBackward,
-  faArrowUpRightFromSquare,
   faArrowUp,
+  faArrowUpRightFromSquare,
   faBan,
   faBitcoinSign,
   faBurst,

src/libs/util.ts

@@ -17,7 +17,7 @@ import {
   updateDefaultSettings,
 } from "../db/index";
 import { Account, AccountEncrypted } from "../db/tables/accounts";
-import { Contact } from "../db/tables/contacts";
+import { Contact, ContactWithJsonStrings } from "../db/tables/contacts";
 import * as databaseUtil from "../db/databaseUtil";
 import { DEFAULT_PASSKEY_EXPIRATION_MINUTES } from "../db/tables/settings";
 import {
@@ -45,6 +45,7 @@ import { PlatformServiceFactory } from "@/services/PlatformServiceFactory";
 import { sha256 } from "ethereum-cryptography/sha256";
 import { IIdentifier } from "@veramo/core";
 import { insertDidSpecificSettings, parseJsonField } from "../db/databaseUtil";
+import { DEFAULT_ROOT_DERIVATION_PATH } from "./crypto";
 
 export interface GiverReceiverInputInfo {
   did?: string;
@@ -884,6 +885,71 @@ export const contactToCsvLine = (contact: Contact): string => {
   return fields.join(",");
 };
 
+/**
+ * Parses a CSV line into a Contact object. See contactToCsvLine for the format.
+ * @param lineRaw - The CSV line to parse
+ * @returns A Contact object
+ */
+export const csvLineToContact = (lineRaw: string): Contact => {
+  // Note that Endorser Mobile puts name first, then did, etc.
+  let line = lineRaw.trim();
+  let did, publicKeyInput, seesMe, registered;
+  let name;
+  let commaPos1 = -1;
+  if (line.startsWith('"')) {
+    let doubleDoubleQuotePos = line.lastIndexOf('""') + 2;
+    if (doubleDoubleQuotePos === -1) {
+      doubleDoubleQuotePos = 1;
+    }
+    const quote2Pos = line.indexOf('"', doubleDoubleQuotePos);
+    if (quote2Pos > -1) {
+      commaPos1 = line.indexOf(",", quote2Pos);
+      name = line.substring(1, quote2Pos).trim();
+      name = name.replace(/""/g, '"');
+    } else {
+      // something is weird with one " to start, so ignore it and start after "
+      line = line.substring(1);
+      commaPos1 = line.indexOf(",");
+      name = line.substring(0, commaPos1).trim();
+    }
+  } else {
+    commaPos1 = line.indexOf(",");
+    name = line.substring(0, commaPos1).trim();
+  }
+  if (commaPos1 > -1) {
+    did = line.substring(commaPos1 + 1).trim();
+    const commaPos2 = line.indexOf(",", commaPos1 + 1);
+    if (commaPos2 > -1) {
+      did = line.substring(commaPos1 + 1, commaPos2).trim();
+      publicKeyInput = line.substring(commaPos2 + 1).trim();
+      const commaPos3 = line.indexOf(",", commaPos2 + 1);
+      if (commaPos3 > -1) {
+        publicKeyInput = line.substring(commaPos2 + 1, commaPos3).trim();
+        seesMe = line.substring(commaPos3 + 1).trim() == "true";
+        const commaPos4 = line.indexOf(",", commaPos3 + 1);
+        if (commaPos4 > -1) {
+          seesMe = line.substring(commaPos3 + 1, commaPos4).trim() == "true";
+          registered = line.substring(commaPos4 + 1).trim() == "true";
+        }
+      }
+    }
+  }
+  // help with potential mistakes while this sharing requires copy-and-paste
+  let publicKeyBase64 = publicKeyInput;
+  if (publicKeyBase64 && /^[0-9A-Fa-f]{66}$/i.test(publicKeyBase64)) {
+    // it must be all hex (compressed public key), so convert
+    publicKeyBase64 = Buffer.from(publicKeyBase64, "hex").toString("base64");
+  }
+  const newContact: Contact = {
+    did: did || "",
+    name,
+    publicKeyBase64,
+    seesMe,
+    registered,
+  };
+  return newContact;
+};
+
 /**
  * Interface for the JSON export format of database tables
  */
@@ -910,19 +976,16 @@ export interface DatabaseExport {
  */
 export const contactsToExportJson = (contacts: Contact[]): DatabaseExport => {
   // Convert each contact to a plain object and ensure all fields are included
-  const rows = contacts.map((contact) => ({
-    did: contact.did,
-    name: contact.name || null,
-    contactMethods: contact.contactMethods
-      ? JSON.stringify(parseJsonField(contact.contactMethods, []))
-      : null,
-    nextPubKeyHashB64: contact.nextPubKeyHashB64 || null,
-    notes: contact.notes || null,
-    profileImageUrl: contact.profileImageUrl || null,
-    publicKeyBase64: contact.publicKeyBase64 || null,
-    seesMe: contact.seesMe || false,
-    registered: contact.registered || false,
-  }));
+  const rows = contacts.map((contact) => {
+    const exContact: ContactWithJsonStrings = R.omit(
+      ["contactMethods"],
+      contact,
+    );
+    exContact.contactMethods = contact.contactMethods
+      ? JSON.stringify(contact.contactMethods, [])
+      : undefined;
+    return exContact;
+  });
 
   return {
     data: {
@@ -935,3 +998,38 @@ export const contactsToExportJson = (contacts: Contact[]): DatabaseExport => {
     },
   };
 };
+
+/**
+ * Imports an account from a mnemonic phrase
+ * @param mnemonic - The seed phrase to import from
+ * @param derivationPath - The derivation path to use (defaults to DEFAULT_ROOT_DERIVATION_PATH)
+ * @param shouldErase - Whether to erase existing accounts before importing
+ * @returns Promise that resolves when import is complete
+ * @throws Error if mnemonic is invalid or import fails
+ */
+export async function importFromMnemonic(
+  mnemonic: string,
+  derivationPath: string = DEFAULT_ROOT_DERIVATION_PATH,
+  shouldErase: boolean = false,
+): Promise<void> {
+  const mne: string = mnemonic.trim().toLowerCase();
+
+  // Derive address and keys from mnemonic
+  const [address, privateHex, publicHex] = deriveAddress(mne, derivationPath);
+
+  // Create new identifier
+  const newId = newIdentifier(address, publicHex, privateHex, derivationPath);
+
+  // Handle erasures
+  if (shouldErase) {
+    const platformService = PlatformServiceFactory.getInstance();
+    await platformService.dbExec("DELETE FROM accounts");
+    if (USE_DEXIE_DB) {
+      const accountsDB = await accountsDBPromise;
+      await accountsDB.accounts.clear();
+    }
+  }
+
+  // Save the new identity
+  await saveNewIdentity(newId, mne, derivationPath);
+}