Skip to content

Privacy-first password manager with built-in email aliasing. Fully encrypted and self-hostable.

Add password generator settings page to browser extension (#776)

Leendert de Borstceaf8701d72f
diff --git a/apps/browser-extension/src/entrypoints/popup/App.tsx b/apps/browser-extension/src/entrypoints/popup/App.tsx
index f9649e788..e00886535 100644
--- a/apps/browser-extension/src/entrypoints/popup/App.tsx
+++ b/apps/browser-extension/src/entrypoints/popup/App.tsx
@@ -34,6 +34,7 @@ import ContextMenuSettings from '@/entrypoints/popup/pages/settings/ContextMenuS
import IdentityGeneratorSettings from '@/entrypoints/popup/pages/settings/IdentityGeneratorSettings';
import LanguageSettings from '@/entrypoints/popup/pages/settings/LanguageSettings';
import PasskeySettings from '@/entrypoints/popup/pages/settings/PasskeySettings';
+import PasswordGeneratorSettings from '@/entrypoints/popup/pages/settings/PasswordGeneratorSettings';
import Settings from '@/entrypoints/popup/pages/settings/Settings';
import VaultUnlockSettings from '@/entrypoints/popup/pages/settings/VaultUnlockSettings';
@@ -207,6 +208,7 @@ const App: React.FC = () => {
{ path: '/settings/auto-lock', element: <AutoLockSettings />, showBackButton: true, title: t('common.settings') },
{ path: '/settings/passkeys', element: <PasskeySettings />, showBackButton: true, title: t('common.settings') },
{ path: '/settings/identity-generator', element: <IdentityGeneratorSettings />, showBackButton: true, title: t('common.settings') },
+ { path: '/settings/password-generator', element: <PasswordGeneratorSettings />, showBackButton: true, title: t('common.settings') },
{ path: '/settings/appearance', element: <AppearanceSettings />, showBackButton: true, title: t('common.settings') },
], [t]);
diff --git a/apps/browser-extension/src/entrypoints/popup/components/Dialogs/PasswordConfigDialog.tsx b/apps/browser-extension/src/entrypoints/popup/components/Dialogs/PasswordConfigDialog.tsx
index 2edc119b8..3dfcba470 100644
--- a/apps/browser-extension/src/entrypoints/popup/components/Dialogs/PasswordConfigDialog.tsx
+++ b/apps/browser-extension/src/entrypoints/popup/components/Dialogs/PasswordConfigDialog.tsx
@@ -1,75 +1,11 @@
-import React, { useState, useEffect, useCallback, useRef } from 'react';
+import React, { useCallback, useEffect, useRef } from 'react';
import { useTranslation } from 'react-i18next';
import ModalWrapper from '@/entrypoints/popup/components/Dialogs/ModalWrapper';
+import PasswordConfigForm from '@/entrypoints/popup/components/Forms/PasswordConfigForm';
+import { usePasswordConfig } from '@/entrypoints/popup/hooks/usePasswordConfig';
-import { MIN_WORD_COUNT, MAX_WORD_COUNT, DEFAULT_WORD_COUNT } from '@/utils/dist/core/models/defaults';
-import type {
- PasswordSettings,
- PasswordGeneratorType,
- DicewareCapitalization,
- DicewareSeparator,
- DicewareSalt
-} from '@/utils/dist/core/models/vault';
-import * as RustCore from '@/utils/RustCore';
-
-const CAPITALIZATION_OPTIONS: DicewareCapitalization[] = ['Lowercase', 'TitleCase', 'Uppercase'];
-const SEPARATOR_OPTIONS: DicewareSeparator[] = ['Dash', 'Space', 'Underscore', 'Dot', 'None'];
-const SALT_OPTIONS: DicewareSalt[] = ['None', 'Prefix', 'Sprinkle', 'Suffix'];
-
-/**
- * Return the next value in a list of options.
- */
-function cycle<T>(options: T[], current: T): T {
- const index = options.indexOf(current);
- return options[(index + 1) % options.length];
-}
-
-/**
- * Glyph for the capitalization.
- */
-function capitalizationGlyph(value: DicewareCapitalization): string {
- switch (value) {
- case 'Uppercase': return 'ABC';
- case 'TitleCase': return 'Abc';
- default: return 'abc';
- }
-}
-
-/**
- * Glyph for the separator.
- */
-function separatorGlyph(value: DicewareSeparator): string {
- switch (value) {
- case 'Dash': return '-';
- case 'Space': return '␣';
- case 'Underscore': return '_';
- case 'Dot': return '.';
- default: return '∅';
- }
-}
-
-/**
- * Glyph for the salt.
- */
-function saltGlyph(value: DicewareSalt): string {
- switch (value) {
- case 'Prefix': return '#ab';
- case 'Sprinkle': return 'a#b';
- case 'Suffix': return 'ab#';
- default: return 'ab';
- }
-}
-
-/**
- * Option button class depending on whether default option is selected or not.
- */
-function optionButtonClass(customized: boolean): string {
- const base = 'flex items-center justify-center px-2 py-2 rounded-md transition-colors';
- return customized
- ? `${base} bg-primary-600 text-white hover:bg-primary-700`
- : `${base} bg-gray-200 text-gray-700 hover:bg-gray-300 dark:bg-gray-700 dark:text-gray-300 dark:hover:bg-gray-600`;
-}
+import type { PasswordSettings } from '@/utils/dist/core/models/vault';
interface IPasswordConfigDialogProps {
isOpen: boolean;
@@ -90,66 +26,34 @@ const PasswordConfigDialog: React.FC<IPasswordConfigDialogProps> = ({
initialSettings
}) => {
const { t } = useTranslation();
- const [settings, setSettings] = useState<PasswordSettings>(initialSettings);
- const [previewPassword, setPreviewPassword] = useState<string>('');
- /*
- * Static RNG seed used for generating the same base passphrase for easy comparison when
- * changing options; refreshed on open and when the regenerate button is pressed.
- */
- const [seed, setSeed] = useState<string>('');
-
- const generatePreview = useCallback(async (currentSettings: PasswordSettings, currentSeed: string): Promise<void> => {
- try {
- const password = await RustCore.generatePassword(currentSettings, currentSeed);
- setPreviewPassword(password);
- } catch (error) {
- console.error('Error generating preview password:', error);
- setPreviewPassword('');
- }
- }, []);
+ const {
+ settings,
+ previewPassword,
+ dicewareLanguages,
+ handleSettingChange,
+ handleRefreshPreview,
+ reset
+ } = usePasswordConfig(initialSettings, onSettingsChange);
/*
- * Initialize settings.
+ * Re-initialize the working settings + seed each time the dialog is opened so it reflects the
+ * latest persisted settings and produces a fresh preview.
*/
const wasOpenRef = useRef(false);
useEffect(() => {
if (isOpen && !wasOpenRef.current) {
wasOpenRef.current = true;
- const newSeed = RustCore.generateSeed();
- setSeed(newSeed);
- setSettings({ ...initialSettings });
- void generatePreview({ ...initialSettings }, newSeed);
+ reset({ ...initialSettings });
} else if (!isOpen) {
wasOpenRef.current = false;
}
- }, [isOpen, initialSettings, generatePreview]);
-
- const handleSettingChange = useCallback((key: keyof PasswordSettings, value: boolean | number | string) => {
- const newSettings = { ...settings, [key]: value };
- setSettings(newSettings);
- // Reuse the same seed so only the changed option affects the preview.
- void generatePreview(newSettings, seed);
- onSettingsChange?.(newSettings);
- }, [settings, seed, generatePreview, onSettingsChange]);
-
- const handleRefreshPreview = useCallback(() => {
- // The regenerate button produces a genuinely new passphrase.
- const newSeed = RustCore.generateSeed();
- setSeed(newSeed);
- void generatePreview(settings, newSeed);
- }, [settings, generatePreview]);
+ }, [isOpen, initialSettings, reset]);
const handleSave = useCallback(() => {
onSave(previewPassword);
onClose();
}, [previewPassword, onSave, onClose]);
- /**
- * Human label for a Diceware option value (used in button tooltips).
- */
- const optionLabel = (group: 'Capitalization' | 'Separator' | 'Salt', value: string): string =>
- value === 'None' ? t('common.none') : t(`items.diceware${group}Option.${value}`);
-
return (
<ModalWrapper
isOpen={isOpen}
@@ -171,189 +75,13 @@ const PasswordConfigDialog: React.FC<IPasswordConfigDialogProps> = ({
</div>
}
>
- {/*
- Type switcher (Basic | Diceware).
- */}
- <div className="-mx-6 -mt-4 mb-4 flex border-b border-gray-200 dark:border-gray-700">
- {(['basic', 'diceware'] as PasswordGeneratorType[]).map((mode) => {
- const isActive = (settings.Type ?? 'basic') === mode;
- return (
- <button
- key={mode}
- type="button"
- onClick={() => handleSettingChange('Type', mode)}
- className={`-mb-px flex-1 border-b-2 px-3 py-4 text-sm font-medium transition-colors ${
- isActive
- ? 'border-primary-600 text-primary-600 dark:border-primary-500 dark:text-primary-500'
- : 'border-transparent text-gray-500 hover:text-gray-700 dark:text-gray-400 dark:hover:text-gray-200'
- }`}
- >
- {mode === 'basic' ? t('items.passwordTypeBasic') : t('items.passwordTypeDiceware')}
- </button>
- );
- })}
- </div>
-
- <div className="space-y-4">
- {/* Password Preview */}
- <div>
- <div className="flex items-center gap-2">
- <input
- type="text"
- value={previewPassword}
- readOnly
- className="flex-1 bg-gray-50 border border-gray-300 text-gray-900 text-sm rounded-lg p-2.5 dark:bg-gray-700 dark:border-gray-600 dark:text-white font-mono"
- />
- <button
- 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('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>
- </svg>
- </button>
- </div>
- </div>
-
- {/* Basic mode: character type options */}
- {(settings.Type ?? 'basic') !== 'diceware' && (
- <div className="space-y-3">
- <div className="grid grid-cols-2 gap-2">
- {/* Lowercase Toggle */}
- <button
- type="button"
- onClick={() => handleSettingChange('UseLowercase', !settings.UseLowercase)}
- className={`flex items-center justify-center px-3 py-2 rounded-md text-sm font-medium transition-colors ${
- settings.UseLowercase
- ? 'bg-primary-600 text-white hover:bg-primary-700'
- : 'bg-gray-200 text-gray-700 hover:bg-gray-300 dark:bg-gray-700 dark:text-gray-300 dark:hover:bg-gray-600'
- }`}
- title={t('items.includeLowercase')}
- >
- <span className="font-mono text-base">a-z</span>
- </button>
-
- {/* Uppercase Toggle */}
- <button
- type="button"
- onClick={() => handleSettingChange('UseUppercase', !settings.UseUppercase)}
- className={`flex items-center justify-center px-3 py-2 rounded-md text-sm font-medium transition-colors ${
- settings.UseUppercase
- ? 'bg-primary-600 text-white hover:bg-primary-700'
- : 'bg-gray-200 text-gray-700 hover:bg-gray-300 dark:bg-gray-700 dark:text-gray-300 dark:hover:bg-gray-600'
- }`}
- title={t('items.includeUppercase')}
- >
- <span className="font-mono text-base">A-Z</span>
- </button>
-
- {/* Numbers Toggle */}
- <button
- type="button"
- onClick={() => handleSettingChange('UseNumbers', !settings.UseNumbers)}
- className={`flex items-center justify-center px-3 py-2 rounded-md text-sm font-medium transition-colors ${
- settings.UseNumbers
- ? 'bg-primary-600 text-white hover:bg-primary-700'
- : 'bg-gray-200 text-gray-700 hover:bg-gray-300 dark:bg-gray-700 dark:text-gray-300 dark:hover:bg-gray-600'
- }`}
- title={t('items.includeNumbers')}
- >
- <span className="font-mono text-base">0-9</span>
- </button>
-
- {/* Special Characters Toggle */}
- <button
- type="button"
- onClick={() => handleSettingChange('UseSpecialChars', !settings.UseSpecialChars)}
- className={`flex items-center justify-center px-3 py-2 rounded-md text-sm font-medium transition-colors ${
- settings.UseSpecialChars
- ? 'bg-primary-600 text-white hover:bg-primary-700'
- : 'bg-gray-200 text-gray-700 hover:bg-gray-300 dark:bg-gray-700 dark:text-gray-300 dark:hover:bg-gray-600'
- }`}
- title={t('items.includeSpecialChars')}
- >
- <span className="font-mono text-base">!@#</span>
- </button>
- </div>
-
- {/* Avoid Ambiguous Characters */}
- <div className="flex items-center">
- <input
- id="use-non-ambiguous"
- type="checkbox"
- checked={settings.UseNonAmbiguousChars}
- onChange={(e) => handleSettingChange('UseNonAmbiguousChars', e.target.checked)}
- className="h-4 w-4 text-primary-600 focus:ring-primary-500 border-gray-300 rounded dark:bg-gray-700 dark:border-gray-600"
- />
- <label htmlFor="use-non-ambiguous" className="ml-2 text-sm text-gray-700 dark:text-gray-300">
- {t('items.avoidAmbiguousChars')}
- </label>
- </div>
- </div>
- )}
-
- {/* Diceware mode: passphrase options */}
- {(settings.Type ?? 'basic') === 'diceware' && (
- <div className="space-y-3">
- {/* Word Count Slider */}
- <div>
- <div className="flex items-center justify-between mb-2">
- <label htmlFor="diceware-word-count" className="text-sm font-medium text-gray-700 dark:text-gray-300">
- {t('items.wordCount')}
- </label>
- <span className="text-sm text-gray-600 dark:text-gray-400 font-mono">
- {settings.WordCount ?? DEFAULT_WORD_COUNT}
- </span>
- </div>
- <input
- id="diceware-word-count"
- type="range"
- min={MIN_WORD_COUNT}
- max={MAX_WORD_COUNT}
- step="1"
- value={settings.WordCount ?? DEFAULT_WORD_COUNT}
- onChange={(e) => handleSettingChange('WordCount', parseInt(e.target.value, 10))}
- className="w-full h-2 bg-gray-200 rounded-lg appearance-none cursor-pointer dark:bg-gray-700"
- />
- </div>
-
- {/* Option buttons */}
- <div className="grid grid-cols-3 gap-2">
- {/* Capitalization */}
- <button
- type="button"
- onClick={() => handleSettingChange('Capitalization', cycle(CAPITALIZATION_OPTIONS, settings.Capitalization ?? 'Lowercase'))}
- className={optionButtonClass((settings.Capitalization ?? 'Lowercase') !== 'Lowercase')}
- title={`${optionLabel('Capitalization', settings.Capitalization ?? 'Lowercase')}`}
- >
- <span className="font-mono text-base">{capitalizationGlyph(settings.Capitalization ?? 'Lowercase')}</span>
- </button>
-
- {/* Separator */}
- <button
- type="button"
- onClick={() => handleSettingChange('Separator', cycle(SEPARATOR_OPTIONS, settings.Separator ?? 'Dash'))}
- className={optionButtonClass((settings.Separator ?? 'Dash') !== 'Dash')}
- title={`${t('items.separator')}: ${optionLabel('Separator', settings.Separator ?? 'Dash')}`}
- >
- <span className="font-mono text-base">{separatorGlyph(settings.Separator ?? 'Dash')}</span>
- </button>
-
- {/* Salt */}
- <button
- type="button"
- onClick={() => handleSettingChange('Salt', cycle(SALT_OPTIONS, settings.Salt ?? 'None'))}
- className={optionButtonClass((settings.Salt ?? 'None') !== 'None')}
- title={`${t('items.salt')}: ${optionLabel('Salt', settings.Salt ?? 'None')}`}
- >
- <span className="font-mono text-base">{saltGlyph(settings.Salt ?? 'None')}</span>
- </button>
- </div>
- </div>
- )}
- </div>
+ <PasswordConfigForm
+ settings={settings}
+ previewPassword={previewPassword}
+ dicewareLanguages={dicewareLanguages}
+ onSettingChange={handleSettingChange}
+ onRefreshPreview={handleRefreshPreview}
+ />
</ModalWrapper>
);
};
diff --git a/apps/browser-extension/src/entrypoints/popup/components/Forms/PasswordConfigForm.tsx b/apps/browser-extension/src/entrypoints/popup/components/Forms/PasswordConfigForm.tsx
new file mode 100644
index 000000000..f2691ae19
--- /dev/null
+++ b/apps/browser-extension/src/entrypoints/popup/components/Forms/PasswordConfigForm.tsx
@@ -0,0 +1,326 @@
+import React from 'react';
+import { useTranslation } from 'react-i18next';
+
+import { getDicewareLanguageDisplay, DEFAULT_DICEWARE_LANGUAGE } from '@/utils/DicewareLanguages';
+import { MIN_WORD_COUNT, MAX_WORD_COUNT, DEFAULT_WORD_COUNT } from '@/utils/dist/core/models/defaults';
+import type {
+ PasswordSettings,
+ PasswordGeneratorType,
+ DicewareCapitalization,
+ DicewareSeparator,
+ DicewareSalt
+} from '@/utils/dist/core/models/vault';
+
+const CAPITALIZATION_OPTIONS: DicewareCapitalization[] = ['Lowercase', 'TitleCase', 'Uppercase'];
+const SEPARATOR_OPTIONS: DicewareSeparator[] = ['Dash', 'Space', 'Underscore', 'Dot', 'None'];
+const SALT_OPTIONS: DicewareSalt[] = ['None', 'Prefix', 'Sprinkle', 'Suffix'];
+
+/**
+ * Return the next value in a list of options.
+ */
+function cycle<T>(options: T[], current: T): T {
+ const index = options.indexOf(current);
+ return options[(index + 1) % options.length];
+}
+
+/**
+ * Glyph for the capitalization.
+ */
+function capitalizationGlyph(value: DicewareCapitalization): string {
+ switch (value) {
+ case 'Uppercase': return 'ABC';
+ case 'TitleCase': return 'Abc';
+ default: return 'abc';
+ }
+}
+
+/**
+ * Glyph for the separator.
+ */
+function separatorGlyph(value: DicewareSeparator): string {
+ switch (value) {
+ case 'Dash': return '-';
+ case 'Space': return '␣';
+ case 'Underscore': return '_';
+ case 'Dot': return '.';
+ default: return '∅';
+ }
+}
+
+/**
+ * Glyph for the salt.
+ */
+function saltGlyph(value: DicewareSalt): string {
+ switch (value) {
+ case 'Prefix': return '#ab';
+ case 'Sprinkle': return 'a#b';
+ case 'Suffix': return 'ab#';
+ default: return 'ab';
+ }
+}
+
+/**
+ * Option button class depending on whether default option is selected or not.
+ */
+function optionButtonClass(customized: boolean): string {
+ const base = 'flex items-center justify-center px-2 py-2 rounded-md transition-colors';
+ return customized
+ ? `${base} bg-primary-600 text-white hover:bg-primary-700`
+ : `${base} bg-gray-200 text-gray-700 hover:bg-gray-300 dark:bg-gray-700 dark:text-gray-300 dark:hover:bg-gray-600`;
+}
+
+interface IPasswordConfigFormProps {
+ settings: PasswordSettings;
+ previewPassword: string;
+ dicewareLanguages: string[];
+ onSettingChange: (key: keyof PasswordSettings, value: boolean | number | string) => void;
+ onRefreshPreview: () => void;
+ /**
+ * Negative-margin utility classes used to make the type switcher span the container's padding.
+ * Defaults to the modal padding (`px-6 pt-4`); pass `-mx-4 -mt-4` when embedded in a `p-4` card.
+ */
+ edgeMarginClass?: string;
+ /**
+ * Whether to show the passphrase language dropdown in the Diceware section. Defaults to true.
+ * Set to false where the language is configured separately (e.g. the settings page).
+ */
+ showLanguagePicker?: boolean;
+}
+
+/**
+ * Controlled password generator configuration form (type switcher, preview, basic and Diceware
+ * options including the passphrase language dropdown). State is owned by the parent
+ * (see {@link import('@/entrypoints/popup/hooks/usePasswordConfig').usePasswordConfig}).
+ */
+const PasswordConfigForm: React.FC<IPasswordConfigFormProps> = ({
+ settings,
+ previewPassword,
+ dicewareLanguages,
+ onSettingChange,
+ onRefreshPreview,
+ edgeMarginClass = '-mx-6 -mt-4',
+ showLanguagePicker = true
+}) => {
+ const { t } = useTranslation();
+
+ const isDiceware = (settings.Type ?? 'basic') === 'diceware';
+ const currentLanguage = settings.Language ?? DEFAULT_DICEWARE_LANGUAGE;
+
+ /**
+ * Human label for a Diceware option value (used in button tooltips).
+ */
+ const optionLabel = (group: 'Capitalization' | 'Separator' | 'Salt', value: string): string =>
+ value === 'None' ? t('common.none') : t(`items.diceware${group}Option.${value}`);
+
+ return (
+ <>
+ {/* Type switcher (Basic | Diceware). */}
+ <div className={`${edgeMarginClass} mb-4 flex border-b border-gray-200 dark:border-gray-700`}>
+ {(['basic', 'diceware'] as PasswordGeneratorType[]).map((mode) => {
+ const isActive = (settings.Type ?? 'basic') === mode;
+ return (
+ <button
+ key={mode}
+ type="button"
+ onClick={() => onSettingChange('Type', mode)}
+ className={`-mb-px flex-1 border-b-2 px-3 py-4 text-sm font-medium transition-colors ${
+ isActive
+ ? 'border-primary-600 text-primary-600 dark:border-primary-500 dark:text-primary-500'
+ : 'border-transparent text-gray-500 hover:text-gray-700 dark:text-gray-400 dark:hover:text-gray-200'
+ }`}
+ >
+ {mode === 'basic' ? t('items.passwordTypeBasic') : t('items.passwordTypeDiceware')}
+ </button>
+ );
+ })}
+ </div>
+
+ <div className="space-y-4">
+ {/* Password Preview */}
+ <div>
+ <div className="flex items-center gap-2">
+ <input
+ type="text"
+ value={previewPassword}
+ readOnly
+ className="flex-1 bg-gray-50 border border-gray-300 text-gray-900 text-sm rounded-lg p-2.5 dark:bg-gray-700 dark:border-gray-600 dark:text-white font-mono"
+ />
+ <button
+ type="button"
+ onClick={onRefreshPreview}
+ 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('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>
+ </svg>
+ </button>
+ </div>
+ </div>
+
+ {/* Basic mode: character type options */}
+ {!isDiceware && (
+ <div className="space-y-3">
+ <div className="grid grid-cols-2 gap-2">
+ {/* Lowercase Toggle */}
+ <button
+ type="button"
+ onClick={() => onSettingChange('UseLowercase', !settings.UseLowercase)}
+ className={`flex items-center justify-center px-3 py-2 rounded-md text-sm font-medium transition-colors ${
+ settings.UseLowercase
+ ? 'bg-primary-600 text-white hover:bg-primary-700'
+ : 'bg-gray-200 text-gray-700 hover:bg-gray-300 dark:bg-gray-700 dark:text-gray-300 dark:hover:bg-gray-600'
+ }`}
+ title={t('items.includeLowercase')}
+ >
+ <span className="font-mono text-base">a-z</span>
+ </button>
+
+ {/* Uppercase Toggle */}
+ <button
+ type="button"
+ onClick={() => onSettingChange('UseUppercase', !settings.UseUppercase)}
+ className={`flex items-center justify-center px-3 py-2 rounded-md text-sm font-medium transition-colors ${
+ settings.UseUppercase
+ ? 'bg-primary-600 text-white hover:bg-primary-700'
+ : 'bg-gray-200 text-gray-700 hover:bg-gray-300 dark:bg-gray-700 dark:text-gray-300 dark:hover:bg-gray-600'
+ }`}
+ title={t('items.includeUppercase')}
+ >
+ <span className="font-mono text-base">A-Z</span>
+ </button>
+
+ {/* Numbers Toggle */}
+ <button
+ type="button"
+ onClick={() => onSettingChange('UseNumbers', !settings.UseNumbers)}
+ className={`flex items-center justify-center px-3 py-2 rounded-md text-sm font-medium transition-colors ${
+ settings.UseNumbers
+ ? 'bg-primary-600 text-white hover:bg-primary-700'
+ : 'bg-gray-200 text-gray-700 hover:bg-gray-300 dark:bg-gray-700 dark:text-gray-300 dark:hover:bg-gray-600'
+ }`}
+ title={t('items.includeNumbers')}
+ >
+ <span className="font-mono text-base">0-9</span>
+ </button>
+
+ {/* Special Characters Toggle */}
+ <button
+ type="button"
+ onClick={() => onSettingChange('UseSpecialChars', !settings.UseSpecialChars)}
+ className={`flex items-center justify-center px-3 py-2 rounded-md text-sm font-medium transition-colors ${
+ settings.UseSpecialChars
+ ? 'bg-primary-600 text-white hover:bg-primary-700'
+ : 'bg-gray-200 text-gray-700 hover:bg-gray-300 dark:bg-gray-700 dark:text-gray-300 dark:hover:bg-gray-600'
+ }`}
+ title={t('items.includeSpecialChars')}
+ >
+ <span className="font-mono text-base">!@#</span>
+ </button>
+ </div>
+
+ {/* Avoid Ambiguous Characters */}
+ <div className="flex items-center">
+ <input
+ id="use-non-ambiguous"
+ type="checkbox"
+ checked={settings.UseNonAmbiguousChars}
+ onChange={(e) => onSettingChange('UseNonAmbiguousChars', e.target.checked)}
+ className="h-4 w-4 text-primary-600 focus:ring-primary-500 border-gray-300 rounded dark:bg-gray-700 dark:border-gray-600"
+ />
+ <label htmlFor="use-non-ambiguous" className="ml-2 text-sm text-gray-700 dark:text-gray-300">
+ {t('items.avoidAmbiguousChars')}
+ </label>
+ </div>
+ </div>
+ )}
+
+ {/* Diceware mode: passphrase options */}
+ {isDiceware && (
+ <div className="space-y-3">
+ {/* Word Count Slider */}
+ <div>
+ <div className="flex items-center justify-between mb-2">
+ <label htmlFor="diceware-word-count" className="text-sm font-medium text-gray-700 dark:text-gray-300">
+ {t('items.wordCount')}
+ </label>
+ <span className="text-sm text-gray-600 dark:text-gray-400 font-mono">
+ {settings.WordCount ?? DEFAULT_WORD_COUNT}
+ </span>
+ </div>
+ <input
+ id="diceware-word-count"
+ type="range"
+ min={MIN_WORD_COUNT}
+ max={MAX_WORD_COUNT}
+ step="1"
+ value={settings.WordCount ?? DEFAULT_WORD_COUNT}
+ onChange={(e) => onSettingChange('WordCount', parseInt(e.target.value, 10))}
+ className="w-full h-2 bg-gray-200 rounded-lg appearance-none cursor-pointer dark:bg-gray-700"
+ />
+ </div>
+
+ {/* Option buttons */}
+ <div className="grid grid-cols-3 gap-2">
+ {/* Capitalization */}
+ <button
+ type="button"
+ onClick={() => onSettingChange('Capitalization', cycle(CAPITALIZATION_OPTIONS, settings.Capitalization ?? 'Lowercase'))}
+ className={optionButtonClass((settings.Capitalization ?? 'Lowercase') !== 'Lowercase')}
+ title={`${optionLabel('Capitalization', settings.Capitalization ?? 'Lowercase')}`}
+ >
+ <span className="font-mono text-base">{capitalizationGlyph(settings.Capitalization ?? 'Lowercase')}</span>
+ </button>
+
+ {/* Separator */}
+ <button
+ type="button"
+ onClick={() => onSettingChange('Separator', cycle(SEPARATOR_OPTIONS, settings.Separator ?? 'Dash'))}
+ className={optionButtonClass((settings.Separator ?? 'Dash') !== 'Dash')}
+ title={`${t('items.separator')}: ${optionLabel('Separator', settings.Separator ?? 'Dash')}`}
+ >
+ <span className="font-mono text-base">{separatorGlyph(settings.Separator ?? 'Dash')}</span>
+ </button>
+
+ {/* Salt */}
+ <button
+ type="button"
+ onClick={() => onSettingChange('Salt', cycle(SALT_OPTIONS, settings.Salt ?? 'None'))}
+ className={optionButtonClass((settings.Salt ?? 'None') !== 'None')}
+ title={`${t('items.salt')}: ${optionLabel('Salt', settings.Salt ?? 'None')}`}
+ >
+ <span className="font-mono text-base">{saltGlyph(settings.Salt ?? 'None')}</span>
+ </button>
+ </div>
+
+ {/* Passphrase language */}
+ {showLanguagePicker && (
+ <div>
+ <label htmlFor="diceware-language" className="block text-sm font-medium text-gray-700 dark:text-gray-300 mb-1">
+ {t('items.passphraseLanguage')}
+ </label>
+ <select
+ id="diceware-language"
+ value={currentLanguage}
+ onChange={(e) => onSettingChange('Language', e.target.value)}
+ className="w-full px-3 py-2 bg-white dark:bg-gray-700 border border-gray-300 dark:border-gray-600 rounded-md text-gray-900 dark:text-white focus:ring-primary-500 focus:border-primary-500"
+ >
+ {dicewareLanguages.map((code) => {
+ const { flag, label } = getDicewareLanguageDisplay(code);
+ return (
+ <option key={code} value={code}>
+ {flag} {label}
+ </option>
+ );
+ })}
+ </select>
+ </div>
+ )}
+ </div>
+ )}
+ </div>
+ </>
+ );
+};
+
+export default PasswordConfigForm;
diff --git a/apps/browser-extension/src/entrypoints/popup/hooks/usePasswordConfig.ts b/apps/browser-extension/src/entrypoints/popup/hooks/usePasswordConfig.ts
new file mode 100644
index 000000000..48549858d
--- /dev/null
+++ b/apps/browser-extension/src/entrypoints/popup/hooks/usePasswordConfig.ts
@@ -0,0 +1,102 @@
+import { useState, useEffect, useCallback, useRef } from 'react';
+
+import type { PasswordSettings } from '@/utils/dist/core/models/vault';
+import * as RustCore from '@/utils/RustCore';
+
+/**
+ * Value returned by {@link usePasswordConfig}.
+ */
+export interface IPasswordConfig {
+ /** The current password settings being edited. */
+ settings: PasswordSettings;
+ /** The live preview password/passphrase for the current settings. */
+ previewPassword: string;
+ /** The Diceware wordlist language codes available from the core. */
+ dicewareLanguages: string[];
+ /** Update a single setting, regenerating the preview with the stable seed. */
+ handleSettingChange: (key: keyof PasswordSettings, value: boolean | number | string) => void;
+ /** Draw a fresh seed and regenerate the preview (genuinely new password). */
+ handleRefreshPreview: () => void;
+ /** Re-initialize from the given settings with a fresh seed (e.g. when a dialog reopens). */
+ reset: (settings: PasswordSettings) => void;
+}
+
+/**
+ * Shared state + preview logic for the password generator UI.
+ *
+ * @param initialSettings - The settings to start from.
+ * @param onSettingsChange - Optional callback fired with the full settings on every change.
+ * @returns The password config state and handlers.
+ */
+export function usePasswordConfig(
+ initialSettings: PasswordSettings,
+ onSettingsChange?: (settings: PasswordSettings) => void
+): IPasswordConfig {
+ const [settings, setSettings] = useState<PasswordSettings>(initialSettings);
+ const [previewPassword, setPreviewPassword] = useState<string>('');
+ const [dicewareLanguages, setDicewareLanguages] = useState<string[]>([]);
+ const seedRef = useRef<string>('');
+
+ const generatePreview = useCallback(async (currentSettings: PasswordSettings, currentSeed: string): Promise<void> => {
+ try {
+ const password = await RustCore.generatePassword(currentSettings, currentSeed);
+ setPreviewPassword(password);
+ } catch (error) {
+ console.error('Error generating preview password:', error);
+ setPreviewPassword('');
+ }
+ }, []);
+
+ // Initialize the seed + preview once on mount.
+ useEffect(() => {
+ seedRef.current = RustCore.generateSeed();
+ void generatePreview(initialSettings, seedRef.current);
+ // eslint-disable-next-line react-hooks/exhaustive-deps
+ }, []);
+
+ // Load the available Diceware languages once.
+ useEffect(() => {
+ let cancelled = false;
+ void RustCore.getDicewareLanguages().then((languages) => {
+ if (!cancelled) {
+ setDicewareLanguages(languages);
+ }
+ });
+ return (): void => {
+ cancelled = true;
+ };
+ }, []);
+
+ const handleSettingChange = useCallback((key: keyof PasswordSettings, value: boolean | number | string) => {
+ setSettings((prev): PasswordSettings => {
+ const newSettings = { ...prev, [key]: value };
+ // Reuse the stable seed so only the changed option affects the preview.
+ void generatePreview(newSettings, seedRef.current);
+ onSettingsChange?.(newSettings);
+ return newSettings;
+ });
+ }, [generatePreview, onSettingsChange]);
+
+ const handleRefreshPreview = useCallback(() => {
+ seedRef.current = RustCore.generateSeed();
+ setSettings((prev): PasswordSettings => {
+ void generatePreview(prev, seedRef.current);
+ return prev;
+ });
+ }, [generatePreview]);
+
+ const reset = useCallback((newSettings: PasswordSettings) => {
+ seedRef.current = RustCore.generateSeed();
+ setSettings(newSettings);
+ void generatePreview(newSettings, seedRef.current);
+ }, [generatePreview]);
+
+ return {
+ settings,
+ previewPassword,
+ dicewareLanguages,
+ handleSettingChange,
+ handleRefreshPreview,
+ reset
+ };
+}
diff --git a/apps/browser-extension/src/entrypoints/popup/pages/settings/PasswordGeneratorSettings.tsx b/apps/browser-extension/src/entrypoints/popup/pages/settings/PasswordGeneratorSettings.tsx
new file mode 100644
index 000000000..2d1b20926
--- /dev/null
+++ b/apps/browser-extension/src/entrypoints/popup/pages/settings/PasswordGeneratorSettings.tsx
@@ -0,0 +1,148 @@
+import React, { useEffect, useState, useCallback, useRef } from 'react';
+import { useTranslation } from 'react-i18next';
+
+import ModalWrapper from '@/entrypoints/popup/components/Dialogs/ModalWrapper';
+import PasswordConfigForm from '@/entrypoints/popup/components/Forms/PasswordConfigForm';
+import PageTitle from '@/entrypoints/popup/components/PageTitle';
+import { useDb } from '@/entrypoints/popup/context/DbContext';
+import { useLoading } from '@/entrypoints/popup/context/LoadingContext';
+import { usePasswordConfig } from '@/entrypoints/popup/hooks/usePasswordConfig';
+import { useVaultMutate } from '@/entrypoints/popup/hooks/useVaultMutate';
+
+import type { PasswordSettings } from '@/utils/dist/core/models/vault';
+
+interface IPasswordSettingsModalProps {
+ isOpen: boolean;
+ initialSettings: PasswordSettings;
+ onSave: (settings: PasswordSettings) => void;
+ onClose: () => void;
+}
+
+/**
+ * Modal that edits the default password generator settings.
+ */
+const PasswordSettingsModal: React.FC<IPasswordSettingsModalProps> = ({ isOpen, initialSettings, onSave, onClose }) => {
+ const { t } = useTranslation();
+ const {
+ settings,
+ previewPassword,
+ dicewareLanguages,
+ handleSettingChange,
+ handleRefreshPreview,
+ reset
+ } = usePasswordConfig(initialSettings);
+
+ // Re-seed the draft from the latest settings each time the modal is opened.
+ const wasOpenRef = useRef(false);
+ useEffect(() => {
+ if (isOpen && !wasOpenRef.current) {
+ wasOpenRef.current = true;
+ reset({ ...initialSettings });
+ } else if (!isOpen) {
+ wasOpenRef.current = false;
+ }
+ }, [isOpen, initialSettings, reset]);
+
+ const handleSave = useCallback(() => {
+ onSave(settings);
+ onClose();
+ }, [settings, onSave, onClose]);
+
+ return (
+ <ModalWrapper
+ isOpen={isOpen}
+ onClose={onClose}
+ showCloseButton={false}
+ maxWidth="max-w-lg"
+ footer={
+ <div className="flex">
+ <button
+ type="button"
+ className="inline-flex w-full items-center justify-center gap-1 rounded-md bg-primary-600 px-3 py-2 text-sm font-semibold text-white shadow-sm hover:bg-primary-700"
+ onClick={handleSave}
+ >
+ {t('common.save')}
+ </button>
+ </div>
+ }
+ >
+ <PasswordConfigForm
+ settings={settings}
+ previewPassword={previewPassword}
+ dicewareLanguages={dicewareLanguages}
+ onSettingChange={handleSettingChange}
+ onRefreshPreview={handleRefreshPreview}
+ />
+ </ModalWrapper>
+ );
+};
+
+/**
+ * Password Generator Settings page.
+ * Configures the default password generator settings (basic and Diceware/passphrase, including the
+ * passphrase language) used for all newly created items. Settings are edited in a modal that only
+ * persists on Save, avoiding a vault write + sync on every adjustment.
+ */
+const PasswordGeneratorSettings: React.FC = () => {
+ const { t } = useTranslation();
+ const { setIsInitialLoading } = useLoading();
+ const dbContext = useDb();
+ const { executeVaultMutationAsync } = useVaultMutate();
+
+ const [settings, setSettings] = useState<PasswordSettings | null>(null);
+ const [showModal, setShowModal] = useState(false);
+
+ useEffect(() => {
+ if (dbContext?.sqliteClient) {
+ setSettings(dbContext.sqliteClient.settings.getPasswordSettings());
+ }
+ setIsInitialLoading(false);
+ }, [dbContext?.sqliteClient, setIsInitialLoading]);
+
+ /**
+ * Persist the full settings blob to the vault (a single write + sync).
+ */
+ const handleModalSave = useCallback((next: PasswordSettings): void => {
+ setSettings(next);
+ if (dbContext?.sqliteClient) {
+ void executeVaultMutationAsync(async () => {
+ dbContext.sqliteClient!.settings.setPasswordSettings(next);
+ });
+ }
+ }, [dbContext?.sqliteClient, executeVaultMutationAsync]);
+
+ return (
+ <div className="space-y-6">
+ <PageTitle>{t('settings.passwordGenerator')}</PageTitle>
+
+ <section>
+ <div className="bg-white dark:bg-gray-800 rounded-lg shadow-sm border border-gray-200 dark:border-gray-700">
+ <div className="p-4">
+ <p className="text-sm text-gray-600 dark:text-gray-400 mb-3">
+ {t('settings.passwordGeneratorSettings.description')}
+ </p>
+ <button
+ type="button"
+ onClick={() => setShowModal(true)}
+ disabled={!settings}
+ className="px-4 py-2 bg-primary-600 text-white rounded-md hover:bg-primary-700 focus:outline-none focus:ring-2 focus:ring-primary-500 disabled:opacity-50"
+ >
+ {t('settings.passwordGeneratorSettings.configureButton')}
+ </button>
+ </div>
+ </div>
+ </section>
+
+ {settings && showModal && (
+ <PasswordSettingsModal
+ isOpen={showModal}
+ initialSettings={settings}
+ onSave={handleModalSave}
+ onClose={() => setShowModal(false)}
+ />
+ )}
+ </div>
+ );
+};
+
+export default PasswordGeneratorSettings;
diff --git a/apps/browser-extension/src/entrypoints/popup/pages/settings/Settings.tsx b/apps/browser-extension/src/entrypoints/popup/pages/settings/Settings.tsx
index 195e7fc8a..910bd0827 100644
--- a/apps/browser-extension/src/entrypoints/popup/pages/settings/Settings.tsx
+++ b/apps/browser-extension/src/entrypoints/popup/pages/settings/Settings.tsx
@@ -190,6 +190,13 @@ const Settings: React.FC = () => {
navigate('/settings/identity-generator');
};
+ /**
+ * Navigate to password generator settings.
+ */
+ const navigateToPasswordGeneratorSettings = () : void => {
+ navigate('/settings/password-generator');
+ };
+
/**
* Navigate to appearance settings.
*/
@@ -507,6 +514,38 @@ const Settings: React.FC = () => {
</svg>
</button>
+ {/* Password Generator Settings */}
+ <button
+ onClick={navigateToPasswordGeneratorSettings}
+ className="w-full px-4 py-3 flex items-center justify-between hover:bg-gray-50 dark:hover:bg-gray-700 transition-colors"
+ >
+ <div className="flex items-center">
+ <svg
+ className="w-5 h-5 mr-3 text-gray-600 dark:text-gray-400"
+ fill="none"
+ stroke="currentColor"
+ strokeWidth={2}
+ viewBox="0 0 24 24"
+ >
+ <path
+ strokeLinecap="round"
+ strokeLinejoin="round"
+ d="M15 7a2 2 0 012 2m4 0a6 6 0 01-7.743 5.743L11 17H9v2H7v2H4a1 1 0 01-1-1v-2.586a1 1 0 01.293-.707l5.964-5.964A6 6 0 1121 9z"
+ />
+ </svg>
+ <span className="text-gray-900 dark:text-white text-left">{t('settings.passwordGenerator')}</span>
+ </div>
+ <svg
+ className="w-4 h-4 text-gray-400"
+ fill="none"
+ stroke="currentColor"
+ strokeWidth={2}
+ viewBox="0 0 24 24"
+ >
+ <path strokeLinecap="round" strokeLinejoin="round" d="M9 5l7 7-7 7" />
+ </svg>
+ </button>
+
{/* Context Menu Settings */}
<button
onClick={navigateToContextMenuSettings}
diff --git a/apps/browser-extension/src/i18n/locales/en.json b/apps/browser-extension/src/i18n/locales/en.json
index 369993653..d928eb9b9 100644
--- a/apps/browser-extension/src/i18n/locales/en.json
+++ b/apps/browser-extension/src/i18n/locales/en.json
@@ -245,6 +245,7 @@
"avoidAmbiguousChars": "Avoid ambiguous characters (o, 0, etc.)",
"passwordTypeBasic": "Password",
"passwordTypeDiceware": "Passphrase",
+ "passphraseLanguage": "Passphrase language",
"wordCount": "Words",
"dicewareCapitalizationOption": {
"TitleCase": "Title Case",
@@ -466,6 +467,11 @@
"female": "Female"
}
},
+ "passwordGenerator": "Password Generator",
+ "passwordGeneratorSettings": {
+ "description": "Configure the default password and passphrase generator settings for newly created items, including password length, character sets, and passphrase language.",
+ "configureButton": "Configure"
+ },
"credentialAutofill": "Credential autofill",
"credentialAutofillDescription": "Show autofill popup when username/password fields are detected",
"totpAutofill": "2FA code autofill",
diff --git a/apps/browser-extension/src/utils/RustCore.ts b/apps/browser-extension/src/utils/RustCore.ts
index 08b06cb8f..5d7059413 100644
--- a/apps/browser-extension/src/utils/RustCore.ts
+++ b/apps/browser-extension/src/utils/RustCore.ts
@@ -74,6 +74,16 @@ export async function generatePassword(settings: PasswordSettings, seed?: string
return core.generatePassword(JSON.stringify(payload));
}
+/**
+ * Get the list of bundled Diceware wordlist language codes (first is the default, English).
+ * The set is owned by the Rust core; unknown codes fall back to English during generation.
+ */
+export async function getDicewareLanguages(): Promise<string[]> {
+ await initRustCore();
+ const languages = core.getDicewareLanguages() as string[];
+ return languages.length > 0 ? languages : ['English'];
+}
+
/**
* Generate a random 32-byte seed as a 64-character hex string, suitable for the
* `seed` argument of {@link generatePassword}.
diff --git a/apps/browser-extension/src/utils/db/repositories/SettingsRepository.ts b/apps/browser-extension/src/utils/db/repositories/SettingsRepository.ts
index 07b03b501..b24e533e8 100644
--- a/apps/browser-extension/src/utils/db/repositories/SettingsRepository.ts
+++ b/apps/browser-extension/src/utils/db/repositories/SettingsRepository.ts
@@ -1,3 +1,4 @@
+import { defaultDicewareLanguageForApp } from '@/utils/DicewareLanguages';
import { DEFAULT_PASSWORD_LENGTH, DEFAULT_WORD_COUNT } from '@/utils/dist/core/models/defaults';
import type { EncryptionKey, PasswordSettings, TotpCode, Attachment } from '@/utils/dist/core/models/vault';
@@ -69,7 +70,7 @@ export class SettingsRepository extends BaseRepository {
UseNonAmbiguousChars: false,
Type: 'basic',
WordCount: DEFAULT_WORD_COUNT,
- Language: 'English',
+ Language: defaultDicewareLanguageForApp(navigator.language),
Capitalization: 'Lowercase',
Separator: 'Dash',
Salt: 'None'
@@ -86,6 +87,15 @@ export class SettingsRepository extends BaseRepository {
return defaultSettings;
}
+ /**
+ * Persist the password generator settings as a JSON blob.
+ * Mirrors the `PasswordGenerationSettings` key used by the other AliasVault clients.
+ * @param settings - The password settings to store.
+ */
+ public setPasswordSettings(settings: PasswordSettings): void {
+ this.updateSetting('PasswordGenerationSettings', JSON.stringify(settings));
+ }
+
/**
* Fetch all encryption keys.
* @returns Array of encryption keys