mirror of
https://github.com/bitwarden/server.git
synced 2025-07-04 17:42:49 -05:00
Merge branch 'master' into feature/billing-obfuscation
This commit is contained in:
@ -318,6 +318,9 @@ namespace Bit.MySqlMigrations.Migrations
|
||||
b.Property<byte?>("DeviceType")
|
||||
.HasColumnType("tinyint unsigned");
|
||||
|
||||
b.Property<string>("DomainName")
|
||||
.HasColumnType("longtext");
|
||||
|
||||
b.Property<Guid?>("GroupId")
|
||||
.HasColumnType("char(36)");
|
||||
|
||||
@ -346,6 +349,12 @@ namespace Bit.MySqlMigrations.Migrations
|
||||
b.Property<Guid?>("ProviderUserId")
|
||||
.HasColumnType("char(36)");
|
||||
|
||||
b.Property<Guid?>("SecretId")
|
||||
.HasColumnType("char(36)");
|
||||
|
||||
b.Property<Guid?>("ServiceAccountId")
|
||||
.HasColumnType("char(36)");
|
||||
|
||||
b.Property<byte?>("SystemUser")
|
||||
.HasColumnType("tinyint unsigned");
|
||||
|
||||
@ -705,6 +714,43 @@ namespace Bit.MySqlMigrations.Migrations
|
||||
b.ToTable("OrganizationConnection", (string)null);
|
||||
});
|
||||
|
||||
modelBuilder.Entity("Bit.Infrastructure.EntityFramework.Models.OrganizationDomain", b =>
|
||||
{
|
||||
b.Property<Guid>("Id")
|
||||
.HasColumnType("char(36)");
|
||||
|
||||
b.Property<DateTime>("CreationDate")
|
||||
.HasColumnType("datetime(6)");
|
||||
|
||||
b.Property<string>("DomainName")
|
||||
.HasMaxLength(255)
|
||||
.HasColumnType("varchar(255)");
|
||||
|
||||
b.Property<int>("JobRunCount")
|
||||
.HasColumnType("int");
|
||||
|
||||
b.Property<DateTime?>("LastCheckedDate")
|
||||
.HasColumnType("datetime(6)");
|
||||
|
||||
b.Property<DateTime>("NextRunDate")
|
||||
.HasColumnType("datetime(6)");
|
||||
|
||||
b.Property<Guid>("OrganizationId")
|
||||
.HasColumnType("char(36)");
|
||||
|
||||
b.Property<string>("Txt")
|
||||
.HasColumnType("longtext");
|
||||
|
||||
b.Property<DateTime?>("VerifiedDate")
|
||||
.HasColumnType("datetime(6)");
|
||||
|
||||
b.HasKey("Id");
|
||||
|
||||
b.HasIndex("OrganizationId");
|
||||
|
||||
b.ToTable("OrganizationDomain", (string)null);
|
||||
});
|
||||
|
||||
modelBuilder.Entity("Bit.Infrastructure.EntityFramework.Models.OrganizationSponsorship", b =>
|
||||
{
|
||||
b.Property<Guid>("Id")
|
||||
@ -1292,9 +1338,6 @@ namespace Bit.MySqlMigrations.Migrations
|
||||
.HasMaxLength(32)
|
||||
.HasColumnType("varchar(32)");
|
||||
|
||||
b.Property<bool>("UnknownDeviceVerificationEnabled")
|
||||
.HasColumnType("tinyint(1)");
|
||||
|
||||
b.Property<bool>("UsesKeyConnector")
|
||||
.HasColumnType("tinyint(1)");
|
||||
|
||||
@ -1783,6 +1826,17 @@ namespace Bit.MySqlMigrations.Migrations
|
||||
b.Navigation("Organization");
|
||||
});
|
||||
|
||||
modelBuilder.Entity("Bit.Infrastructure.EntityFramework.Models.OrganizationDomain", b =>
|
||||
{
|
||||
b.HasOne("Bit.Infrastructure.EntityFramework.Models.Organization", "Organization")
|
||||
.WithMany("Domains")
|
||||
.HasForeignKey("OrganizationId")
|
||||
.OnDelete(DeleteBehavior.Cascade)
|
||||
.IsRequired();
|
||||
|
||||
b.Navigation("Organization");
|
||||
});
|
||||
|
||||
modelBuilder.Entity("Bit.Infrastructure.EntityFramework.Models.OrganizationSponsorship", b =>
|
||||
{
|
||||
b.HasOne("Bit.Infrastructure.EntityFramework.Models.Organization", "SponsoredOrganization")
|
||||
@ -2079,6 +2133,8 @@ namespace Bit.MySqlMigrations.Migrations
|
||||
|
||||
b.Navigation("Connections");
|
||||
|
||||
b.Navigation("Domains");
|
||||
|
||||
b.Navigation("Groups");
|
||||
|
||||
b.Navigation("OrganizationUsers");
|
||||
|
Reference in New Issue
Block a user