#5297 Improve handling of recipients keys with identities missing email (#6207)

ioanatflowcrypt · web-flow · commit 6e7d6df0ccfa · 2026-04-14T13:48:37.000+03:00
* feat: improve handling of recipients keys with identities missing email

* fix: test

* fix: revert changes

* fix: flaky

* fix: pr reviews
diff --git a/extension/chrome/elements/compose-modules/compose-render-module.ts b/extension/chrome/elements/compose-modules/compose-render-module.ts
@@ -436,17 +436,17 @@ export class ComposeRenderModule extends ViewModule<ComposeView> {
         return; // key is invalid
       }
       const key = await KeyUtil.parse(normalizedPub);
-      if (!key.emails.length) {
-        // no users is not desired
+      const firstUserWithEmail = key.users.find(u => u.email);
+      if (!firstUserWithEmail?.email) {
         await Ui.modal.warning(`There are no email addresses listed in this Public Key - don't know who this key belongs to.`);
         return;
       }
-      await ContactStore.update(undefined, key.emails[0], {
-        name: Str.parseEmail(key.identities[0]).name,
+      await ContactStore.update(undefined, firstUserWithEmail.email, {
+        name: firstUserWithEmail.name,
         pubkey: normalizedPub,
         pubkeyLastCheck: Date.now(),
       });
-      this.view.S.cached('input_to').val(key.emails[0]);
+      this.view.S.cached('input_to').val(firstUserWithEmail.email);
       await this.view.recipientsModule.parseRenderRecipients(this.view.S.cached('input_to'));
     }
   };
diff --git a/extension/chrome/elements/compose-modules/formatters/general-mail-formatter.ts b/extension/chrome/elements/compose-modules/formatters/general-mail-formatter.ts
@@ -97,7 +97,7 @@ export class GeneralMailFormatter {
       // This is important to consider when an email address with a email tag is present on the
       // signingKey, as technically it is the same email.
       const baseSenderEmail = senderEmail.includes('+') ? senderEmail.replace(/(.+)(?=\+).*(?=@)/, '$1') : senderEmail;
-      return signingKey.emails.some(email => email.includes(baseSenderEmail));
+      return signingKey.users.some(u => u.email?.includes(baseSenderEmail));
     }
     return true;
   };
diff --git a/extension/chrome/elements/pgp_pubkey.ts b/extension/chrome/elements/pgp_pubkey.ts
@@ -77,7 +77,7 @@ View.run(
         } else {
           let emailText = '';
           if (this.parsedPublicKeys.length === 1) {
-            const email = this.firstParsedPublicKey.emails[0];
+            const email = KeyUtil.getPrimaryEmail(this.firstParsedPublicKey);
             if (email) {
               emailText = email;
               $('.input_email').val(email); // checked above
@@ -90,7 +90,7 @@ View.run(
               Xss.escape(
                 ' for ' +
                   this.parsedPublicKeys
-                    .map(pub => pub.emails[0])
+                    .map(pub => KeyUtil.getPrimaryEmail(pub))
                     .filter(e => !!e)
                     .join(', ')
               )
@@ -193,9 +193,9 @@ View.run(
       $('.error_introduce_label').html(`This OpenPGP key is not usable.<br/><small>(${await this.getErrorText()})</small>`); // xss-escaped
       $('.hide_if_error').hide();
       $('.fingerprints, .add_contact, #manual_import_warning').remove();
-      const email = this.firstParsedPublicKey?.emails[0];
+      const email = this.firstParsedPublicKey ? KeyUtil.getPrimaryEmail(this.firstParsedPublicKey) : undefined;
       if (email) {
-        $('.error_container .input_error_email').val(`${this.firstParsedPublicKey?.emails[0]}`);
+        $('.error_container .input_error_email').val(email);
       } else {
         $('.error_container .input_error_email').hide();
       }
@@ -208,7 +208,7 @@ View.run(
         const emails = new Set<string>();
         for (const pubkey of this.parsedPublicKeys!) {
           /* eslint-enable @typescript-eslint/no-non-null-assertion */
-          const email = pubkey.emails[0];
+          const email = KeyUtil.getPrimaryEmail(pubkey);
           if (email) {
             await ContactStore.update(undefined, email, { pubkey: KeyUtil.armor(pubkey) });
             emails.add(email);
diff --git a/extension/chrome/settings/index.ts b/extension/chrome/settings/index.ts
@@ -537,7 +537,7 @@ View.run(
           removeKeyBtn = `<a href="#" class="action_remove_key" style="margin-left: 5px;" data-test="action-remove-key-${originalIndex}" data-fingerprint=${ki.fingerprints[0]} data-type="${ki.family}" data-id="${ki.id}" data-longid="${ki.longid}">remove</a>`;
         }
 
-        const escapedEmail = Xss.escape(prv.emails[0] || '');
+        const escapedEmail = Xss.escape(KeyUtil.getPrimaryEmail(prv) || '');
         const escapedLink = `<a href="#" data-test="action-show-key-${originalIndex}" class="action_show_key" page="modules/my_key.htm" addurltext="&fingerprint=${ki.id}">${escapedEmail}</a>`;
         const fpHtml = `<span class="good" style="font-family: monospace;">${Str.spaced(Xss.escape(ki.fingerprints[0]))}</span>`;
 
diff --git a/extension/chrome/settings/modules/add_key_generate_module.ts b/extension/chrome/settings/modules/add_key_generate_module.ts
@@ -90,7 +90,10 @@ export class AddKeyGenerateModule extends ViewModule<AddKeyView> {
         const adminPubkey = this.view.clientConfiguration.getPublicKeyForPrivateKeyBackupToDesignatedMailbox();
         if (adminPubkey) {
           const msgEncryptionKey = await KeyUtil.parse(adminPubkey);
-          const destinationEmail = msgEncryptionKey.emails[0];
+          const destinationEmail = KeyUtil.getPrimaryEmail(msgEncryptionKey);
+          if (!destinationEmail) {
+            throw new Error('Admin public key does not have an email address');
+          }
           try {
             const privateKey = await KeyStore.get(this.view.acctEmail);
             const primaryKeyId = privateKey[0].id;
diff --git a/extension/chrome/settings/modules/contacts.ts b/extension/chrome/settings/modules/contacts.ts
@@ -181,7 +181,7 @@ View.run(
         [
           `Type: ${key.family}`,
           `Fingerprint: ${Str.spaced(key.id || 'none')}`,
-          `Users: ${key.emails?.join(', ')}`,
+          `Users: ${key.users?.map(u => u.email).filter(Boolean).join(', ')}`,
           `Created on: ${key.created ? new Date(key.created) : ''}`,
           `Expiration: ${key.expiration ? new Date(key.expiration) : 'Does not expire'}`,
           `Last signature: ${key.lastModified ? new Date(key.lastModified) : ''}`,
diff --git a/extension/chrome/settings/modules/my_key.ts b/extension/chrome/settings/modules/my_key.ts
@@ -49,7 +49,8 @@ View.run(
       $('.action_view_user_ids').attr('href', this.myKeyUserIdsUrl);
       $('.action_view_update').attr('href', this.myKeyUpdateUrl);
       $('.fingerprint').text(Str.spaced(this.keyInfo.fingerprints[0]));
-      Xss.sanitizeRender('.email', this.pubKey.emails.map(email => `<span>${Xss.escape(email)}</span>`).join(', '));
+      const emails = this.pubKey.users.map(u => u.email).filter((e): e is string => !!e);
+      Xss.sanitizeRender('.email', emails.map(email => `<span>${Xss.escape(email)}</span>`).join(', '));
       const expiration = this.pubKey.expiration;
       const creation = Str.datetimeToDate(Str.fromDate(new Date(this.pubKey.created)));
       Xss.sanitizeRender('.key_status_contatiner', KeyUtil.statusHtml(this.keyInfo.longid, this.pubKey));
diff --git a/extension/chrome/settings/modules/my_key_update.ts b/extension/chrome/settings/modules/my_key_update.ts
@@ -115,7 +115,7 @@ View.run(
         KeyImportUi.allowReselect();
         if (typeof updatedKey === 'undefined') {
           await Ui.modal.warning(Lang.setup.keyFormattedWell(this.prvHeaders.begin, String(this.prvHeaders.end)), Ui.getTestCompatibilityLink(this.acctEmail));
-        } else if (updatedKeyEncrypted.identities.length === 0) {
+        } else if (updatedKeyEncrypted.users.length === 0) {
           throw new KeyCanBeFixed(updatedKeyEncrypted);
         } else if (updatedKey.isPublic) {
           await Ui.modal.warning(
diff --git a/extension/chrome/settings/modules/my_key_user_ids.ts b/extension/chrome/settings/modules/my_key_user_ids.ts
@@ -30,7 +30,7 @@ View.run(
       Assert.abortAndRenderErrorIfKeyinfoEmpty(this.ki ? [this.ki] : []);
       $('.action_show_public_key').attr('href', this.myKeyUrl);
       const prv = await KeyUtil.parse(this.ki.private);
-      Xss.sanitizeRender('.user_ids', prv.identities.map((uid: string) => `<div>${Xss.escape(uid)}</div>`).join(''));
+      Xss.sanitizeRender('.user_ids', prv.users.map(u => `<div>${Xss.escape(u.full)}</div>`).join(''));
       $('.email').text(this.acctEmail);
       $('.fingerprint').text(Str.spaced(this.ki.fingerprints[0]));
     };
diff --git a/extension/chrome/settings/setup/setup-create-key.ts b/extension/chrome/settings/setup/setup-create-key.ts
@@ -44,7 +44,10 @@ export class SetupCreateKeyModule {
         const adminPubkey = this.view.clientConfiguration.getPublicKeyForPrivateKeyBackupToDesignatedMailbox();
         if (adminPubkey) {
           const msgEncryptionKey = await KeyUtil.parse(adminPubkey);
-          const destinationEmail = msgEncryptionKey.emails[0];
+          const destinationEmail = KeyUtil.getPrimaryEmail(msgEncryptionKey);
+          if (!destinationEmail) {
+            throw new Error('Admin public key does not have an email address');
+          }
           try {
             const privateKey = await KeyStore.get(this.view.acctEmail);
             const primaryKeyId = privateKey[0].id;
diff --git a/extension/js/common/core/common.ts b/extension/js/common/core/common.ts
@@ -12,6 +12,7 @@ export type UrlParam = string | number | null | undefined | boolean | string[];
 export type UrlParams = Dict<UrlParam>;
 export type PromiseCancellation = { cancel: boolean };
 export type EmailParts = { email: string; name?: string };
+export type ParsedEmail = { email: string | undefined; name: string | undefined; full: string };
 
 export const CID_PATTERN = /^cid:(.+)/;
 
@@ -88,7 +89,7 @@ export class Str {
   public static readonly ltrChars = 'A-Za-z\u00C0-\u00D6\u00D8-\u00F6\u00F8-\u02B8\u0370-\u0590\u0800-\u1FFF\u2C00-\uFB1C\uFDFE-\uFE6F\uFEFD-\uFFFF';
   public static readonly rtlChars = '\u0591-\u07FF\uFB1D-\uFDFD\uFE70-\uFEFC';
 
-  public static parseEmail = (full: string, flag: 'VALIDATE' | 'DO-NOT-VALIDATE' = 'VALIDATE') => {
+  public static parseEmail = (full: string, flag: 'VALIDATE' | 'DO-NOT-VALIDATE' = 'VALIDATE'): ParsedEmail => {
     let email: string | undefined;
     let name: string | undefined;
     if (full.includes('<') && full.includes('>')) {
diff --git a/extension/js/common/core/crypto/key.ts b/extension/js/common/core/crypto/key.ts
@@ -11,7 +11,7 @@ import { OpenPGPKey } from './pgp/openpgp-key.js';
 import type * as OpenPGP from 'openpgp';
 import { SmimeKey } from './smime/smime-key.js';
 import { MsgBlock } from '../msg-block.js';
-import { EmailParts, Str } from '../common.js';
+import { EmailParts, ParsedEmail, Str } from '../common.js';
 
 /**
  * This is a common Key interface for both OpenPGP and X.509 keys.
@@ -38,8 +38,7 @@ export interface Key extends KeyIdentity {
   usableForSigningButExpired: boolean;
   missingPrivateKeyForSigning: boolean;
   missingPrivateKeyForDecryption: boolean;
-  emails: string[];
-  identities: string[];
+  users: ParsedEmail[];
   fullyDecrypted: boolean;
   fullyEncrypted: boolean;
   isPublic: boolean; // isPublic and isPrivate are mutually exclusive
@@ -122,13 +121,14 @@ export class KeyUtil {
 
   public static filterKeysByTypeAndSenderEmail(keys: KeyInfoWithIdentity[], email: string, type: 'openpgp' | 'x509' | undefined): KeyInfoWithIdentity[] {
     let foundKeys: KeyInfoWithIdentity[] = [];
+    const lowerEmail = email.toLowerCase();
     if (type) {
-      foundKeys = keys.filter(key => key.emails?.includes(email.toLowerCase()) && key.family === type);
+      foundKeys = keys.filter(key => key.emails?.includes(lowerEmail) && key.family === type);
       if (!foundKeys.length) {
         foundKeys = keys.filter(key => key.family === type);
       }
     } else {
-      foundKeys = keys.filter(key => key.emails?.includes(email.toLowerCase()));
+      foundKeys = keys.filter(key => key.emails?.includes(lowerEmail));
       if (!foundKeys.length) {
         foundKeys = [...keys];
       }
@@ -440,7 +440,7 @@ export class KeyUtil {
       private: KeyUtil.armor(prv),
       public: KeyUtil.armor(pubkey),
       longid: KeyUtil.getPrimaryLongid(pubkey),
-      emails: prv.emails,
+      emails: prv.users.map(u => u.email).filter((e): e is string => !!e),
       fingerprints: prv.allIds,
       id: prv.id,
       family: prv.family,
@@ -461,6 +461,10 @@ export class KeyUtil {
     return SmimeKey.getKeyLongid(pubkey);
   }
 
+  public static getPrimaryEmail(key: Key): string | undefined {
+    return key.users.find(user => user.email)?.email;
+  }
+
   public static getKeyInfoLongids(ki: KeyInfoWithIdentityAndOptionalPp): string[] {
     if (ki.family !== 'x509') {
       return ki.fingerprints.map(fp => OpenPGPKey.fingerprintToLongid(fp));
@@ -488,7 +492,7 @@ export class KeyUtil {
 
   public static async parseAndArmorKeys(binaryKeysData: Uint8Array): Promise<ArmoredKeyIdentityWithEmails[]> {
     const { keys } = await KeyUtil.readMany(Buf.fromUint8(binaryKeysData));
-    return keys.map(k => ({ id: k.id, emails: k.emails, armored: KeyUtil.armor(k), family: k.family }));
+    return keys.map(k => ({ id: k.id, emails: k.users.map(u => u.email).filter((e): e is string => !!e), armored: KeyUtil.armor(k), family: k.family }));
   }
 
   public static validateChecksum(armoredText: string): boolean {
diff --git a/extension/js/common/core/crypto/pgp/openpgp-key.ts b/extension/js/common/core/crypto/pgp/openpgp-key.ts
@@ -2,7 +2,7 @@
 import { Key, PrvPacket, KeyAlgo, KeyUtil, UnexpectedKeyTypeError, PubkeyInfo } from '../key.js';
 import { OpenPGPDataType, opgp } from './openpgpjs-custom.js';
 import { Catch } from '../../../platform/catch.js';
-import { Str, Value } from '../../common.js';
+import { ParsedEmail, Str, Value } from '../../common.js';
 import { Buf } from '../../buf.js';
 import type * as OpenPGP from 'openpgp';
 import { PgpMsgMethod, VerifyRes } from './msg-util.js';
@@ -188,7 +188,7 @@ export class OpenPGPKey {
    *    is done on the original supplied object.
    */
   public static convertExternalLibraryObjToKey = async (opgpKey: OpenPGP.Key, keyToUpdate?: Key): Promise<Key> => {
-    const { identities, emails } = await OpenPGPKey.getSortedUserids(opgpKey);
+    const users = await OpenPGPKey.getSortedUserids(opgpKey);
     let lastModified: undefined | number;
     try {
       lastModified = await OpenPGPKey.getLastSigTime(opgpKey);
@@ -221,10 +221,7 @@ export class OpenPGPKey {
       usableForSigningButExpired: !signingKey && !!signingKeyIgnoringExpiration,
       missingPrivateKeyForSigning,
       missingPrivateKeyForDecryption,
-      // valid emails extracted from uids
-      emails,
-      // full uids that have valid emails in them
-      identities,
+      users,
       lastModified,
       expiration,
       created: opgpKey.getCreationTime().getTime(),
@@ -541,28 +538,25 @@ export class OpenPGPKey {
     return expirationTime instanceof Date ? expirationTime : undefined; // we don't differ between Infinity and null
   }
 
-  private static async getSortedUserids(key: OpenPGP.Key) {
+  private static async getSortedUserids(key: OpenPGP.Key): Promise<ParsedEmail[]> {
     const primaryUser = await Catch.undefinedOnException(key.getPrimaryUser());
     // if there is no good enough user id to serve as primary identity, we assume other user ids are even worse
     if (primaryUser?.user?.userID?.userID) {
       const primaryUserId = primaryUser.user.userID.userID;
-      const identities = [
+      const rawIdentities = [
         primaryUserId, // put the "primary" identity first
         // other identities go in indeterministic order
         ...Value.arr.unique((await key.verifyAllUsers()).filter(x => x.valid && x.userID !== primaryUserId).map(x => x.userID)),
       ];
-      const emails = identities
-        .filter(userId => !!userId)
-        .map(userid => Str.parseEmail(userid).email)
-        .filter(Boolean);
-      if (emails.length === identities.length || !key.isPrivate()) {
-        // OpenPGP.js uses RFC 5322 `email-addresses` parser, so we expect all identities to contain a valid e-mail address
-        // Return empty emails and identities is a way to later throw KeyCanBeFixed exception, allowing the user to reformat the key
+      const users = rawIdentities.filter(uid => !!uid).map(uid => Str.parseEmail(uid));
+      if ((users.length === rawIdentities.length && users.every(u => u.email)) || !key.isPrivate()) {
+        // OpenPGP.js uses RFC 5322 `email-addresses` parser, so we expect all identities to contain a valid e-mail address.
+        // Returning empty users is a way to later throw KeyCanBeFixed exception, allowing the user to reformat the key
         // (e.g. adding signature for UserIDs etc.) But this makes sense for private keys only.
-        return { emails, identities };
+        return users;
       }
     }
-    return { emails: [], identities: [] };
+    return [];
   }
 
   // mimicks OpenPGP.helper.getLatestValidSignature
diff --git a/extension/js/common/core/crypto/smime/smime-key.ts b/extension/js/common/core/crypto/smime/smime-key.ts
@@ -1,6 +1,6 @@
 /* ©️ 2016 - present FlowCrypt a.s. Limitations apply. Contact human@flowcrypt.com */
 import { Key, UnexpectedKeyTypeError } from '../key.js';
-import { Str } from '../../common.js';
+import { ParsedEmail, Str } from '../../common.js';
 import { UnreportableError } from '../../../platform/error-report.js';
 import { PgpArmor } from '../pgp/pgp-armor.js';
 import { Buf } from '../../buf.js';
@@ -242,23 +242,24 @@ export class SmimeKey {
     return parsed.filter((c, i) => !parsed.some((other, j) => j !== i && other.certificate.isIssuer(c.certificate)));
   }
 
-  private static getNormalizedEmailsFromCertificate(certificate: forge.pki.Certificate): string[] {
+  private static getUsersFromCertificate(certificate: forge.pki.Certificate): ParsedEmail[] {
     const emailFromSubject = (certificate.subject.getField('CN') as { value: string }).value;
-    const normalizedEmail = Str.parseEmail(emailFromSubject).email;
-    const emails = normalizedEmail ? [normalizedEmail] : [];
+    const parsedSubject = Str.parseEmail(emailFromSubject);
+    const users: ParsedEmail[] = parsedSubject.email ? [parsedSubject] : [];
     // search for e-mails in subjectAltName extension
     const subjectAltName = certificate.getExtension('subjectAltName') as {
       altNames: { type: number; value: string }[];
     };
     if (subjectAltName?.altNames) {
-      const emailsFromAltNames = subjectAltName.altNames
-        .filter(entry => entry.type === 1)
-        .map(entry => Str.parseEmail(entry.value).email)
-        .filter(Boolean);
-      emails.push(...(emailsFromAltNames as string[]));
+      for (const entry of subjectAltName.altNames.filter(e => e.type === 1)) {
+        const parsed = Str.parseEmail(entry.value);
+        if (parsed.email && !users.some(u => u.email === parsed.email)) {
+          users.push(parsed);
+        }
+      }
     }
-    if (emails.length) {
-      return emails.filter((value, index, self) => self.indexOf(value) === index);
+    if (users.length) {
+      return users;
     }
     throw new UnreportableError(`This S/MIME x.509 certificate has an invalid recipient email: ${emailFromSubject}`);
   }
@@ -282,7 +283,7 @@ export class SmimeKey {
       }
     }
     const fingerprint = this.forge.pki.getPublicKeyFingerprint(certificate.publicKey, { encoding: 'hex' }).toUpperCase();
-    const emails = SmimeKey.getNormalizedEmailsFromCertificate(certificate);
+    const users = SmimeKey.getUsersFromCertificate(certificate);
     const issuerAndSerialNumberAsn1 = SmimeKey.createIssuerAndSerialNumberAsn1(
       this.forge.pki.distinguishedNameToAsn1(certificate.issuer),
       certificate.serialNumber
@@ -300,8 +301,7 @@ export class SmimeKey {
       usableForSigning: usableIgnoringExpiration && !expired,
       usableForEncryptionButExpired: usableIgnoringExpiration && expired,
       usableForSigningButExpired: usableIgnoringExpiration && expired,
-      emails,
-      identities: emails,
+      users,
       created: SmimeKey.dateToNumber(certificate.validity.notBefore),
       lastModified: SmimeKey.dateToNumber(certificate.validity.notBefore),
       expiration,
diff --git a/extension/js/common/settings.ts b/extension/js/common/settings.ts
@@ -214,7 +214,7 @@ export class Settings {
     passphrase: string,
     backUrl: string
   ): Promise<Key> {
-    const uids = origPrv.identities;
+    const uids = origPrv.users.map(u => u.full);
     if (!uids.length) {
       uids.push(acctEmail);
     }
diff --git a/extension/js/common/ui/key-import-ui.ts b/extension/js/common/ui/key-import-ui.ts
@@ -185,9 +185,10 @@ export class KeyImportUi {
         const prv = await Catch.undefinedOnException(KeyUtil.parse(String($(target).val())));
         if (prv !== undefined) {
           $('.action_add_private_key').removeClass('btn_disabled').removeAttr('disabled');
-          for (const email of prv.emails) {
+          for (const user of prv.users) {
+            if (!user.email) continue;
             for (const inputCheckboxesWithEmail of $('.input_email_alias_submit_pubkey')) {
-              if (String($(inputCheckboxesWithEmail).data('email')) === email) {
+              if (String($(inputCheckboxesWithEmail).data('email')) === user.email) {
                 $(inputCheckboxesWithEmail).prop('checked', true);
               }
             }
@@ -265,7 +266,7 @@ export class KeyImportUi {
     await this.decryptAndEncryptAsNeeded(decrypted, encrypted, passphrase, contactSubsentence);
     await this.checkEncryptionPrvIfSelected(decrypted, encrypted, contactSubsentence);
     await this.checkSigningIfSelected(decrypted, contactSubsentence);
-    if (encrypted.identities.length === 0) {
+    if (encrypted.users.length === 0) {
       throw new KeyCanBeFixed(encrypted);
     }
     // mandatory checks have passed, now display warnings
diff --git a/test/source/mock/key-manager/key-manager-endpoints.ts b/test/source/mock/key-manager/key-manager-endpoints.ts
diff --git a/test/source/tests/decrypt.ts b/test/source/tests/decrypt.ts
diff --git a/test/source/tests/settings.ts b/test/source/tests/settings.ts
diff --git a/test/source/tests/setup.ts b/test/source/tests/setup.ts
diff --git a/test/source/tests/unit-node.ts b/test/source/tests/unit-node.ts

Original file line number	Diff line number	Diff line change
`@@ -97,7 +97,7 @@ export class GeneralMailFormatter {`
`97`	`97`	`// This is important to consider when an email address with a email tag is present on the`
`98`	`98`	`// signingKey, as technically it is the same email.`
`99`	`99`	`const baseSenderEmail = senderEmail.includes('+') ? senderEmail.replace(/(.+)(?=\+).*(?=@)/, '$1') : senderEmail;`
`100`		`- return signingKey.emails.some(email => email.includes(baseSenderEmail));`
	`100`	`+ return signingKey.users.some(u => u.email?.includes(baseSenderEmail));`
`101`	`101`	`}`
`102`	`102`	`return true;`
`103`	`103`	`};`
Original file line number	Diff line number	Diff line change
`@@ -537,7 +537,7 @@ View.run(`
`537`	`537`	removeKeyBtn = `<a href="#" class="action_remove_key" style="margin-left: 5px;" data-test="action-remove-key-${originalIndex}" data-fingerprint=${ki.fingerprints[0]} data-type="${ki.family}" data-id="${ki.id}" data-longid="${ki.longid}">remove</a>`;
`538`	`538`	`}`
`539`	`539`
`540`		`- const escapedEmail = Xss.escape(prv.emails[0] \|\| '');`
	`540`	`+ const escapedEmail = Xss.escape(KeyUtil.getPrimaryEmail(prv) \|\| '');`
`541`	`541`	const escapedLink = `<a href="#" data-test="action-show-key-${originalIndex}" class="action_show_key" page="modules/my_key.htm" addurltext="&fingerprint=${ki.id}">${escapedEmail}</a>`;
`542`	`542`	const fpHtml = `<span class="good" style="font-family: monospace;">${Str.spaced(Xss.escape(ki.fingerprints[0]))}</span>`;
`543`	`543`
Original file line number	Diff line number	Diff line change
`@@ -181,7 +181,7 @@ View.run(`
`181`	`181`	`[`
`182`	`182`	`Type: ${key.family}`,
`183`	`183`	`Fingerprint: ${Str.spaced(key.id \|\| 'none')}`,
`184`		- `Users: ${key.emails?.join(', ')}`,
	`184`	+ `Users: ${key.users?.map(u => u.email).filter(Boolean).join(', ')}`,
`185`	`185`	`Created on: ${key.created ? new Date(key.created) : ''}`,
`186`	`186`	`Expiration: ${key.expiration ? new Date(key.expiration) : 'Does not expire'}`,
`187`	`187`	`Last signature: ${key.lastModified ? new Date(key.lastModified) : ''}`,