Skip to content

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

Refactor system fields to be defined in code (#1404)

Leendert de Borstdbc42fdea4f4
diff --git a/apps/browser-extension/src/utils/dist/shared/models/vault/index.js b/apps/browser-extension/src/utils/dist/shared/models/vault/index.js
index 6a864a01a..e9e8cfbf3 100644
--- a/apps/browser-extension/src/utils/dist/shared/models/vault/index.js
+++ b/apps/browser-extension/src/utils/dist/shared/models/vault/index.js
@@ -183,6 +183,9 @@ function groupFields(item, grouper) {
}
function groupFieldsByCategory(item) {
return groupFields(item, (field) => {
+ if (field.FieldKey === FieldKey.AliasEmail) {
+ return "Login";
+ }
if (field.FieldKey.startsWith("login.")) {
return "Login";
}
diff --git a/apps/mobile-app/utils/dist/shared/models/vault/index.js b/apps/mobile-app/utils/dist/shared/models/vault/index.js
index 6a864a01a..e9e8cfbf3 100644
--- a/apps/mobile-app/utils/dist/shared/models/vault/index.js
+++ b/apps/mobile-app/utils/dist/shared/models/vault/index.js
@@ -183,6 +183,9 @@ function groupFields(item, grouper) {
}
function groupFieldsByCategory(item) {
return groupFields(item, (field) => {
+ if (field.FieldKey === FieldKey.AliasEmail) {
+ return "Login";
+ }
if (field.FieldKey.startsWith("login.")) {
return "Login";
}
diff --git a/apps/server/Databases/AliasClientDb/AliasClientDbContext.cs b/apps/server/Databases/AliasClientDb/AliasClientDbContext.cs
index 65675e25c..579607b92 100644
--- a/apps/server/Databases/AliasClientDb/AliasClientDbContext.cs
+++ b/apps/server/Databases/AliasClientDb/AliasClientDbContext.cs
@@ -191,12 +191,13 @@ public class AliasClientDbContext : DbContext
.HasForeignKey(fv => fv.ItemId)
.OnDelete(DeleteBehavior.Cascade);
- // Configure FieldValue - FieldDefinition relationship
+ // Configure FieldValue - FieldDefinition relationship (nullable for system fields)
modelBuilder.Entity<FieldValue>()
.HasOne(fv => fv.FieldDefinition)
.WithMany(fd => fd.FieldValues)
.HasForeignKey(fv => fv.FieldDefinitionId)
- .OnDelete(DeleteBehavior.Cascade);
+ .OnDelete(DeleteBehavior.Cascade)
+ .IsRequired(false); // Nullable for system fields
// Configure FieldHistory - FieldDefinition relationship
modelBuilder.Entity<FieldHistory>()
@@ -212,9 +213,15 @@ public class AliasClientDbContext : DbContext
modelBuilder.Entity<FieldValue>()
.HasIndex(fv => fv.FieldDefinitionId);
+ modelBuilder.Entity<FieldValue>()
+ .HasIndex(fv => fv.FieldKey); // Index for system field lookups
+
modelBuilder.Entity<FieldValue>()
.HasIndex(fv => new { fv.ItemId, fv.FieldDefinitionId, fv.Weight });
+ modelBuilder.Entity<FieldValue>()
+ .HasIndex(fv => new { fv.ItemId, fv.FieldKey }); // Composite index for system field queries
+
// Configure indexes for FieldHistory
modelBuilder.Entity<FieldHistory>()
.HasIndex(fh => fh.ItemId);
@@ -222,9 +229,7 @@ public class AliasClientDbContext : DbContext
modelBuilder.Entity<FieldHistory>()
.HasIndex(fh => fh.FieldDefinitionId);
- // Configure indexes for FieldDefinition
- modelBuilder.Entity<FieldDefinition>()
- .HasIndex(fd => fd.FieldKey);
+ // FieldDefinition indexes (FieldKey removed - custom fields use GUID only)
// Configure indexes for Folder
modelBuilder.Entity<Folder>()
diff --git a/apps/server/Databases/AliasClientDb/FieldDefinition.cs b/apps/server/Databases/AliasClientDb/FieldDefinition.cs
index 4235fd43a..940bc023e 100644
--- a/apps/server/Databases/AliasClientDb/FieldDefinition.cs
+++ b/apps/server/Databases/AliasClientDb/FieldDefinition.cs
@@ -11,7 +11,11 @@ using System.ComponentModel.DataAnnotations;
using AliasClientDb.Abstracts;
/// <summary>
-/// FieldDefinition entity that defines the schema for fields.
+/// FieldDefinition entity that defines the schema for custom (user-defined) fields.
+/// NOTE: System fields (login.username, alias.email, etc.) do NOT have FieldDefinition rows.
+/// System field metadata is defined in code (SystemFieldRegistry) and is immutable.
+/// This table is ONLY for custom fields that users create themselves.
+/// Custom fields are always referenced by their GUID (Id), never by FieldKey.
/// </summary>
public class FieldDefinition : SyncableEntity
{
@@ -21,19 +25,6 @@ public class FieldDefinition : SyncableEntity
[Key]
public Guid Id { get; set; }
- /// <summary>
- /// Gets or sets the field key for system fields (e.g., 'login.username', 'card.number').
- /// NULL for custom (user-defined) fields.
- /// System fields use predefined keys like:
- /// - login.username, login.password, login.notes, login.url
- /// - card.number, card.cardholder_name, card.cvv
- /// - identity.first_name, identity.email, identity.phone_numbers
- /// - alias.email, alias.first_name (legacy)
- /// Custom fields have FieldKey = NULL and are identified by their GUID and Label.
- /// </summary>
- [StringLength(100)]
- public string? FieldKey { get; set; }
-
/// <summary>
/// Gets or sets the field type (Text, Password, Email, URL, Date, etc.).
/// </summary>
diff --git a/apps/server/Databases/AliasClientDb/FieldValue.cs b/apps/server/Databases/AliasClientDb/FieldValue.cs
index ba0e4fb30..c4e350b89 100644
--- a/apps/server/Databases/AliasClientDb/FieldValue.cs
+++ b/apps/server/Databases/AliasClientDb/FieldValue.cs
@@ -13,6 +13,7 @@ using AliasClientDb.Abstracts;
/// <summary>
/// FieldValue entity that stores encrypted field values.
+/// Supports both system fields (with FieldKey) and custom fields (with FieldDefinitionId).
/// </summary>
public class FieldValue : SyncableEntity
{
@@ -35,16 +36,27 @@ public class FieldValue : SyncableEntity
public virtual Item Item { get; set; } = null!;
/// <summary>
- /// Gets or sets the field definition ID.
+ /// Gets or sets the field definition ID for custom (user-defined) fields.
+ /// NULL for system fields (which use FieldKey instead).
/// </summary>
- [Required]
- public Guid FieldDefinitionId { get; set; }
+ public Guid? FieldDefinitionId { get; set; }
/// <summary>
- /// Gets or sets the field definition object.
+ /// Gets or sets the field definition object for custom fields.
+ /// NULL for system fields.
/// </summary>
[ForeignKey("FieldDefinitionId")]
- public virtual FieldDefinition FieldDefinition { get; set; } = null!;
+ public virtual FieldDefinition? FieldDefinition { get; set; }
+
+ /// <summary>
+ /// Gets or sets the system field key for predefined fields (e.g., 'login.username').
+ /// NULL for custom (user-defined) fields (which use FieldDefinitionId instead).
+ /// System field metadata (label, type, etc.) is defined in code (SystemFieldRegistry),
+ /// not in the database.
+ /// Note: Exactly one of FieldKey or FieldDefinitionId must be non-null.
+ /// </summary>
+ [StringLength(100)]
+ public string? FieldKey { get; set; }
/// <summary>
/// Gets or sets the encrypted value.
diff --git a/apps/server/Databases/AliasClientDb/Migrations/20251203161105_1.8.0-SystemFieldRefactor.Designer.cs b/apps/server/Databases/AliasClientDb/Migrations/20251203161105_1.8.0-SystemFieldRefactor.Designer.cs
new file mode 100644
index 000000000..35580fb7a
--- /dev/null
+++ b/apps/server/Databases/AliasClientDb/Migrations/20251203161105_1.8.0-SystemFieldRefactor.Designer.cs
@@ -0,0 +1,669 @@
+// <auto-generated />
+using System;
+using AliasClientDb;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+
+#nullable disable
+
+namespace AliasClientDb.Migrations
+{
+ [DbContext(typeof(AliasClientDbContext))]
+ [Migration("20251203161105_1.8.0-SystemFieldRefactor")]
+ partial class _180SystemFieldRefactor
+ {
+ /// <inheritdoc />
+ protected override void BuildTargetModel(ModelBuilder modelBuilder)
+ {
+#pragma warning disable 612, 618
+ modelBuilder
+ .HasAnnotation("ProductVersion", "9.0.4")
+ .HasAnnotation("Proxies:ChangeTracking", false)
+ .HasAnnotation("Proxies:CheckEquality", false)
+ .HasAnnotation("Proxies:LazyLoading", true);
+
+ modelBuilder.Entity("AliasClientDb.Attachment", b =>
+ {
+ b.Property<Guid>("Id")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("TEXT");
+
+ b.Property<byte[]>("Blob")
+ .IsRequired()
+ .HasColumnType("BLOB");
+
+ b.Property<DateTime>("CreatedAt")
+ .HasColumnType("TEXT");
+
+ b.Property<string>("Filename")
+ .IsRequired()
+ .HasMaxLength(255)
+ .HasColumnType("TEXT");
+
+ b.Property<bool>("IsDeleted")
+ .HasColumnType("INTEGER");
+
+ b.Property<Guid>("ItemId")
+ .HasColumnType("TEXT");
+
+ b.Property<DateTime>("UpdatedAt")
+ .HasColumnType("TEXT");
+
+ b.HasKey("Id");
+
+ b.HasIndex("ItemId");
+
+ b.ToTable("Attachments");
+ });
+
+ modelBuilder.Entity("AliasClientDb.EncryptionKey", b =>
+ {
+ b.Property<Guid>("Id")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("TEXT");
+
+ b.Property<DateTime>("CreatedAt")
+ .HasColumnType("TEXT");
+
+ b.Property<bool>("IsDeleted")
+ .HasColumnType("INTEGER");
+
+ b.Property<bool>("IsPrimary")
+ .HasColumnType("INTEGER");
+
+ b.Property<string>("PrivateKey")
+ .IsRequired()
+ .HasMaxLength(2000)
+ .HasColumnType("TEXT");
+
+ b.Property<string>("PublicKey")
+ .IsRequired()
+ .HasMaxLength(2000)
+ .HasColumnType("TEXT");
+
+ b.Property<DateTime>("UpdatedAt")
+ .HasColumnType("TEXT");
+
+ b.HasKey("Id");
+
+ b.ToTable("EncryptionKeys");
+ });
+
+ modelBuilder.Entity("AliasClientDb.FieldDefinition", b =>
+ {
+ b.Property<Guid>("Id")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("TEXT");
+
+ b.Property<string>("ApplicableToTypes")
+ .HasColumnType("TEXT");
+
+ b.Property<DateTime>("CreatedAt")
+ .HasColumnType("TEXT");
+
+ b.Property<bool>("EnableHistory")
+ .HasColumnType("INTEGER");
+
+ b.Property<string>("FieldType")
+ .IsRequired()
+ .HasMaxLength(50)
+ .HasColumnType("TEXT");
+
+ b.Property<bool>("IsDeleted")
+ .HasColumnType("INTEGER");
+
+ b.Property<bool>("IsHidden")
+ .HasColumnType("INTEGER");
+
+ b.Property<bool>("IsMultiValue")
+ .HasColumnType("INTEGER");
+
+ b.Property<string>("Label")
+ .IsRequired()
+ .HasMaxLength(255)
+ .HasColumnType("TEXT");
+
+ b.Property<DateTime>("UpdatedAt")
+ .HasColumnType("TEXT");
+
+ b.Property<int>("Weight")
+ .HasColumnType("INTEGER");
+
+ b.HasKey("Id");
+
+ b.ToTable("FieldDefinitions");
+ });
+
+ modelBuilder.Entity("AliasClientDb.FieldHistory", b =>
+ {
+ b.Property<Guid>("Id")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("TEXT");
+
+ b.Property<DateTime>("ChangedAt")
+ .HasColumnType("TEXT");
+
+ b.Property<DateTime>("CreatedAt")
+ .HasColumnType("TEXT");
+
+ b.Property<Guid>("FieldDefinitionId")
+ .HasColumnType("TEXT");
+
+ b.Property<bool>("IsDeleted")
+ .HasColumnType("INTEGER");
+
+ b.Property<Guid>("ItemId")
+ .HasColumnType("TEXT");
+
+ b.Property<DateTime>("UpdatedAt")
+ .HasColumnType("TEXT");
+
+ b.Property<string>("ValueSnapshot")
+ .IsRequired()
+ .HasColumnType("TEXT");
+
+ b.HasKey("Id");
+
+ b.HasIndex("FieldDefinitionId");
+
+ b.HasIndex("ItemId");
+
+ b.ToTable("FieldHistories");
+ });
+
+ modelBuilder.Entity("AliasClientDb.FieldValue", b =>
+ {
+ b.Property<Guid>("Id")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("TEXT");
+
+ b.Property<DateTime>("CreatedAt")
+ .HasColumnType("TEXT");
+
+ b.Property<Guid?>("FieldDefinitionId")
+ .HasColumnType("TEXT");
+
+ b.Property<string>("FieldKey")
+ .HasMaxLength(100)
+ .HasColumnType("TEXT");
+
+ b.Property<bool>("IsDeleted")
+ .HasColumnType("INTEGER");
+
+ b.Property<Guid>("ItemId")
+ .HasColumnType("TEXT");
+
+ b.Property<DateTime>("UpdatedAt")
+ .HasColumnType("TEXT");
+
+ b.Property<string>("Value")
+ .HasColumnType("TEXT");
+
+ b.Property<int>("Weight")
+ .HasColumnType("INTEGER");
+
+ b.HasKey("Id");
+
+ b.HasIndex("FieldDefinitionId");
+
+ b.HasIndex("FieldKey");
+
+ b.HasIndex("ItemId");
+
+ b.HasIndex("ItemId", "FieldKey");
+
+ b.HasIndex("ItemId", "FieldDefinitionId", "Weight");
+
+ b.ToTable("FieldValues");
+ });
+
+ modelBuilder.Entity("AliasClientDb.Folder", b =>
+ {
+ b.Property<Guid>("Id")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("TEXT");
+
+ b.Property<DateTime>("CreatedAt")
+ .HasColumnType("TEXT");
+
+ b.Property<bool>("IsDeleted")
+ .HasColumnType("INTEGER");
+
+ b.Property<string>("Name")
+ .IsRequired()
+ .HasMaxLength(255)
+ .HasColumnType("TEXT");
+
+ b.Property<Guid?>("ParentFolderId")
+ .HasColumnType("TEXT");
+
+ b.Property<DateTime>("UpdatedAt")
+ .HasColumnType("TEXT");
+
+ b.Property<int>("Weight")
+ .HasColumnType("INTEGER");
+
+ b.HasKey("Id");
+
+ b.HasIndex("ParentFolderId");
+
+ b.ToTable("Folders");
+ });
+
+ modelBuilder.Entity("AliasClientDb.Item", b =>
+ {
+ b.Property<Guid>("Id")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("TEXT");
+
+ b.Property<DateTime>("CreatedAt")
+ .HasColumnType("TEXT");
+
+ b.Property<Guid?>("FolderId")
+ .HasColumnType("TEXT");
+
+ b.Property<bool>("IsDeleted")
+ .HasColumnType("INTEGER");
+
+ b.Property<string>("ItemType")
+ .IsRequired()
+ .HasMaxLength(50)
+ .HasColumnType("TEXT");
+
+ b.Property<Guid?>("LogoId")
+ .HasColumnType("TEXT");
+
+ b.Property<string>("Name")
+ .HasMaxLength(255)
+ .HasColumnType("TEXT");
+
+ b.Property<DateTime>("UpdatedAt")
+ .HasColumnType("TEXT");
+
+ b.HasKey("Id");
+
+ b.HasIndex("FolderId");
+
+ b.HasIndex("LogoId");
+
+ b.ToTable("Items");
+ });
+
+ modelBuilder.Entity("AliasClientDb.ItemTag", b =>
+ {
+ b.Property<Guid>("Id")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("TEXT");
+
+ b.Property<DateTime>("CreatedAt")
+ .HasColumnType("TEXT");
+
+ b.Property<bool>("IsDeleted")
+ .HasColumnType("INTEGER");
+
+ b.Property<Guid>("ItemId")
+ .HasColumnType("TEXT");
+
+ b.Property<Guid>("TagId")
+ .HasColumnType("TEXT");
+
+ b.Property<DateTime>("UpdatedAt")
+ .HasColumnType("TEXT");
+
+ b.HasKey("Id");
+
+ b.HasIndex("ItemId");
+
+ b.HasIndex("TagId");
+
+ b.HasIndex("ItemId", "TagId")
+ .IsUnique();
+
+ b.ToTable("ItemTags");
+ });
+
+ modelBuilder.Entity("AliasClientDb.Logo", b =>
+ {
+ b.Property<Guid>("Id")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("TEXT");
+
+ b.Property<DateTime>("CreatedAt")
+ .HasColumnType("TEXT");
+
+ b.Property<DateTime?>("FetchedAt")
+ .HasColumnType("TEXT");
+
+ b.Property<byte[]>("FileData")
+ .HasColumnType("BLOB");
+
+ b.Property<bool>("IsDeleted")
+ .HasColumnType("INTEGER");
+
+ b.Property<string>("MimeType")
+ .HasMaxLength(100)
+ .HasColumnType("TEXT");
+
+ b.Property<string>("Source")
+ .IsRequired()
+ .HasMaxLength(255)
+ .HasColumnType("TEXT");
+
+ b.Property<DateTime>("UpdatedAt")
+ .HasColumnType("TEXT");
+
+ b.HasKey("Id");
+
+ b.HasIndex("Source")
+ .IsUnique();
+
+ b.ToTable("Logos");
+ });
+
+ modelBuilder.Entity("AliasClientDb.Passkey", b =>
+ {
+ b.Property<Guid>("Id")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("TEXT");
+
+ b.Property<byte[]>("AdditionalData")
+ .HasColumnType("BLOB");
+
+ b.Property<DateTime>("CreatedAt")
+ .HasColumnType("TEXT");
+
+ b.Property<string>("DisplayName")
+ .IsRequired()
+ .HasMaxLength(255)
+ .HasColumnType("TEXT");
+
+ b.Property<bool>("IsDeleted")
+ .HasColumnType("INTEGER");
+
+ b.Property<Guid>("ItemId")
+ .HasColumnType("TEXT");
+
+ b.Property<byte[]>("PrfKey")
+ .HasMaxLength(64)
+ .HasColumnType("BLOB");
+
+ b.Property<string>("PrivateKey")
+ .IsRequired()
+ .HasColumnType("TEXT");
+
+ b.Property<string>("PublicKey")
+ .IsRequired()
+ .HasColumnType("TEXT");
+
+ b.Property<string>("RpId")
+ .IsRequired()
+ .HasMaxLength(255)
+ .HasColumnType("TEXT")
+ .UseCollation("NOCASE");
+
+ b.Property<DateTime>("UpdatedAt")
+ .HasColumnType("TEXT");
+
+ b.Property<byte[]>("UserHandle")
+ .IsRequired()
+ .HasColumnType("BLOB");
+
+ b.HasKey("Id");
+
+ b.HasIndex("ItemId");
+
+ b.HasIndex("RpId");
+
+ b.ToTable("Passkeys");
+ });
+
+ modelBuilder.Entity("AliasClientDb.Setting", b =>
+ {
+ b.Property<string>("Key")
+ .HasMaxLength(255)
+ .HasColumnType("TEXT");
+
+ b.Property<DateTime>("CreatedAt")
+ .HasColumnType("TEXT");
+
+ b.Property<bool>("IsDeleted")
+ .HasColumnType("INTEGER");
+
+ b.Property<DateTime>("UpdatedAt")
+ .HasColumnType("TEXT");
+
+ b.Property<string>("Value")
+ .HasColumnType("TEXT");
+
+ b.HasKey("Key");
+
+ b.ToTable("Settings");
+ });
+
+ modelBuilder.Entity("AliasClientDb.Tag", b =>
+ {
+ b.Property<Guid>("Id")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("TEXT");
+
+ b.Property<string>("Color")
+ .HasMaxLength(50)
+ .HasColumnType("TEXT");
+
+ b.Property<DateTime>("CreatedAt")
+ .HasColumnType("TEXT");
+
+ b.Property<int>("DisplayOrder")
+ .HasColumnType("INTEGER");
+
+ b.Property<bool>("IsDeleted")
+ .HasColumnType("INTEGER");
+
+ b.Property<string>("Name")
+ .IsRequired()
+ .HasMaxLength(255)
+ .HasColumnType("TEXT");
+
+ b.Property<DateTime>("UpdatedAt")
+ .HasColumnType("TEXT");
+
+ b.HasKey("Id");
+
+ b.HasIndex("Name");
+
+ b.ToTable("Tags");
+ });
+
+ modelBuilder.Entity("AliasClientDb.TotpCode", b =>
+ {
+ b.Property<Guid>("Id")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("TEXT");
+
+ b.Property<DateTime>("CreatedAt")
+ .HasColumnType("TEXT");
+
+ b.Property<bool>("IsDeleted")
+ .HasColumnType("INTEGER");
+
+ b.Property<Guid>("ItemId")
+ .HasColumnType("TEXT");
+
+ b.Property<string>("Name")
+ .IsRequired()
+ .HasMaxLength(255)
+ .HasColumnType("TEXT");
+
+ b.Property<string>("SecretKey")
+ .IsRequired()
+ .HasMaxLength(255)
+ .HasColumnType("TEXT");
+
+ b.Property<DateTime>("UpdatedAt")
+ .HasColumnType("TEXT");
+
+ b.HasKey("Id");
+
+ b.HasIndex("ItemId");
+
+ b.ToTable("TotpCodes");
+ });
+
+ modelBuilder.Entity("AliasClientDb.Attachment", b =>
+ {
+ b.HasOne("AliasClientDb.Item", "Item")
+ .WithMany("Attachments")
+ .HasForeignKey("ItemId")
+ .OnDelete(DeleteBehavior.Cascade)
+ .IsRequired();
+
+ b.Navigation("Item");
+ });
+
+ modelBuilder.Entity("AliasClientDb.FieldHistory", b =>
+ {
+ b.HasOne("AliasClientDb.FieldDefinition", "FieldDefinition")
+ .WithMany("FieldHistories")
+ .HasForeignKey("FieldDefinitionId")
+ .OnDelete(DeleteBehavior.Cascade)
+ .IsRequired();
+
+ b.HasOne("AliasClientDb.Item", "Item")
+ .WithMany()
+ .HasForeignKey("ItemId")
+ .OnDelete(DeleteBehavior.Cascade)
+ .IsRequired();
+
+ b.Navigation("FieldDefinition");
+
+ b.Navigation("Item");
+ });
+
+ modelBuilder.Entity("AliasClientDb.FieldValue", b =>
+ {
+ b.HasOne("AliasClientDb.FieldDefinition", "FieldDefinition")
+ .WithMany("FieldValues")
+ .HasForeignKey("FieldDefinitionId")
+ .OnDelete(DeleteBehavior.Cascade);
+
+ b.HasOne("AliasClientDb.Item", "Item")
+ .WithMany("FieldValues")
+ .HasForeignKey("ItemId")
+ .OnDelete(DeleteBehavior.Cascade)
+ .IsRequired();
+
+ b.Navigation("FieldDefinition");
+
+ b.Navigation("Item");
+ });
+
+ modelBuilder.Entity("AliasClientDb.Folder", b =>
+ {
+ b.HasOne("AliasClientDb.Folder", "ParentFolder")
+ .WithMany("ChildFolders")
+ .HasForeignKey("ParentFolderId")
+ .OnDelete(DeleteBehavior.Cascade);
+
+ b.Navigation("ParentFolder");
+ });
+
+ modelBuilder.Entity("AliasClientDb.Item", b =>
+ {
+ b.HasOne("AliasClientDb.Folder", "Folder")
+ .WithMany("Items")
+ .HasForeignKey("FolderId")
+ .OnDelete(DeleteBehavior.SetNull);
+
+ b.HasOne("AliasClientDb.Logo", "Logo")
+ .WithMany("Items")
+ .HasForeignKey("LogoId")
+ .OnDelete(DeleteBehavior.SetNull);
+
+ b.Navigation("Folder");
+
+ b.Navigation("Logo");
+ });
+
+ modelBuilder.Entity("AliasClientDb.ItemTag", b =>
+ {
+ b.HasOne("AliasClientDb.Item", "Item")
+ .WithMany("ItemTags")
+ .HasForeignKey("ItemId")
+ .OnDelete(DeleteBehavior.Cascade)
+ .IsRequired();
+
+ b.HasOne("AliasClientDb.Tag", "Tag")
+ .WithMany("ItemTags")
+ .HasForeignKey("TagId")
+ .OnDelete(DeleteBehavior.Cascade)
+ .IsRequired();
+
+ b.Navigation("Item");
+
+ b.Navigation("Tag");
+ });
+
+ modelBuilder.Entity("AliasClientDb.Passkey", b =>
+ {
+ b.HasOne("AliasClientDb.Item", "Item")
+ .WithMany("Passkeys")
+ .HasForeignKey("ItemId")
+ .OnDelete(DeleteBehavior.Cascade)
+ .IsRequired();
+
+ b.Navigation("Item");
+ });
+
+ modelBuilder.Entity("AliasClientDb.TotpCode", b =>
+ {
+ b.HasOne("AliasClientDb.Item", "Item")
+ .WithMany("TotpCodes")
+ .HasForeignKey("ItemId")
+ .OnDelete(DeleteBehavior.Cascade)
+ .IsRequired();
+
+ b.Navigation("Item");
+ });
+
+ modelBuilder.Entity("AliasClientDb.FieldDefinition", b =>
+ {
+ b.Navigation("FieldHistories");
+
+ b.Navigation("FieldValues");
+ });
+
+ modelBuilder.Entity("AliasClientDb.Folder", b =>
+ {
+ b.Navigation("ChildFolders");
+
+ b.Navigation("Items");
+ });
+
+ modelBuilder.Entity("AliasClientDb.Item", b =>
+ {
+ b.Navigation("Attachments");
+
+ b.Navigation("FieldValues");
+
+ b.Navigation("ItemTags");
+
+ b.Navigation("Passkeys");
+
+ b.Navigation("TotpCodes");
+ });
+
+ modelBuilder.Entity("AliasClientDb.Logo", b =>
+ {
+ b.Navigation("Items");
+ });
+
+ modelBuilder.Entity("AliasClientDb.Tag", b =>
+ {
+ b.Navigation("ItemTags");
+ });
+#pragma warning restore 612, 618
+ }
+ }
+}
diff --git a/apps/server/Databases/AliasClientDb/Migrations/20251203161105_1.8.0-SystemFieldRefactor.cs b/apps/server/Databases/AliasClientDb/Migrations/20251203161105_1.8.0-SystemFieldRefactor.cs
new file mode 100644
index 000000000..a4ec96d72
--- /dev/null
+++ b/apps/server/Databases/AliasClientDb/Migrations/20251203161105_1.8.0-SystemFieldRefactor.cs
@@ -0,0 +1,87 @@
+// <auto-generated>
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace AliasClientDb.Migrations
+{
+ /// <inheritdoc />
+ public partial class _180SystemFieldRefactor : Migration
+ {
+ /// <inheritdoc />
+ protected override void Up(MigrationBuilder migrationBuilder)
+ {
+ migrationBuilder.DropIndex(
+ name: "IX_FieldDefinitions_FieldKey",
+ table: "FieldDefinitions");
+
+ migrationBuilder.DropColumn(
+ name: "FieldKey",
+ table: "FieldDefinitions");
+
+ migrationBuilder.AlterColumn<Guid>(
+ name: "FieldDefinitionId",
+ table: "FieldValues",
+ type: "TEXT",
+ nullable: true,
+ oldClrType: typeof(Guid),
+ oldType: "TEXT");
+
+ migrationBuilder.AddColumn<string>(
+ name: "FieldKey",
+ table: "FieldValues",
+ type: "TEXT",
+ maxLength: 100,
+ nullable: true);
+
+ migrationBuilder.CreateIndex(
+ name: "IX_FieldValues_FieldKey",
+ table: "FieldValues",
+ column: "FieldKey");
+
+ migrationBuilder.CreateIndex(
+ name: "IX_FieldValues_ItemId_FieldKey",
+ table: "FieldValues",
+ columns: new[] { "ItemId", "FieldKey" });
+ }
+
+ /// <inheritdoc />
+ protected override void Down(MigrationBuilder migrationBuilder)
+ {
+ migrationBuilder.DropIndex(
+ name: "IX_FieldValues_FieldKey",
+ table: "FieldValues");
+
+ migrationBuilder.DropIndex(
+ name: "IX_FieldValues_ItemId_FieldKey",
+ table: "FieldValues");
+
+ migrationBuilder.DropColumn(
+ name: "FieldKey",
+ table: "FieldValues");
+
+ migrationBuilder.AlterColumn<Guid>(
+ name: "FieldDefinitionId",
+ table: "FieldValues",
+ type: "TEXT",
+ nullable: false,
+ defaultValue: new Guid("00000000-0000-0000-0000-000000000000"),
+ oldClrType: typeof(Guid),
+ oldType: "TEXT",
+ oldNullable: true);
+
+ migrationBuilder.AddColumn<string>(
+ name: "FieldKey",
+ table: "FieldDefinitions",
+ type: "TEXT",
+ maxLength: 100,
+ nullable: true);
+
+ migrationBuilder.CreateIndex(
+ name: "IX_FieldDefinitions_FieldKey",
+ table: "FieldDefinitions",
+ column: "FieldKey");
+ }
+ }
+}
diff --git a/apps/server/Databases/AliasClientDb/Migrations/AliasClientDbContextModelSnapshot.cs b/apps/server/Databases/AliasClientDb/Migrations/AliasClientDbContextModelSnapshot.cs
index bf5922ca0..e24f14d1f 100644
--- a/apps/server/Databases/AliasClientDb/Migrations/AliasClientDbContextModelSnapshot.cs
+++ b/apps/server/Databases/AliasClientDb/Migrations/AliasClientDbContextModelSnapshot.cs
@@ -103,10 +103,6 @@ namespace AliasClientDb.Migrations
b.Property<bool>("EnableHistory")
.HasColumnType("INTEGER");
- b.Property<string>("FieldKey")
- .HasMaxLength(100)
- .HasColumnType("TEXT");
-
b.Property<string>("FieldType")
.IsRequired()
.HasMaxLength(50)
@@ -134,8 +130,6 @@ namespace AliasClientDb.Migrations
b.HasKey("Id");
- b.HasIndex("FieldKey");
-
b.ToTable("FieldDefinitions");
});
@@ -185,7 +179,11 @@ namespace AliasClientDb.Migrations
b.Property<DateTime>("CreatedAt")
.HasColumnType("TEXT");
- b.Property<Guid>("FieldDefinitionId")
+ b.Property<Guid?>("FieldDefinitionId")
+ .HasColumnType("TEXT");
+
+ b.Property<string>("FieldKey")
+ .HasMaxLength(100)
.HasColumnType("TEXT");
b.Property<bool>("IsDeleted")
@@ -207,8 +205,12 @@ namespace AliasClientDb.Migrations
b.HasIndex("FieldDefinitionId");
+ b.HasIndex("FieldKey");
+
b.HasIndex("ItemId");
+ b.HasIndex("ItemId", "FieldKey");
+
b.HasIndex("ItemId", "FieldDefinitionId", "Weight");
b.ToTable("FieldValues");
@@ -541,8 +543,7 @@ namespace AliasClientDb.Migrations
b.HasOne("AliasClientDb.FieldDefinition", "FieldDefinition")
.WithMany("FieldValues")
.HasForeignKey("FieldDefinitionId")
- .OnDelete(DeleteBehavior.Cascade)
- .IsRequired();
+ .OnDelete(DeleteBehavior.Cascade);
b.HasOne("AliasClientDb.Item", "Item")
.WithMany("FieldValues")
diff --git a/apps/server/Databases/AliasClientDb/Scripts/MigrationSql/000_FullSchema.sql b/apps/server/Databases/AliasClientDb/Scripts/MigrationSql/000_FullSchema.sql
index 25ef09901..820081444 100644
--- a/apps/server/Databases/AliasClientDb/Scripts/MigrationSql/000_FullSchema.sql
+++ b/apps/server/Databases/AliasClientDb/Scripts/MigrationSql/000_FullSchema.sql
@@ -1210,5 +1210,80 @@ CREATE INDEX "IX_Tags_Name" ON "Tags" ("Name");
INSERT INTO "__EFMigrationsHistory" ("MigrationId", "ProductVersion")
VALUES ('20251202211204_1.7.2-AddTagTables', '9.0.4');
+DROP INDEX "IX_FieldDefinitions_FieldKey";
+
+ALTER TABLE "FieldValues" ADD "FieldKey" TEXT NULL;
+
+CREATE INDEX "IX_FieldValues_FieldKey" ON "FieldValues" ("FieldKey");
+
+CREATE INDEX "IX_FieldValues_ItemId_FieldKey" ON "FieldValues" ("ItemId", "FieldKey");
+
+CREATE TABLE "ef_temp_FieldDefinitions" (
+ "Id" TEXT NOT NULL CONSTRAINT "PK_FieldDefinitions" PRIMARY KEY,
+ "ApplicableToTypes" TEXT NULL,
+ "CreatedAt" TEXT NOT NULL,
+ "EnableHistory" INTEGER NOT NULL,
+ "FieldType" TEXT NOT NULL,
+ "IsDeleted" INTEGER NOT NULL,
+ "IsHidden" INTEGER NOT NULL,
+ "IsMultiValue" INTEGER NOT NULL,
+ "Label" TEXT NOT NULL,
+ "UpdatedAt" TEXT NOT NULL,
+ "Weight" INTEGER NOT NULL
+);
+
+INSERT INTO "ef_temp_FieldDefinitions" ("Id", "ApplicableToTypes", "CreatedAt", "EnableHistory", "FieldType", "IsDeleted", "IsHidden", "IsMultiValue", "Label", "UpdatedAt", "Weight")
+SELECT "Id", "ApplicableToTypes", "CreatedAt", "EnableHistory", "FieldType", "IsDeleted", "IsHidden", "IsMultiValue", "Label", "UpdatedAt", "Weight"
+FROM "FieldDefinitions";
+
+CREATE TABLE "ef_temp_FieldValues" (
+ "Id" TEXT NOT NULL CONSTRAINT "PK_FieldValues" PRIMARY KEY,
+ "CreatedAt" TEXT NOT NULL,
+ "FieldDefinitionId" TEXT NULL,
+ "FieldKey" TEXT NULL,
+ "IsDeleted" INTEGER NOT NULL,
+ "ItemId" TEXT NOT NULL,
+ "UpdatedAt" TEXT NOT NULL,
+ "Value" TEXT NULL,
+ "Weight" INTEGER NOT NULL,
+ CONSTRAINT "FK_FieldValues_FieldDefinitions_FieldDefinitionId" FOREIGN KEY ("FieldDefinitionId") REFERENCES "FieldDefinitions" ("Id") ON DELETE CASCADE,
+ CONSTRAINT "FK_FieldValues_Items_ItemId" FOREIGN KEY ("ItemId") REFERENCES "Items" ("Id") ON DELETE CASCADE
+);
+
+INSERT INTO "ef_temp_FieldValues" ("Id", "CreatedAt", "FieldDefinitionId", "FieldKey", "IsDeleted", "ItemId", "UpdatedAt", "Value", "Weight")
+SELECT "Id", "CreatedAt", "FieldDefinitionId", "FieldKey", "IsDeleted", "ItemId", "UpdatedAt", "Value", "Weight"
+FROM "FieldValues";
+
COMMIT;
+PRAGMA foreign_keys = 0;
+
+BEGIN TRANSACTION;
+DROP TABLE "FieldDefinitions";
+
+ALTER TABLE "ef_temp_FieldDefinitions" RENAME TO "FieldDefinitions";
+
+DROP TABLE "FieldValues";
+
+ALTER TABLE "ef_temp_FieldValues" RENAME TO "FieldValues";
+
+COMMIT;
+
+PRAGMA foreign_keys = 1;
+
+BEGIN TRANSACTION;
+CREATE INDEX "IX_FieldValues_FieldDefinitionId" ON "FieldValues" ("FieldDefinitionId");
+
+CREATE INDEX "IX_FieldValues_FieldKey" ON "FieldValues" ("FieldKey");
+
+CREATE INDEX "IX_FieldValues_ItemId" ON "FieldValues" ("ItemId");
+
+CREATE INDEX "IX_FieldValues_ItemId_FieldDefinitionId_Weight" ON "FieldValues" ("ItemId", "FieldDefinitionId", "Weight");
+
+CREATE INDEX "IX_FieldValues_ItemId_FieldKey" ON "FieldValues" ("ItemId", "FieldKey");
+
+COMMIT;
+
+INSERT INTO "__EFMigrationsHistory" ("MigrationId", "ProductVersion")
+VALUES ('20251203161105_1.8.0-SystemFieldRefactor', '9.0.4');
+
diff --git a/apps/server/Databases/AliasClientDb/Scripts/MigrationSql/014_20251202211204_1.7.2-AddTagTables_to_20251203161105_1.8.0-SystemFieldRefactor.sql b/apps/server/Databases/AliasClientDb/Scripts/MigrationSql/014_20251202211204_1.7.2-AddTagTables_to_20251203161105_1.8.0-SystemFieldRefactor.sql
new file mode 100644
index 000000000..e882a14ed
--- /dev/null
+++ b/apps/server/Databases/AliasClientDb/Scripts/MigrationSql/014_20251202211204_1.7.2-AddTagTables_to_20251203161105_1.8.0-SystemFieldRefactor.sql
@@ -0,0 +1,78 @@
+BEGIN TRANSACTION;
+DROP INDEX "IX_FieldDefinitions_FieldKey";
+
+ALTER TABLE "FieldValues" ADD "FieldKey" TEXT NULL;
+
+CREATE INDEX "IX_FieldValues_FieldKey" ON "FieldValues" ("FieldKey");
+
+CREATE INDEX "IX_FieldValues_ItemId_FieldKey" ON "FieldValues" ("ItemId", "FieldKey");
+
+CREATE TABLE "ef_temp_FieldDefinitions" (
+ "Id" TEXT NOT NULL CONSTRAINT "PK_FieldDefinitions" PRIMARY KEY,
+ "ApplicableToTypes" TEXT NULL,
+ "CreatedAt" TEXT NOT NULL,
+ "EnableHistory" INTEGER NOT NULL,
+ "FieldType" TEXT NOT NULL,
+ "IsDeleted" INTEGER NOT NULL,
+ "IsHidden" INTEGER NOT NULL,
+ "IsMultiValue" INTEGER NOT NULL,
+ "Label" TEXT NOT NULL,
+ "UpdatedAt" TEXT NOT NULL,
+ "Weight" INTEGER NOT NULL
+);
+
+INSERT INTO "ef_temp_FieldDefinitions" ("Id", "ApplicableToTypes", "CreatedAt", "EnableHistory", "FieldType", "IsDeleted", "IsHidden", "IsMultiValue", "Label", "UpdatedAt", "Weight")
+SELECT "Id", "ApplicableToTypes", "CreatedAt", "EnableHistory", "FieldType", "IsDeleted", "IsHidden", "IsMultiValue", "Label", "UpdatedAt", "Weight"
+FROM "FieldDefinitions";
+
+CREATE TABLE "ef_temp_FieldValues" (
+ "Id" TEXT NOT NULL CONSTRAINT "PK_FieldValues" PRIMARY KEY,
+ "CreatedAt" TEXT NOT NULL,
+ "FieldDefinitionId" TEXT NULL,
+ "FieldKey" TEXT NULL,
+ "IsDeleted" INTEGER NOT NULL,
+ "ItemId" TEXT NOT NULL,
+ "UpdatedAt" TEXT NOT NULL,
+ "Value" TEXT NULL,
+ "Weight" INTEGER NOT NULL,
+ CONSTRAINT "FK_FieldValues_FieldDefinitions_FieldDefinitionId" FOREIGN KEY ("FieldDefinitionId") REFERENCES "FieldDefinitions" ("Id") ON DELETE CASCADE,
+ CONSTRAINT "FK_FieldValues_Items_ItemId" FOREIGN KEY ("ItemId") REFERENCES "Items" ("Id") ON DELETE CASCADE
+);
+
+INSERT INTO "ef_temp_FieldValues" ("Id", "CreatedAt", "FieldDefinitionId", "FieldKey", "IsDeleted", "ItemId", "UpdatedAt", "Value", "Weight")
+SELECT "Id", "CreatedAt", "FieldDefinitionId", "FieldKey", "IsDeleted", "ItemId", "UpdatedAt", "Value", "Weight"
+FROM "FieldValues";
+
+COMMIT;
+
+PRAGMA foreign_keys = 0;
+
+BEGIN TRANSACTION;
+DROP TABLE "FieldDefinitions";
+
+ALTER TABLE "ef_temp_FieldDefinitions" RENAME TO "FieldDefinitions";
+
+DROP TABLE "FieldValues";
+
+ALTER TABLE "ef_temp_FieldValues" RENAME TO "FieldValues";
+
+COMMIT;
+
+PRAGMA foreign_keys = 1;
+
+BEGIN TRANSACTION;
+CREATE INDEX "IX_FieldValues_FieldDefinitionId" ON "FieldValues" ("FieldDefinitionId");
+
+CREATE INDEX "IX_FieldValues_FieldKey" ON "FieldValues" ("FieldKey");
+
+CREATE INDEX "IX_FieldValues_ItemId" ON "FieldValues" ("ItemId");
+
+CREATE INDEX "IX_FieldValues_ItemId_FieldDefinitionId_Weight" ON "FieldValues" ("ItemId", "FieldDefinitionId", "Weight");
+
+CREATE INDEX "IX_FieldValues_ItemId_FieldKey" ON "FieldValues" ("ItemId", "FieldKey");
+
+COMMIT;
+
+INSERT INTO "__EFMigrationsHistory" ("MigrationId", "ProductVersion")
+VALUES ('20251203161105_1.8.0-SystemFieldRefactor', '9.0.4');
+
diff --git a/shared/models/src/vault/ItemMethods.ts b/shared/models/src/vault/ItemMethods.ts
index 103219c4a..52b5b055a 100644
--- a/shared/models/src/vault/ItemMethods.ts
+++ b/shared/models/src/vault/ItemMethods.ts
@@ -61,6 +61,12 @@ export function groupFields(
*/
export function groupFieldsByCategory(item: Item): Record<string, ItemField[]> {
return groupFields(item, (field) => {
+
+ // Render alias.email as login
+ if (field.FieldKey === FieldKey.AliasEmail) {
+ return 'Login';
+ }
+
if (field.FieldKey.startsWith('login.')) {
return 'Login';
}
diff --git a/shared/models/src/vault/SystemFieldRegistry.ts b/shared/models/src/vault/SystemFieldRegistry.ts
new file mode 100644
index 000000000..156a60521
--- /dev/null
+++ b/shared/models/src/vault/SystemFieldRegistry.ts
@@ -0,0 +1,201 @@
+import type { FieldType, ItemType } from './Item';
+
+/**
+ * System field definition with metadata.
+ * System fields are predefined fields with immutable keys like 'login.username'.
+ * Their metadata (label, type, etc.) is defined here in code, not in the database.
+ */
+export type SystemFieldDefinition = {
+ /** Unique system field key (e.g., 'login.username') */
+ FieldKey: string;
+ /** Display label for the field */
+ Label: string;
+ /** Field type for rendering/validation */
+ FieldType: FieldType;
+ /** Whether field is hidden/masked by default */
+ IsHidden: boolean;
+ /** Whether field supports multiple values */
+ IsMultiValue: boolean;
+ /** Item types this field applies to */
+ ApplicableToTypes: ItemType[];
+ /** Whether to track field value history */
+ EnableHistory: boolean;
+ /** Category for grouping in UI */
+ Category: 'Login' | 'Alias' | 'Card' | 'Identity' | 'API' | 'Note';
+ /** Default display order within category (lower = first) */
+ DefaultDisplayOrder: number;
+};
+
+/**
+ * Registry of all system-defined fields.
+ * These fields are immutable and their metadata is defined in code.
+ * DO NOT modify these definitions without careful consideration of backwards compatibility.
+ */
+export const SystemFieldRegistry: Record<string, SystemFieldDefinition> = {
+ // Login Fields
+ 'login.username': {
+ FieldKey: 'login.username',
+ Label: 'Username',
+ FieldType: 'Text',
+ IsHidden: false,
+ IsMultiValue: false,
+ ApplicableToTypes: ['Login'],
+ EnableHistory: true,
+ Category: 'Login',
+ DefaultDisplayOrder: 10
+ },
+ 'login.password': {
+ FieldKey: 'login.password',
+ Label: 'Password',
+ FieldType: 'Password',
+ IsHidden: true,
+ IsMultiValue: false,
+ ApplicableToTypes: ['Login'],
+ EnableHistory: true,
+ Category: 'Login',
+ DefaultDisplayOrder: 20
+ },
+ 'login.url': {
+ FieldKey: 'login.url',
+ Label: 'Website',
+ FieldType: 'URL',
+ IsHidden: false,
+ IsMultiValue: true,
+ ApplicableToTypes: ['Login'],
+ EnableHistory: false,
+ Category: 'Login',
+ DefaultDisplayOrder: 30
+ },
+ 'login.notes': {
+ FieldKey: 'login.notes',
+ Label: 'Notes',
+ FieldType: 'TextArea',
+ IsHidden: false,
+ IsMultiValue: false,
+ ApplicableToTypes: ['Login', 'CreditCard', 'Identity', 'SecureNote', 'ApiKey'],
+ EnableHistory: false,
+ Category: 'Login',
+ DefaultDisplayOrder: 100
+ },
+
+ // Alias Fields
+ 'alias.email': {
+ FieldKey: 'alias.email',
+ Label: 'Email',
+ FieldType: 'Email',
+ IsHidden: false,
+ IsMultiValue: false,
+ ApplicableToTypes: ['Login'],
+ EnableHistory: true,
+ Category: 'Alias',
+ DefaultDisplayOrder: 10
+ },
+ 'alias.first_name': {
+ FieldKey: 'alias.first_name',
+ Label: 'First Name',
+ FieldType: 'Text',
+ IsHidden: false,
+ IsMultiValue: false,
+ ApplicableToTypes: ['Login', 'Identity'],
+ EnableHistory: false,
+ Category: 'Alias',
+ DefaultDisplayOrder: 20
+ },
+ 'alias.last_name': {
+ FieldKey: 'alias.last_name',
+ Label: 'Last Name',
+ FieldType: 'Text',
+ IsHidden: false,
+ IsMultiValue: false,
+ ApplicableToTypes: ['Login', 'Identity'],
+ EnableHistory: false,
+ Category: 'Alias',
+ DefaultDisplayOrder: 30
+ },
+ 'alias.nickname': {
+ FieldKey: 'alias.nickname',
+ Label: 'Nickname',
+ FieldType: 'Text',
+ IsHidden: false,
+ IsMultiValue: false,
+ ApplicableToTypes: ['Login'],
+ EnableHistory: false,
+ Category: 'Alias',
+ DefaultDisplayOrder: 40
+ },
+ 'alias.gender': {
+ FieldKey: 'alias.gender',
+ Label: 'Gender',
+ FieldType: 'Text',
+ IsHidden: false,
+ IsMultiValue: false,
+ ApplicableToTypes: ['Login', 'Identity'],
+ EnableHistory: false,
+ Category: 'Alias',
+ DefaultDisplayOrder: 50
+ },
+ 'alias.birthdate': {
+ FieldKey: 'alias.birthdate',
+ Label: 'Birth Date',
+ FieldType: 'Date',
+ IsHidden: false,
+ IsMultiValue: false,
+ ApplicableToTypes: ['Login', 'Identity'],
+ EnableHistory: false,
+ Category: 'Alias',
+ DefaultDisplayOrder: 60
+ },
+
+ /*
+ * Note: Card, Identity, and API fields can be added here when those item types are implemented
+ * Example:
+ * 'card.number': { ... },
+ * 'card.cardholder_name': { ... },
+ * 'identity.phone_number': { ... },
+ */
+};
+
+/**
+ * Get system field definition by key.
+ * Returns undefined if the field key is not a system field.
+ */
+export function getSystemField(fieldKey: string): SystemFieldDefinition | undefined {
+ return SystemFieldRegistry[fieldKey];
+}
+
+/**
+ * Check if a field key represents a system field.
+ */
+export function isSystemField(fieldKey: string): boolean {
+ return fieldKey in SystemFieldRegistry;
+}
+
+/**
+ * Get all system fields applicable to a specific item type.
+ * Results are sorted by DefaultDisplayOrder.
+ */
+export function getSystemFieldsForItemType(itemType: ItemType): SystemFieldDefinition[] {
+ return Object.values(SystemFieldRegistry)
+ .filter(field => field.ApplicableToTypes.includes(itemType))
+ .sort((a, b) => a.DefaultDisplayOrder - b.DefaultDisplayOrder);
+}
+
+/**
+ * Get all system field keys.
+ */
+export function getAllSystemFieldKeys(): string[] {
+ return Object.keys(SystemFieldRegistry);
+}
+
+/**
+ * Check if a field key matches a known system field prefix.
+ * This is useful for validation even before a specific field is registered.
+ */
+export function isSystemFieldPrefix(fieldKey: string): boolean {
+ return fieldKey.startsWith('login.') ||
+ fieldKey.startsWith('alias.') ||
+ fieldKey.startsWith('card.') ||
+ fieldKey.startsWith('identity.') ||
+ fieldKey.startsWith('api.') ||
+ fieldKey.startsWith('note.');
+}
diff --git a/shared/models/src/vault/index.ts b/shared/models/src/vault/index.ts
index 796c2e152..51098639e 100644
--- a/shared/models/src/vault/index.ts
+++ b/shared/models/src/vault/index.ts
@@ -13,3 +13,4 @@ export * from './ItemTag';
export * from './Item';
export * from './CredentialCompat';
export * from './ItemMethods';
+export * from './SystemFieldRegistry';
diff --git a/shared/vault-sql/src/sql/SqlConstants.ts b/shared/vault-sql/src/sql/SqlConstants.ts
index 3b6a68873..290675d0d 100644
--- a/shared/vault-sql/src/sql/SqlConstants.ts
+++ b/shared/vault-sql/src/sql/SqlConstants.ts
@@ -1217,7 +1217,82 @@ CREATE INDEX "IX_Tags_Name" ON "Tags" ("Name");
INSERT INTO "__EFMigrationsHistory" ("MigrationId", "ProductVersion")
VALUES ('20251202211204_1.7.2-AddTagTables', '9.0.4');
+DROP INDEX "IX_FieldDefinitions_FieldKey";
+
+ALTER TABLE "FieldValues" ADD "FieldKey" TEXT NULL;
+
+CREATE INDEX "IX_FieldValues_FieldKey" ON "FieldValues" ("FieldKey");
+
+CREATE INDEX "IX_FieldValues_ItemId_FieldKey" ON "FieldValues" ("ItemId", "FieldKey");
+
+CREATE TABLE "ef_temp_FieldDefinitions" (
+ "Id" TEXT NOT NULL CONSTRAINT "PK_FieldDefinitions" PRIMARY KEY,
+ "ApplicableToTypes" TEXT NULL,
+ "CreatedAt" TEXT NOT NULL,
+ "EnableHistory" INTEGER NOT NULL,
+ "FieldType" TEXT NOT NULL,
+ "IsDeleted" INTEGER NOT NULL,
+ "IsHidden" INTEGER NOT NULL,
+ "IsMultiValue" INTEGER NOT NULL,
+ "Label" TEXT NOT NULL,
+ "UpdatedAt" TEXT NOT NULL,
+ "Weight" INTEGER NOT NULL
+);
+
+INSERT INTO "ef_temp_FieldDefinitions" ("Id", "ApplicableToTypes", "CreatedAt", "EnableHistory", "FieldType", "IsDeleted", "IsHidden", "IsMultiValue", "Label", "UpdatedAt", "Weight")
+SELECT "Id", "ApplicableToTypes", "CreatedAt", "EnableHistory", "FieldType", "IsDeleted", "IsHidden", "IsMultiValue", "Label", "UpdatedAt", "Weight"
+FROM "FieldDefinitions";
+
+CREATE TABLE "ef_temp_FieldValues" (
+ "Id" TEXT NOT NULL CONSTRAINT "PK_FieldValues" PRIMARY KEY,
+ "CreatedAt" TEXT NOT NULL,
+ "FieldDefinitionId" TEXT NULL,
+ "FieldKey" TEXT NULL,
+ "IsDeleted" INTEGER NOT NULL,
+ "ItemId" TEXT NOT NULL,
+ "UpdatedAt" TEXT NOT NULL,
+ "Value" TEXT NULL,
+ "Weight" INTEGER NOT NULL,
+ CONSTRAINT "FK_FieldValues_FieldDefinitions_FieldDefinitionId" FOREIGN KEY ("FieldDefinitionId") REFERENCES "FieldDefinitions" ("Id") ON DELETE CASCADE,
+ CONSTRAINT "FK_FieldValues_Items_ItemId" FOREIGN KEY ("ItemId") REFERENCES "Items" ("Id") ON DELETE CASCADE
+);
+
+INSERT INTO "ef_temp_FieldValues" ("Id", "CreatedAt", "FieldDefinitionId", "FieldKey", "IsDeleted", "ItemId", "UpdatedAt", "Value", "Weight")
+SELECT "Id", "CreatedAt", "FieldDefinitionId", "FieldKey", "IsDeleted", "ItemId", "UpdatedAt", "Value", "Weight"
+FROM "FieldValues";
+
COMMIT;
+
+PRAGMA foreign_keys = 0;
+
+BEGIN TRANSACTION;
+DROP TABLE "FieldDefinitions";
+
+ALTER TABLE "ef_temp_FieldDefinitions" RENAME TO "FieldDefinitions";
+
+DROP TABLE "FieldValues";
+
+ALTER TABLE "ef_temp_FieldValues" RENAME TO "FieldValues";
+
+COMMIT;
+
+PRAGMA foreign_keys = 1;
+
+BEGIN TRANSACTION;
+CREATE INDEX "IX_FieldValues_FieldDefinitionId" ON "FieldValues" ("FieldDefinitionId");
+
+CREATE INDEX "IX_FieldValues_FieldKey" ON "FieldValues" ("FieldKey");
+
+CREATE INDEX "IX_FieldValues_ItemId" ON "FieldValues" ("ItemId");
+
+CREATE INDEX "IX_FieldValues_ItemId_FieldDefinitionId_Weight" ON "FieldValues" ("ItemId", "FieldDefinitionId", "Weight");
+
+CREATE INDEX "IX_FieldValues_ItemId_FieldKey" ON "FieldValues" ("ItemId", "FieldKey");
+
+COMMIT;
+
+INSERT INTO "__EFMigrationsHistory" ("MigrationId", "ProductVersion")
+VALUES ('20251203161105_1.8.0-SystemFieldRefactor', '9.0.4');
`;
/**
* Individual migration SQL scripts
@@ -2370,4 +2445,81 @@ INSERT INTO "__EFMigrationsHistory" ("MigrationId", "ProductVersion")
VALUES ('20251202211204_1.7.2-AddTagTables', '9.0.4');
COMMIT;`,
+ 14: `BEGIN TRANSACTION;
+DROP INDEX "IX_FieldDefinitions_FieldKey";
+
+ALTER TABLE "FieldValues" ADD "FieldKey" TEXT NULL;
+
+CREATE INDEX "IX_FieldValues_FieldKey" ON "FieldValues" ("FieldKey");
+
+CREATE INDEX "IX_FieldValues_ItemId_FieldKey" ON "FieldValues" ("ItemId", "FieldKey");
+
+CREATE TABLE "ef_temp_FieldDefinitions" (
+ "Id" TEXT NOT NULL CONSTRAINT "PK_FieldDefinitions" PRIMARY KEY,
+ "ApplicableToTypes" TEXT NULL,
+ "CreatedAt" TEXT NOT NULL,
+ "EnableHistory" INTEGER NOT NULL,
+ "FieldType" TEXT NOT NULL,
+ "IsDeleted" INTEGER NOT NULL,
+ "IsHidden" INTEGER NOT NULL,
+ "IsMultiValue" INTEGER NOT NULL,
+ "Label" TEXT NOT NULL,
+ "UpdatedAt" TEXT NOT NULL,
+ "Weight" INTEGER NOT NULL
+);
+
+INSERT INTO "ef_temp_FieldDefinitions" ("Id", "ApplicableToTypes", "CreatedAt", "EnableHistory", "FieldType", "IsDeleted", "IsHidden", "IsMultiValue", "Label", "UpdatedAt", "Weight")
+SELECT "Id", "ApplicableToTypes", "CreatedAt", "EnableHistory", "FieldType", "IsDeleted", "IsHidden", "IsMultiValue", "Label", "UpdatedAt", "Weight"
+FROM "FieldDefinitions";
+
+CREATE TABLE "ef_temp_FieldValues" (
+ "Id" TEXT NOT NULL CONSTRAINT "PK_FieldValues" PRIMARY KEY,
+ "CreatedAt" TEXT NOT NULL,
+ "FieldDefinitionId" TEXT NULL,
+ "FieldKey" TEXT NULL,
+ "IsDeleted" INTEGER NOT NULL,
+ "ItemId" TEXT NOT NULL,
+ "UpdatedAt" TEXT NOT NULL,
+ "Value" TEXT NULL,
+ "Weight" INTEGER NOT NULL,
+ CONSTRAINT "FK_FieldValues_FieldDefinitions_FieldDefinitionId" FOREIGN KEY ("FieldDefinitionId") REFERENCES "FieldDefinitions" ("Id") ON DELETE CASCADE,
+ CONSTRAINT "FK_FieldValues_Items_ItemId" FOREIGN KEY ("ItemId") REFERENCES "Items" ("Id") ON DELETE CASCADE
+);
+
+INSERT INTO "ef_temp_FieldValues" ("Id", "CreatedAt", "FieldDefinitionId", "FieldKey", "IsDeleted", "ItemId", "UpdatedAt", "Value", "Weight")
+SELECT "Id", "CreatedAt", "FieldDefinitionId", "FieldKey", "IsDeleted", "ItemId", "UpdatedAt", "Value", "Weight"
+FROM "FieldValues";
+
+COMMIT;
+
+PRAGMA foreign_keys = 0;
+
+BEGIN TRANSACTION;
+DROP TABLE "FieldDefinitions";
+
+ALTER TABLE "ef_temp_FieldDefinitions" RENAME TO "FieldDefinitions";
+
+DROP TABLE "FieldValues";
+
+ALTER TABLE "ef_temp_FieldValues" RENAME TO "FieldValues";
+
+COMMIT;
+
+PRAGMA foreign_keys = 1;
+
+BEGIN TRANSACTION;
+CREATE INDEX "IX_FieldValues_FieldDefinitionId" ON "FieldValues" ("FieldDefinitionId");
+
+CREATE INDEX "IX_FieldValues_FieldKey" ON "FieldValues" ("FieldKey");
+
+CREATE INDEX "IX_FieldValues_ItemId" ON "FieldValues" ("ItemId");
+
+CREATE INDEX "IX_FieldValues_ItemId_FieldDefinitionId_Weight" ON "FieldValues" ("ItemId", "FieldDefinitionId", "Weight");
+
+CREATE INDEX "IX_FieldValues_ItemId_FieldKey" ON "FieldValues" ("ItemId", "FieldKey");
+
+COMMIT;
+
+INSERT INTO "__EFMigrationsHistory" ("MigrationId", "ProductVersion")
+VALUES ('20251203161105_1.8.0-SystemFieldRefactor', '9.0.4');`,
};