Privacy-first password manager with built-in email aliasing. Fully encrypted and self-hostable.
Update default email domain logic (#1371)
Leendert de Borstda496b31a1f1
diff --git a/apps/mobile-app/utils/SqliteClient.tsx b/apps/mobile-app/utils/SqliteClient.tsxindex 3fae7ead2..809457374 100644--- a/apps/mobile-app/utils/SqliteClient.tsx+++ b/apps/mobile-app/utils/SqliteClient.tsx@@ -82,19 +82,20 @@ class SqliteClient {const { privateEmailDomains, publicEmailDomains, hiddenPrivateEmailDomains } = metadata;/**- * Check if a domain is valid (not empty, not 'DISABLED.TLD', and exists in either private or public domains)+ * Check if a domain is valid (not empty, not 'DISABLED.TLD', not hidden, and exists in either private or public domains)*/const isValidDomain = (domain: string): boolean => {return Boolean(domain &&domain !== 'DISABLED.TLD' &&domain !== '' &&+ !hiddenPrivateEmailDomains?.includes(domain) &&(privateEmailDomains?.includes(domain) || publicEmailDomains?.includes(domain)));};// Get the default email domain from vault settingsconst defaultEmailDomain = await this.getSetting('DefaultEmailDomain');- // First check if the default domain that is configured in the vault is still valid+ // First check if the default domain that is configured in the vault is still valid (not hidden)if (defaultEmailDomain && isValidDomain(defaultEmailDomain)) {return defaultEmailDomain;}diff --git a/apps/server/AliasVault.Client/Main/Pages/Settings/General.razor b/apps/server/AliasVault.Client/Main/Pages/Settings/General.razorindex b2ea49a7d..39cd5428d 100644--- a/apps/server/AliasVault.Client/Main/Pages/Settings/General.razor+++ b/apps/server/AliasVault.Client/Main/Pages/Settings/General.razor@@ -144,7 +144,7 @@BreadcrumbItems.Add(new BreadcrumbItem { DisplayName = Localizer["BreadcrumbTitle"] });DefaultEmailDomain = DbService.Settings.DefaultEmailDomain;- if (DefaultEmailDomain == string.Empty)+ if (DefaultEmailDomain == string.Empty || Config.HiddenPrivateEmailDomains.Contains(DefaultEmailDomain)){if (HasValidPrivateDomains()){diff --git a/apps/server/AliasVault.Client/Services/CredentialService.cs b/apps/server/AliasVault.Client/Services/CredentialService.csindex bfe59ce01..5dd22b8f0 100644--- a/apps/server/AliasVault.Client/Services/CredentialService.cs+++ b/apps/server/AliasVault.Client/Services/CredentialService.cs@@ -105,21 +105,22 @@ public sealed class CredentialService(HttpClient httpClient, DbService dbService{var defaultDomain = dbService.Settings.DefaultEmailDomain;- // Function to check if a domain is valid+ // Function to check if a domain is valid (not disabled, not hidden, and exists in domain lists)// TODO: "DISABLED.TLD" was a placeholder used < 0.22.0 that has been replaced by an empty string.// That value is still here for legacy purposes, but it can be removed from the codebase in a future release.bool IsValidDomain(string domain) =>!string.IsNullOrEmpty(domain) &&domain != "DISABLED.TLD" &&+ !config.HiddenPrivateEmailDomains.Contains(domain) &&(config.PublicEmailDomains.Contains(domain) || config.PrivateEmailDomains.Contains(domain));- // Get the first valid domain from private or public domains+ // Get the first valid domain from private or public domains (excluding hidden ones)string GetFirstValidDomain() =>config.PrivateEmailDomains.Find(IsValidDomain) ??config.PublicEmailDomains.FirstOrDefault() ??"example.com";- // Use the default domain if it's valid, otherwise get the first valid domain+ // Use the default domain if it's valid (not hidden), otherwise get the first valid domainstring domainToUse = IsValidDomain(defaultDomain) ? defaultDomain : GetFirstValidDomain();return domainToUse;