Privacy-first password manager with built-in email aliasing. Fully encrypted and self-hostable.
Show username or email in passkey creation wizard in browser extension (#2379)
Leendert de Borst8a31889266c1
diff --git a/apps/browser-extension/src/entrypoints/popup/pages/passkeys/PasskeyCreate.tsx b/apps/browser-extension/src/entrypoints/popup/pages/passkeys/PasskeyCreate.tsxindex 1ccb1d408..87e280383 100644--- a/apps/browser-extension/src/entrypoints/popup/pages/passkeys/PasskeyCreate.tsx+++ b/apps/browser-extension/src/entrypoints/popup/pages/passkeys/PasskeyCreate.tsx@@ -36,7 +36,7 @@ const PasskeyCreate: React.FC = () => {const [displayName, setDisplayName] = useState('');const [error, setError] = useState<string | null>(null);const { isLocked } = useVaultLockRedirect();- const [existingPasskeys, setExistingPasskeys] = useState<Array<Passkey & { Username?: string | null; ServiceName?: string | null }>>([]);+ const [existingPasskeys, setExistingPasskeys] = useState<Array<Passkey & { Username?: string | null; Email?: string | null; ServiceName?: string | null }>>([]);const [matchingItems, setMatchingItems] = useState<Item[]>([]);const [selectedPasskeyToReplace, setSelectedPasskeyToReplace] = useState<string | null>(null);const [selectedItemToAttach, setSelectedItemToAttach] = useState<string | null>(null);@@ -132,14 +132,15 @@ const PasskeyCreate: React.FC = () => {/** Filter items that:* 1. Match the RP origin URL- * 2. Have username/password (are login items)+ * 2. Have username/email/password (are login items)* 3. Don't already have a passkey*/const itemsWithoutPasskeys = allItems.filter((item) => {- // Must have username or password to be a login item+ // Must have username, email or password to be a login itemconst username = getFieldValue(item, FieldKey.LoginUsername);+ const email = getFieldValue(item, FieldKey.LoginEmail);const password = getFieldValue(item, FieldKey.LoginPassword);- if (!username && !password) {+ if (!username && !email && !password) {return false;}// Check if this item already has a passkey@@ -215,6 +216,13 @@ const PasskeyCreate: React.FC = () => {setShowCreateForm(true);};+ /**+ * Get the account identifier to show for an item: username, or email when no username is set.+ */+ const getItemAccountLabel = (item: Item): string => {+ return getFieldValue(item, FieldKey.LoginUsername) || getFieldValue(item, FieldKey.LoginEmail) || '';+ };+/*** Handle when user selects an existing passkey to replace*/@@ -629,7 +637,7 @@ const PasskeyCreate: React.FC = () => {{passkey.ServiceName}</div><div className="flex items-center justify-between text-xs text-gray-600 dark:text-gray-400">- <span className="truncate">{passkey.DisplayName}</span>+ <span className="truncate">{passkey.Username || passkey.Email || passkey.DisplayName}</span></div></div><svg className="w-5 h-5 text-gray-400" fill="none" viewBox="0 0 24 24" stroke="currentColor">@@ -699,9 +707,9 @@ const PasskeyCreate: React.FC = () => {<div className="font-medium text-gray-900 dark:text-white text-sm truncate">{item.Name}</div>- {getFieldValue(item, FieldKey.LoginUsername) && (+ {getItemAccountLabel(item) && (<div className="text-xs text-gray-600 dark:text-gray-400 truncate">- {getFieldValue(item, FieldKey.LoginUsername)}+ {getItemAccountLabel(item)}</div>)}</div>diff --git a/apps/browser-extension/src/utils/db/mappers/PasskeyMapper.ts b/apps/browser-extension/src/utils/db/mappers/PasskeyMapper.tsindex 113525585..70f03aad9 100644--- a/apps/browser-extension/src/utils/db/mappers/PasskeyMapper.ts+++ b/apps/browser-extension/src/utils/db/mappers/PasskeyMapper.ts@@ -23,6 +23,7 @@ export type PasskeyRow = {*/export type PasskeyWithItemRow = PasskeyRow & {Username?: string | null;+ Email?: string | null;ServiceName?: string | null;}@@ -31,6 +32,7 @@ export type PasskeyWithItemRow = PasskeyRow & {*/export type PasskeyWithItem = Passkey & {Username?: string | null;+ Email?: string | null;ServiceName?: string | null;};@@ -72,12 +74,13 @@ export class PasskeyMapper {/*** Map a single database row to a Passkey with item information.* @param row - Raw passkey row with item data- * @returns Passkey with Username and ServiceName+ * @returns Passkey with Username, Email and ServiceName*/public static mapRowWithItem(row: PasskeyWithItemRow): PasskeyWithItem {return {...this.mapRow(row),Username: row.Username,+ Email: row.Email,ServiceName: row.ServiceName};}@@ -94,7 +97,7 @@ export class PasskeyMapper {/*** Map multiple database rows to Passkey objects with item information.* @param rows - Raw passkey rows with item data- * @returns Array of Passkey with Username and ServiceName+ * @returns Array of Passkey with Username, Email and ServiceName*/public static mapRowsWithItem(rows: PasskeyWithItemRow[]): PasskeyWithItem[] {return rows.map(row => this.mapRowWithItem(row));diff --git a/apps/browser-extension/src/utils/db/queries/PasskeyQueries.ts b/apps/browser-extension/src/utils/db/queries/PasskeyQueries.tsindex 40c3b030c..cafa129be 100644--- a/apps/browser-extension/src/utils/db/queries/PasskeyQueries.ts+++ b/apps/browser-extension/src/utils/db/queries/PasskeyQueries.ts@@ -23,7 +23,8 @@ export class PasskeyQueries {p.UpdatedAt,p.IsDeleted,i.Name as ServiceName,- (SELECT fv.Value FROM FieldValues fv WHERE fv.ItemId = i.Id AND fv.FieldKey = '${FieldKey.LoginUsername}' AND fv.IsDeleted = 0 LIMIT 1) as Username+ (SELECT fv.Value FROM FieldValues fv WHERE fv.ItemId = i.Id AND fv.FieldKey = '${FieldKey.LoginUsername}' AND fv.IsDeleted = 0 LIMIT 1) as Username,+ (SELECT fv.Value FROM FieldValues fv WHERE fv.ItemId = i.Id AND fv.FieldKey = '${FieldKey.LoginEmail}' AND fv.IsDeleted = 0 LIMIT 1) as EmailFROM Passkeys pINNER JOIN Items i ON p.ItemId = i.Id`;@@ -64,7 +65,8 @@ export class PasskeyQueries {p.UpdatedAt,p.IsDeleted,i.Name as ServiceName,- (SELECT fv.Value FROM FieldValues fv WHERE fv.ItemId = i.Id AND fv.FieldKey = '${FieldKey.LoginUsername}' AND fv.IsDeleted = 0 LIMIT 1) as Username+ (SELECT fv.Value FROM FieldValues fv WHERE fv.ItemId = i.Id AND fv.FieldKey = '${FieldKey.LoginUsername}' AND fv.IsDeleted = 0 LIMIT 1) as Username,+ (SELECT fv.Value FROM FieldValues fv WHERE fv.ItemId = i.Id AND fv.FieldKey = '${FieldKey.LoginEmail}' AND fv.IsDeleted = 0 LIMIT 1) as EmailFROM Passkeys pINNER JOIN Items i ON p.ItemId = i.IdWHERE p.RpId = ? AND p.IsDeleted = 0@@ -89,7 +91,8 @@ export class PasskeyQueries {p.UpdatedAt,p.IsDeleted,i.Name as ServiceName,- (SELECT fv.Value FROM FieldValues fv WHERE fv.ItemId = i.Id AND fv.FieldKey = '${FieldKey.LoginUsername}' AND fv.IsDeleted = 0 LIMIT 1) as Username+ (SELECT fv.Value FROM FieldValues fv WHERE fv.ItemId = i.Id AND fv.FieldKey = '${FieldKey.LoginUsername}' AND fv.IsDeleted = 0 LIMIT 1) as Username,+ (SELECT fv.Value FROM FieldValues fv WHERE fv.ItemId = i.Id AND fv.FieldKey = '${FieldKey.LoginEmail}' AND fv.IsDeleted = 0 LIMIT 1) as EmailFROM Passkeys pINNER JOIN Items i ON p.ItemId = i.IdWHERE p.Id = ? AND p.IsDeleted = 0