Skip to content

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

Update identity generator calls to use Rust core in browser extension (#2279)

Leendert de Borst2710b889eb63
diff --git a/apps/browser-extension/src/entrypoints/background/VaultMessageHandler.ts b/apps/browser-extension/src/entrypoints/background/VaultMessageHandler.ts
index 268ee5492..72715d2d6 100644
--- a/apps/browser-extension/src/entrypoints/background/VaultMessageHandler.ts
+++ b/apps/browser-extension/src/entrypoints/background/VaultMessageHandler.ts
@@ -576,7 +576,7 @@ export async function handleGetDefaultIdentitySettings(
) : Promise<IdentitySettingsResponse> {
try {
const sqliteClient = await createVaultSqliteClient();
- const language = sqliteClient.settings.getEffectiveIdentityLanguage();
+ const language = await sqliteClient.settings.getEffectiveIdentityLanguage();
const gender = sqliteClient.settings.getDefaultIdentityGender();
return {
diff --git a/apps/browser-extension/src/entrypoints/popup/hooks/useAliasGenerator.ts b/apps/browser-extension/src/entrypoints/popup/hooks/useAliasGenerator.ts
index f4728e0a2..658f21e0a 100644
--- a/apps/browser-extension/src/entrypoints/popup/hooks/useAliasGenerator.ts
+++ b/apps/browser-extension/src/entrypoints/popup/hooks/useAliasGenerator.ts
@@ -2,7 +2,6 @@ import { useCallback, useState, type Dispatch, type SetStateAction } from 'react
import { useDb } from '@/entrypoints/popup/context/DbContext';
-import { IdentityHelperUtils, CreateIdentityGenerator, convertAgeRangeToBirthdateOptions, UsernameEmailGenerator } from '@/utils/dist/core/identity-generator';
import * as RustCore from '@/utils/RustCore';
/**
@@ -33,7 +32,7 @@ type LastGeneratedValues = {
*/
const useAliasGenerator = (): {
generateAlias: () => Promise<GeneratedAliasData | null>;
- generateRandomEmailPrefix: () => string;
+ generateRandomEmailPrefix: () => Promise<string>;
lastGeneratedValues: LastGeneratedValues;
setLastGeneratedValues: Dispatch<SetStateAction<LastGeneratedValues>>;
} => {
@@ -45,26 +44,6 @@ const useAliasGenerator = (): {
email: null
});
- /**
- * Initialize generators for random alias generation.
- */
- const initializeGenerators = useCallback(async () => {
- if (!dbContext?.sqliteClient) {
- throw new Error('Database not initialized');
- }
-
- // Get effective identity language (smart default based on UI language if no explicit override)
- const identityLanguage = dbContext.sqliteClient.settings.getEffectiveIdentityLanguage();
-
- // Initialize identity generator based on language
- const identityGenerator = CreateIdentityGenerator(identityLanguage);
-
- // Initialize password generator with settings from vault
- const passwordSettings = dbContext.sqliteClient.settings.getPasswordSettings();
-
- return { identityGenerator, passwordSettings };
- }, [dbContext?.sqliteClient]);
-
/**
* Generate random alias data.
* Returns the generated data for the caller to use.
@@ -75,17 +54,20 @@ const useAliasGenerator = (): {
}
try {
- const { identityGenerator, passwordSettings } = await initializeGenerators();
+ // Get effective identity language (smart default based on UI language if no explicit override)
+ const identityLanguage = await dbContext.sqliteClient.settings.getEffectiveIdentityLanguage();
- // Get gender preference from database
+ // Get gender and age range preferences from database
const genderPreference = dbContext.sqliteClient.settings.getDefaultIdentityGender();
-
- // Get age range preference and convert to birthdate options
const ageRange = dbContext.sqliteClient.settings.getDefaultIdentityAgeRange();
- const birthdateOptions = convertAgeRangeToBirthdateOptions(ageRange);
- // Generate identity with gender preference and birthdate options
- const identity = identityGenerator.generateRandomIdentity(genderPreference, birthdateOptions);
+ // Generate identity and password in the Rust core
+ const identity = await RustCore.generateIdentity({
+ language: identityLanguage,
+ gender: genderPreference,
+ ageRange
+ });
+ const passwordSettings = dbContext.sqliteClient.settings.getPasswordSettings();
const password = await RustCore.generatePassword(passwordSettings);
const defaultEmailDomain = dbContext.sqliteClient.settings.getDefaultEmailDomain();
@@ -96,7 +78,7 @@ const useAliasGenerator = (): {
firstName: identity.firstName,
lastName: identity.lastName,
gender: identity.gender,
- birthdate: IdentityHelperUtils.normalizeBirthDate(identity.birthDate.toISOString()),
+ birthdate: identity.birthDate,
username: identity.nickName,
password
};
@@ -113,15 +95,14 @@ const useAliasGenerator = (): {
console.error('Error generating random alias:', error);
return null;
}
- }, [dbContext?.sqliteClient, initializeGenerators]);
+ }, [dbContext?.sqliteClient]);
/**
* 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();
+ const generateRandomEmailPrefix = useCallback((): Promise<string> => {
+ return RustCore.generateRandomEmailPrefix();
}, []);
return {
diff --git a/apps/browser-extension/src/entrypoints/popup/pages/items/ItemAddEdit.tsx b/apps/browser-extension/src/entrypoints/popup/pages/items/ItemAddEdit.tsx
index cb8c8f05c..72d1772ac 100644
--- a/apps/browser-extension/src/entrypoints/popup/pages/items/ItemAddEdit.tsx
+++ b/apps/browser-extension/src/entrypoints/popup/pages/items/ItemAddEdit.tsx
@@ -29,12 +29,12 @@ import useFormPersistence from '@/entrypoints/popup/hooks/useFormPersistence';
import useServiceDetection from '@/entrypoints/popup/hooks/useServiceDetection';
import { useVaultMutate } from '@/entrypoints/popup/hooks/useVaultMutate';
-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';
import { LocalPreferencesService } from '@/utils/LocalPreferencesService';
import { sendMessage } from '@/utils/messaging/ExtensionMessaging';
+import * as RustCore from '@/utils/RustCore';
import { browser } from '#imports';
@@ -542,7 +542,7 @@ const ItemAddEdit: React.FC = () => {
* 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(() => {
+ const handleGenerateAliasEmail = useCallback(async (): Promise<void> => {
if (!dbContext?.sqliteClient) {
return;
}
@@ -553,20 +553,10 @@ const ItemAddEdit: React.FC = () => {
let prefix: string;
if (!firstName.trim() && !lastName.trim()) {
// No alias identity fields filled in, fall back to random prefix.
- prefix = generateRandomEmailPrefix();
+ prefix = await generateRandomEmailPrefix();
} else {
- const gender = (fieldValues['alias.gender'] as string) || Gender.Other;
- const birthdate = (fieldValues['alias.birthdate'] as string) || '';
-
- const generator = new UsernameEmailGenerator();
- prefix = generator.generateEmailPrefix({
- firstName,
- lastName,
- gender: gender as Gender,
- birthDate: birthdate ? new Date(birthdate) : new Date(),
- emailPrefix: '',
- nickName: ''
- });
+ const birthDate = (fieldValues['alias.birthdate'] as string) || '';
+ prefix = await RustCore.generateIdentityEmailPrefix({ firstName, lastName, birthDate });
}
const defaultEmailDomain = dbContext.sqliteClient.settings.getDefaultEmailDomain();
@@ -583,12 +573,12 @@ const ItemAddEdit: React.FC = () => {
* Uses random characters instead of identity-based prefixes since Login type
* has no persona fields to base the email on.
*/
- const handleGenerateRandomEmail = useCallback(() => {
+ const handleGenerateRandomEmail = useCallback(async (): Promise<void> => {
if (!dbContext?.sqliteClient) {
return;
}
- const prefix = generateRandomEmailPrefix();
+ const prefix = await generateRandomEmailPrefix();
const defaultEmailDomain = dbContext.sqliteClient.settings.getDefaultEmailDomain();
const email = defaultEmailDomain ? `${prefix}@${defaultEmailDomain}` : prefix;
diff --git a/apps/browser-extension/src/entrypoints/popup/pages/settings/IdentityGeneratorSettings.tsx b/apps/browser-extension/src/entrypoints/popup/pages/settings/IdentityGeneratorSettings.tsx
index b23f62d58..06561a83c 100644
--- a/apps/browser-extension/src/entrypoints/popup/pages/settings/IdentityGeneratorSettings.tsx
+++ b/apps/browser-extension/src/entrypoints/popup/pages/settings/IdentityGeneratorSettings.tsx
@@ -6,8 +6,8 @@ import { useDb } from '@/entrypoints/popup/context/DbContext';
import { useLoading } from '@/entrypoints/popup/context/LoadingContext';
import { useVaultMutate } from '@/entrypoints/popup/hooks/useVaultMutate';
-import { getAvailableLanguages, getAvailableAgeRanges, IAgeRangeOption } from '@/utils/dist/core/identity-generator';
import { getLanguageInfo } from '@/utils/dist/core/models/defaults';
+import * as RustCore from '@/utils/RustCore';
/**
* Identity Generator Settings page component.
@@ -23,7 +23,7 @@ const IdentityGeneratorSettings: React.FC = () => {
const [gender, setGender] = useState<string>('random');
const [ageRange, setAgeRange] = useState<string>('random');
const [languageOptions, setLanguageOptions] = useState<string[]>([]);
- const [ageRangeOptions, setAgeRangeOptions] = useState<IAgeRangeOption[]>([]);
+ const [ageRangeOptions, setAgeRangeOptions] = useState<string[]>([]);
const GENDER_OPTIONS = [
{ label: t('settings.identityGeneratorSettings.genderOptions.random'), value: 'random' },
@@ -35,24 +35,31 @@ const IdentityGeneratorSettings: React.FC = () => {
* Load settings on mount.
*/
useEffect(() => {
- const languages = getAvailableLanguages().sort(
- (a, b) => getLanguageInfo(a).label.localeCompare(getLanguageInfo(b).label)
- );
- const ranges = getAvailableAgeRanges();
- setLanguageOptions(languages);
- setAgeRangeOptions(ranges);
-
- if (dbContext?.sqliteClient) {
- const currentLanguage = dbContext.sqliteClient.settings.getEffectiveIdentityLanguage();
- const currentGender = dbContext.sqliteClient.settings.getDefaultIdentityGender();
- const currentAgeRange = dbContext.sqliteClient.settings.getDefaultIdentityAgeRange();
-
- setLanguage(currentLanguage);
- setGender(currentGender);
- setAgeRange(currentAgeRange);
- }
-
- setIsInitialLoading(false);
+ /**
+ * Load available options from the Rust core and current settings from the vault.
+ */
+ const loadSettings = async (): Promise<void> => {
+ const languages = (await RustCore.getIdentityLanguages()).sort(
+ (a, b) => getLanguageInfo(a).label.localeCompare(getLanguageInfo(b).label)
+ );
+ const ranges = await RustCore.getIdentityAgeRanges();
+ setLanguageOptions(languages);
+ setAgeRangeOptions(ranges);
+
+ if (dbContext?.sqliteClient) {
+ const currentLanguage = await dbContext.sqliteClient.settings.getEffectiveIdentityLanguage();
+ const currentGender = dbContext.sqliteClient.settings.getDefaultIdentityGender();
+ const currentAgeRange = dbContext.sqliteClient.settings.getDefaultIdentityAgeRange();
+
+ setLanguage(currentLanguage);
+ setGender(currentGender);
+ setAgeRange(currentAgeRange);
+ }
+
+ setIsInitialLoading(false);
+ };
+
+ void loadSettings();
}, [dbContext?.sqliteClient, setIsInitialLoading]);
/**
@@ -172,8 +179,8 @@ const IdentityGeneratorSettings: React.FC = () => {
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"
>
{ageRangeOptions.map((option) => (
- <option key={option.value} value={option.value}>
- {option.value === 'random' ? t('settings.identityGeneratorSettings.genderOptions.random') : option.label}
+ <option key={option} value={option}>
+ {option === 'random' ? t('settings.identityGeneratorSettings.genderOptions.random') : option}
</option>
))}
</select>
diff --git a/apps/browser-extension/src/utils/RustCore.ts b/apps/browser-extension/src/utils/RustCore.ts
index 7cb338a88..b2cce4b17 100644
--- a/apps/browser-extension/src/utils/RustCore.ts
+++ b/apps/browser-extension/src/utils/RustCore.ts
@@ -11,6 +11,7 @@
import { browser } from 'wxt/browser';
import { resolveDefaultLanguage } from '@/utils/dist/core/models/defaults';
+import type { Identity } from '@/utils/dist/core/models/identity';
import type { Item, PasswordSettings } from '@/utils/dist/core/models/vault';
import { FieldKey } from '@/utils/dist/core/models/vault';
import initWasm, * as core from '@/utils/dist/core/rust/aliasvault_core.js';
@@ -99,6 +100,80 @@ export async function getDicewareLanguages(): Promise<string[]> {
return languages.length > 0 ? languages : ['en'];
}
+/**
+ * Request for {@link generateIdentity}. All fields except `language` are optional.
+ */
+export type IdentityRequest = {
+ /** Dictionary language code (e.g. 'en'); unknown codes fall back to English. */
+ language: string;
+ /** Gender preference: 'male', 'female' or 'random' (default). */
+ gender?: string;
+ /** Age range preference as stored in settings (e.g. '21-25' or 'random'). */
+ ageRange?: string;
+};
+
+/**
+ * Name and birth date input for identity-based username/email prefix generation.
+ */
+export type IdentityNameInput = {
+ firstName: string;
+ lastName: string;
+ /** Birth date; only the leading yyyy year part is used. */
+ birthDate: string;
+};
+
+/**
+ * Generate a random identity (alias persona) in the Rust core.
+ * Returns the identity with a yyyy-MM-dd birth date string.
+ */
+export async function generateIdentity(request: IdentityRequest): Promise<Identity> {
+ await initRustCore();
+ return JSON.parse(core.generateIdentity(JSON.stringify(request))) as Identity;
+}
+
+/**
+ * Generate a username from persona name fields (alphanumeric, 6-20 characters).
+ */
+export async function generateIdentityUsername(input: IdentityNameInput): Promise<string> {
+ await initRustCore();
+ return core.generateIdentityUsername(JSON.stringify(input));
+}
+
+/**
+ * Generate an email prefix from persona name fields (6-20 characters).
+ */
+export async function generateIdentityEmailPrefix(input: IdentityNameInput): Promise<string> {
+ await initRustCore();
+ return core.generateIdentityEmailPrefix(JSON.stringify(input));
+}
+
+/**
+ * Generate a random alphanumeric email prefix that is not based on any identity.
+ * Used for login-type credentials where no persona fields are available.
+ */
+export async function generateRandomEmailPrefix(length: number = 14): Promise<string> {
+ await initRustCore();
+ return core.generateRandomEmailPrefix(length);
+}
+
+/**
+ * Get the list of bundled identity dictionary language ISO codes.
+ * The set is owned by the Rust core; unknown codes fall back to English during generation.
+ */
+export async function getIdentityLanguages(): Promise<string[]> {
+ await initRustCore();
+ const languages = core.getIdentityLanguages() as string[];
+ return languages.length > 0 ? languages : ['en'];
+}
+
+/**
+ * Get the list of identity age range option values ('random' plus 5-year ranges).
+ */
+export async function getIdentityAgeRanges(): Promise<string[]> {
+ await initRustCore();
+ return core.getIdentityAgeRanges() as string[];
+}
+
/**
* 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 f1d56048a..b7b35f3b7 100644
--- a/apps/browser-extension/src/utils/db/repositories/SettingsRepository.ts
+++ b/apps/browser-extension/src/utils/db/repositories/SettingsRepository.ts
@@ -1,6 +1,6 @@
-import { getAvailableLanguages } from '@/utils/dist/core/identity-generator';
import { DEFAULT_PASSWORD_LENGTH, DEFAULT_WORD_COUNT, DEFAULT_LANGUAGE_CODE, matchAvailableLanguage } from '@/utils/dist/core/models/defaults';
import type { EncryptionKey, PasswordSettings, TotpCode, Attachment } from '@/utils/dist/core/models/vault';
+import { getIdentityLanguages } from '@/utils/RustCore';
import { BaseRepository } from '../BaseRepository';
import { SettingsQueries } from '../queries/SettingsQueries';
@@ -156,14 +156,15 @@ export class SettingsRepository extends BaseRepository {
* Get the effective identity language. Uses the explicit override when set, otherwise matches the
* browser language to one of the identity generator's available languages via the shared
* region-variant alternative-code table (e.g. "de-CH" -> "de"), falling back to English.
+ * Async because the available languages are owned by the Rust core.
* @returns The effective language code
*/
- public getEffectiveIdentityLanguage(): string {
+ public async getEffectiveIdentityLanguage(): Promise<string> {
const storedLanguage = this.getDefaultIdentityLanguage();
if (storedLanguage) {
return storedLanguage;
}
- return matchAvailableLanguage(navigator.language, getAvailableLanguages()) ?? DEFAULT_LANGUAGE_CODE;
+ return matchAvailableLanguage(navigator.language, await getIdentityLanguages()) ?? DEFAULT_LANGUAGE_CODE;
}
/**