mirror of
https://github.com/bitwarden/server.git
synced 2025-07-05 01:52:49 -05:00
merge branch 'master' into 'encrypted-string-perf'
This commit is contained in:
Justin Baur
@ -23,6 +23,62 @@ namespace Bit.PostgresMigrations.Migrations
|
||||
|
||||
NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
|
||||
|
||||
modelBuilder.Entity("Bit.Infrastructure.EntityFramework.Models.AuthRequest", b =>
|
||||
{
|
||||
b.Property<Guid>("Id")
|
||||
.HasColumnType("uuid");
|
||||
|
||||
b.Property<string>("AccessCode")
|
||||
.HasColumnType("text");
|
||||
|
||||
b.Property<DateTime?>("AuthenticationDate")
|
||||
.HasColumnType("timestamp with time zone");
|
||||
|
||||
b.Property<DateTime>("CreationDate")
|
||||
.HasColumnType("timestamp with time zone");
|
||||
|
||||
b.Property<string>("Key")
|
||||
.HasColumnType("text");
|
||||
|
||||
b.Property<string>("MasterPasswordHash")
|
||||
.HasColumnType("text");
|
||||
|
||||
b.Property<string>("PublicKey")
|
||||
.HasColumnType("text");
|
||||
|
||||
b.Property<string>("RequestDeviceIdentifier")
|
||||
.HasColumnType("text");
|
||||
|
||||
b.Property<byte>("RequestDeviceType")
|
||||
.HasColumnType("smallint");
|
||||
|
||||
b.Property<string>("RequestFingerprint")
|
||||
.HasColumnType("text");
|
||||
|
||||
b.Property<string>("RequestIpAddress")
|
||||
.HasColumnType("text");
|
||||
|
||||
b.Property<DateTime?>("ResponseDate")
|
||||
.HasColumnType("timestamp with time zone");
|
||||
|
||||
b.Property<Guid?>("ResponseDeviceId")
|
||||
.HasColumnType("uuid");
|
||||
|
||||
b.Property<byte>("Type")
|
||||
.HasColumnType("smallint");
|
||||
|
||||
b.Property<Guid>("UserId")
|
||||
.HasColumnType("uuid");
|
||||
|
||||
b.HasKey("Id");
|
||||
|
||||
b.HasIndex("ResponseDeviceId");
|
||||
|
||||
b.HasIndex("UserId");
|
||||
|
||||
b.ToTable("AuthRequest", (string)null);
|
||||
});
|
||||
|
||||
modelBuilder.Entity("Bit.Infrastructure.EntityFramework.Models.Cipher", b =>
|
||||
{
|
||||
b.Property<Guid>("Id")
|
||||
@ -32,13 +88,13 @@ namespace Bit.PostgresMigrations.Migrations
|
||||
.HasColumnType("text");
|
||||
|
||||
b.Property<DateTime>("CreationDate")
|
||||
.HasColumnType("timestamp without time zone");
|
||||
.HasColumnType("timestamp with time zone");
|
||||
|
||||
b.Property<string>("Data")
|
||||
.HasColumnType("text");
|
||||
|
||||
b.Property<DateTime?>("DeletedDate")
|
||||
.HasColumnType("timestamp without time zone");
|
||||
.HasColumnType("timestamp with time zone");
|
||||
|
||||
b.Property<string>("Favorites")
|
||||
.HasColumnType("text");
|
||||
@ -53,7 +109,7 @@ namespace Bit.PostgresMigrations.Migrations
|
||||
.HasColumnType("smallint");
|
||||
|
||||
b.Property<DateTime>("RevisionDate")
|
||||
.HasColumnType("timestamp without time zone");
|
||||
.HasColumnType("timestamp with time zone");
|
||||
|
||||
b.Property<byte>("Type")
|
||||
.HasColumnType("smallint");
|
||||
@ -76,7 +132,7 @@ namespace Bit.PostgresMigrations.Migrations
|
||||
.HasColumnType("uuid");
|
||||
|
||||
b.Property<DateTime>("CreationDate")
|
||||
.HasColumnType("timestamp without time zone");
|
||||
.HasColumnType("timestamp with time zone");
|
||||
|
||||
b.Property<string>("ExternalId")
|
||||
.HasMaxLength(300)
|
||||
@ -89,7 +145,7 @@ namespace Bit.PostgresMigrations.Migrations
|
||||
.HasColumnType("uuid");
|
||||
|
||||
b.Property<DateTime>("RevisionDate")
|
||||
.HasColumnType("timestamp without time zone");
|
||||
.HasColumnType("timestamp with time zone");
|
||||
|
||||
b.HasKey("Id");
|
||||
|
||||
@ -167,7 +223,7 @@ namespace Bit.PostgresMigrations.Migrations
|
||||
.HasColumnType("uuid");
|
||||
|
||||
b.Property<DateTime>("CreationDate")
|
||||
.HasColumnType("timestamp without time zone");
|
||||
.HasColumnType("timestamp with time zone");
|
||||
|
||||
b.Property<string>("Identifier")
|
||||
.HasMaxLength(50)
|
||||
@ -182,7 +238,7 @@ namespace Bit.PostgresMigrations.Migrations
|
||||
.HasColumnType("character varying(255)");
|
||||
|
||||
b.Property<DateTime>("RevisionDate")
|
||||
.HasColumnType("timestamp without time zone");
|
||||
.HasColumnType("timestamp with time zone");
|
||||
|
||||
b.Property<byte>("Type")
|
||||
.HasColumnType("smallint");
|
||||
@ -203,7 +259,7 @@ namespace Bit.PostgresMigrations.Migrations
|
||||
.HasColumnType("uuid");
|
||||
|
||||
b.Property<DateTime>("CreationDate")
|
||||
.HasColumnType("timestamp without time zone");
|
||||
.HasColumnType("timestamp with time zone");
|
||||
|
||||
b.Property<string>("Email")
|
||||
.HasMaxLength(256)
|
||||
@ -219,13 +275,13 @@ namespace Bit.PostgresMigrations.Migrations
|
||||
.HasColumnType("text");
|
||||
|
||||
b.Property<DateTime?>("LastNotificationDate")
|
||||
.HasColumnType("timestamp without time zone");
|
||||
.HasColumnType("timestamp with time zone");
|
||||
|
||||
b.Property<DateTime?>("RecoveryInitiatedDate")
|
||||
.HasColumnType("timestamp without time zone");
|
||||
.HasColumnType("timestamp with time zone");
|
||||
|
||||
b.Property<DateTime>("RevisionDate")
|
||||
.HasColumnType("timestamp without time zone");
|
||||
.HasColumnType("timestamp with time zone");
|
||||
|
||||
b.Property<byte>("Status")
|
||||
.HasColumnType("smallint");
|
||||
@ -260,7 +316,7 @@ namespace Bit.PostgresMigrations.Migrations
|
||||
.HasColumnType("uuid");
|
||||
|
||||
b.Property<DateTime>("Date")
|
||||
.HasColumnType("timestamp without time zone");
|
||||
.HasColumnType("timestamp with time zone");
|
||||
|
||||
b.Property<byte?>("DeviceType")
|
||||
.HasColumnType("smallint");
|
||||
@ -310,13 +366,13 @@ namespace Bit.PostgresMigrations.Migrations
|
||||
.HasColumnType("uuid");
|
||||
|
||||
b.Property<DateTime>("CreationDate")
|
||||
.HasColumnType("timestamp without time zone");
|
||||
.HasColumnType("timestamp with time zone");
|
||||
|
||||
b.Property<string>("Name")
|
||||
.HasColumnType("text");
|
||||
|
||||
b.Property<DateTime>("RevisionDate")
|
||||
.HasColumnType("timestamp without time zone");
|
||||
.HasColumnType("timestamp with time zone");
|
||||
|
||||
b.Property<Guid>("UserId")
|
||||
.HasColumnType("uuid");
|
||||
@ -339,10 +395,10 @@ namespace Bit.PostgresMigrations.Migrations
|
||||
.HasColumnType("character varying(200)");
|
||||
|
||||
b.Property<DateTime?>("ConsumedDate")
|
||||
.HasColumnType("timestamp without time zone");
|
||||
.HasColumnType("timestamp with time zone");
|
||||
|
||||
b.Property<DateTime>("CreationDate")
|
||||
.HasColumnType("timestamp without time zone");
|
||||
.HasColumnType("timestamp with time zone");
|
||||
|
||||
b.Property<string>("Data")
|
||||
.HasColumnType("text");
|
||||
@ -352,7 +408,7 @@ namespace Bit.PostgresMigrations.Migrations
|
||||
.HasColumnType("character varying(200)");
|
||||
|
||||
b.Property<DateTime?>("ExpirationDate")
|
||||
.HasColumnType("timestamp without time zone");
|
||||
.HasColumnType("timestamp with time zone");
|
||||
|
||||
b.Property<string>("SessionId")
|
||||
.HasMaxLength(100)
|
||||
@ -380,7 +436,7 @@ namespace Bit.PostgresMigrations.Migrations
|
||||
.HasColumnType("boolean");
|
||||
|
||||
b.Property<DateTime>("CreationDate")
|
||||
.HasColumnType("timestamp without time zone");
|
||||
.HasColumnType("timestamp with time zone");
|
||||
|
||||
b.Property<string>("ExternalId")
|
||||
.HasMaxLength(300)
|
||||
@ -394,7 +450,7 @@ namespace Bit.PostgresMigrations.Migrations
|
||||
.HasColumnType("uuid");
|
||||
|
||||
b.Property<DateTime>("RevisionDate")
|
||||
.HasColumnType("timestamp without time zone");
|
||||
.HasColumnType("timestamp with time zone");
|
||||
|
||||
b.HasKey("Id");
|
||||
|
||||
@ -429,7 +485,7 @@ namespace Bit.PostgresMigrations.Migrations
|
||||
.HasColumnType("uuid");
|
||||
|
||||
b.Property<DateTime>("CreationDate")
|
||||
.HasColumnType("timestamp without time zone");
|
||||
.HasColumnType("timestamp with time zone");
|
||||
|
||||
b.Property<string>("Email")
|
||||
.HasMaxLength(256)
|
||||
@ -481,13 +537,13 @@ namespace Bit.PostgresMigrations.Migrations
|
||||
.HasColumnType("character varying(30)");
|
||||
|
||||
b.Property<DateTime>("CreationDate")
|
||||
.HasColumnType("timestamp without time zone");
|
||||
.HasColumnType("timestamp with time zone");
|
||||
|
||||
b.Property<bool>("Enabled")
|
||||
.HasColumnType("boolean");
|
||||
|
||||
b.Property<DateTime?>("ExpirationDate")
|
||||
.HasColumnType("timestamp without time zone");
|
||||
.HasColumnType("timestamp with time zone");
|
||||
|
||||
b.Property<byte?>("Gateway")
|
||||
.HasColumnType("smallint");
|
||||
@ -523,7 +579,7 @@ namespace Bit.PostgresMigrations.Migrations
|
||||
.HasColumnType("character varying(50)");
|
||||
|
||||
b.Property<DateTime?>("OwnersNotifiedOfAutoscaling")
|
||||
.HasColumnType("timestamp without time zone");
|
||||
.HasColumnType("timestamp with time zone");
|
||||
|
||||
b.Property<string>("Plan")
|
||||
.HasMaxLength(50)
|
||||
@ -542,7 +598,7 @@ namespace Bit.PostgresMigrations.Migrations
|
||||
.HasColumnType("text");
|
||||
|
||||
b.Property<DateTime>("RevisionDate")
|
||||
.HasColumnType("timestamp without time zone");
|
||||
.HasColumnType("timestamp with time zone");
|
||||
|
||||
b.Property<int?>("Seats")
|
||||
.HasColumnType("integer");
|
||||
@ -610,7 +666,7 @@ namespace Bit.PostgresMigrations.Migrations
|
||||
.HasColumnType("uuid");
|
||||
|
||||
b.Property<DateTime>("RevisionDate")
|
||||
.HasColumnType("timestamp without time zone");
|
||||
.HasColumnType("timestamp with time zone");
|
||||
|
||||
b.Property<byte>("Type")
|
||||
.HasColumnType("smallint");
|
||||
@ -656,7 +712,7 @@ namespace Bit.PostgresMigrations.Migrations
|
||||
.HasColumnType("character varying(256)");
|
||||
|
||||
b.Property<DateTime?>("LastSyncDate")
|
||||
.HasColumnType("timestamp without time zone");
|
||||
.HasColumnType("timestamp with time zone");
|
||||
|
||||
b.Property<string>("OfferedToEmail")
|
||||
.HasMaxLength(256)
|
||||
@ -678,7 +734,7 @@ namespace Bit.PostgresMigrations.Migrations
|
||||
.HasColumnType("boolean");
|
||||
|
||||
b.Property<DateTime?>("ValidUntil")
|
||||
.HasColumnType("timestamp without time zone");
|
||||
.HasColumnType("timestamp with time zone");
|
||||
|
||||
b.HasKey("Id");
|
||||
|
||||
@ -698,7 +754,7 @@ namespace Bit.PostgresMigrations.Migrations
|
||||
.HasColumnType("boolean");
|
||||
|
||||
b.Property<DateTime>("CreationDate")
|
||||
.HasColumnType("timestamp without time zone");
|
||||
.HasColumnType("timestamp with time zone");
|
||||
|
||||
b.Property<string>("Email")
|
||||
.HasMaxLength(256)
|
||||
@ -721,7 +777,7 @@ namespace Bit.PostgresMigrations.Migrations
|
||||
.HasColumnType("text");
|
||||
|
||||
b.Property<DateTime>("RevisionDate")
|
||||
.HasColumnType("timestamp without time zone");
|
||||
.HasColumnType("timestamp with time zone");
|
||||
|
||||
b.Property<short>("Status")
|
||||
.HasColumnType("smallint");
|
||||
@ -747,7 +803,7 @@ namespace Bit.PostgresMigrations.Migrations
|
||||
.HasColumnType("uuid");
|
||||
|
||||
b.Property<DateTime>("CreationDate")
|
||||
.HasColumnType("timestamp without time zone");
|
||||
.HasColumnType("timestamp with time zone");
|
||||
|
||||
b.Property<string>("Data")
|
||||
.HasColumnType("text");
|
||||
@ -759,7 +815,7 @@ namespace Bit.PostgresMigrations.Migrations
|
||||
.HasColumnType("uuid");
|
||||
|
||||
b.Property<DateTime>("RevisionDate")
|
||||
.HasColumnType("timestamp without time zone");
|
||||
.HasColumnType("timestamp with time zone");
|
||||
|
||||
b.Property<byte>("Type")
|
||||
.HasColumnType("smallint");
|
||||
@ -798,7 +854,7 @@ namespace Bit.PostgresMigrations.Migrations
|
||||
.HasColumnType("text");
|
||||
|
||||
b.Property<DateTime>("CreationDate")
|
||||
.HasColumnType("timestamp without time zone");
|
||||
.HasColumnType("timestamp with time zone");
|
||||
|
||||
b.Property<bool>("Enabled")
|
||||
.HasColumnType("boolean");
|
||||
@ -807,7 +863,7 @@ namespace Bit.PostgresMigrations.Migrations
|
||||
.HasColumnType("text");
|
||||
|
||||
b.Property<DateTime>("RevisionDate")
|
||||
.HasColumnType("timestamp without time zone");
|
||||
.HasColumnType("timestamp with time zone");
|
||||
|
||||
b.Property<byte>("Status")
|
||||
.HasColumnType("smallint");
|
||||
@ -826,7 +882,7 @@ namespace Bit.PostgresMigrations.Migrations
|
||||
.HasColumnType("uuid");
|
||||
|
||||
b.Property<DateTime>("CreationDate")
|
||||
.HasColumnType("timestamp without time zone");
|
||||
.HasColumnType("timestamp with time zone");
|
||||
|
||||
b.Property<string>("Key")
|
||||
.HasColumnType("text");
|
||||
@ -838,7 +894,7 @@ namespace Bit.PostgresMigrations.Migrations
|
||||
.HasColumnType("uuid");
|
||||
|
||||
b.Property<DateTime>("RevisionDate")
|
||||
.HasColumnType("timestamp without time zone");
|
||||
.HasColumnType("timestamp with time zone");
|
||||
|
||||
b.Property<string>("Settings")
|
||||
.HasColumnType("text");
|
||||
@ -858,7 +914,7 @@ namespace Bit.PostgresMigrations.Migrations
|
||||
.HasColumnType("uuid");
|
||||
|
||||
b.Property<DateTime>("CreationDate")
|
||||
.HasColumnType("timestamp without time zone");
|
||||
.HasColumnType("timestamp with time zone");
|
||||
|
||||
b.Property<string>("Email")
|
||||
.HasColumnType("text");
|
||||
@ -873,7 +929,7 @@ namespace Bit.PostgresMigrations.Migrations
|
||||
.HasColumnType("uuid");
|
||||
|
||||
b.Property<DateTime>("RevisionDate")
|
||||
.HasColumnType("timestamp without time zone");
|
||||
.HasColumnType("timestamp with time zone");
|
||||
|
||||
b.Property<byte>("Status")
|
||||
.HasColumnType("smallint");
|
||||
@ -902,19 +958,19 @@ namespace Bit.PostgresMigrations.Migrations
|
||||
.HasColumnType("integer");
|
||||
|
||||
b.Property<DateTime>("CreationDate")
|
||||
.HasColumnType("timestamp without time zone");
|
||||
.HasColumnType("timestamp with time zone");
|
||||
|
||||
b.Property<string>("Data")
|
||||
.HasColumnType("text");
|
||||
|
||||
b.Property<DateTime>("DeletionDate")
|
||||
.HasColumnType("timestamp without time zone");
|
||||
.HasColumnType("timestamp with time zone");
|
||||
|
||||
b.Property<bool>("Disabled")
|
||||
.HasColumnType("boolean");
|
||||
|
||||
b.Property<DateTime?>("ExpirationDate")
|
||||
.HasColumnType("timestamp without time zone");
|
||||
.HasColumnType("timestamp with time zone");
|
||||
|
||||
b.Property<bool?>("HideEmail")
|
||||
.HasColumnType("boolean");
|
||||
@ -933,7 +989,7 @@ namespace Bit.PostgresMigrations.Migrations
|
||||
.HasColumnType("character varying(300)");
|
||||
|
||||
b.Property<DateTime>("RevisionDate")
|
||||
.HasColumnType("timestamp without time zone");
|
||||
.HasColumnType("timestamp with time zone");
|
||||
|
||||
b.Property<byte>("Type")
|
||||
.HasColumnType("smallint");
|
||||
@ -959,7 +1015,7 @@ namespace Bit.PostgresMigrations.Migrations
|
||||
NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<long>("Id"));
|
||||
|
||||
b.Property<DateTime>("CreationDate")
|
||||
.HasColumnType("timestamp without time zone");
|
||||
.HasColumnType("timestamp with time zone");
|
||||
|
||||
b.Property<string>("Data")
|
||||
.HasColumnType("text");
|
||||
@ -971,7 +1027,7 @@ namespace Bit.PostgresMigrations.Migrations
|
||||
.HasColumnType("uuid");
|
||||
|
||||
b.Property<DateTime>("RevisionDate")
|
||||
.HasColumnType("timestamp without time zone");
|
||||
.HasColumnType("timestamp with time zone");
|
||||
|
||||
b.HasKey("Id");
|
||||
|
||||
@ -989,7 +1045,7 @@ namespace Bit.PostgresMigrations.Migrations
|
||||
NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<long>("Id"));
|
||||
|
||||
b.Property<DateTime>("CreationDate")
|
||||
.HasColumnType("timestamp without time zone");
|
||||
.HasColumnType("timestamp with time zone");
|
||||
|
||||
b.Property<string>("ExternalId")
|
||||
.HasMaxLength(50)
|
||||
@ -1049,7 +1105,7 @@ namespace Bit.PostgresMigrations.Migrations
|
||||
.HasColumnType("numeric");
|
||||
|
||||
b.Property<DateTime>("CreationDate")
|
||||
.HasColumnType("timestamp without time zone");
|
||||
.HasColumnType("timestamp with time zone");
|
||||
|
||||
b.Property<string>("Details")
|
||||
.HasMaxLength(100)
|
||||
@ -1095,7 +1151,7 @@ namespace Bit.PostgresMigrations.Migrations
|
||||
.HasColumnType("uuid");
|
||||
|
||||
b.Property<DateTime>("AccountRevisionDate")
|
||||
.HasColumnType("timestamp without time zone");
|
||||
.HasColumnType("timestamp with time zone");
|
||||
|
||||
b.Property<string>("ApiKey")
|
||||
.IsRequired()
|
||||
@ -1103,7 +1159,7 @@ namespace Bit.PostgresMigrations.Migrations
|
||||
.HasColumnType("character varying(30)");
|
||||
|
||||
b.Property<DateTime>("CreationDate")
|
||||
.HasColumnType("timestamp without time zone");
|
||||
.HasColumnType("timestamp with time zone");
|
||||
|
||||
b.Property<string>("Culture")
|
||||
.HasMaxLength(10)
|
||||
@ -1151,7 +1207,7 @@ namespace Bit.PostgresMigrations.Migrations
|
||||
.HasColumnType("text");
|
||||
|
||||
b.Property<DateTime?>("LastFailedLoginDate")
|
||||
.HasColumnType("timestamp without time zone");
|
||||
.HasColumnType("timestamp with time zone");
|
||||
|
||||
b.Property<string>("LicenseKey")
|
||||
.HasMaxLength(100)
|
||||
@ -1176,7 +1232,7 @@ namespace Bit.PostgresMigrations.Migrations
|
||||
.HasColumnType("boolean");
|
||||
|
||||
b.Property<DateTime?>("PremiumExpirationDate")
|
||||
.HasColumnType("timestamp without time zone");
|
||||
.HasColumnType("timestamp with time zone");
|
||||
|
||||
b.Property<string>("PrivateKey")
|
||||
.HasColumnType("text");
|
||||
@ -1188,10 +1244,10 @@ namespace Bit.PostgresMigrations.Migrations
|
||||
.HasColumnType("text");
|
||||
|
||||
b.Property<DateTime?>("RenewalReminderDate")
|
||||
.HasColumnType("timestamp without time zone");
|
||||
.HasColumnType("timestamp with time zone");
|
||||
|
||||
b.Property<DateTime>("RevisionDate")
|
||||
.HasColumnType("timestamp without time zone");
|
||||
.HasColumnType("timestamp with time zone");
|
||||
|
||||
b.Property<string>("SecurityStamp")
|
||||
.IsRequired()
|
||||
@ -1219,6 +1275,23 @@ namespace Bit.PostgresMigrations.Migrations
|
||||
b.ToTable("User", (string)null);
|
||||
});
|
||||
|
||||
modelBuilder.Entity("Bit.Infrastructure.EntityFramework.Models.AuthRequest", b =>
|
||||
{
|
||||
b.HasOne("Bit.Infrastructure.EntityFramework.Models.Device", "ResponseDevice")
|
||||
.WithMany()
|
||||
.HasForeignKey("ResponseDeviceId");
|
||||
|
||||
b.HasOne("Bit.Infrastructure.EntityFramework.Models.User", "User")
|
||||
.WithMany()
|
||||
.HasForeignKey("UserId")
|
||||
.OnDelete(DeleteBehavior.Cascade)
|
||||
.IsRequired();
|
||||
|
||||
b.Navigation("ResponseDevice");
|
||||
|
||||
b.Navigation("User");
|
||||
});
|
||||
|
||||
modelBuilder.Entity("Bit.Infrastructure.EntityFramework.Models.Cipher", b =>
|
||||
{
|
||||
b.HasOne("Bit.Infrastructure.EntityFramework.Models.Organization", "Organization")
|
||||
|
||||
Reference in New Issue
Block a user