mirror of
https://github.com/bitwarden/server.git
synced 2025-07-04 01:22:50 -05:00
Merge branch 'master' into feature/billing-obfuscation
This commit is contained in:
@ -322,6 +322,9 @@ namespace Bit.PostgresMigrations.Migrations
|
||||
b.Property<byte?>("DeviceType")
|
||||
.HasColumnType("smallint");
|
||||
|
||||
b.Property<string>("DomainName")
|
||||
.HasColumnType("text");
|
||||
|
||||
b.Property<Guid?>("GroupId")
|
||||
.HasColumnType("uuid");
|
||||
|
||||
@ -350,6 +353,12 @@ namespace Bit.PostgresMigrations.Migrations
|
||||
b.Property<Guid?>("ProviderUserId")
|
||||
.HasColumnType("uuid");
|
||||
|
||||
b.Property<Guid?>("SecretId")
|
||||
.HasColumnType("uuid");
|
||||
|
||||
b.Property<Guid?>("ServiceAccountId")
|
||||
.HasColumnType("uuid");
|
||||
|
||||
b.Property<byte?>("SystemUser")
|
||||
.HasColumnType("smallint");
|
||||
|
||||
@ -710,6 +719,43 @@ namespace Bit.PostgresMigrations.Migrations
|
||||
b.ToTable("OrganizationConnection", (string)null);
|
||||
});
|
||||
|
||||
modelBuilder.Entity("Bit.Infrastructure.EntityFramework.Models.OrganizationDomain", b =>
|
||||
{
|
||||
b.Property<Guid>("Id")
|
||||
.HasColumnType("uuid");
|
||||
|
||||
b.Property<DateTime>("CreationDate")
|
||||
.HasColumnType("timestamp with time zone");
|
||||
|
||||
b.Property<string>("DomainName")
|
||||
.HasMaxLength(255)
|
||||
.HasColumnType("character varying(255)");
|
||||
|
||||
b.Property<int>("JobRunCount")
|
||||
.HasColumnType("integer");
|
||||
|
||||
b.Property<DateTime?>("LastCheckedDate")
|
||||
.HasColumnType("timestamp with time zone");
|
||||
|
||||
b.Property<DateTime>("NextRunDate")
|
||||
.HasColumnType("timestamp with time zone");
|
||||
|
||||
b.Property<Guid>("OrganizationId")
|
||||
.HasColumnType("uuid");
|
||||
|
||||
b.Property<string>("Txt")
|
||||
.HasColumnType("text");
|
||||
|
||||
b.Property<DateTime?>("VerifiedDate")
|
||||
.HasColumnType("timestamp with time zone");
|
||||
|
||||
b.HasKey("Id");
|
||||
|
||||
b.HasIndex("OrganizationId");
|
||||
|
||||
b.ToTable("OrganizationDomain", (string)null);
|
||||
});
|
||||
|
||||
modelBuilder.Entity("Bit.Infrastructure.EntityFramework.Models.OrganizationSponsorship", b =>
|
||||
{
|
||||
b.Property<Guid>("Id")
|
||||
@ -1303,9 +1349,6 @@ namespace Bit.PostgresMigrations.Migrations
|
||||
.HasMaxLength(32)
|
||||
.HasColumnType("character varying(32)");
|
||||
|
||||
b.Property<bool>("UnknownDeviceVerificationEnabled")
|
||||
.HasColumnType("boolean");
|
||||
|
||||
b.Property<bool>("UsesKeyConnector")
|
||||
.HasColumnType("boolean");
|
||||
|
||||
@ -1794,6 +1837,17 @@ namespace Bit.PostgresMigrations.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")
|
||||
@ -2090,6 +2144,8 @@ namespace Bit.PostgresMigrations.Migrations
|
||||
|
||||
b.Navigation("Connections");
|
||||
|
||||
b.Navigation("Domains");
|
||||
|
||||
b.Navigation("Groups");
|
||||
|
||||
b.Navigation("OrganizationUsers");
|
||||
|
Reference in New Issue
Block a user