Privacy-first password manager with built-in email aliasing. Fully encrypted and self-hostable.
Use reference types instead of magic strings (#1404)
Leendert de Borst39d8a5a8436b
diff --git a/apps/server/AliasVault.Client/Main/Models/ItemEdit.cs b/apps/server/AliasVault.Client/Main/Models/ItemEdit.csindex 58b81c020..f5d209501 100644--- a/apps/server/AliasVault.Client/Main/Models/ItemEdit.cs+++ b/apps/server/AliasVault.Client/Main/Models/ItemEdit.cs@@ -362,7 +362,7 @@ public sealed class ItemEditFieldType = fieldType,Value = string.Empty,IsCustomField = true,- IsHidden = fieldType == "Hidden" || fieldType == "Password",+ IsHidden = fieldType == FieldType.Hidden || fieldType == FieldType.Password,EnableHistory = false,DisplayOrder = Fields.Count,Category = FieldCategory.Custom,@@ -448,7 +448,9 @@ public sealed class ItemEdit}/// <summary>- /// Gets the field category from a field key based on its prefix.+ /// Gets the field category from a field key.+ /// Uses the SystemFieldRegistry to look up the category for known system fields.+ /// Falls back to Custom category for unknown fields./// </summary>private static FieldCategory GetCategoryFromFieldKey(string? fieldKey){@@ -457,37 +459,15 @@ public sealed class ItemEditreturn FieldCategory.Custom;}- if (fieldKey.StartsWith("login."))- {- // URL is in Primary category- if (fieldKey == FieldKey.LoginUrl)- {- return FieldCategory.Primary;- }-- return FieldCategory.Login;- }-- if (fieldKey.StartsWith("alias."))- {- return FieldCategory.Alias;- }-- if (fieldKey.StartsWith("card."))- {- return FieldCategory.Card;- }-- if (fieldKey.StartsWith("notes."))- {- return FieldCategory.Notes;- }-- if (fieldKey.StartsWith("metadata."))+ // Look up category from SystemFieldRegistry for known system fields+ var systemField = SystemFieldRegistry.GetSystemField(fieldKey);+ if (systemField != null){- return FieldCategory.Metadata;+ return systemField.Category;}+ // For unknown fields with a system field prefix, this might be a new system field+ // not yet in the registry - treat as custom for nowreturn FieldCategory.Custom;}}diff --git a/apps/server/AliasVault.Client/Main/Pages/Items/AddEdit.razor b/apps/server/AliasVault.Client/Main/Pages/Items/AddEdit.razorindex 0f2c196af..e0b89dcde 100644--- a/apps/server/AliasVault.Client/Main/Pages/Items/AddEdit.razor+++ b/apps/server/AliasVault.Client/Main/Pages/Items/AddEdit.razor@@ -350,13 +350,13 @@ elseLabel="@customField.Label"LabelChanged="@((newLabel) => Obj.UpdateCustomFieldLabel(customField.FieldKey, newLabel))"OnDelete="@(() => Obj.RemoveCustomField(customField.FieldKey))" />- @if (customField.FieldType == "TextArea")+ @if (customField.FieldType == FieldType.TextArea){<div class="relative"><textarea id="@($"custom-{customField.TempId ?? customField.FieldKey}")" style="height: 200px;" class="outline-0 shadow-sm bg-gray-50 border border-gray-300 text-gray-900 sm:text-sm rounded-lg block w-full p-2.5 dark:bg-gray-700 dark:border-gray-600 dark:placeholder-gray-400 dark:text-white" @bind="customField.Value"></textarea></div>}- else if (customField.IsHidden || customField.FieldType == "Hidden" || customField.FieldType == "Password")+ else if (customField.IsHidden || customField.FieldType == FieldType.Hidden || customField.FieldType == FieldType.Password){<EditPasswordFormRow Id="@($"custom-{customField.TempId ?? customField.FieldKey}")" Label="" @bind-Value="customField.Value" ShowPassword="false"></EditPasswordFormRow>}@@ -844,7 +844,7 @@ else{var item = new Item{- ItemType = "Login",+ ItemType = AliasClientDb.Models.ItemType.Login,FieldValues = new List<FieldValue>(),Attachments = new List<Attachment>(),TotpCodes = new List<TotpCode>(),diff --git a/apps/server/AliasVault.Client/Main/Utilities/FieldGrouper.cs b/apps/server/AliasVault.Client/Main/Utilities/FieldGrouper.csindex 168e77ad1..c28c8c9e0 100644--- a/apps/server/AliasVault.Client/Main/Utilities/FieldGrouper.cs+++ b/apps/server/AliasVault.Client/Main/Utilities/FieldGrouper.cs@@ -136,7 +136,9 @@ public static class FieldGrouper}/// <summary>- /// Gets the field category from a field key based on its prefix.+ /// Gets the field category from a field key.+ /// Uses the SystemFieldRegistry to look up the category for known system fields.+ /// Falls back to Custom category for unknown fields./// </summary>private static FieldCategory GetCategoryFromFieldKey(string? fieldKey){@@ -145,38 +147,15 @@ public static class FieldGrouperreturn FieldCategory.Custom;}- if (fieldKey.StartsWith("login."))+ // Look up category from SystemFieldRegistry for known system fields+ var systemField = SystemFieldRegistry.GetSystemField(fieldKey);+ if (systemField != null){- // URL is in Primary category- if (fieldKey == FieldKey.LoginUrl)- {- return FieldCategory.Primary;- }-- return FieldCategory.Login;- }-- if (fieldKey.StartsWith("alias."))- {- return FieldCategory.Alias;- }-- if (fieldKey.StartsWith("card."))- {- return FieldCategory.Card;- }-- if (fieldKey.StartsWith("notes."))- {- return FieldCategory.Notes;- }-- if (fieldKey.StartsWith("metadata."))- {- return FieldCategory.Metadata;+ return systemField.Category;}- // Custom fields+ // For unknown fields with a system field prefix, this might be a new system field+ // not yet in the registry - treat as custom for nowreturn FieldCategory.Custom;}}diff --git a/apps/server/AliasVault.Client/Services/ItemService.cs b/apps/server/AliasVault.Client/Services/ItemService.csindex 9c047aa84..d979bbb01 100644--- a/apps/server/AliasVault.Client/Services/ItemService.cs+++ b/apps/server/AliasVault.Client/Services/ItemService.cs@@ -369,7 +369,7 @@ public sealed class ItemService(HttpClient httpClient, DbService dbService, Confreturn items.Select(x => new ItemListEntry{Id = x.Id,- ItemType = x.ItemType ?? "Login",+ ItemType = x.ItemType ?? AliasClientDb.Models.ItemType.Login,Logo = x.Logo?.FileData,Service = x.Name,Username = GetFieldValue(x, FieldKey.LoginUsername),