Privacy-first password manager with built-in email aliasing. Fully encrypted and self-hostable.
Update identity generator calls to use Rust core in web app (#2279)
Leendert de Borstb38e6d3a8a5f
diff --git a/apps/server/AliasVault.Client/Services/ItemService.cs b/apps/server/AliasVault.Client/Services/ItemService.csindex f6239614f..489d67f86 100644--- a/apps/server/AliasVault.Client/Services/ItemService.cs+++ b/apps/server/AliasVault.Client/Services/ItemService.cs@@ -74,14 +74,11 @@ public sealed class ItemService(HttpClient httpClient, DbService dbService, Confdo{- // Convert age range to birthdate options using shared JS utility- var birthdateOptions = await jsInteropService.ConvertAgeRangeToBirthdateOptionsAsync(dbService.Settings.DefaultIdentityAgeRange);-// Get the effective identity language (smart default based on UI language if no explicit override is set)var identityLanguage = await GetEffectiveIdentityLanguageAsync();- // Generate a random identity using the TypeScript library- var identity = await jsInteropService.GenerateRandomIdentityAsync(identityLanguage, dbService.Settings.DefaultIdentityGender, birthdateOptions);+ // Generate a random identity using the Rust core+ var identity = await jsInteropService.GenerateRandomIdentityAsync(identityLanguage, dbService.Settings.DefaultIdentityGender, dbService.Settings.DefaultIdentityAgeRange);// Set username fieldSetFieldValue(item, FieldKey.LoginUsername, identity.NickName);diff --git a/apps/server/AliasVault.Client/Services/JsInterop/JsInteropService.cs b/apps/server/AliasVault.Client/Services/JsInterop/JsInteropService.csindex ca926fb6e..ebcfa31dd 100644--- a/apps/server/AliasVault.Client/Services/JsInterop/JsInteropService.cs+++ b/apps/server/AliasVault.Client/Services/JsInterop/JsInteropService.cs@@ -26,21 +26,14 @@ public sealed class JsInteropService(IJSRuntime jsRuntime)private readonly string _cacheBuster = AppInfo.GetFullVersion();- private IJSObjectReference? _identityGeneratorModule;private IJSObjectReference? _vaultSqlInteropModule;/// <summary>- /// Initialize the identity generator module.+ /// Initialize the vault SQL generator module./// </summary>/// <returns>A task representing the asynchronous operation.</returns>public async Task InitializeAsync(){- _identityGeneratorModule = await jsRuntime.InvokeAsync<IJSObjectReference>("import", $"./js/dist/core/identity-generator/index.mjs?v={_cacheBuster}");- if (_identityGeneratorModule == null)- {- throw new InvalidOperationException("Failed to initialize identity generator module");- }-_vaultSqlInteropModule = await jsRuntime.InvokeAsync<IJSObjectReference>("import", $"./js/dist/core/vault/index.mjs?v={_cacheBuster}");if (_vaultSqlInteropModule == null){@@ -425,19 +418,14 @@ public sealed class JsInteropService(IJSRuntime jsRuntime)}/// <summary>- /// Gets all available languages for identity generation.+ /// Gets all available languages for identity generation from the Rust core./// </summary>/// <returns>Array of language options.</returns>public async Task<List<LanguageOption>> GetAvailableIdentityGeneratorLanguagesAsync(){try{- if (_identityGeneratorModule == null)- {- await InitializeAsync();- }-- var codes = await _identityGeneratorModule!.InvokeAsync<List<string>>("getAvailableLanguages");+ var codes = await jsRuntime.InvokeAsync<List<string>>("rustCoreGetIdentityLanguages");if (codes == null){return new List<LanguageOption>();@@ -461,20 +449,26 @@ public sealed class JsInteropService(IJSRuntime jsRuntime)}/// <summary>- /// Gets all available age range options from the shared JavaScript utility.+ /// Gets all available age range options from the Rust core./// </summary>/// <returns>Array of age range options.</returns>public async Task<List<AgeRangeOption>> GetAvailableIdentityGeneratorAgeRangesAsync(){try{- if (_identityGeneratorModule == null)+ var values = await jsRuntime.InvokeAsync<List<string>>("rustCoreGetIdentityAgeRanges");+ if (values == null){- await InitializeAsync();+ return new List<AgeRangeOption>();}- var result = await _identityGeneratorModule!.InvokeAsync<List<AgeRangeOption>>("getAvailableAgeRanges");- return result ?? new List<AgeRangeOption>();+ return values+ .Select(value => new AgeRangeOption+ {+ Value = value,+ Label = value == "random" ? "Random" : value,+ })+ .ToList();}catch (JSException ex){@@ -498,12 +492,7 @@ public sealed class JsInteropService(IJSRuntime jsRuntime)return null;}- if (_identityGeneratorModule == null)- {- await InitializeAsync();- }-- var codes = await _identityGeneratorModule!.InvokeAsync<List<string>>("getAvailableLanguages");+ var codes = await jsRuntime.InvokeAsync<List<string>>("rustCoreGetIdentityLanguages");if (codes == null || codes.Count == 0){return null;@@ -519,57 +508,24 @@ public sealed class JsInteropService(IJSRuntime jsRuntime)}/// <summary>- /// Converts an age range string to birthdate options using the shared JavaScript utility.- /// </summary>- /// <param name="ageRange">Age range string (e.g., "21-25", "30-35", or "random").</param>- /// <returns>Birthdate options object or null if random.</returns>- public async Task<object?> ConvertAgeRangeToBirthdateOptionsAsync(string ageRange)- {- try- {- if (_identityGeneratorModule == null)- {- await InitializeAsync();- }-- var result = await _identityGeneratorModule!.InvokeAsync<object?>("convertAgeRangeToBirthdateOptions", ageRange);- return result;- }- catch (JSException ex)- {- await Console.Error.WriteLineAsync($"JavaScript error converting age range: {ex.Message}");- return null;- }- }-- /// <summary>- /// Generates a random identity using the specified language.+ /// Generates a random identity using the Rust core./// </summary>/// <param name="language">The language to use for generating the identity (e.g. "en", "nl", "de").</param>/// <param name="gender">The gender preference for generating the identity (defaults to "random").</param>- /// <param name="birthdateOptions">Optional birthdate options (targetYear and yearDeviation).</param>+ /// <param name="ageRange">Optional age range preference (e.g. "21-25" or "random").</param>/// <returns>An AliasVaultIdentity containing the generated identity information.</returns>- public async Task<AliasVaultIdentity> GenerateRandomIdentityAsync(string language, string? gender = null, object? birthdateOptions = null)+ public async Task<AliasVaultIdentity> GenerateRandomIdentityAsync(string language, string? gender = null, string? ageRange = null){try{- if (_identityGeneratorModule == null)- {- await InitializeAsync();- }-- var generatorInstance = await _identityGeneratorModule!.InvokeAsync<IJSObjectReference>("CreateIdentityGenerator", language);-- // Use "random" as default if gender is null or empty- var genderValue = "random";- if (!string.IsNullOrEmpty(gender))+ var request = new{- genderValue = gender;- }-- var result = await generatorInstance.InvokeAsync<AliasVaultIdentity>("generateRandomIdentity", genderValue, birthdateOptions);+ language,+ gender = string.IsNullOrEmpty(gender) ? "random" : gender,+ ageRange = ageRange ?? string.Empty,+ };- return result;+ return await jsRuntime.InvokeAsync<AliasVaultIdentity>("rustCoreGenerateIdentity", JsonSerializer.Serialize(request));}catch (JSException ex){@@ -579,7 +535,7 @@ public sealed class JsInteropService(IJSRuntime jsRuntime)}/// <summary>- /// Generates a random username.+ /// Generates a random username based on an identity's name fields./// </summary>/// <param name="identity">The identity to use for generating the username.</param>/// <returns>The generated username.</returns>@@ -587,14 +543,7 @@ public sealed class JsInteropService(IJSRuntime jsRuntime){try{- if (_identityGeneratorModule == null)- {- await InitializeAsync();- }-- var generatorInstance = await _identityGeneratorModule!.InvokeAsync<IJSObjectReference>("CreateUsernameEmailGenerator");- var result = await generatorInstance.InvokeAsync<string>("generateUsername", identity);- return result;+ return await jsRuntime.InvokeAsync<string>("rustCoreGenerateIdentityUsername", identity);}catch (JSException ex){@@ -613,14 +562,7 @@ public sealed class JsInteropService(IJSRuntime jsRuntime){try{- if (_identityGeneratorModule == null)- {- await InitializeAsync();- }-- var generatorInstance = await _identityGeneratorModule!.InvokeAsync<IJSObjectReference>("CreateUsernameEmailGenerator");- var result = await generatorInstance.InvokeAsync<string>("generateRandomEmailPrefix");- return result;+ return await jsRuntime.InvokeAsync<string>("rustCoreGenerateRandomEmailPrefix", 14);}catch (JSException ex){@@ -638,14 +580,7 @@ public sealed class JsInteropService(IJSRuntime jsRuntime){try{- if (_identityGeneratorModule == null)- {- await InitializeAsync();- }-- var generatorInstance = await _identityGeneratorModule!.InvokeAsync<IJSObjectReference>("CreateUsernameEmailGenerator");- var result = await generatorInstance.InvokeAsync<string>("generateEmailPrefix", identity);- return result;+ return await jsRuntime.InvokeAsync<string>("rustCoreGenerateIdentityEmailPrefix", identity);}catch (JSException ex){@@ -707,14 +642,14 @@ public sealed class JsInteropService(IJSRuntime jsRuntime)var vaultGenerator = await _vaultSqlInteropModule!.InvokeAsync<IJSObjectReference>(_VAULT_SQL_GENERATOR_FACTORY_FUNCTION);var result = await vaultGenerator.InvokeAsync<JsonElement>("getAllVersions");- return result.EnumerateArray().Select(x => new SqlVaultVersion+ return [.. result.EnumerateArray().Select(x => new SqlVaultVersion{Revision = x.GetProperty("revision").GetInt32(),Version = x.GetProperty("version").GetString() ?? string.Empty,Description = x.GetProperty("description").GetString() ?? string.Empty,ReleaseVersion = x.GetProperty("releaseVersion").GetString() ?? string.Empty,CompatibleUpToVersion = x.GetProperty("compatibleUpToVersion").GetString() ?? string.Empty,- }).ToList();+ })];}/// <summary>diff --git a/apps/server/AliasVault.Client/wwwroot/js/rustCoreInterop.js b/apps/server/AliasVault.Client/wwwroot/js/rustCoreInterop.jsindex 7f511d918..7c2d92c71 100644--- a/apps/server/AliasVault.Client/wwwroot/js/rustCoreInterop.js+++ b/apps/server/AliasVault.Client/wwwroot/js/rustCoreInterop.js@@ -291,6 +291,117 @@ window.rustCorePruneVault = async function(inputJson) {}};+// ============================================================================+// Identity Generator Functions+// ============================================================================++/**+ * Generate a random identity from a JSON-serialized request.+ * @param {string} requestJson - JSON string with language, gender and ageRange.+ * @returns {Promise<object>} The generated identity object (camelCase fields).+ */+window.rustCoreGenerateIdentity = async function(requestJson) {+ if (!await initRustCore()) {+ throw new Error('Rust WASM module not available');+ }++ try {+ return JSON.parse(wasmModule.generateIdentity(requestJson));+ } catch (error) {+ console.error('[RustCore] Generate identity failed:', error);+ throw error;+ }+};++/**+ * Generate a username from an identity's name fields.+ * @param {object} identity - Object with firstName, lastName and birthDate.+ * @returns {Promise<string>} The generated username.+ */+window.rustCoreGenerateIdentityUsername = async function(identity) {+ if (!await initRustCore()) {+ throw new Error('Rust WASM module not available');+ }++ try {+ return wasmModule.generateIdentityUsername(JSON.stringify(identity));+ } catch (error) {+ console.error('[RustCore] Generate identity username failed:', error);+ throw error;+ }+};++/**+ * Generate an email prefix from an identity's name fields.+ * @param {object} identity - Object with firstName, lastName and birthDate.+ * @returns {Promise<string>} The generated email prefix.+ */+window.rustCoreGenerateIdentityEmailPrefix = async function(identity) {+ if (!await initRustCore()) {+ throw new Error('Rust WASM module not available');+ }++ try {+ return wasmModule.generateIdentityEmailPrefix(JSON.stringify(identity));+ } catch (error) {+ console.error('[RustCore] Generate identity email prefix failed:', error);+ throw error;+ }+};++/**+ * Generate a random alphanumeric email prefix that is not based on any identity.+ * @param {number} length - The desired prefix length.+ * @returns {Promise<string>} The generated prefix.+ */+window.rustCoreGenerateRandomEmailPrefix = async function(length) {+ if (!await initRustCore()) {+ throw new Error('Rust WASM module not available');+ }++ try {+ return wasmModule.generateRandomEmailPrefix(length);+ } catch (error) {+ console.error('[RustCore] Generate random email prefix failed:', error);+ throw error;+ }+};++/**+ * Get the list of bundled identity dictionary language codes.+ * @returns {Promise<string[]>} Array of language codes.+ */+window.rustCoreGetIdentityLanguages = async function() {+ if (!await initRustCore()) {+ return ['en'];+ }++ try {+ const languages = wasmModule.getIdentityLanguages();+ return (languages && languages.length > 0) ? languages : ['en'];+ } catch (error) {+ console.error('[RustCore] Get identity languages failed:', error);+ return ['en'];+ }+};++/**+ * Get the list of identity age range option values ("random" plus 5-year ranges).+ * @returns {Promise<string[]>} Array of age range values.+ */+window.rustCoreGetIdentityAgeRanges = async function() {+ if (!await initRustCore()) {+ return [];+ }++ try {+ return wasmModule.getIdentityAgeRanges();+ } catch (error) {+ console.error('[RustCore] Get identity age ranges failed:', error);+ return [];+ }+};+// ============================================================================// SRP (Secure Remote Password) Functions// ============================================================================