Skip to content

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

Optimize client EF datamodel and remove redundant Guids (#2159)

Leendert de Borst8680b4ec63a1
diff --git a/apps/server/AliasVault.Client/Services/ItemService.cs b/apps/server/AliasVault.Client/Services/ItemService.cs
index d858e755b..74f702180 100644
--- a/apps/server/AliasVault.Client/Services/ItemService.cs
+++ b/apps/server/AliasVault.Client/Services/ItemService.cs
@@ -440,7 +440,6 @@ public sealed class ItemService(HttpClient httpClient, DbService dbService, Conf
{
var newItemTag = new ItemTag
{
- Id = Guid.NewGuid(),
ItemId = newItem.Id,
TagId = itemTag.TagId,
};
diff --git a/apps/server/Databases/AliasClientDb/AliasClientDbContext.cs b/apps/server/Databases/AliasClientDb/AliasClientDbContext.cs
index 096da04fe..0828865f4 100644
--- a/apps/server/Databases/AliasClientDb/AliasClientDbContext.cs
+++ b/apps/server/Databases/AliasClientDb/AliasClientDbContext.cs
@@ -155,16 +155,14 @@ public class AliasClientDbContext : DbContext
modelBuilder.Entity<EncryptionKey>().HasKey(e => new { e.ManifestId, e.Id });
modelBuilder.Entity<FieldValue>().HasKey(e => new { e.ManifestId, e.Id });
modelBuilder.Entity<FieldHistory>().HasKey(e => new { e.ManifestId, e.Id });
- modelBuilder.Entity<ItemTag>().HasKey(e => new { e.ManifestId, e.Id });
modelBuilder.Entity<Tag>().HasKey(e => new { e.ManifestId, e.Id });
modelBuilder.Entity<FieldDefinition>().HasKey(e => new { e.ManifestId, e.Id });
modelBuilder.Entity<Attachment>().HasKey(e => new { e.ManifestId, e.Id });
modelBuilder.Entity<Passkey>().HasKey(e => new { e.ManifestId, e.Id });
modelBuilder.Entity<TotpCode>().HasKey(e => new { e.ManifestId, e.Id });
modelBuilder.Entity<ItemStat>().HasKey(e => new { e.ManifestId, e.Id });
-
- // Settings are named by Key rather than Id.
modelBuilder.Entity<Setting>().HasKey(e => new { e.ManifestId, e.Key });
+ modelBuilder.Entity<ItemTag>().HasKey(e => new { e.ManifestId, e.ItemId, e.TagId });
// Configure Attachment - Item relationship
modelBuilder.Entity<Attachment>()
@@ -316,10 +314,6 @@ public class AliasClientDbContext : DbContext
modelBuilder.Entity<ItemTag>()
.HasIndex(it => it.TagId);
-
- modelBuilder.Entity<ItemTag>()
- .HasIndex(it => new { it.ManifestId, it.ItemId, it.TagId })
- .IsUnique();
}
/// <summary>
diff --git a/apps/server/Databases/AliasClientDb/FieldValue.cs b/apps/server/Databases/AliasClientDb/FieldValue.cs
index 7da3b5ea6..91b3c8f79 100644
--- a/apps/server/Databases/AliasClientDb/FieldValue.cs
+++ b/apps/server/Databases/AliasClientDb/FieldValue.cs
@@ -66,6 +66,12 @@ public class FieldValue : ManifestScopedEntity
/// </summary>
public int Weight { get; set; } = 0;
+ /// <summary>
+ /// Gets or sets the position of this value within its field. Always 0 for single-value fields;
+ /// values of a multi-value field are numbered 0..n.
+ /// </summary>
+ public int ValueIndex { get; set; } = 0;
+
/// <summary>
/// Gets or sets a value indicating whether this field value should be considered disabled (e.g. applies to email aliases).
/// </summary>
diff --git a/apps/server/Databases/AliasClientDb/ItemTag.cs b/apps/server/Databases/AliasClientDb/ItemTag.cs
index 0e95ddd26..c8cbf44e8 100644
--- a/apps/server/Databases/AliasClientDb/ItemTag.cs
+++ b/apps/server/Databases/AliasClientDb/ItemTag.cs
@@ -16,11 +16,6 @@ using AliasClientDb.Abstracts;
/// </summary>
public class ItemTag : ManifestScopedEntity
{
- /// <summary>
- /// Gets or sets the item-tag relationship ID.
- /// </summary>
- public Guid Id { get; set; }
-
/// <summary>
/// Gets or sets the item ID foreign key.
/// </summary>
diff --git a/apps/server/Databases/AliasClientDb/Migrations/20260827095434_2.1.5-AddFieldValueValueIndex.Designer.cs b/apps/server/Databases/AliasClientDb/Migrations/20260827095434_2.1.5-AddFieldValueValueIndex.Designer.cs
new file mode 100644
index 000000000..0e6cf3659
--- /dev/null
+++ b/apps/server/Databases/AliasClientDb/Migrations/20260827095434_2.1.5-AddFieldValueValueIndex.Designer.cs
@@ -0,0 +1,827 @@
+// <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("20260827095434_2.1.5-AddFieldValueValueIndex")]
+ partial class _215AddFieldValueValueIndex
+ {
+ /// <inheritdoc />
+ protected override void BuildTargetModel(ModelBuilder modelBuilder)
+ {
+#pragma warning disable 612, 618
+ modelBuilder
+ .HasAnnotation("ProductVersion", "10.0.10")
+ .HasAnnotation("Proxies:ChangeTracking", false)
+ .HasAnnotation("Proxies:CheckEquality", false)
+ .HasAnnotation("Proxies:LazyLoading", true);
+
+ modelBuilder.Entity("AliasClientDb.Attachment", b =>
+ {
+ b.Property<Guid>("ManifestId")
+ .HasColumnType("TEXT");
+
+ b.Property<Guid>("Id")
+ .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("ManifestId", "Id");
+
+ b.HasIndex("ManifestId", "ItemId");
+
+ b.ToTable("Attachments");
+ });
+
+ modelBuilder.Entity("AliasClientDb.CodecOverflow", b =>
+ {
+ b.Property<Guid>("Id")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("TEXT");
+
+ b.Property<string>("Data")
+ .IsRequired()
+ .HasColumnType("TEXT");
+
+ b.HasKey("Id");
+
+ b.ToTable("CodecOverflows");
+ });
+
+ modelBuilder.Entity("AliasClientDb.EncryptionKey", b =>
+ {
+ b.Property<Guid>("ManifestId")
+ .HasColumnType("TEXT");
+
+ b.Property<Guid>("Id")
+ .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("ManifestId", "Id");
+
+ b.HasIndex("ManifestId", "IsPrimary");
+
+ b.ToTable("EncryptionKeys");
+ });
+
+ modelBuilder.Entity("AliasClientDb.FieldDefinition", b =>
+ {
+ b.Property<Guid>("ManifestId")
+ .HasColumnType("TEXT");
+
+ b.Property<Guid>("Id")
+ .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("ManifestId", "Id");
+
+ b.ToTable("FieldDefinitions");
+ });
+
+ modelBuilder.Entity("AliasClientDb.FieldHistory", b =>
+ {
+ b.Property<Guid>("ManifestId")
+ .HasColumnType("TEXT");
+
+ b.Property<Guid>("Id")
+ .HasColumnType("TEXT");
+
+ b.Property<DateTime>("ChangedAt")
+ .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>("ValueSnapshot")
+ .IsRequired()
+ .HasColumnType("TEXT");
+
+ b.HasKey("ManifestId", "Id");
+
+ b.HasIndex("FieldDefinitionId");
+
+ b.HasIndex("ItemId");
+
+ b.HasIndex("ManifestId", "FieldDefinitionId");
+
+ b.HasIndex("ManifestId", "ItemId");
+
+ b.ToTable("FieldHistories");
+ });
+
+ modelBuilder.Entity("AliasClientDb.FieldValue", b =>
+ {
+ b.Property<Guid>("ManifestId")
+ .HasColumnType("TEXT");
+
+ b.Property<Guid>("Id")
+ .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<bool>("IsDisabled")
+ .HasColumnType("INTEGER");
+
+ b.Property<Guid>("ItemId")
+ .HasColumnType("TEXT");
+
+ b.Property<DateTime>("UpdatedAt")
+ .HasColumnType("TEXT");
+
+ b.Property<string>("Value")
+ .HasColumnType("TEXT");
+
+ b.Property<int>("ValueIndex")
+ .HasColumnType("INTEGER");
+
+ b.Property<int>("Weight")
+ .HasColumnType("INTEGER");
+
+ b.HasKey("ManifestId", "Id");
+
+ b.HasIndex("FieldDefinitionId");
+
+ b.HasIndex("FieldKey");
+
+ b.HasIndex("ItemId");
+
+ b.HasIndex("ItemId", "FieldKey");
+
+ b.HasIndex("ManifestId", "FieldDefinitionId");
+
+ b.HasIndex("ManifestId", "ItemId");
+
+ b.HasIndex("ItemId", "FieldDefinitionId", "Weight");
+
+ b.ToTable("FieldValues");
+ });
+
+ modelBuilder.Entity("AliasClientDb.Folder", b =>
+ {
+ b.Property<Guid>("ManifestId")
+ .HasColumnType("TEXT");
+
+ b.Property<Guid>("Id")
+ .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("ManifestId", "Id");
+
+ b.HasIndex("ParentFolderId");
+
+ b.HasIndex("ManifestId", "ParentFolderId");
+
+ b.ToTable("Folders");
+ });
+
+ modelBuilder.Entity("AliasClientDb.Item", b =>
+ {
+ b.Property<Guid>("ManifestId")
+ .HasColumnType("TEXT");
+
+ b.Property<Guid>("Id")
+ .HasColumnType("TEXT");
+
+ b.Property<DateTime?>("ArchivedAt")
+ .HasColumnType("TEXT");
+
+ b.Property<DateTime>("CreatedAt")
+ .HasColumnType("TEXT");
+
+ b.Property<DateTime?>("DeletedAt")
+ .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("ManifestId", "Id");
+
+ b.HasIndex("ManifestId", "FolderId");
+
+ b.HasIndex("ManifestId", "LogoId");
+
+ b.ToTable("Items");
+ });
+
+ modelBuilder.Entity("AliasClientDb.ItemStat", b =>
+ {
+ b.Property<Guid>("ManifestId")
+ .HasColumnType("TEXT");
+
+ b.Property<Guid>("Id")
+ .HasColumnType("TEXT");
+
+ b.Property<int>("AutofillCount")
+ .HasColumnType("INTEGER");
+
+ b.Property<int>("CopyCount")
+ .HasColumnType("INTEGER");
+
+ b.Property<DateTime>("CreatedAt")
+ .HasColumnType("TEXT");
+
+ b.Property<bool>("IsDeleted")
+ .HasColumnType("INTEGER");
+
+ b.Property<DateTime?>("LastAutofilledAt")
+ .HasColumnType("TEXT");
+
+ b.Property<DateTime?>("LastCopiedAt")
+ .HasColumnType("TEXT");
+
+ b.Property<DateTime?>("LastPasskeyAuthAt")
+ .HasColumnType("TEXT");
+
+ b.Property<DateTime?>("LastUsedAt")
+ .HasColumnType("TEXT");
+
+ b.Property<int>("PasskeyAuthCount")
+ .HasColumnType("INTEGER");
+
+ b.Property<DateTime>("UpdatedAt")
+ .HasColumnType("TEXT");
+
+ b.Property<int>("UseCount")
+ .HasColumnType("INTEGER");
+
+ b.HasKey("ManifestId", "Id");
+
+ b.ToTable("ItemStats");
+ });
+
+ modelBuilder.Entity("AliasClientDb.ItemTag", b =>
+ {
+ b.Property<Guid>("ManifestId")
+ .HasColumnType("TEXT");
+
+ b.Property<Guid>("Id")
+ .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("ManifestId", "Id");
+
+ b.HasIndex("ItemId");
+
+ b.HasIndex("TagId");
+
+ b.HasIndex("ManifestId", "TagId");
+
+ b.HasIndex("ManifestId", "ItemId", "TagId")
+ .IsUnique();
+
+ b.ToTable("ItemTags");
+ });
+
+ modelBuilder.Entity("AliasClientDb.Logo", b =>
+ {
+ b.Property<Guid>("ManifestId")
+ .HasColumnType("TEXT");
+
+ b.Property<Guid>("Id")
+ .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>("Kind")
+ .IsRequired()
+ .ValueGeneratedOnAdd()
+ .HasMaxLength(20)
+ .HasColumnType("TEXT")
+ .HasDefaultValue("favicon");
+
+ b.Property<string>("MimeType")
+ .HasMaxLength(100)
+ .HasColumnType("TEXT");
+
+ b.Property<string>("Name")
+ .HasMaxLength(255)
+ .HasColumnType("TEXT");
+
+ b.Property<string>("Source")
+ .IsRequired()
+ .HasMaxLength(255)
+ .HasColumnType("TEXT");
+
+ b.Property<DateTime>("UpdatedAt")
+ .HasColumnType("TEXT");
+
+ b.HasKey("ManifestId", "Id");
+
+ b.HasIndex("ManifestId", "Kind", "Source")
+ .IsUnique();
+
+ b.ToTable("Logos");
+ });
+
+ modelBuilder.Entity("AliasClientDb.Manifest", b =>
+ {
+ b.Property<Guid>("Id")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("TEXT");
+
+ b.Property<string>("Name")
+ .HasColumnType("TEXT");
+
+ b.HasKey("Id");
+
+ b.ToTable("Manifests");
+ });
+
+ modelBuilder.Entity("AliasClientDb.Passkey", b =>
+ {
+ b.Property<Guid>("ManifestId")
+ .HasColumnType("TEXT");
+
+ b.Property<Guid>("Id")
+ .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("ManifestId", "Id");
+
+ b.HasIndex("RpId");
+
+ b.HasIndex("ManifestId", "ItemId");
+
+ b.ToTable("Passkeys");
+ });
+
+ modelBuilder.Entity("AliasClientDb.Setting", b =>
+ {
+ b.Property<Guid>("ManifestId")
+ .HasColumnType("TEXT");
+
+ 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("ManifestId", "Key");
+
+ b.ToTable("Settings");
+ });
+
+ modelBuilder.Entity("AliasClientDb.Tag", b =>
+ {
+ b.Property<Guid>("ManifestId")
+ .HasColumnType("TEXT");
+
+ b.Property<Guid>("Id")
+ .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("ManifestId", "Id");
+
+ b.HasIndex("ManifestId", "Name");
+
+ b.ToTable("Tags");
+ });
+
+ modelBuilder.Entity("AliasClientDb.TotpCode", b =>
+ {
+ b.Property<Guid>("ManifestId")
+ .HasColumnType("TEXT");
+
+ b.Property<Guid>("Id")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("TEXT");
+
+ b.Property<string>("Algorithm")
+ .IsRequired()
+ .ValueGeneratedOnAdd()
+ .HasMaxLength(20)
+ .HasColumnType("TEXT")
+ .HasDefaultValue("SHA1");
+
+ b.Property<DateTime>("CreatedAt")
+ .HasColumnType("TEXT");
+
+ b.Property<int>("Digits")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("INTEGER")
+ .HasDefaultValue(6);
+
+ b.Property<bool>("IsDeleted")
+ .HasColumnType("INTEGER");
+
+ b.Property<Guid>("ItemId")
+ .HasColumnType("TEXT");
+
+ b.Property<string>("Name")
+ .IsRequired()
+ .HasMaxLength(255)
+ .HasColumnType("TEXT");
+
+ b.Property<int>("Period")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("INTEGER")
+ .HasDefaultValue(30);
+
+ b.Property<string>("SecretKey")
+ .IsRequired()
+ .HasMaxLength(255)
+ .HasColumnType("TEXT");
+
+ b.Property<DateTime>("UpdatedAt")
+ .HasColumnType("TEXT");
+
+ b.HasKey("ManifestId", "Id");
+
+ b.HasIndex("ManifestId", "ItemId");
+
+ b.ToTable("TotpCodes");
+ });
+
+ modelBuilder.Entity("AliasClientDb.Attachment", b =>
+ {
+ b.HasOne("AliasClientDb.Item", "Item")
+ .WithMany("Attachments")
+ .HasForeignKey("ManifestId", "ItemId")
+ .OnDelete(DeleteBehavior.Cascade)
+ .IsRequired();
+
+ b.Navigation("Item");
+ });
+
+ modelBuilder.Entity("AliasClientDb.FieldHistory", b =>
+ {
+ b.HasOne("AliasClientDb.FieldDefinition", "FieldDefinition")
+ .WithMany("FieldHistories")
+ .HasForeignKey("ManifestId", "FieldDefinitionId")
+ .OnDelete(DeleteBehavior.Cascade);
+
+ b.HasOne("AliasClientDb.Item", "Item")
+ .WithMany()
+ .HasForeignKey("ManifestId", "ItemId")
+ .OnDelete(DeleteBehavior.Cascade)
+ .IsRequired();
+
+ b.Navigation("FieldDefinition");
+
+ b.Navigation("Item");
+ });
+
+ modelBuilder.Entity("AliasClientDb.FieldValue", b =>
+ {
+ b.HasOne("AliasClientDb.FieldDefinition", "FieldDefinition")
+ .WithMany("FieldValues")
+ .HasForeignKey("ManifestId", "FieldDefinitionId")
+ .OnDelete(DeleteBehavior.Cascade);
+
+ b.HasOne("AliasClientDb.Item", "Item")
+ .WithMany("FieldValues")
+ .HasForeignKey("ManifestId", "ItemId")
+ .OnDelete(DeleteBehavior.Cascade)
+ .IsRequired();
+
+ b.Navigation("FieldDefinition");
+
+ b.Navigation("Item");
+ });
+
+ modelBuilder.Entity("AliasClientDb.Folder", b =>
+ {
+ b.HasOne("AliasClientDb.Folder", "ParentFolder")
+ .WithMany("ChildFolders")
+ .HasForeignKey("ManifestId", "ParentFolderId")
+ .OnDelete(DeleteBehavior.Cascade);
+
+ b.Navigation("ParentFolder");
+ });
+
+ modelBuilder.Entity("AliasClientDb.Item", b =>
+ {
+ b.HasOne("AliasClientDb.Folder", "Folder")
+ .WithMany("Items")
+ .HasForeignKey("ManifestId", "FolderId");
+
+ b.HasOne("AliasClientDb.Logo", "Logo")
+ .WithMany("Items")
+ .HasForeignKey("ManifestId", "LogoId");
+
+ b.Navigation("Folder");
+
+ b.Navigation("Logo");
+ });
+
+ modelBuilder.Entity("AliasClientDb.ItemTag", b =>
+ {
+ b.HasOne("AliasClientDb.Item", "Item")
+ .WithMany("ItemTags")
+ .HasForeignKey("ManifestId", "ItemId")
+ .OnDelete(DeleteBehavior.Cascade)
+ .IsRequired();
+
+ b.HasOne("AliasClientDb.Tag", "Tag")
+ .WithMany("ItemTags")
+ .HasForeignKey("ManifestId", "TagId")
+ .OnDelete(DeleteBehavior.Cascade)
+ .IsRequired();
+
+ b.Navigation("Item");
+
+ b.Navigation("Tag");
+ });
+
+ modelBuilder.Entity("AliasClientDb.Passkey", b =>
+ {
+ b.HasOne("AliasClientDb.Item", "Item")
+ .WithMany("Passkeys")
+ .HasForeignKey("ManifestId", "ItemId")
+ .OnDelete(DeleteBehavior.Cascade)
+ .IsRequired();
+
+ b.Navigation("Item");
+ });
+
+ modelBuilder.Entity("AliasClientDb.TotpCode", b =>
+ {
+ b.HasOne("AliasClientDb.Item", "Item")
+ .WithMany("TotpCodes")
+ .HasForeignKey("ManifestId", "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/20260827095434_2.1.5-AddFieldValueValueIndex.cs b/apps/server/Databases/AliasClientDb/Migrations/20260827095434_2.1.5-AddFieldValueValueIndex.cs
new file mode 100644
index 000000000..43ce597c0
--- /dev/null
+++ b/apps/server/Databases/AliasClientDb/Migrations/20260827095434_2.1.5-AddFieldValueValueIndex.cs
@@ -0,0 +1,30 @@
+// <auto-generated>
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace AliasClientDb.Migrations
+{
+ /// <inheritdoc />
+ public partial class _215AddFieldValueValueIndex : Migration
+ {
+ /// <inheritdoc />
+ protected override void Up(MigrationBuilder migrationBuilder)
+ {
+ migrationBuilder.AddColumn<int>(
+ name: "ValueIndex",
+ table: "FieldValues",
+ type: "INTEGER",
+ nullable: false,
+ defaultValue: 0);
+ }
+
+ /// <inheritdoc />
+ protected override void Down(MigrationBuilder migrationBuilder)
+ {
+ migrationBuilder.DropColumn(
+ name: "ValueIndex",
+ table: "FieldValues");
+ }
+ }
+}
diff --git a/apps/server/Databases/AliasClientDb/Migrations/20260827095516_2.1.6-ItemTagKeyedByItemAndTag.Designer.cs b/apps/server/Databases/AliasClientDb/Migrations/20260827095516_2.1.6-ItemTagKeyedByItemAndTag.Designer.cs
new file mode 100644
index 000000000..2071810cb
--- /dev/null
+++ b/apps/server/Databases/AliasClientDb/Migrations/20260827095516_2.1.6-ItemTagKeyedByItemAndTag.Designer.cs
@@ -0,0 +1,821 @@
+// <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("20260827095516_2.1.6-ItemTagKeyedByItemAndTag")]
+ partial class _216ItemTagKeyedByItemAndTag
+ {
+ /// <inheritdoc />
+ protected override void BuildTargetModel(ModelBuilder modelBuilder)
+ {
+#pragma warning disable 612, 618
+ modelBuilder
+ .HasAnnotation("ProductVersion", "10.0.10")
+ .HasAnnotation("Proxies:ChangeTracking", false)
+ .HasAnnotation("Proxies:CheckEquality", false)
+ .HasAnnotation("Proxies:LazyLoading", true);
+
+ modelBuilder.Entity("AliasClientDb.Attachment", b =>
+ {
+ b.Property<Guid>("ManifestId")
+ .HasColumnType("TEXT");
+
+ b.Property<Guid>("Id")
+ .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("ManifestId", "Id");
+
+ b.HasIndex("ManifestId", "ItemId");
+
+ b.ToTable("Attachments");
+ });
+
+ modelBuilder.Entity("AliasClientDb.CodecOverflow", b =>
+ {
+ b.Property<Guid>("Id")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("TEXT");
+
+ b.Property<string>("Data")
+ .IsRequired()
+ .HasColumnType("TEXT");
+
+ b.HasKey("Id");
+
+ b.ToTable("CodecOverflows");
+ });
+
+ modelBuilder.Entity("AliasClientDb.EncryptionKey", b =>
+ {
+ b.Property<Guid>("ManifestId")
+ .HasColumnType("TEXT");
+
+ b.Property<Guid>("Id")
+ .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("ManifestId", "Id");
+
+ b.HasIndex("ManifestId", "IsPrimary");
+
+ b.ToTable("EncryptionKeys");
+ });
+
+ modelBuilder.Entity("AliasClientDb.FieldDefinition", b =>
+ {
+ b.Property<Guid>("ManifestId")
+ .HasColumnType("TEXT");
+
+ b.Property<Guid>("Id")
+ .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("ManifestId", "Id");
+
+ b.ToTable("FieldDefinitions");
+ });
+
+ modelBuilder.Entity("AliasClientDb.FieldHistory", b =>
+ {
+ b.Property<Guid>("ManifestId")
+ .HasColumnType("TEXT");
+
+ b.Property<Guid>("Id")
+ .HasColumnType("TEXT");
+
+ b.Property<DateTime>("ChangedAt")
+ .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>("ValueSnapshot")
+ .IsRequired()
+ .HasColumnType("TEXT");
+
+ b.HasKey("ManifestId", "Id");
+
+ b.HasIndex("FieldDefinitionId");
+
+ b.HasIndex("ItemId");
+
+ b.HasIndex("ManifestId", "FieldDefinitionId");
+
+ b.HasIndex("ManifestId", "ItemId");
+
+ b.ToTable("FieldHistories");
+ });
+
+ modelBuilder.Entity("AliasClientDb.FieldValue", b =>
+ {
+ b.Property<Guid>("ManifestId")
+ .HasColumnType("TEXT");
+
+ b.Property<Guid>("Id")
+ .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<bool>("IsDisabled")
+ .HasColumnType("INTEGER");
+
+ b.Property<Guid>("ItemId")
+ .HasColumnType("TEXT");
+
+ b.Property<DateTime>("UpdatedAt")
+ .HasColumnType("TEXT");
+
+ b.Property<string>("Value")
+ .HasColumnType("TEXT");
+
+ b.Property<int>("ValueIndex")
+ .HasColumnType("INTEGER");
+
+ b.Property<int>("Weight")
+ .HasColumnType("INTEGER");
+
+ b.HasKey("ManifestId", "Id");
+
+ b.HasIndex("FieldDefinitionId");
+
+ b.HasIndex("FieldKey");
+
+ b.HasIndex("ItemId");
+
+ b.HasIndex("ItemId", "FieldKey");
+
+ b.HasIndex("ManifestId", "FieldDefinitionId");
+
+ b.HasIndex("ManifestId", "ItemId");
+
+ b.HasIndex("ItemId", "FieldDefinitionId", "Weight");
+
+ b.ToTable("FieldValues");
+ });
+
+ modelBuilder.Entity("AliasClientDb.Folder", b =>
+ {
+ b.Property<Guid>("ManifestId")
+ .HasColumnType("TEXT");
+
+ b.Property<Guid>("Id")
+ .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("ManifestId", "Id");
+
+ b.HasIndex("ParentFolderId");
+
+ b.HasIndex("ManifestId", "ParentFolderId");
+
+ b.ToTable("Folders");
+ });
+
+ modelBuilder.Entity("AliasClientDb.Item", b =>
+ {
+ b.Property<Guid>("ManifestId")
+ .HasColumnType("TEXT");
+
+ b.Property<Guid>("Id")
+ .HasColumnType("TEXT");
+
+ b.Property<DateTime?>("ArchivedAt")
+ .HasColumnType("TEXT");
+
+ b.Property<DateTime>("CreatedAt")
+ .HasColumnType("TEXT");
+
+ b.Property<DateTime?>("DeletedAt")
+ .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("ManifestId", "Id");
+
+ b.HasIndex("ManifestId", "FolderId");
+
+ b.HasIndex("ManifestId", "LogoId");
+
+ b.ToTable("Items");
+ });
+
+ modelBuilder.Entity("AliasClientDb.ItemStat", b =>
+ {
+ b.Property<Guid>("ManifestId")
+ .HasColumnType("TEXT");
+
+ b.Property<Guid>("Id")
+ .HasColumnType("TEXT");
+
+ b.Property<int>("AutofillCount")
+ .HasColumnType("INTEGER");
+
+ b.Property<int>("CopyCount")
+ .HasColumnType("INTEGER");
+
+ b.Property<DateTime>("CreatedAt")
+ .HasColumnType("TEXT");
+
+ b.Property<bool>("IsDeleted")
+ .HasColumnType("INTEGER");
+
+ b.Property<DateTime?>("LastAutofilledAt")
+ .HasColumnType("TEXT");
+
+ b.Property<DateTime?>("LastCopiedAt")
+ .HasColumnType("TEXT");
+
+ b.Property<DateTime?>("LastPasskeyAuthAt")
+ .HasColumnType("TEXT");
+
+ b.Property<DateTime?>("LastUsedAt")
+ .HasColumnType("TEXT");
+
+ b.Property<int>("PasskeyAuthCount")
+ .HasColumnType("INTEGER");
+
+ b.Property<DateTime>("UpdatedAt")
+ .HasColumnType("TEXT");
+
+ b.Property<int>("UseCount")
+ .HasColumnType("INTEGER");
+
+ b.HasKey("ManifestId", "Id");
+
+ b.ToTable("ItemStats");
+ });
+
+ modelBuilder.Entity("AliasClientDb.ItemTag", b =>
+ {
+ b.Property<Guid>("ManifestId")
+ .HasColumnType("TEXT");
+
+ b.Property<Guid>("ItemId")
+ .HasColumnType("TEXT");
+
+ b.Property<Guid>("TagId")
+ .HasColumnType("TEXT");
+
+ b.Property<DateTime>("CreatedAt")
+ .HasColumnType("TEXT");
+
+ b.Property<bool>("IsDeleted")
+ .HasColumnType("INTEGER");
+
+ b.Property<DateTime>("UpdatedAt")
+ .HasColumnType("TEXT");
+
+ b.HasKey("ManifestId", "ItemId", "TagId");
+
+ b.HasIndex("ItemId");
+
+ b.HasIndex("TagId");
+
+ b.HasIndex("ManifestId", "TagId");
+
+ b.ToTable("ItemTags");
+ });
+
+ modelBuilder.Entity("AliasClientDb.Logo", b =>
+ {
+ b.Property<Guid>("ManifestId")
+ .HasColumnType("TEXT");
+
+ b.Property<Guid>("Id")
+ .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>("Kind")
+ .IsRequired()
+ .ValueGeneratedOnAdd()
+ .HasMaxLength(20)
+ .HasColumnType("TEXT")
+ .HasDefaultValue("favicon");
+
+ b.Property<string>("MimeType")
+ .HasMaxLength(100)
+ .HasColumnType("TEXT");
+
+ b.Property<string>("Name")
+ .HasMaxLength(255)
+ .HasColumnType("TEXT");
+
+ b.Property<string>("Source")
+ .IsRequired()
+ .HasMaxLength(255)
+ .HasColumnType("TEXT");
+
+ b.Property<DateTime>("UpdatedAt")
+ .HasColumnType("TEXT");
+
+ b.HasKey("ManifestId", "Id");
+
+ b.HasIndex("ManifestId", "Kind", "Source")
+ .IsUnique();
+
+ b.ToTable("Logos");
+ });
+
+ modelBuilder.Entity("AliasClientDb.Manifest", b =>
+ {
+ b.Property<Guid>("Id")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("TEXT");
+
+ b.Property<string>("Name")
+ .HasColumnType("TEXT");
+
+ b.HasKey("Id");
+
+ b.ToTable("Manifests");
+ });
+
+ modelBuilder.Entity("AliasClientDb.Passkey", b =>
+ {
+ b.Property<Guid>("ManifestId")
+ .HasColumnType("TEXT");
+
+ b.Property<Guid>("Id")
+ .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("ManifestId", "Id");
+
+ b.HasIndex("RpId");
+
+ b.HasIndex("ManifestId", "ItemId");
+
+ b.ToTable("Passkeys");
+ });
+
+ modelBuilder.Entity("AliasClientDb.Setting", b =>
+ {
+ b.Property<Guid>("ManifestId")
+ .HasColumnType("TEXT");
+
+ 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("ManifestId", "Key");
+
+ b.ToTable("Settings");
+ });
+
+ modelBuilder.Entity("AliasClientDb.Tag", b =>
+ {
+ b.Property<Guid>("ManifestId")
+ .HasColumnType("TEXT");
+
+ b.Property<Guid>("Id")
+ .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("ManifestId", "Id");
+
+ b.HasIndex("ManifestId", "Name");
+
+ b.ToTable("Tags");
+ });
+
+ modelBuilder.Entity("AliasClientDb.TotpCode", b =>
+ {
+ b.Property<Guid>("ManifestId")
+ .HasColumnType("TEXT");
+
+ b.Property<Guid>("Id")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("TEXT");
+
+ b.Property<string>("Algorithm")
+ .IsRequired()
+ .ValueGeneratedOnAdd()
+ .HasMaxLength(20)
+ .HasColumnType("TEXT")
+ .HasDefaultValue("SHA1");
+
+ b.Property<DateTime>("CreatedAt")
+ .HasColumnType("TEXT");
+
+ b.Property<int>("Digits")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("INTEGER")
+ .HasDefaultValue(6);
+
+ b.Property<bool>("IsDeleted")
+ .HasColumnType("INTEGER");
+
+ b.Property<Guid>("ItemId")
+ .HasColumnType("TEXT");
+
+ b.Property<string>("Name")
+ .IsRequired()
+ .HasMaxLength(255)
+ .HasColumnType("TEXT");
+
+ b.Property<int>("Period")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("INTEGER")
+ .HasDefaultValue(30);
+
+ b.Property<string>("SecretKey")
+ .IsRequired()
+ .HasMaxLength(255)
+ .HasColumnType("TEXT");
+
+ b.Property<DateTime>("UpdatedAt")
+ .HasColumnType("TEXT");
+
+ b.HasKey("ManifestId", "Id");
+
+ b.HasIndex("ManifestId", "ItemId");
+
+ b.ToTable("TotpCodes");
+ });
+
+ modelBuilder.Entity("AliasClientDb.Attachment", b =>
+ {
+ b.HasOne("AliasClientDb.Item", "Item")
+ .WithMany("Attachments")
+ .HasForeignKey("ManifestId", "ItemId")
+ .OnDelete(DeleteBehavior.Cascade)
+ .IsRequired();
+
+ b.Navigation("Item");
+ });
+
+ modelBuilder.Entity("AliasClientDb.FieldHistory", b =>
+ {
+ b.HasOne("AliasClientDb.FieldDefinition", "FieldDefinition")
+ .WithMany("FieldHistories")
+ .HasForeignKey("ManifestId", "FieldDefinitionId")
+ .OnDelete(DeleteBehavior.Cascade);
+
+ b.HasOne("AliasClientDb.Item", "Item")
+ .WithMany()
+ .HasForeignKey("ManifestId", "ItemId")
+ .OnDelete(DeleteBehavior.Cascade)
+ .IsRequired();
+
+ b.Navigation("FieldDefinition");
+
+ b.Navigation("Item");
+ });
+
+ modelBuilder.Entity("AliasClientDb.FieldValue", b =>
+ {
+ b.HasOne("AliasClientDb.FieldDefinition", "FieldDefinition")
+ .WithMany("FieldValues")
+ .HasForeignKey("ManifestId", "FieldDefinitionId")
+ .OnDelete(DeleteBehavior.Cascade);
+
+ b.HasOne("AliasClientDb.Item", "Item")
+ .WithMany("FieldValues")
+ .HasForeignKey("ManifestId", "ItemId")
+ .OnDelete(DeleteBehavior.Cascade)
+ .IsRequired();
+
+ b.Navigation("FieldDefinition");
+
+ b.Navigation("Item");
+ });
+
+ modelBuilder.Entity("AliasClientDb.Folder", b =>
+ {
+ b.HasOne("AliasClientDb.Folder", "ParentFolder")
+ .WithMany("ChildFolders")
+ .HasForeignKey("ManifestId", "ParentFolderId")
+ .OnDelete(DeleteBehavior.Cascade);
+
+ b.Navigation("ParentFolder");
+ });
+
+ modelBuilder.Entity("AliasClientDb.Item", b =>
+ {
+ b.HasOne("AliasClientDb.Folder", "Folder")
+ .WithMany("Items")
+ .HasForeignKey("ManifestId", "FolderId");
+
+ b.HasOne("AliasClientDb.Logo", "Logo")
+ .WithMany("Items")
+ .HasForeignKey("ManifestId", "LogoId");
+
+ b.Navigation("Folder");
+
+ b.Navigation("Logo");
+ });
+
+ modelBuilder.Entity("AliasClientDb.ItemTag", b =>
+ {
+ b.HasOne("AliasClientDb.Item", "Item")
+ .WithMany("ItemTags")
+ .HasForeignKey("ManifestId", "ItemId")
+ .OnDelete(DeleteBehavior.Cascade)
+ .IsRequired();
+
+ b.HasOne("AliasClientDb.Tag", "Tag")
+ .WithMany("ItemTags")
+ .HasForeignKey("ManifestId", "TagId")
+ .OnDelete(DeleteBehavior.Cascade)
+ .IsRequired();
+
+ b.Navigation("Item");
+
+ b.Navigation("Tag");
+ });
+
+ modelBuilder.Entity("AliasClientDb.Passkey", b =>
+ {
+ b.HasOne("AliasClientDb.Item", "Item")
+ .WithMany("Passkeys")
+ .HasForeignKey("ManifestId", "ItemId")
+ .OnDelete(DeleteBehavior.Cascade)
+ .IsRequired();
+
+ b.Navigation("Item");
+ });
+
+ modelBuilder.Entity("AliasClientDb.TotpCode", b =>
+ {
+ b.HasOne("AliasClientDb.Item", "Item")
+ .WithMany("TotpCodes")
+ .HasForeignKey("ManifestId", "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/20260827095516_2.1.6-ItemTagKeyedByItemAndTag.cs b/apps/server/Databases/AliasClientDb/Migrations/20260827095516_2.1.6-ItemTagKeyedByItemAndTag.cs
new file mode 100644
index 000000000..c28be5d84
--- /dev/null
+++ b/apps/server/Databases/AliasClientDb/Migrations/20260827095516_2.1.6-ItemTagKeyedByItemAndTag.cs
@@ -0,0 +1,59 @@
+// <auto-generated>
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace AliasClientDb.Migrations
+{
+ /// <inheritdoc />
+ public partial class _216ItemTagKeyedByItemAndTag : Migration
+ {
+ /// <inheritdoc />
+ protected override void Up(MigrationBuilder migrationBuilder)
+ {
+ migrationBuilder.DropPrimaryKey(
+ name: "PK_ItemTags",
+ table: "ItemTags");
+
+ migrationBuilder.DropIndex(
+ name: "IX_ItemTags_ManifestId_ItemId_TagId",
+ table: "ItemTags");
+
+ migrationBuilder.DropColumn(
+ name: "Id",
+ table: "ItemTags");
+
+ migrationBuilder.AddPrimaryKey(
+ name: "PK_ItemTags",
+ table: "ItemTags",
+ columns: new[] { "ManifestId", "ItemId", "TagId" });
+ }
+
+ /// <inheritdoc />
+ protected override void Down(MigrationBuilder migrationBuilder)
+ {
+ migrationBuilder.DropPrimaryKey(
+ name: "PK_ItemTags",
+ table: "ItemTags");
+
+ migrationBuilder.AddColumn<Guid>(
+ name: "Id",
+ table: "ItemTags",
+ type: "TEXT",
+ nullable: false,
+ defaultValue: new Guid("00000000-0000-0000-0000-000000000000"));
+
+ migrationBuilder.AddPrimaryKey(
+ name: "PK_ItemTags",
+ table: "ItemTags",
+ columns: new[] { "ManifestId", "Id" });
+
+ migrationBuilder.CreateIndex(
+ name: "IX_ItemTags_ManifestId_ItemId_TagId",
+ table: "ItemTags",
+ columns: new[] { "ManifestId", "ItemId", "TagId" },
+ unique: true);
+ }
+ }
+}
diff --git a/apps/server/Databases/AliasClientDb/Migrations/AliasClientDbContextModelSnapshot.cs b/apps/server/Databases/AliasClientDb/Migrations/AliasClientDbContextModelSnapshot.cs
index abb9cff68..5853bd9cf 100644
--- a/apps/server/Databases/AliasClientDb/Migrations/AliasClientDbContextModelSnapshot.cs
+++ b/apps/server/Databases/AliasClientDb/Migrations/AliasClientDbContextModelSnapshot.cs
@@ -236,6 +236,9 @@ namespace AliasClientDb.Migrations
b.Property<string>("Value")
.HasColumnType("TEXT");
+ b.Property<int>("ValueIndex")
+ .HasColumnType("INTEGER");
+
b.Property<int>("Weight")
.HasColumnType("INTEGER");
@@ -393,7 +396,10 @@ namespace AliasClientDb.Migrations
b.Property<Guid>("ManifestId")
.HasColumnType("TEXT");
- b.Property<Guid>("Id")
+ b.Property<Guid>("ItemId")
+ .HasColumnType("TEXT");
+
+ b.Property<Guid>("TagId")
.HasColumnType("TEXT");
b.Property<DateTime>("CreatedAt")
@@ -402,16 +408,10 @@ namespace AliasClientDb.Migrations
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("ManifestId", "Id");
+ b.HasKey("ManifestId", "ItemId", "TagId");
b.HasIndex("ItemId");
@@ -419,9 +419,6 @@ namespace AliasClientDb.Migrations
b.HasIndex("ManifestId", "TagId");
- b.HasIndex("ManifestId", "ItemId", "TagId")
- .IsUnique();
-
b.ToTable("ItemTags");
});
diff --git a/apps/server/Databases/AliasClientDb/Scripts/MigrationSql/000_FullSchema.sql b/apps/server/Databases/AliasClientDb/Scripts/MigrationSql/000_FullSchema.sql
index ebc3e5f62..8cd7dd94f 100644
--- a/apps/server/Databases/AliasClientDb/Scripts/MigrationSql/000_FullSchema.sql
+++ b/apps/server/Databases/AliasClientDb/Scripts/MigrationSql/000_FullSchema.sql
@@ -1803,3 +1803,55 @@ VALUES ('20260813090206_2.1.4-AddFieldValueIsDisabled', '10.0.10');
COMMIT;
+BEGIN TRANSACTION;
+ALTER TABLE "FieldValues" ADD "ValueIndex" INTEGER NOT NULL DEFAULT 0;
+
+INSERT INTO "__EFMigrationsHistory" ("MigrationId", "ProductVersion")
+VALUES ('20260827095434_2.1.5-AddFieldValueValueIndex', '10.0.10');
+
+COMMIT;
+
+BEGIN TRANSACTION;
+DROP INDEX "IX_ItemTags_ManifestId_ItemId_TagId";
+
+CREATE TABLE "ef_temp_ItemTags" (
+ "ManifestId" TEXT NOT NULL,
+ "ItemId" TEXT NOT NULL,
+ "TagId" TEXT NOT NULL,
+ "CreatedAt" TEXT NOT NULL,
+ "IsDeleted" INTEGER NOT NULL,
+ "UpdatedAt" TEXT NOT NULL,
+ CONSTRAINT "PK_ItemTags" PRIMARY KEY ("ManifestId", "ItemId", "TagId"),
+ CONSTRAINT "FK_ItemTags_Items_ManifestId_ItemId" FOREIGN KEY ("ManifestId", "ItemId") REFERENCES "Items" ("ManifestId", "Id") ON DELETE CASCADE,
+ CONSTRAINT "FK_ItemTags_Tags_ManifestId_TagId" FOREIGN KEY ("ManifestId", "TagId") REFERENCES "Tags" ("ManifestId", "Id") ON DELETE CASCADE
+);
+
+INSERT INTO "ef_temp_ItemTags" ("ManifestId", "ItemId", "TagId", "CreatedAt", "IsDeleted", "UpdatedAt")
+SELECT "ManifestId", "ItemId", "TagId", "CreatedAt", "IsDeleted", "UpdatedAt"
+FROM "ItemTags";
+
+COMMIT;
+
+PRAGMA foreign_keys = 0;
+
+BEGIN TRANSACTION;
+DROP TABLE "ItemTags";
+
+ALTER TABLE "ef_temp_ItemTags" RENAME TO "ItemTags";
+
+COMMIT;
+
+PRAGMA foreign_keys = 1;
+
+BEGIN TRANSACTION;
+CREATE INDEX "IX_ItemTags_ItemId" ON "ItemTags" ("ItemId");
+
+CREATE INDEX "IX_ItemTags_ManifestId_TagId" ON "ItemTags" ("ManifestId", "TagId");
+
+CREATE INDEX "IX_ItemTags_TagId" ON "ItemTags" ("TagId");
+
+COMMIT;
+
+INSERT INTO "__EFMigrationsHistory" ("MigrationId", "ProductVersion")
+VALUES ('20260827095516_2.1.6-ItemTagKeyedByItemAndTag', '10.0.10');
+
diff --git a/apps/server/Tests/AliasVault.UnitTests/Utilities/ImportExportTests.cs b/apps/server/Tests/AliasVault.UnitTests/Utilities/ImportExportTests.cs
index 013595827..d0771d765 100644
--- a/apps/server/Tests/AliasVault.UnitTests/Utilities/ImportExportTests.cs
+++ b/apps/server/Tests/AliasVault.UnitTests/Utilities/ImportExportTests.cs
@@ -1842,7 +1842,6 @@ public class ImportExportTests
{
new()
{
- Id = Guid.NewGuid(),
ItemId = items[0].Id,
TagId = tags[0].Id,
},
diff --git a/apps/server/Utilities/AliasVault.ImportExport/VaultExportService.cs b/apps/server/Utilities/AliasVault.ImportExport/VaultExportService.cs
index 8615359fe..98a9ff58e 100644
--- a/apps/server/Utilities/AliasVault.ImportExport/VaultExportService.cs
+++ b/apps/server/Utilities/AliasVault.ImportExport/VaultExportService.cs
@@ -208,7 +208,7 @@ public static class VaultExportService
{
return new AvuxItemTag
{
- Id = itemTag.Id,
+ Id = Guid.NewGuid(),
ItemId = itemTag.ItemId,
TagId = itemTag.TagId,
};
diff --git a/core/vault/src/sql/SqlConstants.ts b/core/vault/src/sql/SqlConstants.ts
index 03a620a29..0aeaecfa0 100644
--- a/core/vault/src/sql/SqlConstants.ts
+++ b/core/vault/src/sql/SqlConstants.ts
@@ -1809,6 +1809,58 @@ INSERT INTO "__EFMigrationsHistory" ("MigrationId", "ProductVersion")
VALUES ('20260813090206_2.1.4-AddFieldValueIsDisabled', '10.0.10');
COMMIT;
+
+BEGIN TRANSACTION;
+ALTER TABLE "FieldValues" ADD "ValueIndex" INTEGER NOT NULL DEFAULT 0;
+
+INSERT INTO "__EFMigrationsHistory" ("MigrationId", "ProductVersion")
+VALUES ('20260827095434_2.1.5-AddFieldValueValueIndex', '10.0.10');
+
+COMMIT;
+
+BEGIN TRANSACTION;
+DROP INDEX "IX_ItemTags_ManifestId_ItemId_TagId";
+
+CREATE TABLE "ef_temp_ItemTags" (
+ "ManifestId" TEXT NOT NULL,
+ "ItemId" TEXT NOT NULL,
+ "TagId" TEXT NOT NULL,
+ "CreatedAt" TEXT NOT NULL,
+ "IsDeleted" INTEGER NOT NULL,
+ "UpdatedAt" TEXT NOT NULL,
+ CONSTRAINT "PK_ItemTags" PRIMARY KEY ("ManifestId", "ItemId", "TagId"),
+ CONSTRAINT "FK_ItemTags_Items_ManifestId_ItemId" FOREIGN KEY ("ManifestId", "ItemId") REFERENCES "Items" ("ManifestId", "Id") ON DELETE CASCADE,
+ CONSTRAINT "FK_ItemTags_Tags_ManifestId_TagId" FOREIGN KEY ("ManifestId", "TagId") REFERENCES "Tags" ("ManifestId", "Id") ON DELETE CASCADE
+);
+
+INSERT INTO "ef_temp_ItemTags" ("ManifestId", "ItemId", "TagId", "CreatedAt", "IsDeleted", "UpdatedAt")
+SELECT "ManifestId", "ItemId", "TagId", "CreatedAt", "IsDeleted", "UpdatedAt"
+FROM "ItemTags";
+
+COMMIT;
+
+PRAGMA foreign_keys = 0;
+
+BEGIN TRANSACTION;
+DROP TABLE "ItemTags";
+
+ALTER TABLE "ef_temp_ItemTags" RENAME TO "ItemTags";
+
+COMMIT;
+
+PRAGMA foreign_keys = 1;
+
+BEGIN TRANSACTION;
+CREATE INDEX "IX_ItemTags_ItemId" ON "ItemTags" ("ItemId");
+
+CREATE INDEX "IX_ItemTags_ManifestId_TagId" ON "ItemTags" ("ManifestId", "TagId");
+
+CREATE INDEX "IX_ItemTags_TagId" ON "ItemTags" ("TagId");
+
+COMMIT;
+
+INSERT INTO "__EFMigrationsHistory" ("MigrationId", "ProductVersion")
+VALUES ('20260827095516_2.1.6-ItemTagKeyedByItemAndTag', '10.0.10');
`;
/**
* Individual migration SQL scripts