bitwarden/server
1
0
Fork 0
mirror of https://github.com/bitwarden/server synced 2025-12-17 16:53:23 +00:00
Code Issues Releases Wiki Activity

Redoing migration

Browse Source
This commit is contained in:
cd-bitwarden
2025-11-26 11:55:52 -05:00
parent b8a14c948a
commit 17fad604cd
10 changed files with 495 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

0
util/Migrator/DbScripts/2025-10-15_00_AddDisableSMAdsForUsersToOrganization.sql → util/Migrator/DbScripts/2025-11-26_00_AddDisableSMAdsForUsersToOrganization.sql
View File

166
util/MySqlMigrations/Migrations/20251015172830_AddingNewFlagToLicenseForDisableSMAdsForUser.Designer.cs → util/MySqlMigrations/Migrations/20251126165404_AddingdisableSMAdsForUsersToLicense.Designer.cs generated
View File

@@ -12,8 +12,8 @@ using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
namespace Bit.MySqlMigrations.Migrations namespace Bit.MySqlMigrations.Migrations
{ {
[DbContext(typeof(DatabaseContext))] [DbContext(typeof(DatabaseContext))]
[Migration("20251015172830_AddingNewFlagToLicenseForDisableSMAdsForUser")] [Migration("20251126165404_AddingdisableSMAdsForUsersToLicense")]
partial class AddingNewFlagToLicenseForDisableSMAdsForUser partial class AddingdisableSMAdsForUsersToLicense
{ {
/// <inheritdoc /> /// <inheritdoc />
protected override void BuildTargetModel(ModelBuilder modelBuilder) protected override void BuildTargetModel(ModelBuilder modelBuilder)
@@ -113,9 +113,6 @@ namespace Bit.MySqlMigrations.Migrations
b.Property<DateTime>("CreationDate") b.Property<DateTime>("CreationDate")
.HasColumnType("datetime(6)"); .HasColumnType("datetime(6)");
b.Property<bool>("UseDisableSmAdsForUsers")
.HasColumnType("tinyint(1)");
b.Property<bool>("Enabled") b.Property<bool>("Enabled")
.HasColumnType("tinyint(1)"); .HasColumnType("tinyint(1)");
@@ -226,12 +223,18 @@ namespace Bit.MySqlMigrations.Migrations
b.Property<bool>("UseApi") b.Property<bool>("UseApi")
.HasColumnType("tinyint(1)"); .HasColumnType("tinyint(1)");
b.Property<bool>("UseAutomaticUserConfirmation")
.HasColumnType("tinyint(1)");
b.Property<bool>("UseCustomPermissions") b.Property<bool>("UseCustomPermissions")
.HasColumnType("tinyint(1)"); .HasColumnType("tinyint(1)");
b.Property<bool>("UseDirectory") b.Property<bool>("UseDirectory")
.HasColumnType("tinyint(1)"); .HasColumnType("tinyint(1)");
b.Property<bool>("UseDisableSmAdsForUsers")
.HasColumnType("tinyint(1)");
b.Property<bool>("UseEvents") b.Property<bool>("UseEvents")
.HasColumnType("tinyint(1)"); .HasColumnType("tinyint(1)");
@@ -1017,6 +1020,12 @@ namespace Bit.MySqlMigrations.Migrations
b.Property<Guid>("Id") b.Property<Guid>("Id")
.HasColumnType("char(36)"); .HasColumnType("char(36)");
b.Property<int?>("ApplicationAtRiskCount")
.HasColumnType("int");
b.Property<int?>("ApplicationCount")
.HasColumnType("int");
b.Property<string>("ApplicationData") b.Property<string>("ApplicationData")
.HasColumnType("longtext"); .HasColumnType("longtext");
@@ -1027,9 +1036,39 @@ namespace Bit.MySqlMigrations.Migrations
b.Property<DateTime>("CreationDate") b.Property<DateTime>("CreationDate")
.HasColumnType("datetime(6)"); .HasColumnType("datetime(6)");
b.Property<int?>("CriticalApplicationAtRiskCount")
.HasColumnType("int");
b.Property<int?>("CriticalApplicationCount")
.HasColumnType("int");
b.Property<int?>("CriticalMemberAtRiskCount")
.HasColumnType("int");
b.Property<int?>("CriticalMemberCount")
.HasColumnType("int");
b.Property<int?>("CriticalPasswordAtRiskCount")
.HasColumnType("int");
b.Property<int?>("CriticalPasswordCount")
.HasColumnType("int");
b.Property<int?>("MemberAtRiskCount")
.HasColumnType("int");
b.Property<int?>("MemberCount")
.HasColumnType("int");
b.Property<Guid>("OrganizationId") b.Property<Guid>("OrganizationId")
.HasColumnType("char(36)"); .HasColumnType("char(36)");
b.Property<int?>("PasswordAtRiskCount")
.HasColumnType("int");
b.Property<int?>("PasswordCount")
.HasColumnType("int");
b.Property<string>("ReportData") b.Property<string>("ReportData")
.IsRequired() .IsRequired()
.HasColumnType("longtext"); .HasColumnType("longtext");
@@ -1879,6 +1918,15 @@ namespace Bit.MySqlMigrations.Migrations
.HasMaxLength(50) .HasMaxLength(50)
.HasColumnType("varchar(50)"); .HasColumnType("varchar(50)");
b.Property<string>("SecurityState")
.HasColumnType("longtext");
b.Property<int?>("SecurityVersion")
.HasColumnType("int");
b.Property<string>("SignedPublicKey")
.HasColumnType("longtext");
b.Property<long?>("Storage") b.Property<long?>("Storage")
.HasColumnType("bigint"); .HasColumnType("bigint");
@@ -1907,6 +1955,40 @@ namespace Bit.MySqlMigrations.Migrations
b.ToTable("User", (string)null); b.ToTable("User", (string)null);
}); });
modelBuilder.Entity("Bit.Infrastructure.EntityFramework.Models.UserSignatureKeyPair", b =>
{
b.Property<Guid>("Id")
.HasColumnType("char(36)");
b.Property<DateTime>("CreationDate")
.HasColumnType("datetime(6)");
b.Property<DateTime>("RevisionDate")
.HasColumnType("datetime(6)");
b.Property<byte>("SignatureAlgorithm")
.HasColumnType("tinyint unsigned");
b.Property<string>("SigningKey")
.IsRequired()
.HasColumnType("longtext");
b.Property<Guid>("UserId")
.HasColumnType("char(36)");
b.Property<string>("VerifyingKey")
.IsRequired()
.HasColumnType("longtext");
b.HasKey("Id");
b.HasIndex("UserId")
.IsUnique()
.HasAnnotation("SqlServer:Clustered", false);
b.ToTable("UserSignatureKeyPair", (string)null);
});
modelBuilder.Entity("Bit.Infrastructure.EntityFramework.NotificationCenter.Models.Notification", b => modelBuilder.Entity("Bit.Infrastructure.EntityFramework.NotificationCenter.Models.Notification", b =>
{ {
b.Property<Guid>("Id") b.Property<Guid>("Id")
@@ -2165,6 +2247,42 @@ namespace Bit.MySqlMigrations.Migrations
b.ToTable("Secret", (string)null); b.ToTable("Secret", (string)null);
}); });
modelBuilder.Entity("Bit.Infrastructure.EntityFramework.SecretsManager.Models.SecretVersion", b =>
{
b.Property<Guid>("Id")
.HasColumnType("char(36)");
b.Property<Guid?>("EditorOrganizationUserId")
.HasColumnType("char(36)");
b.Property<Guid?>("EditorServiceAccountId")
.HasColumnType("char(36)");
b.Property<Guid>("SecretId")
.HasColumnType("char(36)");
b.Property<string>("Value")
.IsRequired()
.HasColumnType("longtext");
b.Property<DateTime>("VersionDate")
.HasColumnType("datetime(6)");
b.HasKey("Id")
.HasAnnotation("SqlServer:Clustered", true);
b.HasIndex("EditorOrganizationUserId")
.HasDatabaseName("IX_SecretVersion_EditorOrganizationUserId");
b.HasIndex("EditorServiceAccountId")
.HasDatabaseName("IX_SecretVersion_EditorServiceAccountId");
b.HasIndex("SecretId")
.HasDatabaseName("IX_SecretVersion_SecretId");
b.ToTable("SecretVersion");
});
modelBuilder.Entity("Bit.Infrastructure.EntityFramework.SecretsManager.Models.ServiceAccount", b => modelBuilder.Entity("Bit.Infrastructure.EntityFramework.SecretsManager.Models.ServiceAccount", b =>
{ {
b.Property<Guid>("Id") b.Property<Guid>("Id")
@@ -2918,6 +3036,17 @@ namespace Bit.MySqlMigrations.Migrations
b.Navigation("User"); b.Navigation("User");
}); });
modelBuilder.Entity("Bit.Infrastructure.EntityFramework.Models.UserSignatureKeyPair", b =>
{
b.HasOne("Bit.Infrastructure.EntityFramework.Models.User", "User")
.WithMany()
.HasForeignKey("UserId")
.OnDelete(DeleteBehavior.Cascade)
.IsRequired();
b.Navigation("User");
});
modelBuilder.Entity("Bit.Infrastructure.EntityFramework.NotificationCenter.Models.Notification", b => modelBuilder.Entity("Bit.Infrastructure.EntityFramework.NotificationCenter.Models.Notification", b =>
{ {
b.HasOne("Bit.Infrastructure.EntityFramework.AdminConsole.Models.Organization", "Organization") b.HasOne("Bit.Infrastructure.EntityFramework.AdminConsole.Models.Organization", "Organization")
@@ -2990,6 +3119,31 @@ namespace Bit.MySqlMigrations.Migrations
b.Navigation("Organization"); b.Navigation("Organization");
}); });
modelBuilder.Entity("Bit.Infrastructure.EntityFramework.SecretsManager.Models.SecretVersion", b =>
{
b.HasOne("Bit.Infrastructure.EntityFramework.Models.OrganizationUser", "EditorOrganizationUser")
.WithMany()
.HasForeignKey("EditorOrganizationUserId")
.OnDelete(DeleteBehavior.SetNull);
b.HasOne("Bit.Infrastructure.EntityFramework.SecretsManager.Models.ServiceAccount", "EditorServiceAccount")
.WithMany()
.HasForeignKey("EditorServiceAccountId")
.OnDelete(DeleteBehavior.SetNull);
b.HasOne("Bit.Infrastructure.EntityFramework.SecretsManager.Models.Secret", "Secret")
.WithMany("SecretVersions")
.HasForeignKey("SecretId")
.OnDelete(DeleteBehavior.Cascade)
.IsRequired();
b.Navigation("EditorOrganizationUser");
b.Navigation("EditorServiceAccount");
b.Navigation("Secret");
});
modelBuilder.Entity("Bit.Infrastructure.EntityFramework.SecretsManager.Models.ServiceAccount", b => modelBuilder.Entity("Bit.Infrastructure.EntityFramework.SecretsManager.Models.ServiceAccount", b =>
{ {
b.HasOne("Bit.Infrastructure.EntityFramework.AdminConsole.Models.Organization", "Organization") b.HasOne("Bit.Infrastructure.EntityFramework.AdminConsole.Models.Organization", "Organization")
@@ -3261,6 +3415,8 @@ namespace Bit.MySqlMigrations.Migrations
{ {
b.Navigation("GroupAccessPolicies"); b.Navigation("GroupAccessPolicies");
b.Navigation("SecretVersions");
b.Navigation("ServiceAccountAccessPolicies"); b.Navigation("ServiceAccountAccessPolicies");
b.Navigation("UserAccessPolicies"); b.Navigation("UserAccessPolicies");

2
util/MySqlMigrations/Migrations/20251015172830_AddingNewFlagToLicenseForDisableSMAdsForUser.cs → util/MySqlMigrations/Migrations/20251126165404_AddingdisableSMAdsForUsersToLicense.cs
View File

@@ -5,7 +5,7 @@
namespace Bit.MySqlMigrations.Migrations; namespace Bit.MySqlMigrations.Migrations;
/// <inheritdoc /> /// <inheritdoc />
public partial class AddingNewFlagToLicenseForDisableSMAdsForUser : Migration public partial class AddingdisableSMAdsForUsersToLicense : Migration
{ {
/// <inheritdoc /> /// <inheritdoc />
protected override void Up(MigrationBuilder migrationBuilder) protected override void Up(MigrationBuilder migrationBuilder)

6
util/MySqlMigrations/Migrations/DatabaseContextModelSnapshot.cs
View File

@@ -110,9 +110,6 @@ namespace Bit.MySqlMigrations.Migrations
b.Property<DateTime>("CreationDate") b.Property<DateTime>("CreationDate")
.HasColumnType("datetime(6)"); .HasColumnType("datetime(6)");
b.Property<bool>("UseDisableSmAdsForUsers")
.HasColumnType("tinyint(1)");
b.Property<bool>("Enabled") b.Property<bool>("Enabled")
.HasColumnType("tinyint(1)"); .HasColumnType("tinyint(1)");
@@ -232,6 +229,9 @@ namespace Bit.MySqlMigrations.Migrations
b.Property<bool>("UseDirectory") b.Property<bool>("UseDirectory")
.HasColumnType("tinyint(1)"); .HasColumnType("tinyint(1)");
b.Property<bool>("UseDisableSmAdsForUsers")
.HasColumnType("tinyint(1)");
b.Property<bool>("UseEvents") b.Property<bool>("UseEvents")
.HasColumnType("tinyint(1)"); .HasColumnType("tinyint(1)");

166
util/PostgresMigrations/Migrations/20251015172813_AddingNewFlagToLicenseForDisableSMAdsForUser.Designer.cs → util/PostgresMigrations/Migrations/20251126165420_AddingdisableSMAdsForUsersToLicense.Designer.cs generated
View File

@@ -12,8 +12,8 @@ using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
namespace Bit.PostgresMigrations.Migrations namespace Bit.PostgresMigrations.Migrations
{ {
[DbContext(typeof(DatabaseContext))] [DbContext(typeof(DatabaseContext))]
[Migration("20251015172813_AddingNewFlagToLicenseForDisableSMAdsForUser")] [Migration("20251126165420_AddingdisableSMAdsForUsersToLicense")]
partial class AddingNewFlagToLicenseForDisableSMAdsForUser partial class AddingdisableSMAdsForUsersToLicense
{ {
/// <inheritdoc /> /// <inheritdoc />
protected override void BuildTargetModel(ModelBuilder modelBuilder) protected override void BuildTargetModel(ModelBuilder modelBuilder)
@@ -114,9 +114,6 @@ namespace Bit.PostgresMigrations.Migrations
b.Property<DateTime>("CreationDate") b.Property<DateTime>("CreationDate")
.HasColumnType("timestamp with time zone"); .HasColumnType("timestamp with time zone");
b.Property<bool>("UseDisableSmAdsForUsers")
.HasColumnType("boolean");
b.Property<bool>("Enabled") b.Property<bool>("Enabled")
.HasColumnType("boolean"); .HasColumnType("boolean");
@@ -228,12 +225,18 @@ namespace Bit.PostgresMigrations.Migrations
b.Property<bool>("UseApi") b.Property<bool>("UseApi")
.HasColumnType("boolean"); .HasColumnType("boolean");
b.Property<bool>("UseAutomaticUserConfirmation")
.HasColumnType("boolean");
b.Property<bool>("UseCustomPermissions") b.Property<bool>("UseCustomPermissions")
.HasColumnType("boolean"); .HasColumnType("boolean");
b.Property<bool>("UseDirectory") b.Property<bool>("UseDirectory")
.HasColumnType("boolean"); .HasColumnType("boolean");
b.Property<bool>("UseDisableSmAdsForUsers")
.HasColumnType("boolean");
b.Property<bool>("UseEvents") b.Property<bool>("UseEvents")
.HasColumnType("boolean"); .HasColumnType("boolean");
@@ -1022,6 +1025,12 @@ namespace Bit.PostgresMigrations.Migrations
b.Property<Guid>("Id") b.Property<Guid>("Id")
.HasColumnType("uuid"); .HasColumnType("uuid");
b.Property<int?>("ApplicationAtRiskCount")
.HasColumnType("integer");
b.Property<int?>("ApplicationCount")
.HasColumnType("integer");
b.Property<string>("ApplicationData") b.Property<string>("ApplicationData")
.HasColumnType("text"); .HasColumnType("text");
@@ -1032,9 +1041,39 @@ namespace Bit.PostgresMigrations.Migrations
b.Property<DateTime>("CreationDate") b.Property<DateTime>("CreationDate")
.HasColumnType("timestamp with time zone"); .HasColumnType("timestamp with time zone");
b.Property<int?>("CriticalApplicationAtRiskCount")
.HasColumnType("integer");
b.Property<int?>("CriticalApplicationCount")
.HasColumnType("integer");
b.Property<int?>("CriticalMemberAtRiskCount")
.HasColumnType("integer");
b.Property<int?>("CriticalMemberCount")
.HasColumnType("integer");
b.Property<int?>("CriticalPasswordAtRiskCount")
.HasColumnType("integer");
b.Property<int?>("CriticalPasswordCount")
.HasColumnType("integer");
b.Property<int?>("MemberAtRiskCount")
.HasColumnType("integer");
b.Property<int?>("MemberCount")
.HasColumnType("integer");
b.Property<Guid>("OrganizationId") b.Property<Guid>("OrganizationId")
.HasColumnType("uuid"); .HasColumnType("uuid");
b.Property<int?>("PasswordAtRiskCount")
.HasColumnType("integer");
b.Property<int?>("PasswordCount")
.HasColumnType("integer");
b.Property<string>("ReportData") b.Property<string>("ReportData")
.IsRequired() .IsRequired()
.HasColumnType("text"); .HasColumnType("text");
@@ -1885,6 +1924,15 @@ namespace Bit.PostgresMigrations.Migrations
.HasMaxLength(50) .HasMaxLength(50)
.HasColumnType("character varying(50)"); .HasColumnType("character varying(50)");
b.Property<string>("SecurityState")
.HasColumnType("text");
b.Property<int?>("SecurityVersion")
.HasColumnType("integer");
b.Property<string>("SignedPublicKey")
.HasColumnType("text");
b.Property<long?>("Storage") b.Property<long?>("Storage")
.HasColumnType("bigint"); .HasColumnType("bigint");
@@ -1913,6 +1961,40 @@ namespace Bit.PostgresMigrations.Migrations
b.ToTable("User", (string)null); b.ToTable("User", (string)null);
}); });
modelBuilder.Entity("Bit.Infrastructure.EntityFramework.Models.UserSignatureKeyPair", b =>
{
b.Property<Guid>("Id")
.HasColumnType("uuid");
b.Property<DateTime>("CreationDate")
.HasColumnType("timestamp with time zone");
b.Property<DateTime>("RevisionDate")
.HasColumnType("timestamp with time zone");
b.Property<byte>("SignatureAlgorithm")
.HasColumnType("smallint");
b.Property<string>("SigningKey")
.IsRequired()
.HasColumnType("text");
b.Property<Guid>("UserId")
.HasColumnType("uuid");
b.Property<string>("VerifyingKey")
.IsRequired()
.HasColumnType("text");
b.HasKey("Id");
b.HasIndex("UserId")
.IsUnique()
.HasAnnotation("SqlServer:Clustered", false);
b.ToTable("UserSignatureKeyPair", (string)null);
});
modelBuilder.Entity("Bit.Infrastructure.EntityFramework.NotificationCenter.Models.Notification", b => modelBuilder.Entity("Bit.Infrastructure.EntityFramework.NotificationCenter.Models.Notification", b =>
{ {
b.Property<Guid>("Id") b.Property<Guid>("Id")
@@ -2171,6 +2253,42 @@ namespace Bit.PostgresMigrations.Migrations
b.ToTable("Secret", (string)null); b.ToTable("Secret", (string)null);
}); });
modelBuilder.Entity("Bit.Infrastructure.EntityFramework.SecretsManager.Models.SecretVersion", b =>
{
b.Property<Guid>("Id")
.HasColumnType("uuid");
b.Property<Guid?>("EditorOrganizationUserId")
.HasColumnType("uuid");
b.Property<Guid?>("EditorServiceAccountId")
.HasColumnType("uuid");
b.Property<Guid>("SecretId")
.HasColumnType("uuid");
b.Property<string>("Value")
.IsRequired()
.HasColumnType("text");
b.Property<DateTime>("VersionDate")
.HasColumnType("timestamp with time zone");
b.HasKey("Id")
.HasAnnotation("SqlServer:Clustered", true);
b.HasIndex("EditorOrganizationUserId")
.HasDatabaseName("IX_SecretVersion_EditorOrganizationUserId");
b.HasIndex("EditorServiceAccountId")
.HasDatabaseName("IX_SecretVersion_EditorServiceAccountId");
b.HasIndex("SecretId")
.HasDatabaseName("IX_SecretVersion_SecretId");
b.ToTable("SecretVersion");
});
modelBuilder.Entity("Bit.Infrastructure.EntityFramework.SecretsManager.Models.ServiceAccount", b => modelBuilder.Entity("Bit.Infrastructure.EntityFramework.SecretsManager.Models.ServiceAccount", b =>
{ {
b.Property<Guid>("Id") b.Property<Guid>("Id")
@@ -2924,6 +3042,17 @@ namespace Bit.PostgresMigrations.Migrations
b.Navigation("User"); b.Navigation("User");
}); });
modelBuilder.Entity("Bit.Infrastructure.EntityFramework.Models.UserSignatureKeyPair", b =>
{
b.HasOne("Bit.Infrastructure.EntityFramework.Models.User", "User")
.WithMany()
.HasForeignKey("UserId")
.OnDelete(DeleteBehavior.Cascade)
.IsRequired();
b.Navigation("User");
});
modelBuilder.Entity("Bit.Infrastructure.EntityFramework.NotificationCenter.Models.Notification", b => modelBuilder.Entity("Bit.Infrastructure.EntityFramework.NotificationCenter.Models.Notification", b =>
{ {
b.HasOne("Bit.Infrastructure.EntityFramework.AdminConsole.Models.Organization", "Organization") b.HasOne("Bit.Infrastructure.EntityFramework.AdminConsole.Models.Organization", "Organization")
@@ -2996,6 +3125,31 @@ namespace Bit.PostgresMigrations.Migrations
b.Navigation("Organization"); b.Navigation("Organization");
}); });
modelBuilder.Entity("Bit.Infrastructure.EntityFramework.SecretsManager.Models.SecretVersion", b =>
{
b.HasOne("Bit.Infrastructure.EntityFramework.Models.OrganizationUser", "EditorOrganizationUser")
.WithMany()
.HasForeignKey("EditorOrganizationUserId")
.OnDelete(DeleteBehavior.SetNull);
b.HasOne("Bit.Infrastructure.EntityFramework.SecretsManager.Models.ServiceAccount", "EditorServiceAccount")
.WithMany()
.HasForeignKey("EditorServiceAccountId")
.OnDelete(DeleteBehavior.SetNull);
b.HasOne("Bit.Infrastructure.EntityFramework.SecretsManager.Models.Secret", "Secret")
.WithMany("SecretVersions")
.HasForeignKey("SecretId")
.OnDelete(DeleteBehavior.Cascade)
.IsRequired();
b.Navigation("EditorOrganizationUser");
b.Navigation("EditorServiceAccount");
b.Navigation("Secret");
});
modelBuilder.Entity("Bit.Infrastructure.EntityFramework.SecretsManager.Models.ServiceAccount", b => modelBuilder.Entity("Bit.Infrastructure.EntityFramework.SecretsManager.Models.ServiceAccount", b =>
{ {
b.HasOne("Bit.Infrastructure.EntityFramework.AdminConsole.Models.Organization", "Organization") b.HasOne("Bit.Infrastructure.EntityFramework.AdminConsole.Models.Organization", "Organization")
@@ -3267,6 +3421,8 @@ namespace Bit.PostgresMigrations.Migrations
{ {
b.Navigation("GroupAccessPolicies"); b.Navigation("GroupAccessPolicies");
b.Navigation("SecretVersions");
b.Navigation("ServiceAccountAccessPolicies"); b.Navigation("ServiceAccountAccessPolicies");
b.Navigation("UserAccessPolicies"); b.Navigation("UserAccessPolicies");

2
util/PostgresMigrations/Migrations/20251015172813_AddingNewFlagToLicenseForDisableSMAdsForUser.cs → util/PostgresMigrations/Migrations/20251126165420_AddingdisableSMAdsForUsersToLicense.cs
View File

@@ -5,7 +5,7 @@
namespace Bit.PostgresMigrations.Migrations; namespace Bit.PostgresMigrations.Migrations;
/// <inheritdoc /> /// <inheritdoc />
public partial class AddingNewFlagToLicenseForDisableSMAdsForUser : Migration public partial class AddingdisableSMAdsForUsersToLicense : Migration
{ {
/// <inheritdoc /> /// <inheritdoc />
protected override void Up(MigrationBuilder migrationBuilder) protected override void Up(MigrationBuilder migrationBuilder)

6
util/PostgresMigrations/Migrations/DatabaseContextModelSnapshot.cs
View File

@@ -111,9 +111,6 @@ namespace Bit.PostgresMigrations.Migrations
b.Property<DateTime>("CreationDate") b.Property<DateTime>("CreationDate")
.HasColumnType("timestamp with time zone"); .HasColumnType("timestamp with time zone");
b.Property<bool>("UseDisableSmAdsForUsers")
.HasColumnType("boolean");
b.Property<bool>("Enabled") b.Property<bool>("Enabled")
.HasColumnType("boolean"); .HasColumnType("boolean");
@@ -234,6 +231,9 @@ namespace Bit.PostgresMigrations.Migrations
b.Property<bool>("UseDirectory") b.Property<bool>("UseDirectory")
.HasColumnType("boolean"); .HasColumnType("boolean");
b.Property<bool>("UseDisableSmAdsForUsers")
.HasColumnType("boolean");
b.Property<bool>("UseEvents") b.Property<bool>("UseEvents")
.HasColumnType("boolean"); .HasColumnType("boolean");

166
util/SqliteMigrations/Migrations/20251015172754_AddingNewFlagToLicenseForDisableSMAdsForUser.Designer.cs → util/SqliteMigrations/Migrations/20251126165445_AddingdisableSMAdsForUsersToLicense.Designer.cs generated
View File

@@ -11,8 +11,8 @@ using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
namespace Bit.SqliteMigrations.Migrations namespace Bit.SqliteMigrations.Migrations
{ {
[DbContext(typeof(DatabaseContext))] [DbContext(typeof(DatabaseContext))]
[Migration("20251015172754_AddingNewFlagToLicenseForDisableSMAdsForUser")] [Migration("20251126165445_AddingdisableSMAdsForUsersToLicense")]
partial class AddingNewFlagToLicenseForDisableSMAdsForUser partial class AddingdisableSMAdsForUsersToLicense
{ {
/// <inheritdoc /> /// <inheritdoc />
protected override void BuildTargetModel(ModelBuilder modelBuilder) protected override void BuildTargetModel(ModelBuilder modelBuilder)
@@ -108,9 +108,6 @@ namespace Bit.SqliteMigrations.Migrations
b.Property<DateTime>("CreationDate") b.Property<DateTime>("CreationDate")
.HasColumnType("TEXT"); .HasColumnType("TEXT");
b.Property<bool>("UseDisableSmAdsForUsers")
.HasColumnType("INTEGER");
b.Property<bool>("Enabled") b.Property<bool>("Enabled")
.HasColumnType("INTEGER"); .HasColumnType("INTEGER");
@@ -221,12 +218,18 @@ namespace Bit.SqliteMigrations.Migrations
b.Property<bool>("UseApi") b.Property<bool>("UseApi")
.HasColumnType("INTEGER"); .HasColumnType("INTEGER");
b.Property<bool>("UseAutomaticUserConfirmation")
.HasColumnType("INTEGER");
b.Property<bool>("UseCustomPermissions") b.Property<bool>("UseCustomPermissions")
.HasColumnType("INTEGER"); .HasColumnType("INTEGER");
b.Property<bool>("UseDirectory") b.Property<bool>("UseDirectory")
.HasColumnType("INTEGER"); .HasColumnType("INTEGER");
b.Property<bool>("UseDisableSmAdsForUsers")
.HasColumnType("INTEGER");
b.Property<bool>("UseEvents") b.Property<bool>("UseEvents")
.HasColumnType("INTEGER"); .HasColumnType("INTEGER");
@@ -1006,6 +1009,12 @@ namespace Bit.SqliteMigrations.Migrations
b.Property<Guid>("Id") b.Property<Guid>("Id")
.HasColumnType("TEXT"); .HasColumnType("TEXT");
b.Property<int?>("ApplicationAtRiskCount")
.HasColumnType("INTEGER");
b.Property<int?>("ApplicationCount")
.HasColumnType("INTEGER");
b.Property<string>("ApplicationData") b.Property<string>("ApplicationData")
.HasColumnType("TEXT"); .HasColumnType("TEXT");
@@ -1016,9 +1025,39 @@ namespace Bit.SqliteMigrations.Migrations
b.Property<DateTime>("CreationDate") b.Property<DateTime>("CreationDate")
.HasColumnType("TEXT"); .HasColumnType("TEXT");
b.Property<int?>("CriticalApplicationAtRiskCount")
.HasColumnType("INTEGER");
b.Property<int?>("CriticalApplicationCount")
.HasColumnType("INTEGER");
b.Property<int?>("CriticalMemberAtRiskCount")
.HasColumnType("INTEGER");
b.Property<int?>("CriticalMemberCount")
.HasColumnType("INTEGER");
b.Property<int?>("CriticalPasswordAtRiskCount")
.HasColumnType("INTEGER");
b.Property<int?>("CriticalPasswordCount")
.HasColumnType("INTEGER");
b.Property<int?>("MemberAtRiskCount")
.HasColumnType("INTEGER");
b.Property<int?>("MemberCount")
.HasColumnType("INTEGER");
b.Property<Guid>("OrganizationId") b.Property<Guid>("OrganizationId")
.HasColumnType("TEXT"); .HasColumnType("TEXT");
b.Property<int?>("PasswordAtRiskCount")
.HasColumnType("INTEGER");
b.Property<int?>("PasswordCount")
.HasColumnType("INTEGER");
b.Property<string>("ReportData") b.Property<string>("ReportData")
.IsRequired() .IsRequired()
.HasColumnType("TEXT"); .HasColumnType("TEXT");
@@ -1868,6 +1907,15 @@ namespace Bit.SqliteMigrations.Migrations
.HasMaxLength(50) .HasMaxLength(50)
.HasColumnType("TEXT"); .HasColumnType("TEXT");
b.Property<string>("SecurityState")
.HasColumnType("TEXT");
b.Property<int?>("SecurityVersion")
.HasColumnType("INTEGER");
b.Property<string>("SignedPublicKey")
.HasColumnType("TEXT");
b.Property<long?>("Storage") b.Property<long?>("Storage")
.HasColumnType("INTEGER"); .HasColumnType("INTEGER");
@@ -1896,6 +1944,40 @@ namespace Bit.SqliteMigrations.Migrations
b.ToTable("User", (string)null); b.ToTable("User", (string)null);
}); });
modelBuilder.Entity("Bit.Infrastructure.EntityFramework.Models.UserSignatureKeyPair", b =>
{
b.Property<Guid>("Id")
.HasColumnType("TEXT");
b.Property<DateTime>("CreationDate")
.HasColumnType("TEXT");
b.Property<DateTime>("RevisionDate")
.HasColumnType("TEXT");
b.Property<byte>("SignatureAlgorithm")
.HasColumnType("INTEGER");
b.Property<string>("SigningKey")
.IsRequired()
.HasColumnType("TEXT");
b.Property<Guid>("UserId")
.HasColumnType("TEXT");
b.Property<string>("VerifyingKey")
.IsRequired()
.HasColumnType("TEXT");
b.HasKey("Id");
b.HasIndex("UserId")
.IsUnique()
.HasAnnotation("SqlServer:Clustered", false);
b.ToTable("UserSignatureKeyPair", (string)null);
});
modelBuilder.Entity("Bit.Infrastructure.EntityFramework.NotificationCenter.Models.Notification", b => modelBuilder.Entity("Bit.Infrastructure.EntityFramework.NotificationCenter.Models.Notification", b =>
{ {
b.Property<Guid>("Id") b.Property<Guid>("Id")
@@ -2154,6 +2236,42 @@ namespace Bit.SqliteMigrations.Migrations
b.ToTable("Secret", (string)null); b.ToTable("Secret", (string)null);
}); });
modelBuilder.Entity("Bit.Infrastructure.EntityFramework.SecretsManager.Models.SecretVersion", b =>
{
b.Property<Guid>("Id")
.HasColumnType("TEXT");
b.Property<Guid?>("EditorOrganizationUserId")
.HasColumnType("TEXT");
b.Property<Guid?>("EditorServiceAccountId")
.HasColumnType("TEXT");
b.Property<Guid>("SecretId")
.HasColumnType("TEXT");
b.Property<string>("Value")
.IsRequired()
.HasColumnType("TEXT");
b.Property<DateTime>("VersionDate")
.HasColumnType("TEXT");
b.HasKey("Id")
.HasAnnotation("SqlServer:Clustered", true);
b.HasIndex("EditorOrganizationUserId")
.HasDatabaseName("IX_SecretVersion_EditorOrganizationUserId");
b.HasIndex("EditorServiceAccountId")
.HasDatabaseName("IX_SecretVersion_EditorServiceAccountId");
b.HasIndex("SecretId")
.HasDatabaseName("IX_SecretVersion_SecretId");
b.ToTable("SecretVersion");
});
modelBuilder.Entity("Bit.Infrastructure.EntityFramework.SecretsManager.Models.ServiceAccount", b => modelBuilder.Entity("Bit.Infrastructure.EntityFramework.SecretsManager.Models.ServiceAccount", b =>
{ {
b.Property<Guid>("Id") b.Property<Guid>("Id")
@@ -2907,6 +3025,17 @@ namespace Bit.SqliteMigrations.Migrations
b.Navigation("User"); b.Navigation("User");
}); });
modelBuilder.Entity("Bit.Infrastructure.EntityFramework.Models.UserSignatureKeyPair", b =>
{
b.HasOne("Bit.Infrastructure.EntityFramework.Models.User", "User")
.WithMany()
.HasForeignKey("UserId")
.OnDelete(DeleteBehavior.Cascade)
.IsRequired();
b.Navigation("User");
});
modelBuilder.Entity("Bit.Infrastructure.EntityFramework.NotificationCenter.Models.Notification", b => modelBuilder.Entity("Bit.Infrastructure.EntityFramework.NotificationCenter.Models.Notification", b =>
{ {
b.HasOne("Bit.Infrastructure.EntityFramework.AdminConsole.Models.Organization", "Organization") b.HasOne("Bit.Infrastructure.EntityFramework.AdminConsole.Models.Organization", "Organization")
@@ -2979,6 +3108,31 @@ namespace Bit.SqliteMigrations.Migrations
b.Navigation("Organization"); b.Navigation("Organization");
}); });
modelBuilder.Entity("Bit.Infrastructure.EntityFramework.SecretsManager.Models.SecretVersion", b =>
{
b.HasOne("Bit.Infrastructure.EntityFramework.Models.OrganizationUser", "EditorOrganizationUser")
.WithMany()
.HasForeignKey("EditorOrganizationUserId")
.OnDelete(DeleteBehavior.SetNull);
b.HasOne("Bit.Infrastructure.EntityFramework.SecretsManager.Models.ServiceAccount", "EditorServiceAccount")
.WithMany()
.HasForeignKey("EditorServiceAccountId")
.OnDelete(DeleteBehavior.SetNull);
b.HasOne("Bit.Infrastructure.EntityFramework.SecretsManager.Models.Secret", "Secret")
.WithMany("SecretVersions")
.HasForeignKey("SecretId")
.OnDelete(DeleteBehavior.Cascade)
.IsRequired();
b.Navigation("EditorOrganizationUser");
b.Navigation("EditorServiceAccount");
b.Navigation("Secret");
});
modelBuilder.Entity("Bit.Infrastructure.EntityFramework.SecretsManager.Models.ServiceAccount", b => modelBuilder.Entity("Bit.Infrastructure.EntityFramework.SecretsManager.Models.ServiceAccount", b =>
{ {
b.HasOne("Bit.Infrastructure.EntityFramework.AdminConsole.Models.Organization", "Organization") b.HasOne("Bit.Infrastructure.EntityFramework.AdminConsole.Models.Organization", "Organization")
@@ -3250,6 +3404,8 @@ namespace Bit.SqliteMigrations.Migrations
{ {
b.Navigation("GroupAccessPolicies"); b.Navigation("GroupAccessPolicies");
b.Navigation("SecretVersions");
b.Navigation("ServiceAccountAccessPolicies"); b.Navigation("ServiceAccountAccessPolicies");
b.Navigation("UserAccessPolicies"); b.Navigation("UserAccessPolicies");

2
util/SqliteMigrations/Migrations/20251015172754_AddingNewFlagToLicenseForDisableSMAdsForUser.cs → util/SqliteMigrations/Migrations/20251126165445_AddingdisableSMAdsForUsersToLicense.cs
View File

@@ -5,7 +5,7 @@
namespace Bit.SqliteMigrations.Migrations; namespace Bit.SqliteMigrations.Migrations;
/// <inheritdoc /> /// <inheritdoc />
public partial class AddingNewFlagToLicenseForDisableSMAdsForUser : Migration public partial class AddingdisableSMAdsForUsersToLicense : Migration
{ {
/// <inheritdoc /> /// <inheritdoc />
protected override void Up(MigrationBuilder migrationBuilder) protected override void Up(MigrationBuilder migrationBuilder)

6
util/SqliteMigrations/Migrations/DatabaseContextModelSnapshot.cs
View File

@@ -105,9 +105,6 @@ namespace Bit.SqliteMigrations.Migrations
b.Property<DateTime>("CreationDate") b.Property<DateTime>("CreationDate")
.HasColumnType("TEXT"); .HasColumnType("TEXT");
b.Property<bool>("UseDisableSmAdsForUsers")
.HasColumnType("INTEGER");
b.Property<bool>("Enabled") b.Property<bool>("Enabled")
.HasColumnType("INTEGER"); .HasColumnType("INTEGER");
@@ -227,6 +224,9 @@ namespace Bit.SqliteMigrations.Migrations
b.Property<bool>("UseDirectory") b.Property<bool>("UseDirectory")
.HasColumnType("INTEGER"); .HasColumnType("INTEGER");
b.Property<bool>("UseDisableSmAdsForUsers")
.HasColumnType("INTEGER");
b.Property<bool>("UseEvents") b.Property<bool>("UseEvents")
.HasColumnType("INTEGER"); .HasColumnType("INTEGER");