mirror of
https://github.com/bitwarden/server.git
synced 2025-07-03 17:12:49 -05:00
Merge branch 'master' into feature/billing-obfuscation
This commit is contained in:
@ -316,6 +316,9 @@ namespace Bit.SqliteMigrations.Migrations
|
||||
b.Property<byte?>("DeviceType")
|
||||
.HasColumnType("INTEGER");
|
||||
|
||||
b.Property<string>("DomainName")
|
||||
.HasColumnType("TEXT");
|
||||
|
||||
b.Property<Guid?>("GroupId")
|
||||
.HasColumnType("TEXT");
|
||||
|
||||
@ -709,6 +712,43 @@ namespace Bit.SqliteMigrations.Migrations
|
||||
b.ToTable("OrganizationConnection", (string)null);
|
||||
});
|
||||
|
||||
modelBuilder.Entity("Bit.Infrastructure.EntityFramework.Models.OrganizationDomain", b =>
|
||||
{
|
||||
b.Property<Guid>("Id")
|
||||
.HasColumnType("TEXT");
|
||||
|
||||
b.Property<DateTime>("CreationDate")
|
||||
.HasColumnType("TEXT");
|
||||
|
||||
b.Property<string>("DomainName")
|
||||
.HasMaxLength(255)
|
||||
.HasColumnType("TEXT");
|
||||
|
||||
b.Property<int>("JobRunCount")
|
||||
.HasColumnType("INTEGER");
|
||||
|
||||
b.Property<DateTime?>("LastCheckedDate")
|
||||
.HasColumnType("TEXT");
|
||||
|
||||
b.Property<DateTime>("NextRunDate")
|
||||
.HasColumnType("TEXT");
|
||||
|
||||
b.Property<Guid>("OrganizationId")
|
||||
.HasColumnType("TEXT");
|
||||
|
||||
b.Property<string>("Txt")
|
||||
.HasColumnType("TEXT");
|
||||
|
||||
b.Property<DateTime?>("VerifiedDate")
|
||||
.HasColumnType("TEXT");
|
||||
|
||||
b.HasKey("Id");
|
||||
|
||||
b.HasIndex("OrganizationId");
|
||||
|
||||
b.ToTable("OrganizationDomain", (string)null);
|
||||
});
|
||||
|
||||
modelBuilder.Entity("Bit.Infrastructure.EntityFramework.Models.OrganizationSponsorship", b =>
|
||||
{
|
||||
b.Property<Guid>("Id")
|
||||
@ -1628,7 +1668,7 @@ namespace Bit.SqliteMigrations.Migrations
|
||||
modelBuilder.Entity("Bit.Infrastructure.EntityFramework.Models.Collection", b =>
|
||||
{
|
||||
b.HasOne("Bit.Infrastructure.EntityFramework.Models.Organization", "Organization")
|
||||
.WithMany()
|
||||
.WithMany("Collections")
|
||||
.HasForeignKey("OrganizationId")
|
||||
.OnDelete(DeleteBehavior.Cascade)
|
||||
.IsRequired();
|
||||
@ -1784,6 +1824,17 @@ namespace Bit.SqliteMigrations.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")
|
||||
@ -2078,8 +2129,12 @@ namespace Bit.SqliteMigrations.Migrations
|
||||
|
||||
b.Navigation("Ciphers");
|
||||
|
||||
b.Navigation("Collections");
|
||||
|
||||
b.Navigation("Connections");
|
||||
|
||||
b.Navigation("Domains");
|
||||
|
||||
b.Navigation("Groups");
|
||||
|
||||
b.Navigation("OrganizationUsers");
|
||||
|
Reference in New Issue
Block a user