Privacy-first password manager with built-in email aliasing. Fully encrypted and self-hostable.
Add alias email resolve method to check if domain is valid (#2287)
Leendert de Borstf67cd73084bc
diff --git a/apps/browser-extension/src/entrypoints/popup/hooks/useAliasGenerator.ts b/apps/browser-extension/src/entrypoints/popup/hooks/useAliasGenerator.tsindex 658f21e0a..f6083e0ac 100644--- a/apps/browser-extension/src/entrypoints/popup/hooks/useAliasGenerator.ts+++ b/apps/browser-extension/src/entrypoints/popup/hooks/useAliasGenerator.ts@@ -33,6 +33,7 @@ type LastGeneratedValues = {const useAliasGenerator = (): {generateAlias: () => Promise<GeneratedAliasData | null>;generateRandomEmailPrefix: () => Promise<string>;+ resolveDefaultEmailDomain: () => Promise<string>;lastGeneratedValues: LastGeneratedValues;setLastGeneratedValues: Dispatch<SetStateAction<LastGeneratedValues>>;} => {@@ -44,6 +45,33 @@ const useAliasGenerator = (): {email: null});+ /**+ * Resolve the email domain to use for generated aliases. Falls back to the first available+ * private (or public) domain when the vault has no valid default domain configured, so that+ * generated emails always include a domain.+ */+ const resolveDefaultEmailDomain = useCallback(async (): Promise<string> => {+ const metadata = await dbContext.getVaultMetadata();+ const privateEmailDomains = metadata?.privateEmailDomains ?? [];+ const publicEmailDomains = metadata?.publicEmailDomains ?? [];+ const hiddenPrivateEmailDomains = metadata?.hiddenPrivateEmailDomains ?? [];++ /**+ * Check if a domain is valid.+ */+ const isValidDomain = (domain: string): boolean => Boolean(domain) &&+ domain !== 'DISABLED.TLD' &&+ !hiddenPrivateEmailDomains.includes(domain) &&+ (privateEmailDomains.includes(domain) || publicEmailDomains.includes(domain));++ const configuredDomain = dbContext.sqliteClient?.settings.getDefaultEmailDomain() ?? '';+ if (isValidDomain(configuredDomain)) {+ return configuredDomain;+ }++ return privateEmailDomains.find(isValidDomain) ?? publicEmailDomains.find(isValidDomain) ?? '';+ }, [dbContext]);+/*** Generate random alias data.* Returns the generated data for the caller to use.@@ -70,7 +98,7 @@ const useAliasGenerator = (): {const passwordSettings = dbContext.sqliteClient.settings.getPasswordSettings();const password = await RustCore.generatePassword(passwordSettings);- const defaultEmailDomain = dbContext.sqliteClient.settings.getDefaultEmailDomain();+ const defaultEmailDomain = await resolveDefaultEmailDomain();const email = defaultEmailDomain ? `${identity.emailPrefix}@${defaultEmailDomain}` : identity.emailPrefix;const generatedData: GeneratedAliasData = {@@ -95,7 +123,7 @@ const useAliasGenerator = (): {console.error('Error generating random alias:', error);return null;}- }, [dbContext?.sqliteClient]);+ }, [dbContext?.sqliteClient, resolveDefaultEmailDomain]);/*** Generate a random string email prefix (not identity-based).@@ -108,6 +136,7 @@ const useAliasGenerator = (): {return {generateAlias,generateRandomEmailPrefix,+ resolveDefaultEmailDomain,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 d2e5ec6cd..2acef5d06 100644--- a/apps/browser-extension/src/entrypoints/popup/pages/items/ItemAddEdit.tsx+++ b/apps/browser-extension/src/entrypoints/popup/pages/items/ItemAddEdit.tsx@@ -91,7 +91,7 @@ const ItemAddEdit: React.FC = () => {const { executeVaultMutationAsync } = useVaultMutate();const { setHeaderButtons, setBackButtonTitle } = useHeaderButtons();const { setIsInitialLoading } = useLoading();- const { generateAlias, generateRandomEmailPrefix, lastGeneratedValues } = useAliasGenerator();+ const { generateAlias, generateRandomEmailPrefix, resolveDefaultEmailDomain, lastGeneratedValues, setLastGeneratedValues } = useAliasGenerator();const { detectService } = useServiceDetection();const webApi = useWebApi();@@ -560,14 +560,14 @@ const ItemAddEdit: React.FC = () => {prefix = await RustCore.generateIdentityEmailPrefix({ firstName, lastName, birthDate });}- const defaultEmailDomain = dbContext.sqliteClient.settings.getDefaultEmailDomain();+ const defaultEmailDomain = await resolveDefaultEmailDomain();const email = defaultEmailDomain ? `${prefix}@${defaultEmailDomain}` : prefix;setFieldValues(prev => ({...prev,'login.email': email}));- }, [dbContext?.sqliteClient, fieldValues, generateRandomEmailPrefix]);+ }, [dbContext?.sqliteClient, fieldValues, generateRandomEmailPrefix, resolveDefaultEmailDomain]);/*** Generate a random-string email alias (for Login type email field).@@ -580,20 +580,21 @@ const ItemAddEdit: React.FC = () => {}const prefix = await generateRandomEmailPrefix();- const defaultEmailDomain = dbContext.sqliteClient.settings.getDefaultEmailDomain();+ const defaultEmailDomain = await resolveDefaultEmailDomain();const email = defaultEmailDomain ? `${prefix}@${defaultEmailDomain}` : prefix;setFieldValues(prev => ({...prev,'login.email': email}));- }, [dbContext?.sqliteClient, generateRandomEmailPrefix]);+ }, [dbContext?.sqliteClient, generateRandomEmailPrefix, resolveDefaultEmailDomain]);/*** Generate a random username using the shared alias generator.* Reuses the same logic as full alias generation but only updates the username field.*/const generateRandomUsername = useCallback(async () => {+ const previousGeneratedValues = lastGeneratedValues;const generatedData = await generateAlias();if (!generatedData) {return;@@ -604,7 +605,12 @@ const ItemAddEdit: React.FC = () => {...prev,'login.username': generatedData.username}));- }, [generateAlias]);++ setLastGeneratedValues({+ ...previousGeneratedValues,+ username: generatedData.username+ });+ }, [generateAlias, lastGeneratedValues, setLastGeneratedValues]);/*** Check if alias fields are shown by default for the current item type.