Privacy-first password manager with built-in email aliasing. Fully encrypted and self-hostable.
Update email domain field to generate random prefix for login types (#1449)
Leendert de Borst72a190a6af6f
diff --git a/apps/browser-extension/src/entrypoints/contentScript/Popup.ts b/apps/browser-extension/src/entrypoints/contentScript/Popup.tsindex 39e2e43d9..ef642d0d8 100644--- a/apps/browser-extension/src/entrypoints/contentScript/Popup.ts+++ b/apps/browser-extension/src/entrypoints/contentScript/Popup.ts@@ -1279,7 +1279,7 @@ export async function createAliasCreationPopup(suggestedNames: string[], rootConconst showPasswordConfigDialog = async (): Promise<void> => {// Get all translations firstconst changePasswordComplexityText = await t('items.changePasswordComplexity');- const generateNewPreviewText = await t('items.generateNewPreview');+ const generateNewPreviewText = await t('common.generate');const includeLowercaseText = await t('items.includeLowercase');const includeUppercaseText = await t('items.includeUppercase');const includeNumbersText = await t('items.includeNumbers');diff --git a/apps/browser-extension/src/entrypoints/popup/components/Dialogs/PasswordConfigDialog.tsx b/apps/browser-extension/src/entrypoints/popup/components/Dialogs/PasswordConfigDialog.tsxindex 43bb68835..ccabd924b 100644--- a/apps/browser-extension/src/entrypoints/popup/components/Dialogs/PasswordConfigDialog.tsx+++ b/apps/browser-extension/src/entrypoints/popup/components/Dialogs/PasswordConfigDialog.tsx@@ -98,7 +98,7 @@ const PasswordConfigDialog: React.FC<IPasswordConfigDialogProps> = ({type="button"onClick={handleRefreshPreview}className="px-3 py-2 text-sm text-gray-500 dark:text-white bg-gray-200 hover:bg-gray-300 focus:ring-4 focus:outline-none focus:ring-gray-300 font-medium rounded-lg dark:bg-gray-600 dark:hover:bg-gray-700 dark:focus:ring-gray-800"- title={t('items.generateNewPreview')}+ title={t('common.generate')}><svg className="w-4 h-6" fill="none" stroke="currentColor" viewBox="0 0 24 24"><path strokeLinecap="round" strokeLinejoin="round" strokeWidth="2" d="M4 4v5h.582m15.356 2A8.001 8.001 0 004.582 9m0 0H9m11 11v-5h-.581m0 0a8.003 8.003 0 01-15.357-2m15.357 2H15"></path>diff --git a/apps/browser-extension/src/entrypoints/popup/components/Forms/EmailDomainField.tsx b/apps/browser-extension/src/entrypoints/popup/components/Forms/EmailDomainField.tsxindex e0ba21918..3104e852b 100644--- a/apps/browser-extension/src/entrypoints/popup/components/Forms/EmailDomainField.tsx+++ b/apps/browser-extension/src/entrypoints/popup/components/Forms/EmailDomainField.tsx@@ -282,14 +282,11 @@ const EmailDomainField: React.FC<EmailDomainFieldProps> = ({if (newIsCustom) {/*- * Switching to custom domain mode (free text / normal email)- * Extract just the local part from the domain-based value+ * Switching to custom domain mode (free text / normal email).+ * Clear the value so the user starts fresh with a regular email address.*/- if (value && value.includes('@')) {- const [local] = value.split('@');- onChange(local);- setLocalPart(local);- }+ onChange('');+ setLocalPart('');} else {// Switching to domain chooser modeconst defaultDomain = showPrivateDomains && privateEmailDomains[0]@@ -338,19 +335,22 @@ const EmailDomainField: React.FC<EmailDomainFieldProps> = ({/*** Handle the "Generate alias email" button click.- * Calls onGenerateAlias if provided, and switches to domain chooser mode.- * Also ensures the value is updated with the domain when switching modes.+ * When onGenerateAlias is provided, delegates to it (it sets the full email value).+ * Otherwise, just switches to domain chooser mode and preserves the current local part.*/const handleGenerateAliasClick = useCallback(() => {+ // Always switch to domain chooser mode+ setIsCustomDomain(false);+if (onGenerateAlias) {+ // Delegate to the parent callback which sets the full email value (prefix@domain)onGenerateAlias();+ return;}- // Always switch to domain chooser mode- setIsCustomDomain(false);/*- * When switching to alias mode, ensure the value includes the domain.- * Use the same simple pattern as toggleCustomDomain: check localPart first, then value.+ * No generate callback - just switching modes.+ * Ensure the value includes the domain when switching from email to alias mode.*/const defaultDomain = showPrivateDomains && privateEmailDomains[0]? privateEmailDomains[0]@@ -359,14 +359,10 @@ const EmailDomainField: React.FC<EmailDomainFieldProps> = ({if (defaultDomain) {setSelectedDomain(defaultDomain);- // Use the same pattern as toggleCustomDomain: check localPart first, then valueif (localPart && localPart.trim()) {- // localPart is available - use it directlyonChange(`${localPart}@${defaultDomain}`);} else if (value && !value.includes('@')) {- // Fallback: value is just a prefix without @onChange(`${value}@${defaultDomain}`);- // Also update localPart to keep in syncsetLocalPart(value);}}@@ -436,12 +432,25 @@ const EmailDomainField: React.FC<EmailDomainFieldProps> = ({<buttontype="button"onClick={() => setIsPopupVisible(!isPopupVisible)}- className="inline-flex items-center px-2 py-2 border border-l-0 border-gray-300 dark:border-gray-600 rounded-r-md bg-gray-50 dark:bg-gray-600 text-gray-700 dark:text-gray-300 hover:bg-gray-100 dark:hover:bg-gray-500 cursor-pointer text-sm truncate max-w-[120px]"+ className={`inline-flex items-center px-2 py-2 border border-l-0 border-gray-300 dark:border-gray-600 ${onGenerateAlias ? '' : 'rounded-r-md'} bg-gray-50 dark:bg-gray-600 text-gray-700 dark:text-gray-300 hover:bg-gray-100 dark:hover:bg-gray-500 cursor-pointer text-sm truncate max-w-[120px]`}><span className="text-gray-500 dark:text-gray-400">@</span><span className="truncate ml-0.5">{selectedDomain}</span></button>)}++ {!isCustomDomain && onGenerateAlias && (+ <button+ type="button"+ onClick={onGenerateAlias}+ className="px-3 text-gray-500 dark:text-white bg-gray-200 hover:bg-gray-300 focus:ring-4 focus:outline-none focus:ring-gray-300 font-medium rounded-r-lg text-sm border-l border-gray-300 dark:border-gray-700 dark:bg-gray-600 dark:hover:bg-gray-700 dark:focus:ring-gray-800"+ title={t('common.generate')}+ >+ <svg className="w-5 h-5" fill="none" stroke="currentColor" viewBox="0 0 24 24">+ <path strokeLinecap="round" strokeLinejoin="round" strokeWidth="2" d="M4 4v5h.582m15.356 2A8.001 8.001 0 004.582 9m0 0H9m11 11v-5h-.581m0 0a8.003 8.003 0 01-15.357-2m15.357 2H15" />+ </svg>+ </button>+ )}</div>{/* Domain selection popup */}@@ -456,7 +465,7 @@ const EmailDomainField: React.FC<EmailDomainFieldProps> = ({<h4 className="text-sm font-semibold text-gray-700 dark:text-gray-300 mb-2">{t('items.privateEmailTitle')} <span className="text-gray-500 dark:text-gray-400">({t('items.privateEmailAliasVaultServer')})</span></h4>- <p className="text-gray-500 dark:text-gray-400 mb-3">+ <p className="text-xs text-gray-500 dark:text-gray-400 mb-3">{t('items.privateEmailDescription')}</p><div className="flex flex-wrap gap-2">diff --git a/apps/browser-extension/src/entrypoints/popup/components/Forms/PasswordField.tsx b/apps/browser-extension/src/entrypoints/popup/components/Forms/PasswordField.tsxindex e1c692ee3..c5626497f 100644--- a/apps/browser-extension/src/entrypoints/popup/components/Forms/PasswordField.tsx+++ b/apps/browser-extension/src/entrypoints/popup/components/Forms/PasswordField.tsx@@ -191,7 +191,7 @@ const PasswordField: React.FC<IPasswordFieldProps> = ({type="button"onClick={handleRegeneratePassword}className="px-3 text-gray-500 dark:text-white bg-gray-200 hover:bg-gray-300 focus:ring-4 focus:outline-none focus:ring-gray-300 font-medium rounded-r-lg text-sm border-l border-gray-300 dark:border-gray-700 dark:bg-gray-600 dark:hover:bg-gray-700 dark:focus:ring-gray-800"- title={t('items.generateRandomPassword')}+ title={t('common.generate')}><svg className="w-5 h-5" fill="none" stroke="currentColor" viewBox="0 0 24 24"><path strokeLinecap="round" strokeLinejoin="round" strokeWidth="2" d="M4 4v5h.582m15.356 2A8.001 8.001 0 004.582 9m0 0H9m11 11v-5h-.581m0 0a8.003 8.003 0 01-15.357-2m15.357 2H15" />diff --git a/apps/browser-extension/src/entrypoints/popup/components/Forms/UsernameField.tsx b/apps/browser-extension/src/entrypoints/popup/components/Forms/UsernameField.tsxindex 61a8efc48..db33d5257 100644--- a/apps/browser-extension/src/entrypoints/popup/components/Forms/UsernameField.tsx+++ b/apps/browser-extension/src/entrypoints/popup/components/Forms/UsernameField.tsx@@ -58,7 +58,7 @@ const UsernameField: React.FC<IUsernameFieldProps> = ({type="button"onClick={handleRegenerate}className="px-3 text-gray-500 dark:text-white bg-gray-200 hover:bg-gray-300 focus:ring-4 focus:outline-none focus:ring-gray-300 font-medium rounded-r-lg text-sm dark:bg-gray-600 dark:hover:bg-gray-700 dark:focus:ring-gray-800"- title={t('items.generateRandomUsername')}+ title={t('common.generate')}><svg className="w-5 h-5" fill="none" stroke="currentColor" viewBox="0 0 24 24"><path strokeLinecap="round" strokeLinejoin="round" strokeWidth="2" d="M4 4v5h.582m15.356 2A8.001 8.001 0 004.582 9m0 0H9m11 11v-5h-.581m0 0a8.003 8.003 0 01-15.357-2m15.357 2H15" />diff --git a/apps/browser-extension/src/entrypoints/popup/hooks/useAliasGenerator.ts b/apps/browser-extension/src/entrypoints/popup/hooks/useAliasGenerator.tsindex 693a9d5ae..ed991d338 100644--- a/apps/browser-extension/src/entrypoints/popup/hooks/useAliasGenerator.ts+++ b/apps/browser-extension/src/entrypoints/popup/hooks/useAliasGenerator.ts@@ -2,7 +2,7 @@ import { useCallback, useState, type Dispatch, type SetStateAction } from 'reactimport { useDb } from '@/entrypoints/popup/context/DbContext';-import { IdentityHelperUtils, CreateIdentityGenerator, convertAgeRangeToBirthdateOptions } from '@/utils/dist/core/identity-generator';+import { IdentityHelperUtils, CreateIdentityGenerator, convertAgeRangeToBirthdateOptions, UsernameEmailGenerator } from '@/utils/dist/core/identity-generator';import { CreatePasswordGenerator } from '@/utils/dist/core/password-generator';/**@@ -33,6 +33,7 @@ type LastGeneratedValues = {*/const useAliasGenerator = (): {generateAlias: () => Promise<GeneratedAliasData | null>;+ generateRandomEmailPrefix: () => string;lastGeneratedValues: LastGeneratedValues;setLastGeneratedValues: Dispatch<SetStateAction<LastGeneratedValues>>;} => {@@ -115,8 +116,18 @@ const useAliasGenerator = (): {}}, [dbContext?.sqliteClient, initializeGenerators]);+ /**+ * Generate a random string email prefix (not identity-based).+ * Used for Login-type credentials where no persona fields are available.+ */+ const generateRandomEmailPrefix = useCallback((): string => {+ const generator = new UsernameEmailGenerator();+ return generator.generateRandomEmailPrefix();+ }, []);+return {generateAlias,+ generateRandomEmailPrefix,lastGeneratedValues,setLastGeneratedValues};diff --git a/apps/browser-extension/src/entrypoints/popup/pages/items/ItemAddEdit.tsx b/apps/browser-extension/src/entrypoints/popup/pages/items/ItemAddEdit.tsxindex 1d7027ed7..5896e3be3 100644--- a/apps/browser-extension/src/entrypoints/popup/pages/items/ItemAddEdit.tsx+++ b/apps/browser-extension/src/entrypoints/popup/pages/items/ItemAddEdit.tsx@@ -29,6 +29,7 @@ import useServiceDetection from '@/entrypoints/popup/hooks/useServiceDetection';import { useVaultMutate } from '@/entrypoints/popup/hooks/useVaultMutate';import { SKIP_FORM_RESTORE_KEY } from '@/utils/Constants';+import { UsernameEmailGenerator, Gender } from '@/utils/dist/core/identity-generator';import type { Item, ItemField, ItemType, FieldType, Attachment, TotpCode, PasswordSettings } from '@/utils/dist/core/models/vault';import { FieldCategories, FieldTypes, ItemTypes, getSystemFieldsForItemType, getOptionalFieldsForItemType, isFieldShownByDefault, getSystemField, fieldAppliesToType } from '@/utils/dist/core/models/vault';import { FaviconService } from '@/utils/FaviconService';@@ -94,7 +95,7 @@ const ItemAddEdit: React.FC = () => {const { executeVaultMutationAsync } = useVaultMutate();const { setHeaderButtons } = useHeaderButtons();const { setIsInitialLoading } = useLoading();- const { generateAlias, lastGeneratedValues } = useAliasGenerator();+ const { generateAlias, generateRandomEmailPrefix, lastGeneratedValues } = useAliasGenerator();const { detectService } = useServiceDetection();const webApi = useWebApi();@@ -506,21 +507,58 @@ const ItemAddEdit: React.FC = () => {}, [generateAlias, lastGeneratedValues]);/**- * Generate only the alias email (for Login type email field).- * Generates a random identity and uses it to create an email address.+ * Generate an identity-based email alias (for Alias type email field).+ * Uses the current alias field values (first name, last name, birthdate) to derive the email prefix,+ * so the email stays consistent with the filled-in persona fields.*/- const handleGenerateAliasEmail = useCallback(async () => {- const generatedData = await generateAlias();- if (!generatedData) {+ const handleGenerateAliasEmail = useCallback(() => {+ if (!dbContext?.sqliteClient) {return;}- // Only update the email field+ const firstName = (fieldValues['alias.first_name'] as string) || '';+ const lastName = (fieldValues['alias.last_name'] as string) || '';+ const gender = (fieldValues['alias.gender'] as string) || Gender.Other;+ const birthdate = (fieldValues['alias.birthdate'] as string) || '';++ const generator = new UsernameEmailGenerator();+ const prefix = generator.generateEmailPrefix({+ firstName,+ lastName,+ gender: gender as Gender,+ birthDate: birthdate ? new Date(birthdate) : new Date(),+ emailPrefix: '',+ nickName: ''+ });++ const defaultEmailDomain = dbContext.sqliteClient.settings.getDefaultEmailDomain();+ const email = defaultEmailDomain ? `${prefix}@${defaultEmailDomain}` : prefix;+setFieldValues(prev => ({...prev,- 'login.email': generatedData.email+ 'login.email': email}));- }, [generateAlias]);+ }, [dbContext?.sqliteClient, fieldValues]);++ /**+ * Generate a random-string email alias (for Login type email field).+ * Uses random characters instead of identity-based prefixes since Login type+ * has no persona fields to base the email on.+ */+ const handleGenerateRandomEmail = useCallback(() => {+ if (!dbContext?.sqliteClient) {+ return;+ }++ const prefix = generateRandomEmailPrefix();+ const defaultEmailDomain = dbContext.sqliteClient.settings.getDefaultEmailDomain();+ const email = defaultEmailDomain ? `${prefix}@${defaultEmailDomain}` : prefix;++ setFieldValues(prev => ({+ ...prev,+ 'login.email': email+ }));+ }, [dbContext?.sqliteClient, generateRandomEmailPrefix]);/*** Generate a random username using the shared alias generator.@@ -1087,7 +1125,7 @@ const ItemAddEdit: React.FC = () => {value={stringValue}onChange={(value) => handleFieldChange(fieldKey, value)}onRemove={onRemove}- onGenerateAlias={handleGenerateAliasEmail}+ onGenerateAlias={aliasFieldsShownByDefault ? handleGenerateAliasEmail : handleGenerateRandomEmail}isEmailMode={isLoginEmailInEmailMode}onEmailModeChange={setIsLoginEmailInEmailMode}/>@@ -1122,7 +1160,7 @@ const ItemAddEdit: React.FC = () => {);}- }, [fieldValues, handleFieldChange, showPassword, t, handleGenerateAliasEmail, aliasFieldsShownByDefault, generateRandomUsername, isLoginEmailInEmailMode, passwordSettings]);+ }, [fieldValues, handleFieldChange, showPassword, t, handleGenerateAliasEmail, handleGenerateRandomEmail, aliasFieldsShownByDefault, generateRandomUsername, isLoginEmailInEmailMode, passwordSettings]);/*** Handle form submission via Enter key.@@ -1161,7 +1199,7 @@ const ItemAddEdit: React.FC = () => {type="button"onClick={handleGenerateAlias}className="p-1.5 text-gray-400 hover:text-primary-500 focus:outline-none"- title={t('items.generateRandomAlias')}+ title={t('common.generate')}><svg className='w-4 h-4' viewBox="0 0 24 24" fill="none" stroke="currentColor" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"><path d="M23 4v6h-6"/>diff --git a/apps/browser-extension/src/i18n/locales/en.json b/apps/browser-extension/src/i18n/locales/en.jsonindex 2b60d30bd..97d3344b4 100644--- a/apps/browser-extension/src/i18n/locales/en.json+++ b/apps/browser-extension/src/i18n/locales/en.json@@ -82,6 +82,7 @@"email": "Email","username": "Username","password": "Password",+ "generate": "Generate","serviceName": "Service Name","loggedIn": "Logged in","syncingVault": "Syncing vault",@@ -222,10 +223,6 @@"privateEmailDescription": "E2E encrypted, fully private.","publicEmailTitle": "Public Temp Email Providers","publicEmailDescription": "Anonymous but limited privacy. Email content is readable by anyone that knows the address.",- "generateRandomUsername": "Generate random username",- "generateRandomPassword": "Generate random password",- "generateNewPreview": "Generate new preview",- "generateRandomAlias": "Generate Random Alias","validation": {"required": "This field is required"}