#4378 Migrate StoredKeyInfo to KeyInfoWithIdentity format (#5976)

* feat: migrated StoredKeyInfo to KeyInfoWithIdentity

* fix

* fix: comment

Author: Ioan Moldovan

extension/js/common/platform/store/global-store.ts

@@ -18,6 +18,7 @@ export type GlobalStoreDict = {
   dev_outlook_allow?: boolean;
   install_mobile_app_notification_dismissed?: boolean;
   key_info_store_fingerprints_added?: boolean;
+  stored_key_info_migrated?: boolean;
   contact_store_x509_fingerprints_and_longids_updated?: boolean;
   contact_store_opgp_revoked_flags_updated?: boolean;
   contact_store_searchable_pruned?: boolean;
@@ -36,7 +37,8 @@ export type GlobalIndex =
   | 'contact_store_x509_fingerprints_and_longids_updated'
   | 'contact_store_opgp_revoked_flags_updated'
   | 'contact_store_searchable_pruned'
-  | 'local_drafts';
+  | 'local_drafts'
+  | 'stored_key_info_migrated';
 
 /**
  * Locally stored data that is not associated with any email account

extension/js/service_worker/migrations.ts

@@ -42,14 +42,29 @@ const addKeyInfoFingerprints = async () => {
 };
 
 export const migrateGlobal = async () => {
-  const globalStore = await GlobalStore.get(['key_info_store_fingerprints_added', 'local_drafts']);
+  const globalStore = await GlobalStore.get(['key_info_store_fingerprints_added', 'local_drafts', 'stored_key_info_migrated']);
   if (!globalStore.key_info_store_fingerprints_added) {
     console.info('migrating KeyStorage to add fingerprints and emails of each key...');
     await addKeyInfoFingerprints();
     // eslint-disable-next-line @typescript-eslint/naming-convention
     await GlobalStore.set({ key_info_store_fingerprints_added: true });
     console.info('done migrating');
   }
+  // Migrate StoredKeyInfo to KeyInfoWithIdentity format
+  // Ref: https://github.com/FlowCrypt/flowcrypt-browser/issues/4378
+  if (!globalStore.stored_key_info_migrated) {
+    console.info('migrating StoredKeyInfo to KeyInfoWithIdentity format');
+    const acctEmails = await GlobalStore.acctEmailsGet();
+    await Promise.all(
+      acctEmails.map(async acctEmail => {
+        // KeyStore.get returns updated key with KeyInfoWithIdentity type
+        const updatedKeyWithIdentity = await KeyStore.get(acctEmail);
+        await KeyStore.set(acctEmail, updatedKeyWithIdentity);
+      })
+    ); // eslint-disable-next-line @typescript-eslint/naming-convention
+    await GlobalStore.set({ stored_key_info_migrated: true });
+    console.info('Migration to KeyInfoWithIdentity completed successfully');
+  }
   // migrate local drafts (https://github.com/FlowCrypt/flowcrypt-browser/pull/3986)
   if (typeof globalStore.local_drafts === 'undefined') {
     console.info('migrating local drafts in old format...');