Skip to content

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

Update identity generator implementation for mobile app (#1379)

Leendert de Borst40fdb4e21a6c
diff --git a/apps/mobile-app/app/(tabs)/credentials/add-edit.tsx b/apps/mobile-app/app/(tabs)/credentials/add-edit.tsx
index e8887626e..27bd4dbe0 100644
--- a/apps/mobile-app/app/(tabs)/credentials/add-edit.tsx
+++ b/apps/mobile-app/app/(tabs)/credentials/add-edit.tsx
@@ -11,7 +11,7 @@ import { useTranslation } from 'react-i18next';
import { StyleSheet, View, Alert, Keyboard, Platform, ScrollView, KeyboardAvoidingView } from 'react-native';
import Toast from 'react-native-toast-message';
-import { CreateIdentityGenerator, IdentityGenerator, IdentityHelperUtils } from '@/utils/dist/shared/identity-generator';
+import { CreateIdentityGenerator, CreateUsernameEmailGenerator, Gender, Identity, IdentityHelperUtils, convertAgeRangeToBirthdateOptions } from '@/utils/dist/shared/identity-generator';
import type { Attachment, Credential } from '@/utils/dist/shared/models/vault';
import type { FaviconExtractModel } from '@/utils/dist/shared/models/webapi';
import { CreatePasswordGenerator, PasswordGenerator } from '@/utils/dist/shared/password-generator';
@@ -92,6 +92,21 @@ export default function AddEditCredentialScreen() : React.ReactNode {
*/
const isEditMode = id !== undefined && id.length > 0;
+ /**
+ * Generate a random identity.
+ */
+ const generateRandomIdentity = useCallback(async () : Promise<Identity> => {
+ const identityLanguage = await dbContext.sqliteClient!.getDefaultIdentityLanguage();
+ const identityGenerator = CreateIdentityGenerator(identityLanguage);
+
+ const genderPreference = await dbContext.sqliteClient!.getDefaultIdentityGender();
+ const ageRange = await dbContext.sqliteClient!.getDefaultIdentityAgeRange();
+ const birthdateOptions = convertAgeRangeToBirthdateOptions(ageRange);
+
+ // Generate identity with gender preference and birthdate options
+ return identityGenerator.generateRandomIdentity(genderPreference, birthdateOptions);
+ }, [dbContext.sqliteClient]);
+
/**
* Track form changes to warn user before dismissing with unsaved changes.
*/
@@ -204,34 +219,25 @@ export default function AddEditCredentialScreen() : React.ReactNode {
}, [id, isEditMode, serviceUrl, loadExistingCredential, setValue, authContext.isOffline, router, t, dbContext.sqliteClient]);
/**
- * Initialize the identity and password generators with settings from user's vault.
- * @returns {identityGenerator: IIdentityGenerator, passwordGenerator: PasswordGenerator}
+ * Initialize the password generator with settings from user's vault.
+ * @returns {PasswordGenerator}
*/
- const initializeGenerators = useCallback(async () : Promise<{ identityGenerator: IdentityGenerator, passwordGenerator: PasswordGenerator }> => {
- // Get default identity language from database
- const identityLanguage = await dbContext.sqliteClient!.getDefaultIdentityLanguage();
-
- // Initialize identity generator based on language
- const identityGenerator = CreateIdentityGenerator(identityLanguage);
-
+ const initializePasswordGenerator = useCallback(async () : Promise<PasswordGenerator> => {
// Initialize password generator with settings from vault
const passwordSettings = await dbContext.sqliteClient!.getPasswordSettings();
const passwordGenerator = CreatePasswordGenerator(passwordSettings);
- return { identityGenerator, passwordGenerator };
+ return passwordGenerator;
}, [dbContext.sqliteClient]);
/**
* Generate a random alias and password.
*/
const generateRandomAlias = useCallback(async (): Promise<void> => {
- const { identityGenerator, passwordGenerator } = await initializeGenerators();
-
- // Get gender preference from database
- const genderPreference = await dbContext.sqliteClient!.getDefaultIdentityGender();
+ const passwordGenerator = await initializePasswordGenerator();
- // Generate identity with gender preference
- const identity = identityGenerator.generateRandomIdentity(genderPreference);
+ // Generate identity with gender preference and birthdate options
+ const identity = await generateRandomIdentity();
const password = passwordGenerator.generateRandomPassword();
const defaultEmailDomain = await dbContext.sqliteClient!.getDefaultEmailDomain();
@@ -270,7 +276,7 @@ export default function AddEditCredentialScreen() : React.ReactNode {
password: password,
email: email
});
- }, [watch, setValue, setIsPasswordVisible, initializeGenerators, dbContext.sqliteClient, lastGeneratedValues, setLastGeneratedValues]);
+ }, [watch, setValue, setIsPasswordVisible, initializePasswordGenerator, generateRandomIdentity, dbContext.sqliteClient, lastGeneratedValues, setLastGeneratedValues]);
/**
* Clear all alias fields.
@@ -455,29 +461,57 @@ export default function AddEditCredentialScreen() : React.ReactNode {
}, [isEditMode, id, serviceUrl, router, executeVaultMutation, dbContext.sqliteClient, mode, generateRandomAlias, webApi, watch, setIsSaveDisabled, setIsSyncing, isSaveDisabled, t, originalAttachmentIds, attachments, passkeyMarkedForDeletion]);
/**
- * Generate a random username.
+ * Generate a random username based on current identity fields, or completely random if fields are empty.
*/
- const generateRandomUsername = async () : Promise<void> => {
+ const generateRandomUsername = useCallback(async () : Promise<void> => {
try {
- const { identityGenerator } = await initializeGenerators();
+ const firstName = watch('Alias.FirstName') ?? '';
+ const lastName = watch('Alias.LastName') ?? '';
+ const nickName = watch('Alias.NickName') ?? '';
+ const birthDate = watch('Alias.BirthDate') ?? '';
- // Get gender preference from database
- const genderPreference = await dbContext.sqliteClient!.getDefaultIdentityGender();
+ let username: string;
- // Generate identity with gender preference
- const identity = identityGenerator.generateRandomIdentity(genderPreference);
+ // If alias fields are empty, generate a completely random username
+ if (!firstName && !lastName && !nickName && !birthDate) {
+ const randomIdentity = await generateRandomIdentity();
+ username = randomIdentity.nickName;
+ } else {
+ // Generate username based on current identity fields
+ const usernameEmailGenerator = CreateUsernameEmailGenerator();
+
+ let gender = Gender.Other;
+ try {
+ gender = watch('Alias.Gender') as Gender;
+ } catch {
+ // Gender parsing failed, default to other.
+ }
- // Only overwrite username if it's empty or matches the last generated value
- const currentUsername = watch('Username') ?? '';
- if (!currentUsername || currentUsername === lastGeneratedValues.username) {
- setValue('Username', identity.nickName);
- // Update the tracking for username
- setLastGeneratedValues(prev => ({ ...prev, username: identity.nickName }));
+ // Parse birthDate, fallback to current date if invalid
+ let parsedBirthDate = new Date(birthDate);
+ if (!birthDate || isNaN(parsedBirthDate.getTime())) {
+ parsedBirthDate = new Date();
+ }
+
+ const identity: Identity = {
+ firstName,
+ lastName,
+ nickName,
+ gender,
+ birthDate: parsedBirthDate,
+ emailPrefix: watch('Alias.Email') ?? '',
+ };
+
+ username = usernameEmailGenerator.generateUsername(identity);
}
+
+ setValue('Username', username);
+ // Update the tracking for username
+ setLastGeneratedValues(prev => ({ ...prev, username }));
} catch (error) {
console.error('Error generating random username:', error);
}
- };
+ }, [setValue, watch, setLastGeneratedValues, generateRandomIdentity]);
/**
* Handle the delete button press.
@@ -786,12 +820,10 @@ export default function AddEditCredentialScreen() : React.ReactNode {
control={control}
name="Username"
label={t('credentials.username')}
- buttons={[
- {
- icon: "refresh",
- onPress: generateRandomUsername
- }
- ]}
+ buttons={[{
+ icon: "refresh",
+ onPress: generateRandomUsername
+ }]}
/>
{!passkeyMarkedForDeletion && (
<View style={{
@@ -923,12 +955,10 @@ export default function AddEditCredentialScreen() : React.ReactNode {
control={control}
name="Username"
label={t('credentials.username')}
- buttons={[
- {
- icon: "refresh",
- onPress: generateRandomUsername
- }
- ]}
+ buttons={[{
+ icon: "refresh",
+ onPress: generateRandomUsername
+ }]}
/>
<AdvancedPasswordField
control={control}
diff --git a/apps/mobile-app/app/(tabs)/settings/identity-generator.tsx b/apps/mobile-app/app/(tabs)/settings/identity-generator.tsx
index a4ba57852..a86f1bd51 100644
--- a/apps/mobile-app/app/(tabs)/settings/identity-generator.tsx
+++ b/apps/mobile-app/app/(tabs)/settings/identity-generator.tsx
@@ -1,9 +1,11 @@
import { Ionicons } from '@expo/vector-icons';
import { useFocusEffect } from 'expo-router';
-import { useState, useCallback, useRef } from 'react';
+import { useState, useCallback, useRef, useEffect } from 'react';
import { useTranslation } from 'react-i18next';
import { StyleSheet, View, Alert, TouchableOpacity } from 'react-native';
+import { getAvailableAgeRanges, IAgeRangeOption, getAvailableLanguages, ILanguageOption } from '@/utils/dist/shared/identity-generator';
+
import { useColors } from '@/hooks/useColorScheme';
import { useVaultMutate } from '@/hooks/useVaultMutate';
@@ -12,7 +14,7 @@ import { ThemedScrollView } from '@/components/themed/ThemedScrollView';
import { ThemedText } from '@/components/themed/ThemedText';
import { useDb } from '@/context/DbContext';
-// Language and gender options will be defined inside the component to use translations
+// Language, gender, and age range options will be defined inside the component to use translations
/**
* Identity Generator Settings screen.
@@ -25,15 +27,13 @@ export default function IdentityGeneratorSettingsScreen(): React.ReactNode {
const [language, setLanguage] = useState<string>('en');
const [gender, setGender] = useState<string>('random');
+ const [ageRange, setAgeRange] = useState<string>('random');
+ const [languageOptions, setLanguageOptions] = useState<ILanguageOption[]>([]);
+ const [ageRangeOptions, setAgeRangeOptions] = useState<IAgeRangeOption[]>([]);
// Store pending changes and initial values
- const pendingChanges = useRef<{ language?: string; gender?: string }>({});
- const initialValues = useRef<{ language: string; gender: string }>({ language: 'en', gender: 'random' });
-
- const LANGUAGE_OPTIONS = [
- { label: t('settings.identityGeneratorSettings.languageOptions.english'), value: 'en' },
- { label: t('settings.identityGeneratorSettings.languageOptions.dutch'), value: 'nl' }
- ];
+ const pendingChanges = useRef<{ language?: string; gender?: string; ageRange?: string }>({});
+ const initialValues = useRef<{ language: string; gender: string; ageRange: string }>({ language: 'en', gender: 'random', ageRange: 'random' });
const GENDER_OPTIONS = [
{ label: t('settings.identityGeneratorSettings.genderOptions.random'), value: 'random' },
@@ -41,6 +41,14 @@ export default function IdentityGeneratorSettingsScreen(): React.ReactNode {
{ label: t('settings.identityGeneratorSettings.genderOptions.female'), value: 'female' }
];
+ // Load available languages and age ranges on mount
+ useEffect(() => {
+ const languages = getAvailableLanguages();
+ const ranges = getAvailableAgeRanges();
+ setLanguageOptions(languages);
+ setAgeRangeOptions(ranges);
+ }, []);
+
useFocusEffect(
useCallback(() => {
/**
@@ -48,15 +56,17 @@ export default function IdentityGeneratorSettingsScreen(): React.ReactNode {
*/
const loadSettings = async (): Promise<void> => {
try {
- const [currentLanguage, currentGender] = await Promise.all([
+ const [currentLanguage, currentGender, currentAgeRange] = await Promise.all([
dbContext.sqliteClient!.getDefaultIdentityLanguage(),
- dbContext.sqliteClient!.getDefaultIdentityGender()
+ dbContext.sqliteClient!.getDefaultIdentityGender(),
+ dbContext.sqliteClient!.getDefaultIdentityAgeRange()
]);
setLanguage(currentLanguage);
setGender(currentGender);
+ setAgeRange(currentAgeRange);
// Store initial values
- initialValues.current = { language: currentLanguage, gender: currentGender };
+ initialValues.current = { language: currentLanguage, gender: currentGender, ageRange: currentAgeRange };
// Clear pending changes when screen loads
pendingChanges.current = {};
} catch (error) {
@@ -89,6 +99,9 @@ export default function IdentityGeneratorSettingsScreen(): React.ReactNode {
if (pendingChanges.current.gender !== undefined) {
await dbContext.sqliteClient!.updateSetting('DefaultIdentityGender', pendingChanges.current.gender);
}
+ if (pendingChanges.current.ageRange !== undefined) {
+ await dbContext.sqliteClient!.updateSetting('DefaultIdentityAgeRange', pendingChanges.current.ageRange);
+ }
});
// Clear pending changes after successful save
@@ -121,6 +134,14 @@ export default function IdentityGeneratorSettingsScreen(): React.ReactNode {
pendingChanges.current.gender = newGender;
}, []);
+ /**
+ * Handle age range change - just update UI and store pending change.
+ */
+ const handleAgeRangeChange = useCallback((newAgeRange: string): void => {
+ setAgeRange(newAgeRange);
+ pendingChanges.current.ageRange = newAgeRange;
+ }, []);
+
const styles = StyleSheet.create({
descriptionText: {
color: colors.textMuted,
@@ -178,15 +199,15 @@ export default function IdentityGeneratorSettingsScreen(): React.ReactNode {
{t('settings.identityGeneratorSettings.languageDescription')}
</ThemedText>
<View style={styles.optionContainer}>
- {LANGUAGE_OPTIONS.map((option, index) => {
- const isLast = index === LANGUAGE_OPTIONS.length - 1;
+ {languageOptions.map((option, index) => {
+ const isLast = index === languageOptions.length - 1;
return (
<TouchableOpacity
key={option.value}
style={[styles.option, isLast && styles.optionLast]}
onPress={() => handleLanguageChange(option.value)}
>
- <ThemedText style={styles.optionText}>{option.label}</ThemedText>
+ <ThemedText style={styles.optionText}>{option.flag} {option.label}</ThemedText>
{language === option.value && (
<Ionicons name="checkmark" size={20} style={styles.selectedIcon} />
)}
@@ -216,6 +237,31 @@ export default function IdentityGeneratorSettingsScreen(): React.ReactNode {
);
})}
</View>
+
+ <ThemedText style={styles.sectionTitle}>{t('settings.identityGeneratorSettings.ageRangeSection')}</ThemedText>
+ <ThemedText style={styles.descriptionText}>
+ {t('settings.identityGeneratorSettings.ageRangeDescription')}
+ </ThemedText>
+ <View style={styles.optionContainer}>
+ {ageRangeOptions.map((option, index) => {
+ const isLast = index === ageRangeOptions.length - 1;
+ const displayLabel = option.value === 'random'
+ ? t('settings.identityGeneratorSettings.genderOptions.random')
+ : option.label;
+ return (
+ <TouchableOpacity
+ key={option.value}
+ style={[styles.option, isLast && styles.optionLast]}
+ onPress={() => handleAgeRangeChange(option.value)}
+ >
+ <ThemedText style={styles.optionText}>{displayLabel}</ThemedText>
+ {ageRange === option.value && (
+ <Ionicons name="checkmark" size={20} style={styles.selectedIcon} />
+ )}
+ </TouchableOpacity>
+ );
+ })}
+ </View>
</ThemedScrollView>
</ThemedContainer>
);
diff --git a/apps/mobile-app/i18n/locales/en.json b/apps/mobile-app/i18n/locales/en.json
index ebb95d8fe..9a79a3de5 100644
--- a/apps/mobile-app/i18n/locales/en.json
+++ b/apps/mobile-app/i18n/locales/en.json
@@ -315,10 +315,8 @@
"languageDescription": "Set the language that will be used when generating new identities.",
"genderSection": "Gender",
"genderDescription": "Set the gender preference for generating new identities.",
- "languageOptions": {
- "english": "English",
- "dutch": "Dutch"
- },
+ "ageRangeSection": "Age Range",
+ "ageRangeDescription": "Set the age range for generating new identities.",
"genderOptions": {
"random": "Random",
"male": "Male",