fix import for derived accounts and hopefully make other account-access code more robust

src/libs/util.ts

@@ -42,6 +42,8 @@ import { createPeerDid } from "../libs/crypto/vc/didPeer";
 import { registerCredential } from "../libs/crypto/vc/passkeyDidPeer";
 import { logger } from "../utils/logger";
 import { PlatformServiceFactory } from "@/services/PlatformServiceFactory";
+import { sha256 } from "ethereum-cryptography/sha256";
+import { IIdentifier } from "@veramo/core";
 
 export interface GiverReceiverInputInfo {
   did?: string;
@@ -622,14 +624,12 @@ export const retrieveFullyDecryptedAccount = async (
   return result;
 };
 
-export const retrieveAllAccountsMetadata = async (): Promise<Account[]> => {
+export const retrieveAllAccountsMetadata = async (): Promise<AccountEncrypted[]> => {
   const platformService = PlatformServiceFactory.getInstance();
   const dbAccounts = await platformService.dbQuery(`SELECT * FROM accounts`);
   const accounts = databaseUtil.mapQueryResultToValues(dbAccounts) as Account[];
   let result = accounts.map((account) => {
-    // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    const { identity, mnemonic, ...metadata } = account;
-    return metadata as Account;
+    return account as AccountEncrypted;
   });
   if (USE_DEXIE_DB) {
     // one of the few times we use accountsDBPromise directly; try to avoid more usage
@@ -638,7 +638,14 @@ export const retrieveAllAccountsMetadata = async (): Promise<Account[]> => {
     result = array.map((account) => {
       // eslint-disable-next-line @typescript-eslint/no-unused-vars
       const { identity, mnemonic, ...metadata } = account;
-      return metadata as Account;
+      // This is not accurate because they can't be decrypted, but we're removing Dexie anyway.
+      const identityStr = JSON.stringify(identity);
+      const encryptedAccount = {
+        identityEncrBase64: sha256(new TextEncoder().encode(identityStr)).toString(),
+        mnemonicEncrBase64: sha256(new TextEncoder().encode(account.mnemonic)).toString(),
+        ...metadata,
+      };
+      return encryptedAccount as AccountEncrypted;
     });
   }
   return result;
@@ -648,9 +655,8 @@ export const retrieveAllAccountsMetadata = async (): Promise<Account[]> => {
  * Saves a new identity to both SQL and Dexie databases
  */
 export async function saveNewIdentity(
-  identity: string,
+  identity: IIdentifier,
   mnemonic: string,
-  newId: { did: string; keys: Array<{ publicKeyHex: string }> },
   derivationPath: string,
 ): Promise<void> {
   try {
@@ -666,7 +672,8 @@ export async function saveNewIdentity(
     }
     const secretBase64 = secrets.values[0][0] as string;
     const secret = base64ToArrayBuffer(secretBase64);
-    const encryptedIdentity = await simpleEncrypt(identity, secret);
+    const identityStr = JSON.stringify(identity);
+    const encryptedIdentity = await simpleEncrypt(identityStr, secret);
     const encryptedMnemonic = await simpleEncrypt(mnemonic, secret);
     const encryptedIdentityBase64 = arrayBufferToBase64(encryptedIdentity);
     const encryptedMnemonicBase64 = arrayBufferToBase64(encryptedMnemonic);
@@ -675,13 +682,13 @@ export async function saveNewIdentity(
     const params = [
       new Date().toISOString(),
       derivationPath,
-      newId.did,
+      identity.did,
       encryptedIdentityBase64,
       encryptedMnemonicBase64,
-      newId.keys[0].publicKeyHex,
+      identity.keys[0].publicKeyHex,
     ];
     await platformService.dbExec(sql, params);
-    await databaseUtil.updateDefaultSettings({ activeDid: newId.did });
+    await databaseUtil.updateDefaultSettings({ activeDid: identity.did });
 
     if (USE_DEXIE_DB) {
       // one of the few times we use accountsDBPromise directly; try to avoid more usage
@@ -689,12 +696,12 @@ export async function saveNewIdentity(
       await accountsDB.accounts.add({
         dateCreated: new Date().toISOString(),
         derivationPath: derivationPath,
-        did: newId.did,
-        identity: identity,
+        did: identity.did,
+        identity: identityStr,
         mnemonic: mnemonic,
-        publicKeyHex: newId.keys[0].publicKeyHex,
+        publicKeyHex: identity.keys[0].publicKeyHex,
       });
-      await updateDefaultSettings({ activeDid: newId.did });
+      await updateDefaultSettings({ activeDid: identity.did });
     }
   } catch (error) {
     logger.error("Failed to update default settings:", error);
@@ -715,9 +722,8 @@ export const generateSaveAndActivateIdentity = async (): Promise<string> => {
     deriveAddress(mnemonic);
 
   const newId = newIdentifier(address, publicHex, privateHex, derivationPath);
-  const identity = JSON.stringify(newId);
 
-  await saveNewIdentity(identity, mnemonic, newId, derivationPath);
+  await saveNewIdentity(newId, mnemonic, derivationPath);
   await databaseUtil.updateAccountSettings(newId.did, { isRegistered: false });
   if (USE_DEXIE_DB) {
     await updateAccountSettings(newId.did, { isRegistered: false });