From 3564ec5821c472d0379a936fe1ee1aac47c658c6 Mon Sep 17 00:00:00 2001 From: Ike Kottlowski Date: Tue, 25 Mar 2025 15:43:09 -0400 Subject: [PATCH] fix : Fixing ef-migrations --- .../Migrations/20250321102617_OpaqueKex.cs | 44 ----------- ...eyExchangeEntityAndProcedures.Designer.cs} | 79 +++++++++++-------- ...ateOpaqueKeyExchangeEntityAndProcedures.cs | 68 ++++++++++++++++ .../DatabaseContextModelSnapshot.cs | 75 ++++++++++-------- .../Migrations/20250321102623_OpaqueKex.cs | 38 --------- ...eyExchangeEntityAndProcedures.Designer.cs} | 79 +++++++++++-------- ...ateOpaqueKeyExchangeEntityAndProcedures.cs | 61 ++++++++++++++ .../DatabaseContextModelSnapshot.cs | 75 ++++++++++-------- .../Migrations/20250321102612_OpaqueKex.cs | 38 --------- ...eyExchangeEntityAndProcedures.Designer.cs} | 79 +++++++++++-------- ...ateOpaqueKeyExchangeEntityAndProcedures.cs | 61 ++++++++++++++ .../DatabaseContextModelSnapshot.cs | 75 ++++++++++-------- 12 files changed, 460 insertions(+), 312 deletions(-) delete mode 100644 util/MySqlMigrations/Migrations/20250321102617_OpaqueKex.cs rename util/MySqlMigrations/Migrations/{20250321102617_OpaqueKex.Designer.cs => 20250325193540_CreateOpaqueKeyExchangeEntityAndProcedures.Designer.cs} (99%) create mode 100644 util/MySqlMigrations/Migrations/20250325193540_CreateOpaqueKeyExchangeEntityAndProcedures.cs delete mode 100644 util/PostgresMigrations/Migrations/20250321102623_OpaqueKex.cs rename util/PostgresMigrations/Migrations/{20250321102623_OpaqueKex.Designer.cs => 20250325193524_CreateOpaqueKeyExchangeEntityAndProcedures.Designer.cs} (99%) create mode 100644 util/PostgresMigrations/Migrations/20250325193524_CreateOpaqueKeyExchangeEntityAndProcedures.cs delete mode 100644 util/SqliteMigrations/Migrations/20250321102612_OpaqueKex.cs rename util/SqliteMigrations/Migrations/{20250321102612_OpaqueKex.Designer.cs => 20250325193532_CreateOpaqueKeyExchangeEntityAndProcedures.Designer.cs} (99%) create mode 100644 util/SqliteMigrations/Migrations/20250325193532_CreateOpaqueKeyExchangeEntityAndProcedures.cs diff --git a/util/MySqlMigrations/Migrations/20250321102617_OpaqueKex.cs b/util/MySqlMigrations/Migrations/20250321102617_OpaqueKex.cs deleted file mode 100644 index f70f97ff3c..0000000000 --- a/util/MySqlMigrations/Migrations/20250321102617_OpaqueKex.cs +++ /dev/null @@ -1,44 +0,0 @@ -using Microsoft.EntityFrameworkCore.Migrations; - -#nullable disable - -namespace Bit.MySqlMigrations.Migrations; - -/// -public partial class OpaqueKex : Migration -{ - /// - protected override void Up(MigrationBuilder migrationBuilder) - { - migrationBuilder.CreateTable( - name: "OpaqueKeyExchangeCredential", - columns: table => new - { - Id = table.Column(type: "char(36)", nullable: false, collation: "ascii_general_ci"), - UserId = table.Column(type: "char(36)", nullable: false, collation: "ascii_general_ci"), - CipherConfiguration = table.Column(type: "longtext", nullable: true) - .Annotation("MySql:CharSet", "utf8mb4"), - CredentialBlob = table.Column(type: "longtext", nullable: true) - .Annotation("MySql:CharSet", "utf8mb4"), - EncryptedPublicKey = table.Column(type: "longtext", nullable: true) - .Annotation("MySql:CharSet", "utf8mb4"), - EncryptedPrivateKey = table.Column(type: "longtext", nullable: true) - .Annotation("MySql:CharSet", "utf8mb4"), - EncryptedUserKey = table.Column(type: "longtext", nullable: true) - .Annotation("MySql:CharSet", "utf8mb4"), - CreationDate = table.Column(type: "datetime(6)", nullable: false) - }, - constraints: table => - { - table.PrimaryKey("PK_OpaqueKeyExchangeCredential", x => x.Id); - }) - .Annotation("MySql:CharSet", "utf8mb4"); - } - - /// - protected override void Down(MigrationBuilder migrationBuilder) - { - migrationBuilder.DropTable( - name: "OpaqueKeyExchangeCredential"); - } -} diff --git a/util/MySqlMigrations/Migrations/20250321102617_OpaqueKex.Designer.cs b/util/MySqlMigrations/Migrations/20250325193540_CreateOpaqueKeyExchangeEntityAndProcedures.Designer.cs similarity index 99% rename from util/MySqlMigrations/Migrations/20250321102617_OpaqueKex.Designer.cs rename to util/MySqlMigrations/Migrations/20250325193540_CreateOpaqueKeyExchangeEntityAndProcedures.Designer.cs index ba05a10c07..b2228a1a1e 100644 --- a/util/MySqlMigrations/Migrations/20250321102617_OpaqueKex.Designer.cs +++ b/util/MySqlMigrations/Migrations/20250325193540_CreateOpaqueKeyExchangeEntityAndProcedures.Designer.cs @@ -12,8 +12,8 @@ using Microsoft.EntityFrameworkCore.Storage.ValueConversion; namespace Bit.MySqlMigrations.Migrations { [DbContext(typeof(DatabaseContext))] - [Migration("20250321102617_OpaqueKex")] - partial class OpaqueKex + [Migration("20250325193540_CreateOpaqueKeyExchangeEntityAndProcedures")] + partial class CreateOpaqueKeyExchangeEntityAndProcedures { /// protected override void BuildTargetModel(ModelBuilder modelBuilder) @@ -25,37 +25,6 @@ namespace Bit.MySqlMigrations.Migrations MySqlModelBuilderExtensions.AutoIncrementColumns(modelBuilder); - modelBuilder.Entity("Bit.Core.Auth.Entities.OpaqueKeyExchangeCredential", b => - { - b.Property("Id") - .HasColumnType("char(36)"); - - b.Property("CipherConfiguration") - .HasColumnType("longtext"); - - b.Property("CreationDate") - .HasColumnType("datetime(6)"); - - b.Property("CredentialBlob") - .HasColumnType("longtext"); - - b.Property("EncryptedPrivateKey") - .HasColumnType("longtext"); - - b.Property("EncryptedPublicKey") - .HasColumnType("longtext"); - - b.Property("EncryptedUserKey") - .HasColumnType("longtext"); - - b.Property("UserId") - .HasColumnType("char(36)"); - - b.HasKey("Id"); - - b.ToTable("OpaqueKeyExchangeCredential", (string)null); - }); - modelBuilder.Entity("Bit.Infrastructure.EntityFramework.AdminConsole.Models.Organization", b => { b.Property("Id") @@ -603,6 +572,39 @@ namespace Bit.MySqlMigrations.Migrations b.ToTable("Grant", (string)null); }); + modelBuilder.Entity("Bit.Infrastructure.EntityFramework.Auth.Models.OpaqueKeyExchangeCredential", b => + { + b.Property("Id") + .HasColumnType("char(36)"); + + b.Property("CipherConfiguration") + .HasColumnType("longtext"); + + b.Property("CreationDate") + .HasColumnType("datetime(6)"); + + b.Property("CredentialBlob") + .HasColumnType("longtext"); + + b.Property("EncryptedPrivateKey") + .HasColumnType("longtext"); + + b.Property("EncryptedPublicKey") + .HasColumnType("longtext"); + + b.Property("EncryptedUserKey") + .HasColumnType("longtext"); + + b.Property("UserId") + .HasColumnType("char(36)"); + + b.HasKey("Id"); + + b.HasIndex("UserId"); + + b.ToTable("OpaqueKeyExchangeCredential", (string)null); + }); + modelBuilder.Entity("Bit.Infrastructure.EntityFramework.Auth.Models.SsoConfig", b => { b.Property("Id") @@ -2380,6 +2382,17 @@ namespace Bit.MySqlMigrations.Migrations b.Navigation("Grantor"); }); + modelBuilder.Entity("Bit.Infrastructure.EntityFramework.Auth.Models.OpaqueKeyExchangeCredential", b => + { + b.HasOne("Bit.Infrastructure.EntityFramework.Models.User", "User") + .WithMany() + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("User"); + }); + modelBuilder.Entity("Bit.Infrastructure.EntityFramework.Auth.Models.SsoConfig", b => { b.HasOne("Bit.Infrastructure.EntityFramework.AdminConsole.Models.Organization", "Organization") diff --git a/util/MySqlMigrations/Migrations/20250325193540_CreateOpaqueKeyExchangeEntityAndProcedures.cs b/util/MySqlMigrations/Migrations/20250325193540_CreateOpaqueKeyExchangeEntityAndProcedures.cs new file mode 100644 index 0000000000..9debdb0160 --- /dev/null +++ b/util/MySqlMigrations/Migrations/20250325193540_CreateOpaqueKeyExchangeEntityAndProcedures.cs @@ -0,0 +1,68 @@ +using System; +using Microsoft.EntityFrameworkCore.Migrations; + +#nullable disable + +namespace Bit.MySqlMigrations.Migrations +{ + /// + public partial class CreateOpaqueKeyExchangeEntityAndProcedures : Migration + { + /// + protected override void Up(MigrationBuilder migrationBuilder) + { + migrationBuilder.AddColumn( + name: "DiscountId", + table: "Provider", + type: "longtext", + nullable: true) + .Annotation("MySql:CharSet", "utf8mb4"); + + migrationBuilder.CreateTable( + name: "OpaqueKeyExchangeCredential", + columns: table => new + { + Id = table.Column(type: "char(36)", nullable: false, collation: "ascii_general_ci"), + UserId = table.Column(type: "char(36)", nullable: false, collation: "ascii_general_ci"), + CipherConfiguration = table.Column(type: "longtext", nullable: true) + .Annotation("MySql:CharSet", "utf8mb4"), + CredentialBlob = table.Column(type: "longtext", nullable: true) + .Annotation("MySql:CharSet", "utf8mb4"), + EncryptedPublicKey = table.Column(type: "longtext", nullable: true) + .Annotation("MySql:CharSet", "utf8mb4"), + EncryptedPrivateKey = table.Column(type: "longtext", nullable: true) + .Annotation("MySql:CharSet", "utf8mb4"), + EncryptedUserKey = table.Column(type: "longtext", nullable: true) + .Annotation("MySql:CharSet", "utf8mb4"), + CreationDate = table.Column(type: "datetime(6)", nullable: false) + }, + constraints: table => + { + table.PrimaryKey("PK_OpaqueKeyExchangeCredential", x => x.Id); + table.ForeignKey( + name: "FK_OpaqueKeyExchangeCredential_User_UserId", + column: x => x.UserId, + principalTable: "User", + principalColumn: "Id", + onDelete: ReferentialAction.Cascade); + }) + .Annotation("MySql:CharSet", "utf8mb4"); + + migrationBuilder.CreateIndex( + name: "IX_OpaqueKeyExchangeCredential_UserId", + table: "OpaqueKeyExchangeCredential", + column: "UserId"); + } + + /// + protected override void Down(MigrationBuilder migrationBuilder) + { + migrationBuilder.DropTable( + name: "OpaqueKeyExchangeCredential"); + + migrationBuilder.DropColumn( + name: "DiscountId", + table: "Provider"); + } + } +} diff --git a/util/MySqlMigrations/Migrations/DatabaseContextModelSnapshot.cs b/util/MySqlMigrations/Migrations/DatabaseContextModelSnapshot.cs index a947c2782a..76aa3eb1f8 100644 --- a/util/MySqlMigrations/Migrations/DatabaseContextModelSnapshot.cs +++ b/util/MySqlMigrations/Migrations/DatabaseContextModelSnapshot.cs @@ -22,37 +22,6 @@ namespace Bit.MySqlMigrations.Migrations MySqlModelBuilderExtensions.AutoIncrementColumns(modelBuilder); - modelBuilder.Entity("Bit.Core.Auth.Entities.OpaqueKeyExchangeCredential", b => - { - b.Property("Id") - .HasColumnType("char(36)"); - - b.Property("CipherConfiguration") - .HasColumnType("longtext"); - - b.Property("CreationDate") - .HasColumnType("datetime(6)"); - - b.Property("CredentialBlob") - .HasColumnType("longtext"); - - b.Property("EncryptedPrivateKey") - .HasColumnType("longtext"); - - b.Property("EncryptedPublicKey") - .HasColumnType("longtext"); - - b.Property("EncryptedUserKey") - .HasColumnType("longtext"); - - b.Property("UserId") - .HasColumnType("char(36)"); - - b.HasKey("Id"); - - b.ToTable("OpaqueKeyExchangeCredential", (string)null); - }); - modelBuilder.Entity("Bit.Infrastructure.EntityFramework.AdminConsole.Models.Organization", b => { b.Property("Id") @@ -600,6 +569,39 @@ namespace Bit.MySqlMigrations.Migrations b.ToTable("Grant", (string)null); }); + modelBuilder.Entity("Bit.Infrastructure.EntityFramework.Auth.Models.OpaqueKeyExchangeCredential", b => + { + b.Property("Id") + .HasColumnType("char(36)"); + + b.Property("CipherConfiguration") + .HasColumnType("longtext"); + + b.Property("CreationDate") + .HasColumnType("datetime(6)"); + + b.Property("CredentialBlob") + .HasColumnType("longtext"); + + b.Property("EncryptedPrivateKey") + .HasColumnType("longtext"); + + b.Property("EncryptedPublicKey") + .HasColumnType("longtext"); + + b.Property("EncryptedUserKey") + .HasColumnType("longtext"); + + b.Property("UserId") + .HasColumnType("char(36)"); + + b.HasKey("Id"); + + b.HasIndex("UserId"); + + b.ToTable("OpaqueKeyExchangeCredential", (string)null); + }); + modelBuilder.Entity("Bit.Infrastructure.EntityFramework.Auth.Models.SsoConfig", b => { b.Property("Id") @@ -2377,6 +2379,17 @@ namespace Bit.MySqlMigrations.Migrations b.Navigation("Grantor"); }); + modelBuilder.Entity("Bit.Infrastructure.EntityFramework.Auth.Models.OpaqueKeyExchangeCredential", b => + { + b.HasOne("Bit.Infrastructure.EntityFramework.Models.User", "User") + .WithMany() + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("User"); + }); + modelBuilder.Entity("Bit.Infrastructure.EntityFramework.Auth.Models.SsoConfig", b => { b.HasOne("Bit.Infrastructure.EntityFramework.AdminConsole.Models.Organization", "Organization") diff --git a/util/PostgresMigrations/Migrations/20250321102623_OpaqueKex.cs b/util/PostgresMigrations/Migrations/20250321102623_OpaqueKex.cs deleted file mode 100644 index f1562911dc..0000000000 --- a/util/PostgresMigrations/Migrations/20250321102623_OpaqueKex.cs +++ /dev/null @@ -1,38 +0,0 @@ -using Microsoft.EntityFrameworkCore.Migrations; - -#nullable disable - -namespace Bit.PostgresMigrations.Migrations; - -/// -public partial class OpaqueKex : Migration -{ - /// - protected override void Up(MigrationBuilder migrationBuilder) - { - migrationBuilder.CreateTable( - name: "OpaqueKeyExchangeCredential", - columns: table => new - { - Id = table.Column(type: "uuid", nullable: false), - UserId = table.Column(type: "uuid", nullable: false), - CipherConfiguration = table.Column(type: "text", nullable: true), - CredentialBlob = table.Column(type: "text", nullable: true), - EncryptedPublicKey = table.Column(type: "text", nullable: true), - EncryptedPrivateKey = table.Column(type: "text", nullable: true), - EncryptedUserKey = table.Column(type: "text", nullable: true), - CreationDate = table.Column(type: "timestamp with time zone", nullable: false) - }, - constraints: table => - { - table.PrimaryKey("PK_OpaqueKeyExchangeCredential", x => x.Id); - }); - } - - /// - protected override void Down(MigrationBuilder migrationBuilder) - { - migrationBuilder.DropTable( - name: "OpaqueKeyExchangeCredential"); - } -} diff --git a/util/PostgresMigrations/Migrations/20250321102623_OpaqueKex.Designer.cs b/util/PostgresMigrations/Migrations/20250325193524_CreateOpaqueKeyExchangeEntityAndProcedures.Designer.cs similarity index 99% rename from util/PostgresMigrations/Migrations/20250321102623_OpaqueKex.Designer.cs rename to util/PostgresMigrations/Migrations/20250325193524_CreateOpaqueKeyExchangeEntityAndProcedures.Designer.cs index 8be98517ea..a0a2e2ef3a 100644 --- a/util/PostgresMigrations/Migrations/20250321102623_OpaqueKex.Designer.cs +++ b/util/PostgresMigrations/Migrations/20250325193524_CreateOpaqueKeyExchangeEntityAndProcedures.Designer.cs @@ -12,8 +12,8 @@ using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata; namespace Bit.PostgresMigrations.Migrations { [DbContext(typeof(DatabaseContext))] - [Migration("20250321102623_OpaqueKex")] - partial class OpaqueKex + [Migration("20250325193524_CreateOpaqueKeyExchangeEntityAndProcedures")] + partial class CreateOpaqueKeyExchangeEntityAndProcedures { /// protected override void BuildTargetModel(ModelBuilder modelBuilder) @@ -26,37 +26,6 @@ namespace Bit.PostgresMigrations.Migrations NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder); - modelBuilder.Entity("Bit.Core.Auth.Entities.OpaqueKeyExchangeCredential", b => - { - b.Property("Id") - .HasColumnType("uuid"); - - b.Property("CipherConfiguration") - .HasColumnType("text"); - - b.Property("CreationDate") - .HasColumnType("timestamp with time zone"); - - b.Property("CredentialBlob") - .HasColumnType("text"); - - b.Property("EncryptedPrivateKey") - .HasColumnType("text"); - - b.Property("EncryptedPublicKey") - .HasColumnType("text"); - - b.Property("EncryptedUserKey") - .HasColumnType("text"); - - b.Property("UserId") - .HasColumnType("uuid"); - - b.HasKey("Id"); - - b.ToTable("OpaqueKeyExchangeCredential", (string)null); - }); - modelBuilder.Entity("Bit.Infrastructure.EntityFramework.AdminConsole.Models.Organization", b => { b.Property("Id") @@ -606,6 +575,39 @@ namespace Bit.PostgresMigrations.Migrations b.ToTable("Grant", (string)null); }); + modelBuilder.Entity("Bit.Infrastructure.EntityFramework.Auth.Models.OpaqueKeyExchangeCredential", b => + { + b.Property("Id") + .HasColumnType("uuid"); + + b.Property("CipherConfiguration") + .HasColumnType("text"); + + b.Property("CreationDate") + .HasColumnType("timestamp with time zone"); + + b.Property("CredentialBlob") + .HasColumnType("text"); + + b.Property("EncryptedPrivateKey") + .HasColumnType("text"); + + b.Property("EncryptedPublicKey") + .HasColumnType("text"); + + b.Property("EncryptedUserKey") + .HasColumnType("text"); + + b.Property("UserId") + .HasColumnType("uuid"); + + b.HasKey("Id"); + + b.HasIndex("UserId"); + + b.ToTable("OpaqueKeyExchangeCredential", (string)null); + }); + modelBuilder.Entity("Bit.Infrastructure.EntityFramework.Auth.Models.SsoConfig", b => { b.Property("Id") @@ -2386,6 +2388,17 @@ namespace Bit.PostgresMigrations.Migrations b.Navigation("Grantor"); }); + modelBuilder.Entity("Bit.Infrastructure.EntityFramework.Auth.Models.OpaqueKeyExchangeCredential", b => + { + b.HasOne("Bit.Infrastructure.EntityFramework.Models.User", "User") + .WithMany() + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("User"); + }); + modelBuilder.Entity("Bit.Infrastructure.EntityFramework.Auth.Models.SsoConfig", b => { b.HasOne("Bit.Infrastructure.EntityFramework.AdminConsole.Models.Organization", "Organization") diff --git a/util/PostgresMigrations/Migrations/20250325193524_CreateOpaqueKeyExchangeEntityAndProcedures.cs b/util/PostgresMigrations/Migrations/20250325193524_CreateOpaqueKeyExchangeEntityAndProcedures.cs new file mode 100644 index 0000000000..ac2b02533c --- /dev/null +++ b/util/PostgresMigrations/Migrations/20250325193524_CreateOpaqueKeyExchangeEntityAndProcedures.cs @@ -0,0 +1,61 @@ +using System; +using Microsoft.EntityFrameworkCore.Migrations; + +#nullable disable + +namespace Bit.PostgresMigrations.Migrations +{ + /// + public partial class CreateOpaqueKeyExchangeEntityAndProcedures : Migration + { + /// + protected override void Up(MigrationBuilder migrationBuilder) + { + migrationBuilder.AddColumn( + name: "DiscountId", + table: "Provider", + type: "text", + nullable: true); + + migrationBuilder.CreateTable( + name: "OpaqueKeyExchangeCredential", + columns: table => new + { + Id = table.Column(type: "uuid", nullable: false), + UserId = table.Column(type: "uuid", nullable: false), + CipherConfiguration = table.Column(type: "text", nullable: true), + CredentialBlob = table.Column(type: "text", nullable: true), + EncryptedPublicKey = table.Column(type: "text", nullable: true), + EncryptedPrivateKey = table.Column(type: "text", nullable: true), + EncryptedUserKey = table.Column(type: "text", nullable: true), + CreationDate = table.Column(type: "timestamp with time zone", nullable: false) + }, + constraints: table => + { + table.PrimaryKey("PK_OpaqueKeyExchangeCredential", x => x.Id); + table.ForeignKey( + name: "FK_OpaqueKeyExchangeCredential_User_UserId", + column: x => x.UserId, + principalTable: "User", + principalColumn: "Id", + onDelete: ReferentialAction.Cascade); + }); + + migrationBuilder.CreateIndex( + name: "IX_OpaqueKeyExchangeCredential_UserId", + table: "OpaqueKeyExchangeCredential", + column: "UserId"); + } + + /// + protected override void Down(MigrationBuilder migrationBuilder) + { + migrationBuilder.DropTable( + name: "OpaqueKeyExchangeCredential"); + + migrationBuilder.DropColumn( + name: "DiscountId", + table: "Provider"); + } + } +} diff --git a/util/PostgresMigrations/Migrations/DatabaseContextModelSnapshot.cs b/util/PostgresMigrations/Migrations/DatabaseContextModelSnapshot.cs index a7797b75e5..8bdf130d90 100644 --- a/util/PostgresMigrations/Migrations/DatabaseContextModelSnapshot.cs +++ b/util/PostgresMigrations/Migrations/DatabaseContextModelSnapshot.cs @@ -23,37 +23,6 @@ namespace Bit.PostgresMigrations.Migrations NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder); - modelBuilder.Entity("Bit.Core.Auth.Entities.OpaqueKeyExchangeCredential", b => - { - b.Property("Id") - .HasColumnType("uuid"); - - b.Property("CipherConfiguration") - .HasColumnType("text"); - - b.Property("CreationDate") - .HasColumnType("timestamp with time zone"); - - b.Property("CredentialBlob") - .HasColumnType("text"); - - b.Property("EncryptedPrivateKey") - .HasColumnType("text"); - - b.Property("EncryptedPublicKey") - .HasColumnType("text"); - - b.Property("EncryptedUserKey") - .HasColumnType("text"); - - b.Property("UserId") - .HasColumnType("uuid"); - - b.HasKey("Id"); - - b.ToTable("OpaqueKeyExchangeCredential", (string)null); - }); - modelBuilder.Entity("Bit.Infrastructure.EntityFramework.AdminConsole.Models.Organization", b => { b.Property("Id") @@ -603,6 +572,39 @@ namespace Bit.PostgresMigrations.Migrations b.ToTable("Grant", (string)null); }); + modelBuilder.Entity("Bit.Infrastructure.EntityFramework.Auth.Models.OpaqueKeyExchangeCredential", b => + { + b.Property("Id") + .HasColumnType("uuid"); + + b.Property("CipherConfiguration") + .HasColumnType("text"); + + b.Property("CreationDate") + .HasColumnType("timestamp with time zone"); + + b.Property("CredentialBlob") + .HasColumnType("text"); + + b.Property("EncryptedPrivateKey") + .HasColumnType("text"); + + b.Property("EncryptedPublicKey") + .HasColumnType("text"); + + b.Property("EncryptedUserKey") + .HasColumnType("text"); + + b.Property("UserId") + .HasColumnType("uuid"); + + b.HasKey("Id"); + + b.HasIndex("UserId"); + + b.ToTable("OpaqueKeyExchangeCredential", (string)null); + }); + modelBuilder.Entity("Bit.Infrastructure.EntityFramework.Auth.Models.SsoConfig", b => { b.Property("Id") @@ -2383,6 +2385,17 @@ namespace Bit.PostgresMigrations.Migrations b.Navigation("Grantor"); }); + modelBuilder.Entity("Bit.Infrastructure.EntityFramework.Auth.Models.OpaqueKeyExchangeCredential", b => + { + b.HasOne("Bit.Infrastructure.EntityFramework.Models.User", "User") + .WithMany() + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("User"); + }); + modelBuilder.Entity("Bit.Infrastructure.EntityFramework.Auth.Models.SsoConfig", b => { b.HasOne("Bit.Infrastructure.EntityFramework.AdminConsole.Models.Organization", "Organization") diff --git a/util/SqliteMigrations/Migrations/20250321102612_OpaqueKex.cs b/util/SqliteMigrations/Migrations/20250321102612_OpaqueKex.cs deleted file mode 100644 index 95e9984a96..0000000000 --- a/util/SqliteMigrations/Migrations/20250321102612_OpaqueKex.cs +++ /dev/null @@ -1,38 +0,0 @@ -using Microsoft.EntityFrameworkCore.Migrations; - -#nullable disable - -namespace Bit.SqliteMigrations.Migrations; - -/// -public partial class OpaqueKex : Migration -{ - /// - protected override void Up(MigrationBuilder migrationBuilder) - { - migrationBuilder.CreateTable( - name: "OpaqueKeyExchangeCredential", - columns: table => new - { - Id = table.Column(type: "TEXT", nullable: false), - UserId = table.Column(type: "TEXT", nullable: false), - CipherConfiguration = table.Column(type: "TEXT", nullable: true), - CredentialBlob = table.Column(type: "TEXT", nullable: true), - EncryptedPublicKey = table.Column(type: "TEXT", nullable: true), - EncryptedPrivateKey = table.Column(type: "TEXT", nullable: true), - EncryptedUserKey = table.Column(type: "TEXT", nullable: true), - CreationDate = table.Column(type: "TEXT", nullable: false) - }, - constraints: table => - { - table.PrimaryKey("PK_OpaqueKeyExchangeCredential", x => x.Id); - }); - } - - /// - protected override void Down(MigrationBuilder migrationBuilder) - { - migrationBuilder.DropTable( - name: "OpaqueKeyExchangeCredential"); - } -} diff --git a/util/SqliteMigrations/Migrations/20250321102612_OpaqueKex.Designer.cs b/util/SqliteMigrations/Migrations/20250325193532_CreateOpaqueKeyExchangeEntityAndProcedures.Designer.cs similarity index 99% rename from util/SqliteMigrations/Migrations/20250321102612_OpaqueKex.Designer.cs rename to util/SqliteMigrations/Migrations/20250325193532_CreateOpaqueKeyExchangeEntityAndProcedures.Designer.cs index bd68400224..dcad548cc2 100644 --- a/util/SqliteMigrations/Migrations/20250321102612_OpaqueKex.Designer.cs +++ b/util/SqliteMigrations/Migrations/20250325193532_CreateOpaqueKeyExchangeEntityAndProcedures.Designer.cs @@ -11,8 +11,8 @@ using Microsoft.EntityFrameworkCore.Storage.ValueConversion; namespace Bit.SqliteMigrations.Migrations { [DbContext(typeof(DatabaseContext))] - [Migration("20250321102612_OpaqueKex")] - partial class OpaqueKex + [Migration("20250325193532_CreateOpaqueKeyExchangeEntityAndProcedures")] + partial class CreateOpaqueKeyExchangeEntityAndProcedures { /// protected override void BuildTargetModel(ModelBuilder modelBuilder) @@ -20,37 +20,6 @@ namespace Bit.SqliteMigrations.Migrations #pragma warning disable 612, 618 modelBuilder.HasAnnotation("ProductVersion", "8.0.8"); - modelBuilder.Entity("Bit.Core.Auth.Entities.OpaqueKeyExchangeCredential", b => - { - b.Property("Id") - .HasColumnType("TEXT"); - - b.Property("CipherConfiguration") - .HasColumnType("TEXT"); - - b.Property("CreationDate") - .HasColumnType("TEXT"); - - b.Property("CredentialBlob") - .HasColumnType("TEXT"); - - b.Property("EncryptedPrivateKey") - .HasColumnType("TEXT"); - - b.Property("EncryptedPublicKey") - .HasColumnType("TEXT"); - - b.Property("EncryptedUserKey") - .HasColumnType("TEXT"); - - b.Property("UserId") - .HasColumnType("TEXT"); - - b.HasKey("Id"); - - b.ToTable("OpaqueKeyExchangeCredential", (string)null); - }); - modelBuilder.Entity("Bit.Infrastructure.EntityFramework.AdminConsole.Models.Organization", b => { b.Property("Id") @@ -596,6 +565,39 @@ namespace Bit.SqliteMigrations.Migrations b.ToTable("Grant", (string)null); }); + modelBuilder.Entity("Bit.Infrastructure.EntityFramework.Auth.Models.OpaqueKeyExchangeCredential", b => + { + b.Property("Id") + .HasColumnType("TEXT"); + + b.Property("CipherConfiguration") + .HasColumnType("TEXT"); + + b.Property("CreationDate") + .HasColumnType("TEXT"); + + b.Property("CredentialBlob") + .HasColumnType("TEXT"); + + b.Property("EncryptedPrivateKey") + .HasColumnType("TEXT"); + + b.Property("EncryptedPublicKey") + .HasColumnType("TEXT"); + + b.Property("EncryptedUserKey") + .HasColumnType("TEXT"); + + b.Property("UserId") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("UserId"); + + b.ToTable("OpaqueKeyExchangeCredential", (string)null); + }); + modelBuilder.Entity("Bit.Infrastructure.EntityFramework.Auth.Models.SsoConfig", b => { b.Property("Id") @@ -2369,6 +2371,17 @@ namespace Bit.SqliteMigrations.Migrations b.Navigation("Grantor"); }); + modelBuilder.Entity("Bit.Infrastructure.EntityFramework.Auth.Models.OpaqueKeyExchangeCredential", b => + { + b.HasOne("Bit.Infrastructure.EntityFramework.Models.User", "User") + .WithMany() + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("User"); + }); + modelBuilder.Entity("Bit.Infrastructure.EntityFramework.Auth.Models.SsoConfig", b => { b.HasOne("Bit.Infrastructure.EntityFramework.AdminConsole.Models.Organization", "Organization") diff --git a/util/SqliteMigrations/Migrations/20250325193532_CreateOpaqueKeyExchangeEntityAndProcedures.cs b/util/SqliteMigrations/Migrations/20250325193532_CreateOpaqueKeyExchangeEntityAndProcedures.cs new file mode 100644 index 0000000000..0417d4b7c1 --- /dev/null +++ b/util/SqliteMigrations/Migrations/20250325193532_CreateOpaqueKeyExchangeEntityAndProcedures.cs @@ -0,0 +1,61 @@ +using System; +using Microsoft.EntityFrameworkCore.Migrations; + +#nullable disable + +namespace Bit.SqliteMigrations.Migrations +{ + /// + public partial class CreateOpaqueKeyExchangeEntityAndProcedures : Migration + { + /// + protected override void Up(MigrationBuilder migrationBuilder) + { + migrationBuilder.AddColumn( + name: "DiscountId", + table: "Provider", + type: "TEXT", + nullable: true); + + migrationBuilder.CreateTable( + name: "OpaqueKeyExchangeCredential", + columns: table => new + { + Id = table.Column(type: "TEXT", nullable: false), + UserId = table.Column(type: "TEXT", nullable: false), + CipherConfiguration = table.Column(type: "TEXT", nullable: true), + CredentialBlob = table.Column(type: "TEXT", nullable: true), + EncryptedPublicKey = table.Column(type: "TEXT", nullable: true), + EncryptedPrivateKey = table.Column(type: "TEXT", nullable: true), + EncryptedUserKey = table.Column(type: "TEXT", nullable: true), + CreationDate = table.Column(type: "TEXT", nullable: false) + }, + constraints: table => + { + table.PrimaryKey("PK_OpaqueKeyExchangeCredential", x => x.Id); + table.ForeignKey( + name: "FK_OpaqueKeyExchangeCredential_User_UserId", + column: x => x.UserId, + principalTable: "User", + principalColumn: "Id", + onDelete: ReferentialAction.Cascade); + }); + + migrationBuilder.CreateIndex( + name: "IX_OpaqueKeyExchangeCredential_UserId", + table: "OpaqueKeyExchangeCredential", + column: "UserId"); + } + + /// + protected override void Down(MigrationBuilder migrationBuilder) + { + migrationBuilder.DropTable( + name: "OpaqueKeyExchangeCredential"); + + migrationBuilder.DropColumn( + name: "DiscountId", + table: "Provider"); + } + } +} diff --git a/util/SqliteMigrations/Migrations/DatabaseContextModelSnapshot.cs b/util/SqliteMigrations/Migrations/DatabaseContextModelSnapshot.cs index 99b7a978a8..670be9eaac 100644 --- a/util/SqliteMigrations/Migrations/DatabaseContextModelSnapshot.cs +++ b/util/SqliteMigrations/Migrations/DatabaseContextModelSnapshot.cs @@ -17,37 +17,6 @@ namespace Bit.SqliteMigrations.Migrations #pragma warning disable 612, 618 modelBuilder.HasAnnotation("ProductVersion", "8.0.8"); - modelBuilder.Entity("Bit.Core.Auth.Entities.OpaqueKeyExchangeCredential", b => - { - b.Property("Id") - .HasColumnType("TEXT"); - - b.Property("CipherConfiguration") - .HasColumnType("TEXT"); - - b.Property("CreationDate") - .HasColumnType("TEXT"); - - b.Property("CredentialBlob") - .HasColumnType("TEXT"); - - b.Property("EncryptedPrivateKey") - .HasColumnType("TEXT"); - - b.Property("EncryptedPublicKey") - .HasColumnType("TEXT"); - - b.Property("EncryptedUserKey") - .HasColumnType("TEXT"); - - b.Property("UserId") - .HasColumnType("TEXT"); - - b.HasKey("Id"); - - b.ToTable("OpaqueKeyExchangeCredential", (string)null); - }); - modelBuilder.Entity("Bit.Infrastructure.EntityFramework.AdminConsole.Models.Organization", b => { b.Property("Id") @@ -593,6 +562,39 @@ namespace Bit.SqliteMigrations.Migrations b.ToTable("Grant", (string)null); }); + modelBuilder.Entity("Bit.Infrastructure.EntityFramework.Auth.Models.OpaqueKeyExchangeCredential", b => + { + b.Property("Id") + .HasColumnType("TEXT"); + + b.Property("CipherConfiguration") + .HasColumnType("TEXT"); + + b.Property("CreationDate") + .HasColumnType("TEXT"); + + b.Property("CredentialBlob") + .HasColumnType("TEXT"); + + b.Property("EncryptedPrivateKey") + .HasColumnType("TEXT"); + + b.Property("EncryptedPublicKey") + .HasColumnType("TEXT"); + + b.Property("EncryptedUserKey") + .HasColumnType("TEXT"); + + b.Property("UserId") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("UserId"); + + b.ToTable("OpaqueKeyExchangeCredential", (string)null); + }); + modelBuilder.Entity("Bit.Infrastructure.EntityFramework.Auth.Models.SsoConfig", b => { b.Property("Id") @@ -2366,6 +2368,17 @@ namespace Bit.SqliteMigrations.Migrations b.Navigation("Grantor"); }); + modelBuilder.Entity("Bit.Infrastructure.EntityFramework.Auth.Models.OpaqueKeyExchangeCredential", b => + { + b.HasOne("Bit.Infrastructure.EntityFramework.Models.User", "User") + .WithMany() + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("User"); + }); + modelBuilder.Entity("Bit.Infrastructure.EntityFramework.Auth.Models.SsoConfig", b => { b.HasOne("Bit.Infrastructure.EntityFramework.AdminConsole.Models.Organization", "Organization")