bitwarden/server
1
0
Fork 0
mirror of https://github.com/bitwarden/server synced 2025-12-19 09:43:25 +00:00
Code Issues Releases Wiki Activity

Merge branch 'main' into SM-1571-DisableSMAdsForUsers

Browse Source
This commit is contained in:
cd-bitwarden
2025-10-22 12:28:04 -04:00
committed by GitHub
parent 1f1b1037a4 c58f3d590c
commit f2388e6dc1
295 changed files with 42165 additions and 4881 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -218,6 +218,9 @@ namespace Bit.SqliteMigrations.Migrations
b.Property<bool>("UseApi")
.HasColumnType("INTEGER");
b.Property<bool>("UseAutomaticUserConfirmation")
.HasColumnType("INTEGER");
b.Property<bool>("UseCustomPermissions")
.HasColumnType("INTEGER");
@@ -1865,6 +1868,15 @@ namespace Bit.SqliteMigrations.Migrations
.HasMaxLength(50)
.HasColumnType("TEXT");
b.Property<string>("SecurityState")
.HasColumnType("TEXT");
b.Property<int?>("SecurityVersion")
.HasColumnType("INTEGER");
b.Property<string>("SignedPublicKey")
.HasColumnType("TEXT");
b.Property<long?>("Storage")
.HasColumnType("INTEGER");
@@ -1893,6 +1905,40 @@ namespace Bit.SqliteMigrations.Migrations
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 =>
{
b.Property<Guid>("Id")
@@ -2151,6 +2197,42 @@ namespace Bit.SqliteMigrations.Migrations
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 =>
{
b.Property<Guid>("Id")
@@ -2904,6 +2986,17 @@ namespace Bit.SqliteMigrations.Migrations
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 =>
{
b.HasOne("Bit.Infrastructure.EntityFramework.AdminConsole.Models.Organization", "Organization")
@@ -2976,6 +3069,31 @@ namespace Bit.SqliteMigrations.Migrations
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 =>
{
b.HasOne("Bit.Infrastructure.EntityFramework.AdminConsole.Models.Organization", "Organization")
@@ -3247,6 +3365,8 @@ namespace Bit.SqliteMigrations.Migrations
{
b.Navigation("GroupAccessPolicies");
b.Navigation("SecretVersions");
b.Navigation("ServiceAccountAccessPolicies");
b.Navigation("UserAccessPolicies");