Privacy-first password manager with built-in email aliasing. Fully encrypted and self-hostable.
Exclude hidden private domains from email domain defaults (for self-hosted environments) (#2451)
Leendert de Borstce2cde537846
diff --git a/apps/browser-extension/src/entrypoints/popup/components/Forms/EmailDomainField.tsx b/apps/browser-extension/src/entrypoints/popup/components/Forms/EmailDomainField.tsxindex 64a799b95..bf7e6a6bb 100644--- a/apps/browser-extension/src/entrypoints/popup/components/Forms/EmailDomainField.tsx+++ b/apps/browser-extension/src/entrypoints/popup/components/Forms/EmailDomainField.tsx@@ -94,11 +94,16 @@ const EmailDomainField: React.FC<EmailDomainFieldProps> = ({loadDomains();}, [dbContext]);+ // Private domains that are available to the user to pick from+ const selectablePrivateEmailDomains = useMemo(() => {+ return privateEmailDomains.filter(domain => !hiddenPrivateEmailDomains.includes(domain));+ }, [privateEmailDomains, hiddenPrivateEmailDomains]);+// Check if private domains are available and validconst showPrivateDomains = useMemo(() => {- return privateEmailDomains.length > 0 &&- !(privateEmailDomains.length === 1 && (privateEmailDomains[0] === 'DISABLED.TLD' || privateEmailDomains[0] === ''));- }, [privateEmailDomains]);+ return selectablePrivateEmailDomains.length > 0 &&+ !(selectablePrivateEmailDomains.length === 1 && (selectablePrivateEmailDomains[0] === 'DISABLED.TLD' || selectablePrivateEmailDomains[0] === ''));+ }, [selectablePrivateEmailDomains]);// Initialize state from value propuseEffect(() => {@@ -107,8 +112,8 @@ const EmailDomainField: React.FC<EmailDomainFieldProps> = ({setLocalPart('');// Only set default domain if none is selected yet (initial load)if (!selectedDomain) {- if (showPrivateDomains && privateEmailDomains[0]) {- setSelectedDomain(privateEmailDomains[0]);+ if (showPrivateDomains && selectablePrivateEmailDomains[0]) {+ setSelectedDomain(selectablePrivateEmailDomains[0]);} else if (publicEmailDomains[0]) {setSelectedDomain(publicEmailDomains[0]);}@@ -142,14 +147,14 @@ const EmailDomainField: React.FC<EmailDomainFieldProps> = ({// Set default domain if not already setif (!selectedDomain && !value.includes('@')) {- if (showPrivateDomains && privateEmailDomains[0]) {- setSelectedDomain(privateEmailDomains[0]);+ if (showPrivateDomains && selectablePrivateEmailDomains[0]) {+ setSelectedDomain(selectablePrivateEmailDomains[0]);} else if (publicEmailDomains[0]) {setSelectedDomain(publicEmailDomains[0]);}}}- }, [value, publicEmailDomains, privateEmailDomains, hiddenPrivateEmailDomains, showPrivateDomains, isControlled, onEmailModeChange, selectedDomain, setIsCustomDomain]);+ }, [value, publicEmailDomains, privateEmailDomains, hiddenPrivateEmailDomains, selectablePrivateEmailDomains, showPrivateDomains, isControlled, onEmailModeChange, selectedDomain, setIsCustomDomain]);/** Re-check domain mode when domains finish loading.@@ -198,8 +203,8 @@ const EmailDomainField: React.FC<EmailDomainFieldProps> = ({// If value exists but doesn't include @, we need to add the domainif (value && !value.includes('@') && value.trim()) {- const defaultDomain = showPrivateDomains && privateEmailDomains[0]- ? privateEmailDomains[0]+ const defaultDomain = showPrivateDomains && selectablePrivateEmailDomains[0]+ ? selectablePrivateEmailDomains[0]: publicEmailDomains[0];const domainToUse = selectedDomain || defaultDomain;@@ -217,7 +222,7 @@ const EmailDomainField: React.FC<EmailDomainFieldProps> = ({onChange(`${value}@${domainToUse}`);}}- }, [value, isCustomDomain, selectedDomain, showPrivateDomains, privateEmailDomains, publicEmailDomains, onChange]);+ }, [value, isCustomDomain, selectedDomain, showPrivateDomains, selectablePrivateEmailDomains, publicEmailDomains, onChange]);// Handle local part changesconst handleLocalPartChange = useCallback((e: React.ChangeEvent<HTMLInputElement>) => {@@ -248,7 +253,7 @@ const EmailDomainField: React.FC<EmailDomainFieldProps> = ({* This ensures that when user types in alias mode, we always have a domain to construct the full email.*/const domainToUse = selectedDomain ||- (showPrivateDomains && privateEmailDomains[0] ? privateEmailDomains[0] : publicEmailDomains[0] || '');+ (showPrivateDomains && selectablePrivateEmailDomains[0] ? selectablePrivateEmailDomains[0] : publicEmailDomains[0] || '');if (domainToUse) {onChange(`${newLocalPart}@${domainToUse}`);// Update selectedDomain if it wasn't set@@ -263,7 +268,7 @@ const EmailDomainField: React.FC<EmailDomainFieldProps> = ({onChange(newLocalPart);}}- }, [isCustomDomain, selectedDomain, onChange, setIsCustomDomain, showPrivateDomains, privateEmailDomains, publicEmailDomains]);+ }, [isCustomDomain, selectedDomain, onChange, setIsCustomDomain, showPrivateDomains, selectablePrivateEmailDomains, publicEmailDomains]);// Select a domain from the popupconst selectDomain = useCallback((domain: string) => {@@ -294,14 +299,14 @@ const EmailDomainField: React.FC<EmailDomainFieldProps> = ({setLocalPart('');} else {// Switching to domain chooser mode - clear the old email-mode value.- const defaultDomain = showPrivateDomains && privateEmailDomains[0]- ? privateEmailDomains[0]+ const defaultDomain = showPrivateDomains && selectablePrivateEmailDomains[0]+ ? selectablePrivateEmailDomains[0]: publicEmailDomains[0];setSelectedDomain(defaultDomain);setLocalPart('');onChange('');}- }, [isCustomDomain, showPrivateDomains, publicEmailDomains, privateEmailDomains, onChange, setIsCustomDomain]);+ }, [isCustomDomain, showPrivateDomains, publicEmailDomains, selectablePrivateEmailDomains, onChange, setIsCustomDomain]);// Handle clicks outside the popupuseEffect(() => {@@ -336,8 +341,8 @@ const EmailDomainField: React.FC<EmailDomainFieldProps> = ({setIsCustomDomain(false);// Reset to the default domain so stale domains from email mode are cleared.- const defaultDomain = showPrivateDomains && privateEmailDomains[0]- ? privateEmailDomains[0]+ const defaultDomain = showPrivateDomains && selectablePrivateEmailDomains[0]+ ? selectablePrivateEmailDomains[0]: publicEmailDomains[0];if (defaultDomain) {setSelectedDomain(defaultDomain);@@ -350,7 +355,7 @@ const EmailDomainField: React.FC<EmailDomainFieldProps> = ({if (onGenerateAlias) {onGenerateAlias();}- }, [onGenerateAlias, setIsCustomDomain, showPrivateDomains, privateEmailDomains, publicEmailDomains, onChange]);+ }, [onGenerateAlias, setIsCustomDomain, showPrivateDomains, selectablePrivateEmailDomains, publicEmailDomains, onChange]);return (<div className="space-y-2">@@ -454,8 +459,7 @@ const EmailDomainField: React.FC<EmailDomainFieldProps> = ({{t('items.privateEmailDescription')}</p><div className="flex flex-wrap gap-2">- {privateEmailDomains- .filter((domain) => !hiddenPrivateEmailDomains.includes(domain))+ {selectablePrivateEmailDomains.map((domain) => (<buttonkey={domain}diff --git a/apps/browser-extension/src/entrypoints/popup/pages/items/ItemAddEdit.tsx b/apps/browser-extension/src/entrypoints/popup/pages/items/ItemAddEdit.tsxindex 572a1873b..a448d0c75 100644--- a/apps/browser-extension/src/entrypoints/popup/pages/items/ItemAddEdit.tsx+++ b/apps/browser-extension/src/entrypoints/popup/pages/items/ItemAddEdit.tsx@@ -135,6 +135,9 @@ const ItemAddEdit: React.FC = () => {// Track if alias was already auto-generated (to avoid re-generating on re-renders)const aliasGeneratedRef = useRef(false);+ // Set when an existing item without alias identity values is switched to the alias type, so the identity gets generated+ const aliasRequestedByTypeChangeRef = useRef(false);+// Ref for the item name input field (for auto-focus)const nameInputRef = useRef<HTMLInputElement>(null);@@ -649,10 +652,11 @@ const ItemAddEdit: React.FC = () => {}, [applicableSystemFields]);/**- * Auto-generate alias when alias fields are shown by default in create mode.+ * Auto-generate alias when alias fields are shown by default in create mode, or after an existing item was switched to the alias type.*/useEffect(() => {- if (!isEditMode && aliasFieldsShownByDefault && !localLoading && dbContext?.sqliteClient && !aliasGeneratedRef.current) {+ if ((!isEditMode || aliasRequestedByTypeChangeRef.current) && aliasFieldsShownByDefault && !localLoading && dbContext?.sqliteClient && !aliasGeneratedRef.current) {+ aliasRequestedByTypeChangeRef.current = false;aliasGeneratedRef.current = true;void handleGenerateAlias();}@@ -1015,6 +1019,8 @@ const ItemAddEdit: React.FC = () => {// Reset alias generated flag, so alias fields will be filled (again) if they are shown by the new typealiasGeneratedRef.current = false;+ aliasRequestedByTypeChangeRef.current = isEditMode && oldType !== newType && newType === ItemTypes.Alias &&+ ['alias.first_name', 'alias.last_name', 'alias.gender', 'alias.birthdate'].every(key => !((fieldValues[key] as string) ?? '').trim());/** Update email field mode based on new item type@@ -1029,7 +1035,7 @@ const ItemAddEdit: React.FC = () => {});setShowTypeDropdown(false);- }, [item, isEditMode]);+ }, [item, isEditMode, fieldValues]);/*** Remove notes section - clears value and removes from manually added fields.diff --git a/apps/mobile-app/components/form/EmailDomainField.tsx b/apps/mobile-app/components/form/EmailDomainField.tsxindex e551cead5..f973e2fff 100644--- a/apps/mobile-app/components/form/EmailDomainField.tsx+++ b/apps/mobile-app/components/form/EmailDomainField.tsx@@ -76,11 +76,16 @@ export const EmailDomainField: React.FC<EmailDomainFieldProps> = ({loadDomains();}, [dbContext]);+ // Private domains that are available to the user to pick from+ const selectablePrivateEmailDomains = useMemo(() => {+ return privateEmailDomains.filter(domain => !hiddenPrivateEmailDomains.includes(domain));+ }, [privateEmailDomains, hiddenPrivateEmailDomains]);+// Check if private domains are available and validconst showPrivateDomains = useMemo(() => {- return privateEmailDomains.length > 0 &&- !(privateEmailDomains.length === 1 && (privateEmailDomains[0] === 'DISABLED.TLD' || privateEmailDomains[0] === ''));- }, [privateEmailDomains]);+ return selectablePrivateEmailDomains.length > 0 &&+ !(selectablePrivateEmailDomains.length === 1 && (selectablePrivateEmailDomains[0] === 'DISABLED.TLD' || selectablePrivateEmailDomains[0] === ''));+ }, [selectablePrivateEmailDomains]);// Track previous defaultEmailMode to detect prop changes (e.g., when item type changes)const prevDefaultEmailModeRef = useRef(defaultEmailMode);@@ -122,8 +127,8 @@ export const EmailDomainField: React.FC<EmailDomainFieldProps> = ({const userDefaultDomain = await dbContext.sqliteClient?.getDefaultEmailDomain();if (userDefaultDomain) {setSelectedDomain(userDefaultDomain);- } else if (showPrivateDomains && privateEmailDomains[0]) {- setSelectedDomain(privateEmailDomains[0]);+ } else if (showPrivateDomains && selectablePrivateEmailDomains[0]) {+ setSelectedDomain(selectablePrivateEmailDomains[0]);} else if (publicEmailDomains[0]) {setSelectedDomain(publicEmailDomains[0]);}@@ -159,8 +164,8 @@ export const EmailDomainField: React.FC<EmailDomainFieldProps> = ({const userDefaultDomain = await dbContext.sqliteClient?.getDefaultEmailDomain();if (userDefaultDomain) {setSelectedDomain(userDefaultDomain);- } else if (showPrivateDomains && privateEmailDomains[0]) {- setSelectedDomain(privateEmailDomains[0]);+ } else if (showPrivateDomains && selectablePrivateEmailDomains[0]) {+ setSelectedDomain(selectablePrivateEmailDomains[0]);} else if (publicEmailDomains[0]) {setSelectedDomain(publicEmailDomains[0]);}@@ -168,7 +173,7 @@ export const EmailDomainField: React.FC<EmailDomainFieldProps> = ({loadDefaultDomain();}}- }, [value, publicEmailDomains, privateEmailDomains, hiddenPrivateEmailDomains, showPrivateDomains, selectedDomain, dbContext.sqliteClient]);+ }, [value, publicEmailDomains, privateEmailDomains, hiddenPrivateEmailDomains, selectablePrivateEmailDomains, showPrivateDomains, selectedDomain, dbContext.sqliteClient]);/** Re-check domain mode when domains finish loading.@@ -255,7 +260,7 @@ export const EmailDomainField: React.FC<EmailDomainFieldProps> = ({// Load the user's configured default domainconst userDefaultDomain = await dbContext.sqliteClient?.getDefaultEmailDomain();const defaultDomain = userDefaultDomain ||- (showPrivateDomains && privateEmailDomains[0] ? privateEmailDomains[0] : publicEmailDomains[0]);+ (showPrivateDomains && selectablePrivateEmailDomains[0] ? selectablePrivateEmailDomains[0] : publicEmailDomains[0]);if (defaultDomain) {setSelectedDomain(defaultDomain);}@@ -266,7 +271,7 @@ export const EmailDomainField: React.FC<EmailDomainFieldProps> = ({onGenerateAlias();}}- }, [isCustomDomain, showPrivateDomains, publicEmailDomains, privateEmailDomains, onChange, onGenerateAlias, dbContext.sqliteClient]);+ }, [isCustomDomain, showPrivateDomains, publicEmailDomains, selectablePrivateEmailDomains, onChange, onGenerateAlias, dbContext.sqliteClient]);const styles = StyleSheet.create({domainAt: {@@ -566,7 +571,7 @@ export const EmailDomainField: React.FC<EmailDomainFieldProps> = ({{t('items.privateEmailDescription')}</Text><View style={styles.domainList}>- {privateEmailDomains.filter(domain => !hiddenPrivateEmailDomains.includes(domain)).map((domain) => (+ {selectablePrivateEmailDomains.map((domain) => (<TouchableOpacitykey={domain}style={[diff --git a/apps/mobile-app/components/items/AddEditItemScreen.tsx b/apps/mobile-app/components/items/AddEditItemScreen.tsxindex d56354bfb..f11cb9896 100644--- a/apps/mobile-app/components/items/AddEditItemScreen.tsx+++ b/apps/mobile-app/components/items/AddEditItemScreen.tsx@@ -112,6 +112,8 @@ export default function AddEditItemScreen({ editRef }: AddEditItemScreenProps):const [manuallyAddedFields, setManuallyAddedFields] = useState<Set<string>>(new Set());const [initiallyVisibleFields, setInitiallyVisibleFields] = useState<Set<string>>(new Set());const aliasGeneratedRef = useRef(false);+ // Set when an existing item without alias identity values is switched to the alias type, so the identity gets generated+ const aliasRequestedByTypeChangeRef = useRef(false);const [lastGeneratedValues, setLastGeneratedValues] = useState<{username: string | null;password: string | null;@@ -575,10 +577,11 @@ export default function AddEditItemScreen({ editRef }: AddEditItemScreenProps):}, [isEditMode, itemUrl, itemName, itemTypeParam, folderIdParam, folderManifestIdParam, loadExistingItem, router, t, dbContext.sqliteClient]);/**- * Auto-generate alias when alias fields are shown by default in create mode.+ * Auto-generate alias when alias fields are shown by default in create mode, or after an existing item was switched to the alias type.*/useEffect(() => {- if (!isEditMode && aliasFieldsShownByDefault && item && dbContext?.sqliteClient && !aliasGeneratedRef.current) {+ if ((!isEditMode || aliasRequestedByTypeChangeRef.current) && aliasFieldsShownByDefault && item && dbContext?.sqliteClient && !aliasGeneratedRef.current) {+ aliasRequestedByTypeChangeRef.current = false;aliasGeneratedRef.current = true;void generateRandomAlias();}@@ -641,6 +644,8 @@ export default function AddEditItemScreen({ editRef }: AddEditItemScreenProps):// Reset alias generated flagaliasGeneratedRef.current = false;+ aliasRequestedByTypeChangeRef.current = isEditMode && oldType !== newType && newType === ItemTypes.Alias &&+ ['alias.first_name', 'alias.last_name', 'alias.gender', 'alias.birthdate'].every(key => !((fieldValues[key] as string) ?? '').trim());setItem({...item,@@ -649,7 +654,7 @@ export default function AddEditItemScreen({ editRef }: AddEditItemScreenProps):});HapticsUtility.impact();- }, [item, isEditMode]);+ }, [item, isEditMode, fieldValues]);/*** Handle adding an optional system field.diff --git a/apps/web/src/pages/items/AddEdit.tsx b/apps/web/src/pages/items/AddEdit.tsxindex 086df94f2..be751641c 100644--- a/apps/web/src/pages/items/AddEdit.tsx+++ b/apps/web/src/pages/items/AddEdit.tsx@@ -168,11 +168,11 @@ const ItemAddEditForm: React.FC = () => {setManuallyAddedFields(prev => new Set([...prev].filter(applies)));setInitiallyVisibleFields(prev => new Set([...prev].filter(applies)));- if (newType === ItemTypes.Alias && !editMode && !hasAliasValues(next)) {+ if (newType === ItemTypes.Alias && !hasAliasValues(next)) {next = await generateRandomAlias(next);}return next;- }, [editMode, generateRandomAlias]);+ }, [generateRandomAlias]);// Load the item (edit) or prefill the form from the quick create widget's query (create).useEffect(() => {