bitwarden/server
1
0
Fork 0
mirror of https://github.com/bitwarden/server synced 2026-01-05 01:53:17 +00:00
Code Issues Releases Wiki Activity

Merge branch 'EC-427-create-provider-types-msp-reseller-server-database' of https://github.com/bitwarden/server into EC-427-create-provider-types-msp-reseller-server-database

Browse Source
This commit is contained in:
Rui Tome
2023-01-12 15:30:50 +00:00
parent 36d1fa07db e5595a9d05
commit 63f329a3d2
151 changed files with 8073 additions and 4694 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
util/Migrator/DbMigrator.cs
View File

@@ -1,8 +1,8 @@
using System.Data;
using System.Data.SqlClient;
using System.Reflection;
using Bit.Core;
using DbUp;
using Microsoft.Data.SqlClient;
using Microsoft.Extensions.Logging;
namespace Bit.Migrator;

226
util/Migrator/DbScripts/2022-09-20_00_AvatarColor.sql Normal file
View File

@@ -0,0 +1,226 @@
--Add column
IF COL_LENGTH('[dbo].[User]', 'AvatarColor') IS NULL
BEGIN
ALTER TABLE [dbo].[User] ADD [AvatarColor] VARCHAR (7) NULL;
END
GO
-- Recreate VIEW UserView
CREATE OR ALTER VIEW [dbo].[UserView]
AS
SELECT
*
FROM
[dbo].[User]
GO
-- Recreate procedure User_Update
CREATE OR ALTER PROCEDURE [dbo].[User_Update]
@Id UNIQUEIDENTIFIER,
@Name NVARCHAR(50),
@Email NVARCHAR(256),
@EmailVerified BIT,
@MasterPassword NVARCHAR(300),
@MasterPasswordHint NVARCHAR(50),
@Culture NVARCHAR(10),
@SecurityStamp NVARCHAR(50),
@TwoFactorProviders NVARCHAR(MAX),
@TwoFactorRecoveryCode NVARCHAR(32),
@EquivalentDomains NVARCHAR(MAX),
@ExcludedGlobalEquivalentDomains NVARCHAR(MAX),
@AccountRevisionDate DATETIME2(7),
@Key NVARCHAR(MAX),
@PublicKey NVARCHAR(MAX),
@PrivateKey NVARCHAR(MAX),
@Premium BIT,
@PremiumExpirationDate DATETIME2(7),
@RenewalReminderDate DATETIME2(7),
@Storage BIGINT,
@MaxStorageGb SMALLINT,
@Gateway TINYINT,
@GatewayCustomerId VARCHAR(50),
@GatewaySubscriptionId VARCHAR(50),
@ReferenceData VARCHAR(MAX),
@LicenseKey VARCHAR(100),
@Kdf TINYINT,
@KdfIterations INT,
@CreationDate DATETIME2(7),
@RevisionDate DATETIME2(7),
@ApiKey VARCHAR(30),
@ForcePasswordReset BIT = 0,
@UsesKeyConnector BIT = 0,
@FailedLoginCount INT,
@LastFailedLoginDate DATETIME2(7),
@UnknownDeviceVerificationEnabled BIT = 1,
@AvatarColor VARCHAR(7)
AS
BEGIN
SET NOCOUNT ON
UPDATE
[dbo].[User]
SET
[Name] = @Name,
[Email] = @Email,
[EmailVerified] = @EmailVerified,
[MasterPassword] = @MasterPassword,
[MasterPasswordHint] = @MasterPasswordHint,
[Culture] = @Culture,
[SecurityStamp] = @SecurityStamp,
[TwoFactorProviders] = @TwoFactorProviders,
[TwoFactorRecoveryCode] = @TwoFactorRecoveryCode,
[EquivalentDomains] = @EquivalentDomains,
[ExcludedGlobalEquivalentDomains] = @ExcludedGlobalEquivalentDomains,
[AccountRevisionDate] = @AccountRevisionDate,
[Key] = @Key,
[PublicKey] = @PublicKey,
[PrivateKey] = @PrivateKey,
[Premium] = @Premium,
[PremiumExpirationDate] = @PremiumExpirationDate,
[RenewalReminderDate] = @RenewalReminderDate,
[Storage] = @Storage,
[MaxStorageGb] = @MaxStorageGb,
[Gateway] = @Gateway,
[GatewayCustomerId] = @GatewayCustomerId,
[GatewaySubscriptionId] = @GatewaySubscriptionId,
[ReferenceData] = @ReferenceData,
[LicenseKey] = @LicenseKey,
[Kdf] = @Kdf,
[KdfIterations] = @KdfIterations,
[CreationDate] = @CreationDate,
[RevisionDate] = @RevisionDate,
[ApiKey] = @ApiKey,
[ForcePasswordReset] = @ForcePasswordReset,
[UsesKeyConnector] = @UsesKeyConnector,
[FailedLoginCount] = @FailedLoginCount,
[LastFailedLoginDate] = @LastFailedLoginDate,
[UnknownDeviceVerificationEnabled] = @UnknownDeviceVerificationEnabled,
[AvatarColor] = @AvatarColor
WHERE
[Id] = @Id
END
GO
CREATE OR ALTER PROCEDURE [dbo].[User_Create]
@Id UNIQUEIDENTIFIER OUTPUT,
@Name NVARCHAR(50),
@Email NVARCHAR(256),
@EmailVerified BIT,
@MasterPassword NVARCHAR(300),
@MasterPasswordHint NVARCHAR(50),
@Culture NVARCHAR(10),
@SecurityStamp NVARCHAR(50),
@TwoFactorProviders NVARCHAR(MAX),
@TwoFactorRecoveryCode NVARCHAR(32),
@EquivalentDomains NVARCHAR(MAX),
@ExcludedGlobalEquivalentDomains NVARCHAR(MAX),
@AccountRevisionDate DATETIME2(7),
@Key NVARCHAR(MAX),
@PublicKey NVARCHAR(MAX),
@PrivateKey NVARCHAR(MAX),
@Premium BIT,
@PremiumExpirationDate DATETIME2(7),
@RenewalReminderDate DATETIME2(7),
@Storage BIGINT,
@MaxStorageGb SMALLINT,
@Gateway TINYINT,
@GatewayCustomerId VARCHAR(50),
@GatewaySubscriptionId VARCHAR(50),
@ReferenceData VARCHAR(MAX),
@LicenseKey VARCHAR(100),
@Kdf TINYINT,
@KdfIterations INT,
@CreationDate DATETIME2(7),
@RevisionDate DATETIME2(7),
@ApiKey VARCHAR(30),
@ForcePasswordReset BIT = 0,
@UsesKeyConnector BIT = 0,
@FailedLoginCount INT = 0,
@LastFailedLoginDate DATETIME2(7),
@UnknownDeviceVerificationEnabled BIT = 1,
@AvatarColor VARCHAR(7) = NULL
AS
BEGIN
SET NOCOUNT ON
INSERT INTO [dbo].[User]
(
[Id],
[Name],
[Email],
[EmailVerified],
[MasterPassword],
[MasterPasswordHint],
[Culture],
[SecurityStamp],
[TwoFactorProviders],
[TwoFactorRecoveryCode],
[EquivalentDomains],
[ExcludedGlobalEquivalentDomains],
[AccountRevisionDate],
[Key],
[PublicKey],
[PrivateKey],
[Premium],
[PremiumExpirationDate],
[RenewalReminderDate],
[Storage],
[MaxStorageGb],
[Gateway],
[GatewayCustomerId],
[GatewaySubscriptionId],
[ReferenceData],
[LicenseKey],
[Kdf],
[KdfIterations],
[CreationDate],
[RevisionDate],
[ApiKey],
[ForcePasswordReset],
[UsesKeyConnector],
[FailedLoginCount],
[LastFailedLoginDate],
[UnknownDeviceVerificationEnabled],
[AvatarColor]
)
VALUES
(
@Id,
@Name,
@Email,
@EmailVerified,
@MasterPassword,
@MasterPasswordHint,
@Culture,
@SecurityStamp,
@TwoFactorProviders,
@TwoFactorRecoveryCode,
@EquivalentDomains,
@ExcludedGlobalEquivalentDomains,
@AccountRevisionDate,
@Key,
@PublicKey,
@PrivateKey,
@Premium,
@PremiumExpirationDate,
@RenewalReminderDate,
@Storage,
@MaxStorageGb,
@Gateway,
@GatewayCustomerId,
@GatewaySubscriptionId,
@ReferenceData,
@LicenseKey,
@Kdf,
@KdfIterations,
@CreationDate,
@RevisionDate,
@ApiKey,
@ForcePasswordReset,
@UsesKeyConnector,
@FailedLoginCount,
@LastFailedLoginDate,
@UnknownDeviceVerificationEnabled,
@AvatarColor
)
END

2
util/Migrator/SqlServerDbMigrator.cs
View File

@@ -1,10 +1,10 @@
using System.Data;
using System.Data.SqlClient;
using System.Reflection;
using Bit.Core;
using Bit.Core.Settings;
using Bit.Core.Utilities;
using DbUp;
using Microsoft.Data.SqlClient;
using Microsoft.Extensions.Logging;
namespace Bit.Migrator;

246
util/Migrator/packages.lock.json
View File

@@ -46,23 +46,6 @@
"StackExchange.Redis": "2.5.43"
}
},
"AutoMapper": {
"type": "Transitive",
"resolved": "11.0.0",
"contentHash": "+596AnKykYCk9RxXCEF4GYuapSebQtFVvIA1oVG1rrRkCLAC7AkWehJ0brCfYUbdDW3v1H/p0W3hob7JoXGjMw==",
"dependencies": {
"Microsoft.CSharp": "4.7.0"
}
},
"AutoMapper.Extensions.Microsoft.DependencyInjection": {
"type": "Transitive",
"resolved": "11.0.0",
"contentHash": "0asw5WxdCFh2OTi9Gv+oKyH9SzxwYQSnO8TV5Dd0GggovILzJW4UimP26JAcxc3yB5NnC5urooZ1BBs8ElpiBw==",
"dependencies": {
"AutoMapper": "11.0.0",
"Microsoft.Extensions.Options": "6.0.0"
}
},
"AWSSDK.Core": {
"type": "Transitive",
"resolved": "3.7.10.11",
@@ -86,8 +69,8 @@
},
"Azure.Core": {
"type": "Transitive",
"resolved": "1.22.0",
"contentHash": "ze/xRCHSSDe5TIk5vBDbVrauW1EN7UIbnBvIBfMH8KSt/I9+/7yPAjTBDgNBk0IwG6WBV+BBHp4IUtS/PGAQwQ==",
"resolved": "1.24.0",
"contentHash": "+/qI1j2oU1S4/nvxb2k/wDsol00iGf1AyJX5g3epV7eOpQEP/2xcgh/cxgKMeFgn3U2fmgSiBnQZdkV+l5y0Uw==",
"dependencies": {
"Microsoft.Bcl.AsyncInterfaces": "1.1.1",
"System.Diagnostics.DiagnosticSource": "4.6.0",
@@ -110,16 +93,16 @@
},
"Azure.Identity": {
"type": "Transitive",
"resolved": "1.3.0",
"contentHash": "l1SYfZKOFBuUFG7C2SWHmJcrQQaiXgBdVCycx4vcZQkC6efDVt7mzZ5pfJAFEJDBUq7mjRQ0RPq9ZDGdSswqMg==",
"resolved": "1.6.0",
"contentHash": "EycyMsb6rD2PK9P0SyibFfEhvWWttdrYhyPF4f41uzdB/44yQlV+2Wehxyg489Rj6gbPvSPgbKq0xsHJBhipZA==",
"dependencies": {
"Azure.Core": "1.6.0",
"Microsoft.Identity.Client": "4.22.0",
"Microsoft.Identity.Client.Extensions.Msal": "2.16.5",
"System.Memory": "4.5.3",
"System.Security.Cryptography.ProtectedData": "4.5.0",
"System.Text.Json": "4.6.0",
"System.Threading.Tasks.Extensions": "4.5.2"
"Azure.Core": "1.24.0",
"Microsoft.Identity.Client": "4.39.0",
"Microsoft.Identity.Client.Extensions.Msal": "2.19.3",
"System.Memory": "4.5.4",
"System.Security.Cryptography.ProtectedData": "4.7.0",
"System.Text.Json": "4.7.2",
"System.Threading.Tasks.Extensions": "4.5.4"
}
},
"Azure.Storage.Blobs": {
@@ -263,23 +246,6 @@
"Microsoft.NETCore.Platforms": "1.0.1"
}
},
"linq2db": {
"type": "Transitive",
"resolved": "3.7.0",
"contentHash": "iDous2TbSchtALnTLNXQnprmNZF4GrXas0MBz6ZHWkSdilSJjcf26qFM7Qf98Mny0OXHEmNXG/jtIDhoVJ5KmQ==",
"dependencies": {
"System.ComponentModel.Annotations": "4.7.0"
}
},
"linq2db.EntityFrameworkCore": {
"type": "Transitive",
"resolved": "6.7.1",
"contentHash": "Bb25vUDyFw3nKnf7KY+bauwKGD0hdM7/syodS+IgHdWlcbH9g7tHxYmMa9+DNuL0yy6DFvP6Q3BkClm7zbQdAw==",
"dependencies": {
"Microsoft.EntityFrameworkCore.Relational": "6.0.0",
"linq2db": "3.7.0"
}
},
"MailKit": {
"type": "Transitive",
"resolved": "3.2.0",
@@ -482,14 +448,15 @@
},
"Microsoft.Data.SqlClient": {
"type": "Transitive",
"resolved": "4.1.0",
"contentHash": "o/sIRlcKEcI9vg5z9USqJ/VCxtUUBYEOXYr4TrkMNu+gGBh0KfUi06Jqpe+xZgeoxcqYruV9dLOn046uFA4vHQ==",
"resolved": "5.0.1",
"contentHash": "uu8dfrsx081cSbEevWuZAvqdmANDGJkbLBL2G3j0LAZxX1Oy8RCVAaC4Lcuak6jNicWP6CWvHqBTIEmQNSxQlw==",
"dependencies": {
"Azure.Identity": "1.3.0",
"Microsoft.Data.SqlClient.SNI.runtime": "4.0.0",
"Microsoft.Identity.Client": "4.22.0",
"Microsoft.IdentityModel.JsonWebTokens": "6.8.0",
"Microsoft.IdentityModel.Protocols.OpenIdConnect": "6.8.0",
"Azure.Identity": "1.6.0",
"Microsoft.Data.SqlClient.SNI.runtime": "5.0.1",
"Microsoft.Identity.Client": "4.45.0",
"Microsoft.IdentityModel.JsonWebTokens": "6.21.0",
"Microsoft.IdentityModel.Protocols.OpenIdConnect": "6.21.0",
"Microsoft.SqlServer.Server": "1.0.0",
"Microsoft.Win32.Registry": "5.0.0",
"System.Buffers": "4.5.1",
"System.Configuration.ConfigurationManager": "5.0.0",
@@ -505,41 +472,8 @@
},
"Microsoft.Data.SqlClient.SNI.runtime": {
"type": "Transitive",
"resolved": "4.0.0",
"contentHash": "wtLlRwQX7YoBUYm25xBjJ3UsuLgycme1xXqDn8t3S5kPCWiZrx8uOkyZHLKzH4kkCiQ9m2/J5JeCKNRbZNn3Qg=="
},
"Microsoft.EntityFrameworkCore": {
"type": "Transitive",
"resolved": "6.0.4",
"contentHash": "gTh3SJsF5WNjEmG32kYc3U4tjeTIv55QOrwHAJcF/xtrIVMteDHMArGC35N0dw86WFY0v8yFkKYKOIOln4jkfQ==",
"dependencies": {
"Microsoft.EntityFrameworkCore.Abstractions": "6.0.4",
"Microsoft.EntityFrameworkCore.Analyzers": "6.0.4",
"Microsoft.Extensions.Caching.Memory": "6.0.1",
"Microsoft.Extensions.DependencyInjection": "6.0.0",
"Microsoft.Extensions.Logging": "6.0.0",
"System.Collections.Immutable": "6.0.0",
"System.Diagnostics.DiagnosticSource": "6.0.0"
}
},
"Microsoft.EntityFrameworkCore.Abstractions": {
"type": "Transitive",
"resolved": "6.0.4",
"contentHash": "jycTQF0FUJp10cGWBmtsyFhQNeISU9CltDRKCaNiX4QRSEFzgRgaFN4vAFK0T+G5etmXugyddijE4NWCGtgznQ=="
},
"Microsoft.EntityFrameworkCore.Analyzers": {
"type": "Transitive",
"resolved": "6.0.4",
"contentHash": "t12WodVyGGP2CuLo7R1qwcawHY5zlg+GiQzvkceZpsjcFJVyTFFBFDPg1isBtzurLzWsl+G3z5fVXeic90mPxg=="
},
"Microsoft.EntityFrameworkCore.Relational": {
"type": "Transitive",
"resolved": "6.0.4",
"contentHash": "E867NbEXYRTElBF5ff+1AN5Awa1jkORy/Rrm0ueibaTAV5uw89LsLoH6yTe+b9urZTWMHtLfGd1RDdNjk8+KzA==",
"dependencies": {
"Microsoft.EntityFrameworkCore": "6.0.4",
"Microsoft.Extensions.Configuration.Abstractions": "6.0.0"
}
"resolved": "5.0.1",
"contentHash": "y0X5MxiNdbITJYoafJ2ruaX6hqO0twpCGR/ipiDOe85JKLU8WL4TuAQfDe5qtt3bND5Je26HnrarLSAMMnVTNg=="
},
"Microsoft.Extensions.Caching.Abstractions": {
"type": "Transitive",
@@ -551,14 +485,13 @@
},
"Microsoft.Extensions.Caching.Memory": {
"type": "Transitive",
"resolved": "6.0.1",
"contentHash": "B4y+Cev05eMcjf1na0v9gza6GUtahXbtY1JCypIgx3B4Ea/KAgsWyXEmW4q6zMbmTMtKzmPVk09rvFJirvMwTg==",
"resolved": "3.1.8",
"contentHash": "u04q7+tgc8l6pQ5HOcr6scgapkQQHnrhpGoCaaAZd24R36/NxGsGxuhSmhHOrQx9CsBLe2CVBN/4CkLlxtnnXw==",
"dependencies": {
"Microsoft.Extensions.Caching.Abstractions": "6.0.0",
"Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0",
"Microsoft.Extensions.Logging.Abstractions": "6.0.0",
"Microsoft.Extensions.Options": "6.0.0",
"Microsoft.Extensions.Primitives": "6.0.0"
"Microsoft.Extensions.Caching.Abstractions": "3.1.8",
"Microsoft.Extensions.DependencyInjection.Abstractions": "3.1.8",
"Microsoft.Extensions.Logging.Abstractions": "3.1.8",
"Microsoft.Extensions.Options": "3.1.8"
}
},
"Microsoft.Extensions.Caching.StackExchangeRedis": {
@@ -751,18 +684,26 @@
},
"Microsoft.Identity.Client": {
"type": "Transitive",
"resolved": "4.22.0",
"contentHash": "GlamU9rs8cSVIx9WSGv5QKpt66KkE+ImxNa/wNZZUJ3knt3PM98T9sOY8B7NcEfhw7NoxU2/0TSOcmnRSJQgqw=="
"resolved": "4.45.0",
"contentHash": "ircobISCLWbtE5eEoLKU+ldfZ8O41vg4lcy38KRj/znH17jvBiAl8oxcyNp89CsuqE3onxIpn21Ca7riyDDrRw==",
"dependencies": {
"Microsoft.IdentityModel.Abstractions": "6.18.0"
}
},
"Microsoft.Identity.Client.Extensions.Msal": {
"type": "Transitive",
"resolved": "2.16.5",
"contentHash": "VlGUZEpF8KP/GCfFI59sdE0WA0o9quqwM1YQY0dSp6jpGy5EOBkureaybLfpwCuYUUjQbLkN2p7neUIcQCfbzA==",
"resolved": "2.19.3",
"contentHash": "zVVZjn8aW7W79rC1crioDgdOwaFTQorsSO6RgVlDDjc7MvbEGz071wSNrjVhzR0CdQn6Sefx7Abf1o7vasmrLg==",
"dependencies": {
"Microsoft.Identity.Client": "4.22.0",
"Microsoft.Identity.Client": "4.38.0",
"System.Security.Cryptography.ProtectedData": "4.5.0"
}
},
"Microsoft.IdentityModel.Abstractions": {
"type": "Transitive",
"resolved": "6.21.0",
"contentHash": "XeE6LQtD719Qs2IG7HDi1TSw9LIkDbJ33xFiOBoHbApVw/8GpIBCbW+t7RwOjErUDyXZvjhZliwRkkLb8Z1uzg=="
},
"Microsoft.IdentityModel.Clients.ActiveDirectory": {
"type": "Transitive",
"resolved": "4.3.0",
@@ -778,42 +719,45 @@
},
"Microsoft.IdentityModel.JsonWebTokens": {
"type": "Transitive",
"resolved": "6.10.0",
"contentHash": "0qjS31rN1MQTc46tAYbzmMTSRfdV5ndZxSjYxIGqKSidd4wpNJfNII/pdhU5Fx8olarQoKL9lqqYw4yNOIwT0Q==",
"resolved": "6.21.0",
"contentHash": "d3h1/BaMeylKTkdP6XwRCxuOoDJZ44V9xaXr6gl5QxmpnZGdoK3bySo3OQN8ehRLJHShb94ElLUvoXyglQtgAw==",
"dependencies": {
"Microsoft.IdentityModel.Tokens": "6.10.0"
"Microsoft.IdentityModel.Tokens": "6.21.0"
}
},
"Microsoft.IdentityModel.Logging": {
"type": "Transitive",
"resolved": "6.10.0",
"contentHash": "zbcwV6esnNzhZZ/VP87dji6VrUBLB5rxnZBkDMqNYpyG+nrBnBsbm4PUYLCBMUflHCM9EMLDG0rLnqqT+l0ldA=="
"resolved": "6.21.0",
"contentHash": "tuEhHIQwvBEhMf8I50hy8FHmRSUkffDFP5EdLsSDV4qRcl2wvOPkQxYqEzWkh+ytW6sbdJGEXElGhmhDfAxAKg==",
"dependencies": {
"Microsoft.IdentityModel.Abstractions": "6.21.0"
}
},
"Microsoft.IdentityModel.Protocols": {
"type": "Transitive",
"resolved": "6.10.0",
"contentHash": "DFyXD0xylP+DknCT3hzJ7q/Q5qRNu0hO/gCU90O0ATdR0twZmlcuY9RNYaaDofXKVbzcShYNCFCGle2G/o8mkg==",
"resolved": "6.21.0",
"contentHash": "0FqY5cTLQKtHrClzHEI+QxJl8OBT2vUiEQQB7UKk832JDiJJmetzYZ3AdSrPjN/3l3nkhByeWzXnhrX0JbifKg==",
"dependencies": {
"Microsoft.IdentityModel.Logging": "6.10.0",
"Microsoft.IdentityModel.Tokens": "6.10.0"
"Microsoft.IdentityModel.Logging": "6.21.0",
"Microsoft.IdentityModel.Tokens": "6.21.0"
}
},
"Microsoft.IdentityModel.Protocols.OpenIdConnect": {
"type": "Transitive",
"resolved": "6.10.0",
"contentHash": "LVvMXAWPbPeEWTylDrxunlHH2wFyE4Mv0L4gZrJHC4HTESbWHquKZb/y/S8jgiQEDycOP0PDQvbG4RR/tr2TVQ==",
"resolved": "6.21.0",
"contentHash": "vtSKL7n6EnAsLyxmiviusm6LKrblT2ndnNqN6rvVq6iIHAnPCK9E2DkDx6h1Jrpy1cvbp40r0cnTg23nhEAGTA==",
"dependencies": {
"Microsoft.IdentityModel.Protocols": "6.10.0",
"System.IdentityModel.Tokens.Jwt": "6.10.0"
"Microsoft.IdentityModel.Protocols": "6.21.0",
"System.IdentityModel.Tokens.Jwt": "6.21.0"
}
},
"Microsoft.IdentityModel.Tokens": {
"type": "Transitive",
"resolved": "6.10.0",
"contentHash": "qbf1NslutDB4oLrriYTJpy7oB1pbh2ej2lEHd2IPDQH9C74ysOdhU5wAC7KoXblldbo7YsNR2QYFOqQM/b0Rsg==",
"resolved": "6.21.0",
"contentHash": "AAEHZvZyb597a+QJSmtxH3n2P1nIJGpZ4Q89GTenknRx6T6zyfzf592yW/jA5e8EHN4tNMjjXHQaYWEq5+L05w==",
"dependencies": {
"Microsoft.CSharp": "4.5.0",
"Microsoft.IdentityModel.Logging": "6.10.0",
"Microsoft.IdentityModel.Logging": "6.21.0",
"System.Security.Cryptography.Cng": "4.5.0"
}
},
@@ -846,6 +790,11 @@
"resolved": "7.6.4",
"contentHash": "3mB+Frn4LU4yb5ie9R752QiRn0Hvp9PITkSRofV/Lzm9EyLM87Fy9ziqgz75O/c712dh6GxuypMSBUGmNFwMeA=="
},
"Microsoft.SqlServer.Server": {
"type": "Transitive",
"resolved": "1.0.0",
"contentHash": "N4KeF3cpcm1PUHym1RmakkzfkEv3GRMyofVv40uXsQhCQeglr2OHNcUk2WOG51AKpGO8ynGpo9M/kFXSzghwug=="
},
"Microsoft.Win32.Primitives": {
"type": "Transitive",
"resolved": "4.3.0",
@@ -879,11 +828,6 @@
"System.Security.Cryptography.Pkcs": "6.0.0"
}
},
"MySqlConnector": {
"type": "Transitive",
"resolved": "2.1.2",
"contentHash": "JVokQTUNN3WHAu9Vw8ieeq1dXTFokJiig5P0VJ4f439UxRrsPo6SaVWC8Zdm6mkPeQFhZ0/9afdWa02EY/1j/w=="
},
"NETStandard.Library": {
"type": "Transitive",
"resolved": "1.6.1",
@@ -940,25 +884,6 @@
"resolved": "13.0.1",
"contentHash": "ppPFpBcvxdsfUonNcvITKqLl3bqxWbDCZIzDWHzjpdAHRFfZe0Dw9HmA0+za13IdyrgJwpkDTDA9fHaxOrt20A=="
},
"Npgsql": {
"type": "Transitive",
"resolved": "6.0.4",
"contentHash": "SJMlOmFHr32oOzVXeHmarGaBKkhi0wHVN/rzuu2tUSJ4Qx2AkHCpr9R/DhLWwDiklqgzFU++9wkFyGJxbx/zzg==",
"dependencies": {
"System.Runtime.CompilerServices.Unsafe": "6.0.0"
}
},
"Npgsql.EntityFrameworkCore.PostgreSQL": {
"type": "Transitive",
"resolved": "6.0.4",
"contentHash": "fzgRmBd3nAFvKt/L70sJfFWAdobtwDEeOzOzruJq9og97O8/5B96inQOAgOpYyaUjPYpS4ZS5/bxm3vnOJ0+pQ==",
"dependencies": {
"Microsoft.EntityFrameworkCore": "6.0.4",
"Microsoft.EntityFrameworkCore.Abstractions": "6.0.4",
"Microsoft.EntityFrameworkCore.Relational": "6.0.4",
"Npgsql": "6.0.4"
}
},
"NSec.Cryptography": {
"type": "Transitive",
"resolved": "20.2.0",
@@ -981,16 +906,6 @@
"System.IO.Pipelines": "5.0.1"
}
},
"Pomelo.EntityFrameworkCore.MySql": {
"type": "Transitive",
"resolved": "6.0.1",
"contentHash": "sFIo5e9RmQoCTEvH6EeSV8ptmX3dw/6XgyD8R93X/i7A9+XCeG9KTjSNjrszVjVOtCu/eyvYqqcv2uZ/BHhlYA==",
"dependencies": {
"Microsoft.EntityFrameworkCore.Relational": "[6.0.1, 7.0.0)",
"Microsoft.Extensions.DependencyInjection": "6.0.0",
"MySqlConnector": "2.1.2"
}
},
"Portable.BouncyCastle": {
"type": "Transitive",
"resolved": "1.9.0",
@@ -1383,11 +1298,8 @@
},
"System.Collections.Immutable": {
"type": "Transitive",
"resolved": "6.0.0",
"contentHash": "l4zZJ1WU2hqpQQHXz1rvC3etVZN+2DLmQMO79FhOTZHMn8tDRr+WU287sbomD0BETlmKDn0ygUgVy9k5xkkJdA==",
"dependencies": {
"System.Runtime.CompilerServices.Unsafe": "6.0.0"
}
"resolved": "1.7.0",
"contentHash": "RVSM6wZUo6L2y6P3vN6gjUtyJ2IF2RVtrepF3J7nrDKfFQd5u/SnSUFclchYQis8/k5scHy9E+fVeKVQLnnkzw=="
},
"System.Collections.NonGeneric": {
"type": "Transitive",
@@ -1416,11 +1328,6 @@
"System.Threading": "4.0.11"
}
},
"System.ComponentModel.Annotations": {
"type": "Transitive",
"resolved": "4.7.0",
"contentHash": "0YFqjhp/mYkDGpU0Ye1GjE53HMp9UVfGN7seGpAMttAC0C40v5gw598jCgpbBLMmCo0E5YRLBv5Z2doypO49ZQ=="
},
"System.Configuration.ConfigurationManager": {
"type": "Transitive",
"resolved": "6.0.0",
@@ -1622,11 +1529,11 @@
},
"System.IdentityModel.Tokens.Jwt": {
"type": "Transitive",
"resolved": "6.10.0",
"contentHash": "C+Q5ORsFycRkRuvy/Xd0Pv5xVpmWSAvQYZAGs7VQogmkqlLhvfZXTgBIlHqC3cxkstSoLJAYx6xZB7foQ2y5eg==",
"resolved": "6.21.0",
"contentHash": "JRD8AuypBE+2zYxT3dMJomQVsPYsCqlyZhWel3J1d5nzQokSRyTueF+Q4ID3Jcu6zSZKuzOdJ1MLTkbQsDqcvQ==",
"dependencies": {
"Microsoft.IdentityModel.JsonWebTokens": "6.10.0",
"Microsoft.IdentityModel.Tokens": "6.10.0"
"Microsoft.IdentityModel.JsonWebTokens": "6.21.0",
"Microsoft.IdentityModel.Tokens": "6.21.0"
}
},
"System.IO": {
@@ -2707,7 +2614,7 @@
"Microsoft.Azure.Cosmos.Table": "[1.0.8, )",
"Microsoft.Azure.NotificationHubs": "[4.1.0, )",
"Microsoft.Azure.ServiceBus": "[5.2.0, )",
"Microsoft.Data.SqlClient": "[4.1.0, )",
"Microsoft.Data.SqlClient": "[5.0.1, )",
"Microsoft.Extensions.Caching.StackExchangeRedis": "[6.0.6, )",
"Microsoft.Extensions.Configuration.EnvironmentVariables": "[6.0.1, )",
"Microsoft.Extensions.Configuration.UserSecrets": "[6.0.1, )",
@@ -2725,17 +2632,6 @@
"Stripe.net": "[40.0.0, )",
"YubicoDotNetClient": "[1.2.0, )"
}
},
"infrastructure.entityframework": {
"type": "Project",
"dependencies": {
"AutoMapper.Extensions.Microsoft.DependencyInjection": "[11.0.0, )",
"Core": "[2022.10.0, )",
"Microsoft.EntityFrameworkCore.Relational": "[6.0.4, )",
"Npgsql.EntityFrameworkCore.PostgreSQL": "[6.0.4, )",
"Pomelo.EntityFrameworkCore.MySql": "[6.0.1, )",
"linq2db.EntityFrameworkCore": "[6.7.1, )"
}
}
}
}

0
util/MySqlMigrations/Scripts/2021-09-21_01_SplitManageCollectionsPermission.sql → util/MySqlMigrations/HelperScripts/2021-09-21_01_SplitManageCollectionsPermission.sql
View File

0
util/MySqlMigrations/Scripts/2021-10-21_00_SetMaxAutoscaleSeatCount.sql → util/MySqlMigrations/HelperScripts/2021-10-21_00_SetMaxAutoscaleSeatCount.sql
View File

2
util/MySqlMigrations/Migrations/20211011144835_SplitManageCollectionsPermissions2.cs
View File

@@ -6,7 +6,7 @@ namespace Bit.MySqlMigrations.Migrations;
public partial class SplitManageCollectionsPermissions2 : Migration
{
private const string _scriptLocation =
"MySqlMigrations.Scripts.2021-09-21_01_SplitManageCollectionsPermission.sql";
"MySqlMigrations.HelperScripts.2021-09-21_01_SplitManageCollectionsPermission.sql";
protected override void Up(MigrationBuilder migrationBuilder)
{

2
util/MySqlMigrations/Migrations/20211021201150_SetMaxAutoscaleSeatsToCurrentSeatCount.cs
View File

@@ -6,7 +6,7 @@ namespace Bit.MySqlMigrations.Migrations;
public partial class SetMaxAutoscaleSeatsToCurrentSeatCount : Migration
{
private const string _scriptLocation =
"MySqlMigrations.Scripts.2021-10-21_00_SetMaxAutoscaleSeatCount.sql";
"MySqlMigrations.HelperScripts.2021-10-21_00_SetMaxAutoscaleSeatCount.sql";
protected override void Up(MigrationBuilder migrationBuilder)
{

1676
util/MySqlMigrations/Migrations/20221115030843_AvatarColor.Designer.cs generated Normal file
View File

File diff suppressed because it is too large Load Diff

25
util/MySqlMigrations/Migrations/20221115030843_AvatarColor.cs Normal file
View File

@@ -0,0 +1,25 @@
using Microsoft.EntityFrameworkCore.Migrations;
#nullable disable
namespace Bit.MySqlMigrations.Migrations;
public partial class AvatarColor : Migration
{
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.AddColumn<string>(
name: "AvatarColor",
table: "User",
type: "varchar(7)",
maxLength: 7,
nullable: true)
.Annotation("MySql:CharSet", "utf8mb4");
}
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropColumn(
name: "AvatarColor",
table: "User");
}
}

4
util/MySqlMigrations/Migrations/DatabaseContextModelSnapshot.cs
View File

@@ -1166,6 +1166,10 @@ namespace Bit.MySqlMigrations.Migrations
.HasMaxLength(30)
.HasColumnType("varchar(30)");
b.Property<string>("AvatarColor")
.HasMaxLength(7)
.HasColumnType("varchar(7)");
b.Property<DateTime>("CreationDate")
.HasColumnType("datetime(6)");

8
util/MySqlMigrations/MySqlMigrations.csproj
View File

@@ -21,12 +21,12 @@
</ItemGroup>
<ItemGroup>
<None Remove="Scripts\2021-09-21_01_SplitManageCollectionsPermission.sql" />
<None Remove="Scripts\2021-10-21_00_SetMaxAutoscaleSeatCount.sql" />
<None Remove="HelperScripts\2021-09-21_01_SplitManageCollectionsPermission.sql" />
<None Remove="HelperScripts\2021-10-21_00_SetMaxAutoscaleSeatCount.sql" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="Scripts\2021-09-21_01_SplitManageCollectionsPermission.sql" />
<EmbeddedResource Include="Scripts\2021-10-21_00_SetMaxAutoscaleSeatCount.sql" />
<EmbeddedResource Include="HelperScripts\2021-09-21_01_SplitManageCollectionsPermission.sql" />
<EmbeddedResource Include="HelperScripts\2021-10-21_00_SetMaxAutoscaleSeatCount.sql" />
<EmbeddedResource Include="HelperScripts\2022-03-01_00_Up_MigrateOrganizationApiKeys.sql" />
<EmbeddedResource Include="HelperScripts\2022-03-01_00_Down_MigrateOrganizationApiKeys.sql" />
</ItemGroup>

491
util/MySqlMigrations/Scripts/2021-07-08_00_Init.sql
View File

@@ -1,491 +0,0 @@
ALTER DATABASE CHARACTER SET utf8mb4;
CREATE TABLE IF NOT EXISTS `__EFMigrationsHistory` (
`MigrationId` varchar(150) CHARACTER SET utf8mb4 NOT NULL,
`ProductVersion` varchar(32) CHARACTER SET utf8mb4 NOT NULL,
CONSTRAINT `PK___EFMigrationsHistory` PRIMARY KEY (`MigrationId`)
) CHARACTER SET utf8mb4;
START TRANSACTION;
ALTER DATABASE CHARACTER SET utf8mb4;
CREATE TABLE `Event` (
`Id` char(36) COLLATE ascii_general_ci NOT NULL,
`Date` datetime(6) NOT NULL,
`Type` int NOT NULL,
`UserId` char(36) COLLATE ascii_general_ci NULL,
`OrganizationId` char(36) COLLATE ascii_general_ci NULL,
`CipherId` char(36) COLLATE ascii_general_ci NULL,
`CollectionId` char(36) COLLATE ascii_general_ci NULL,
`PolicyId` char(36) COLLATE ascii_general_ci NULL,
`GroupId` char(36) COLLATE ascii_general_ci NULL,
`OrganizationUserId` char(36) COLLATE ascii_general_ci NULL,
`DeviceType` tinyint unsigned NULL,
`IpAddress` varchar(50) CHARACTER SET utf8mb4 NULL,
`ActingUserId` char(36) COLLATE ascii_general_ci NULL,
CONSTRAINT `PK_Event` PRIMARY KEY (`Id`)
) ENGINE=InnoDB CHARACTER SET utf8mb4;
CREATE TABLE `Grant` (
`Key` varchar(200) CHARACTER SET utf8mb4 NOT NULL,
`Type` varchar(50) CHARACTER SET utf8mb4 NULL,
`SubjectId` varchar(200) CHARACTER SET utf8mb4 NULL,
`SessionId` varchar(100) CHARACTER SET utf8mb4 NULL,
`ClientId` varchar(200) CHARACTER SET utf8mb4 NULL,
`Description` varchar(200) CHARACTER SET utf8mb4 NULL,
`CreationDate` datetime(6) NOT NULL,
`ExpirationDate` datetime(6) NULL,
`ConsumedDate` datetime(6) NULL,
`Data` longtext CHARACTER SET utf8mb4 NULL,
CONSTRAINT `PK_Grant` PRIMARY KEY (`Key`)
) ENGINE=InnoDB CHARACTER SET utf8mb4;
CREATE TABLE `Installation` (
`Id` char(36) COLLATE ascii_general_ci NOT NULL,
`Email` varchar(256) CHARACTER SET utf8mb4 NULL,
`Key` varchar(150) CHARACTER SET utf8mb4 NULL,
`Enabled` tinyint(1) NOT NULL,
`CreationDate` datetime(6) NOT NULL,
CONSTRAINT `PK_Installation` PRIMARY KEY (`Id`)
) ENGINE=InnoDB CHARACTER SET utf8mb4;
CREATE TABLE `Organization` (
`Id` char(36) COLLATE ascii_general_ci NOT NULL,
`Identifier` varchar(50) CHARACTER SET utf8mb4 NULL,
`Name` varchar(50) CHARACTER SET utf8mb4 NULL,
`BusinessName` varchar(50) CHARACTER SET utf8mb4 NULL,
`BusinessAddress1` varchar(50) CHARACTER SET utf8mb4 NULL,
`BusinessAddress2` varchar(50) CHARACTER SET utf8mb4 NULL,
`BusinessAddress3` varchar(50) CHARACTER SET utf8mb4 NULL,
`BusinessCountry` varchar(2) CHARACTER SET utf8mb4 NULL,
`BusinessTaxNumber` varchar(30) CHARACTER SET utf8mb4 NULL,
`BillingEmail` varchar(256) CHARACTER SET utf8mb4 NULL,
`Plan` varchar(50) CHARACTER SET utf8mb4 NULL,
`PlanType` tinyint unsigned NOT NULL,
`Seats` int NULL,
`MaxCollections` smallint NULL,
`UsePolicies` tinyint(1) NOT NULL,
`UseSso` tinyint(1) NOT NULL,
`UseGroups` tinyint(1) NOT NULL,
`UseDirectory` tinyint(1) NOT NULL,
`UseEvents` tinyint(1) NOT NULL,
`UseTotp` tinyint(1) NOT NULL,
`Use2fa` tinyint(1) NOT NULL,
`UseApi` tinyint(1) NOT NULL,
`UseResetPassword` tinyint(1) NOT NULL,
`SelfHost` tinyint(1) NOT NULL,
`UsersGetPremium` tinyint(1) NOT NULL,
`Storage` bigint NULL,
`MaxStorageGb` smallint NULL,
`Gateway` tinyint unsigned NULL,
`GatewayCustomerId` varchar(50) CHARACTER SET utf8mb4 NULL,
`GatewaySubscriptionId` varchar(50) CHARACTER SET utf8mb4 NULL,
`ReferenceData` longtext CHARACTER SET utf8mb4 NULL,
`Enabled` tinyint(1) NOT NULL,
`LicenseKey` varchar(100) CHARACTER SET utf8mb4 NULL,
`ApiKey` varchar(30) CHARACTER SET utf8mb4 NULL,
`PublicKey` longtext CHARACTER SET utf8mb4 NULL,
`PrivateKey` longtext CHARACTER SET utf8mb4 NULL,
`TwoFactorProviders` longtext CHARACTER SET utf8mb4 NULL,
`ExpirationDate` datetime(6) NULL,
`CreationDate` datetime(6) NOT NULL,
`RevisionDate` datetime(6) NOT NULL,
CONSTRAINT `PK_Organization` PRIMARY KEY (`Id`)
) ENGINE=InnoDB CHARACTER SET utf8mb4;
CREATE TABLE `Provider` (
`Id` char(36) COLLATE ascii_general_ci NOT NULL,
`Name` longtext CHARACTER SET utf8mb4 NULL,
`BusinessName` longtext CHARACTER SET utf8mb4 NULL,
`BusinessAddress1` longtext CHARACTER SET utf8mb4 NULL,
`BusinessAddress2` longtext CHARACTER SET utf8mb4 NULL,
`BusinessAddress3` longtext CHARACTER SET utf8mb4 NULL,
`BusinessCountry` longtext CHARACTER SET utf8mb4 NULL,
`BusinessTaxNumber` longtext CHARACTER SET utf8mb4 NULL,
`BillingEmail` longtext CHARACTER SET utf8mb4 NULL,
`Status` tinyint unsigned NOT NULL,
`Enabled` tinyint(1) NOT NULL,
`CreationDate` datetime(6) NOT NULL,
`RevisionDate` datetime(6) NOT NULL,
CONSTRAINT `PK_Provider` PRIMARY KEY (`Id`)
) ENGINE=InnoDB CHARACTER SET utf8mb4;
CREATE TABLE `TaxRate` (
`Id` varchar(40) CHARACTER SET utf8mb4 NOT NULL,
`Country` varchar(50) CHARACTER SET utf8mb4 NULL,
`State` varchar(2) CHARACTER SET utf8mb4 NULL,
`PostalCode` varchar(10) CHARACTER SET utf8mb4 NULL,
`Rate` decimal(65,30) NOT NULL,
`Active` tinyint(1) NOT NULL,
CONSTRAINT `PK_TaxRate` PRIMARY KEY (`Id`)
) ENGINE=InnoDB CHARACTER SET utf8mb4;
CREATE TABLE `User` (
`Id` char(36) COLLATE ascii_general_ci NOT NULL,
`Name` varchar(50) CHARACTER SET utf8mb4 NULL,
`Email` varchar(256) CHARACTER SET utf8mb4 NOT NULL,
`EmailVerified` tinyint(1) NOT NULL,
`MasterPassword` varchar(300) CHARACTER SET utf8mb4 NULL,
`MasterPasswordHint` varchar(50) CHARACTER SET utf8mb4 NULL,
`Culture` varchar(10) CHARACTER SET utf8mb4 NULL,
`SecurityStamp` varchar(50) CHARACTER SET utf8mb4 NOT NULL,
`TwoFactorProviders` longtext CHARACTER SET utf8mb4 NULL,
`TwoFactorRecoveryCode` varchar(32) CHARACTER SET utf8mb4 NULL,
`EquivalentDomains` longtext CHARACTER SET utf8mb4 NULL,
`ExcludedGlobalEquivalentDomains` longtext CHARACTER SET utf8mb4 NULL,
`AccountRevisionDate` datetime(6) NOT NULL,
`Key` longtext CHARACTER SET utf8mb4 NULL,
`PublicKey` longtext CHARACTER SET utf8mb4 NULL,
`PrivateKey` longtext CHARACTER SET utf8mb4 NULL,
`Premium` tinyint(1) NOT NULL,
`PremiumExpirationDate` datetime(6) NULL,
`RenewalReminderDate` datetime(6) NULL,
`Storage` bigint NULL,
`MaxStorageGb` smallint NULL,
`Gateway` tinyint unsigned NULL,
`GatewayCustomerId` varchar(50) CHARACTER SET utf8mb4 NULL,
`GatewaySubscriptionId` varchar(50) CHARACTER SET utf8mb4 NULL,
`ReferenceData` longtext CHARACTER SET utf8mb4 NULL,
`LicenseKey` varchar(100) CHARACTER SET utf8mb4 NULL,
`ApiKey` varchar(30) CHARACTER SET utf8mb4 NOT NULL,
`Kdf` tinyint unsigned NOT NULL,
`KdfIterations` int NOT NULL,
`CreationDate` datetime(6) NOT NULL,
`RevisionDate` datetime(6) NOT NULL,
CONSTRAINT `PK_User` PRIMARY KEY (`Id`)
) ENGINE=InnoDB CHARACTER SET utf8mb4;
CREATE TABLE `Collection` (
`Id` char(36) COLLATE ascii_general_ci NOT NULL,
`OrganizationId` char(36) COLLATE ascii_general_ci NOT NULL,
`Name` longtext CHARACTER SET utf8mb4 NULL,
`ExternalId` varchar(300) CHARACTER SET utf8mb4 NULL,
`CreationDate` datetime(6) NOT NULL,
`RevisionDate` datetime(6) NOT NULL,
CONSTRAINT `PK_Collection` PRIMARY KEY (`Id`),
CONSTRAINT `FK_Collection_Organization_OrganizationId` FOREIGN KEY (`OrganizationId`) REFERENCES `Organization` (`Id`) ON DELETE CASCADE
) ENGINE=InnoDB CHARACTER SET utf8mb4;
CREATE TABLE `Group` (
`Id` char(36) COLLATE ascii_general_ci NOT NULL,
`OrganizationId` char(36) COLLATE ascii_general_ci NOT NULL,
`Name` varchar(100) CHARACTER SET utf8mb4 NULL,
`AccessAll` tinyint(1) NOT NULL,
`ExternalId` varchar(300) CHARACTER SET utf8mb4 NULL,
`CreationDate` datetime(6) NOT NULL,
`RevisionDate` datetime(6) NOT NULL,
CONSTRAINT `PK_Group` PRIMARY KEY (`Id`),
CONSTRAINT `FK_Group_Organization_OrganizationId` FOREIGN KEY (`OrganizationId`) REFERENCES `Organization` (`Id`) ON DELETE CASCADE
) ENGINE=InnoDB CHARACTER SET utf8mb4;
CREATE TABLE `Policy` (
`Id` char(36) COLLATE ascii_general_ci NOT NULL,
`OrganizationId` char(36) COLLATE ascii_general_ci NOT NULL,
`Type` tinyint unsigned NOT NULL,
`Data` longtext CHARACTER SET utf8mb4 NULL,
`Enabled` tinyint(1) NOT NULL,
`CreationDate` datetime(6) NOT NULL,
`RevisionDate` datetime(6) NOT NULL,
CONSTRAINT `PK_Policy` PRIMARY KEY (`Id`),
CONSTRAINT `FK_Policy_Organization_OrganizationId` FOREIGN KEY (`OrganizationId`) REFERENCES `Organization` (`Id`) ON DELETE CASCADE
) ENGINE=InnoDB CHARACTER SET utf8mb4;
CREATE TABLE `SsoConfig` (
`Id` bigint NOT NULL AUTO_INCREMENT,
`Enabled` tinyint(1) NOT NULL,
`OrganizationId` char(36) COLLATE ascii_general_ci NOT NULL,
`Data` longtext CHARACTER SET utf8mb4 NULL,
`CreationDate` datetime(6) NOT NULL,
`RevisionDate` datetime(6) NOT NULL,
CONSTRAINT `PK_SsoConfig` PRIMARY KEY (`Id`),
CONSTRAINT `FK_SsoConfig_Organization_OrganizationId` FOREIGN KEY (`OrganizationId`) REFERENCES `Organization` (`Id`) ON DELETE CASCADE
) ENGINE=InnoDB CHARACTER SET utf8mb4;
CREATE TABLE `ProviderOrganization` (
`Id` char(36) COLLATE ascii_general_ci NOT NULL,
`ProviderId` char(36) COLLATE ascii_general_ci NOT NULL,
`OrganizationId` char(36) COLLATE ascii_general_ci NOT NULL,
`Key` longtext CHARACTER SET utf8mb4 NULL,
`Settings` longtext CHARACTER SET utf8mb4 NULL,
`CreationDate` datetime(6) NOT NULL,
`RevisionDate` datetime(6) NOT NULL,
CONSTRAINT `PK_ProviderOrganization` PRIMARY KEY (`Id`),
CONSTRAINT `FK_ProviderOrganization_Organization_OrganizationId` FOREIGN KEY (`OrganizationId`) REFERENCES `Organization` (`Id`) ON DELETE CASCADE,
CONSTRAINT `FK_ProviderOrganization_Provider_ProviderId` FOREIGN KEY (`ProviderId`) REFERENCES `Provider` (`Id`) ON DELETE CASCADE
) ENGINE=InnoDB CHARACTER SET utf8mb4;
CREATE TABLE `Cipher` (
`Id` char(36) COLLATE ascii_general_ci NOT NULL,
`UserId` char(36) COLLATE ascii_general_ci NULL,
`OrganizationId` char(36) COLLATE ascii_general_ci NULL,
`Type` tinyint unsigned NOT NULL,
`Data` longtext CHARACTER SET utf8mb4 NULL,
`Favorites` longtext CHARACTER SET utf8mb4 NULL,
`Folders` longtext CHARACTER SET utf8mb4 NULL,
`Attachments` longtext CHARACTER SET utf8mb4 NULL,
`CreationDate` datetime(6) NOT NULL,
`RevisionDate` datetime(6) NOT NULL,
`DeletedDate` datetime(6) NULL,
`Reprompt` tinyint unsigned NULL,
CONSTRAINT `PK_Cipher` PRIMARY KEY (`Id`),
CONSTRAINT `FK_Cipher_Organization_OrganizationId` FOREIGN KEY (`OrganizationId`) REFERENCES `Organization` (`Id`) ON DELETE RESTRICT,
CONSTRAINT `FK_Cipher_User_UserId` FOREIGN KEY (`UserId`) REFERENCES `User` (`Id`) ON DELETE RESTRICT
) ENGINE=InnoDB CHARACTER SET utf8mb4;
CREATE TABLE `Device` (
`Id` char(36) COLLATE ascii_general_ci NOT NULL,
`UserId` char(36) COLLATE ascii_general_ci NOT NULL,
`Name` varchar(50) CHARACTER SET utf8mb4 NULL,
`Type` tinyint unsigned NOT NULL,
`Identifier` varchar(50) CHARACTER SET utf8mb4 NULL,
`PushToken` varchar(255) CHARACTER SET utf8mb4 NULL,
`CreationDate` datetime(6) NOT NULL,
`RevisionDate` datetime(6) NOT NULL,
CONSTRAINT `PK_Device` PRIMARY KEY (`Id`),
CONSTRAINT `FK_Device_User_UserId` FOREIGN KEY (`UserId`) REFERENCES `User` (`Id`) ON DELETE CASCADE
) ENGINE=InnoDB CHARACTER SET utf8mb4;
CREATE TABLE `EmergencyAccess` (
`Id` char(36) COLLATE ascii_general_ci NOT NULL,
`GrantorId` char(36) COLLATE ascii_general_ci NOT NULL,
`GranteeId` char(36) COLLATE ascii_general_ci NULL,
`Email` varchar(256) CHARACTER SET utf8mb4 NULL,
`KeyEncrypted` longtext CHARACTER SET utf8mb4 NULL,
`Type` tinyint unsigned NOT NULL,
`Status` tinyint unsigned NOT NULL,
`WaitTimeDays` int NOT NULL,
`RecoveryInitiatedDate` datetime(6) NULL,
`LastNotificationDate` datetime(6) NULL,
`CreationDate` datetime(6) NOT NULL,
`RevisionDate` datetime(6) NOT NULL,
CONSTRAINT `PK_EmergencyAccess` PRIMARY KEY (`Id`),
CONSTRAINT `FK_EmergencyAccess_User_GranteeId` FOREIGN KEY (`GranteeId`) REFERENCES `User` (`Id`) ON DELETE RESTRICT,
CONSTRAINT `FK_EmergencyAccess_User_GrantorId` FOREIGN KEY (`GrantorId`) REFERENCES `User` (`Id`) ON DELETE CASCADE
) ENGINE=InnoDB CHARACTER SET utf8mb4;
CREATE TABLE `Folder` (
`Id` char(36) COLLATE ascii_general_ci NOT NULL,
`UserId` char(36) COLLATE ascii_general_ci NOT NULL,
`Name` longtext CHARACTER SET utf8mb4 NULL,
`CreationDate` datetime(6) NOT NULL,
`RevisionDate` datetime(6) NOT NULL,
CONSTRAINT `PK_Folder` PRIMARY KEY (`Id`),
CONSTRAINT `FK_Folder_User_UserId` FOREIGN KEY (`UserId`) REFERENCES `User` (`Id`) ON DELETE CASCADE
) ENGINE=InnoDB CHARACTER SET utf8mb4;
CREATE TABLE `OrganizationUser` (
`Id` char(36) COLLATE ascii_general_ci NOT NULL,
`OrganizationId` char(36) COLLATE ascii_general_ci NOT NULL,
`UserId` char(36) COLLATE ascii_general_ci NULL,
`Email` varchar(256) CHARACTER SET utf8mb4 NULL,
`Key` longtext CHARACTER SET utf8mb4 NULL,
`ResetPasswordKey` longtext CHARACTER SET utf8mb4 NULL,
`Status` tinyint unsigned NOT NULL,
`Type` tinyint unsigned NOT NULL,
`AccessAll` tinyint(1) NOT NULL,
`ExternalId` varchar(300) CHARACTER SET utf8mb4 NULL,
`CreationDate` datetime(6) NOT NULL,
`RevisionDate` datetime(6) NOT NULL,
`Permissions` longtext CHARACTER SET utf8mb4 NULL,
CONSTRAINT `PK_OrganizationUser` PRIMARY KEY (`Id`),
CONSTRAINT `FK_OrganizationUser_Organization_OrganizationId` FOREIGN KEY (`OrganizationId`) REFERENCES `Organization` (`Id`) ON DELETE CASCADE,
CONSTRAINT `FK_OrganizationUser_User_UserId` FOREIGN KEY (`UserId`) REFERENCES `User` (`Id`) ON DELETE RESTRICT
) ENGINE=InnoDB CHARACTER SET utf8mb4;
CREATE TABLE `ProviderUser` (
`Id` char(36) COLLATE ascii_general_ci NOT NULL,
`ProviderId` char(36) COLLATE ascii_general_ci NOT NULL,
`UserId` char(36) COLLATE ascii_general_ci NULL,
`Email` longtext CHARACTER SET utf8mb4 NULL,
`Key` longtext CHARACTER SET utf8mb4 NULL,
`Status` tinyint unsigned NOT NULL,
`Type` tinyint unsigned NOT NULL,
`Permissions` longtext CHARACTER SET utf8mb4 NULL,
`CreationDate` datetime(6) NOT NULL,
`RevisionDate` datetime(6) NOT NULL,
CONSTRAINT `PK_ProviderUser` PRIMARY KEY (`Id`),
CONSTRAINT `FK_ProviderUser_Provider_ProviderId` FOREIGN KEY (`ProviderId`) REFERENCES `Provider` (`Id`) ON DELETE CASCADE,
CONSTRAINT `FK_ProviderUser_User_UserId` FOREIGN KEY (`UserId`) REFERENCES `User` (`Id`) ON DELETE RESTRICT
) ENGINE=InnoDB CHARACTER SET utf8mb4;
CREATE TABLE `Send` (
`Id` char(36) COLLATE ascii_general_ci NOT NULL,
`UserId` char(36) COLLATE ascii_general_ci NULL,
`OrganizationId` char(36) COLLATE ascii_general_ci NULL,
`Type` tinyint unsigned NOT NULL,
`Data` longtext CHARACTER SET utf8mb4 NULL,
`Key` longtext CHARACTER SET utf8mb4 NULL,
`Password` varchar(300) CHARACTER SET utf8mb4 NULL,
`MaxAccessCount` int NULL,
`AccessCount` int NOT NULL,
`CreationDate` datetime(6) NOT NULL,
`RevisionDate` datetime(6) NOT NULL,
`ExpirationDate` datetime(6) NULL,
`DeletionDate` datetime(6) NOT NULL,
`Disabled` tinyint(1) NOT NULL,
`HideEmail` tinyint(1) NULL,
CONSTRAINT `PK_Send` PRIMARY KEY (`Id`),
CONSTRAINT `FK_Send_Organization_OrganizationId` FOREIGN KEY (`OrganizationId`) REFERENCES `Organization` (`Id`) ON DELETE RESTRICT,
CONSTRAINT `FK_Send_User_UserId` FOREIGN KEY (`UserId`) REFERENCES `User` (`Id`) ON DELETE RESTRICT
) ENGINE=InnoDB CHARACTER SET utf8mb4;
CREATE TABLE `SsoUser` (
`Id` bigint NOT NULL AUTO_INCREMENT,
`UserId` char(36) COLLATE ascii_general_ci NOT NULL,
`OrganizationId` char(36) COLLATE ascii_general_ci NULL,
`ExternalId` varchar(50) CHARACTER SET utf8mb4 NULL,
`CreationDate` datetime(6) NOT NULL,
CONSTRAINT `PK_SsoUser` PRIMARY KEY (`Id`),
CONSTRAINT `FK_SsoUser_Organization_OrganizationId` FOREIGN KEY (`OrganizationId`) REFERENCES `Organization` (`Id`) ON DELETE RESTRICT,
CONSTRAINT `FK_SsoUser_User_UserId` FOREIGN KEY (`UserId`) REFERENCES `User` (`Id`) ON DELETE CASCADE
) ENGINE=InnoDB CHARACTER SET utf8mb4;
CREATE TABLE `Transaction` (
`Id` char(36) COLLATE ascii_general_ci NOT NULL,
`UserId` char(36) COLLATE ascii_general_ci NULL,
`OrganizationId` char(36) COLLATE ascii_general_ci NULL,
`Type` tinyint unsigned NOT NULL,
`Amount` decimal(65,30) NOT NULL,
`Refunded` tinyint(1) NULL,
`RefundedAmount` decimal(65,30) NULL,
`Details` varchar(100) CHARACTER SET utf8mb4 NULL,
`PaymentMethodType` tinyint unsigned NULL,
`Gateway` tinyint unsigned NULL,
`GatewayId` varchar(50) CHARACTER SET utf8mb4 NULL,
`CreationDate` datetime(6) NOT NULL,
CONSTRAINT `PK_Transaction` PRIMARY KEY (`Id`),
CONSTRAINT `FK_Transaction_Organization_OrganizationId` FOREIGN KEY (`OrganizationId`) REFERENCES `Organization` (`Id`) ON DELETE RESTRICT,
CONSTRAINT `FK_Transaction_User_UserId` FOREIGN KEY (`UserId`) REFERENCES `User` (`Id`) ON DELETE RESTRICT
) ENGINE=InnoDB CHARACTER SET utf8mb4;
CREATE TABLE `U2f` (
`Id` int NOT NULL AUTO_INCREMENT,
`UserId` char(36) COLLATE ascii_general_ci NOT NULL,
`KeyHandle` varchar(200) CHARACTER SET utf8mb4 NULL,
`Challenge` varchar(200) CHARACTER SET utf8mb4 NULL,
`AppId` varchar(50) CHARACTER SET utf8mb4 NULL,
`Version` varchar(20) CHARACTER SET utf8mb4 NULL,
`CreationDate` datetime(6) NOT NULL,
CONSTRAINT `PK_U2f` PRIMARY KEY (`Id`),
CONSTRAINT `FK_U2f_User_UserId` FOREIGN KEY (`UserId`) REFERENCES `User` (`Id`) ON DELETE CASCADE
) ENGINE=InnoDB CHARACTER SET utf8mb4;
CREATE TABLE `CollectionGroups` (
`CollectionId` char(36) COLLATE ascii_general_ci NOT NULL,
`GroupId` char(36) COLLATE ascii_general_ci NOT NULL,
`ReadOnly` tinyint(1) NOT NULL,
`HidePasswords` tinyint(1) NOT NULL,
CONSTRAINT `PK_CollectionGroups` PRIMARY KEY (`CollectionId`, `GroupId`),
CONSTRAINT `FK_CollectionGroups_Collection_CollectionId` FOREIGN KEY (`CollectionId`) REFERENCES `Collection` (`Id`) ON DELETE CASCADE,
CONSTRAINT `FK_CollectionGroups_Group_GroupId` FOREIGN KEY (`GroupId`) REFERENCES `Group` (`Id`) ON DELETE CASCADE
) ENGINE=InnoDB CHARACTER SET utf8mb4;
CREATE TABLE `CollectionCipher` (
`CollectionId` char(36) COLLATE ascii_general_ci NOT NULL,
`CipherId` char(36) COLLATE ascii_general_ci NOT NULL,
CONSTRAINT `PK_CollectionCipher` PRIMARY KEY (`CollectionId`, `CipherId`),
CONSTRAINT `FK_CollectionCipher_Cipher_CipherId` FOREIGN KEY (`CipherId`) REFERENCES `Cipher` (`Id`) ON DELETE CASCADE,
CONSTRAINT `FK_CollectionCipher_Collection_CollectionId` FOREIGN KEY (`CollectionId`) REFERENCES `Collection` (`Id`) ON DELETE CASCADE
) ENGINE=InnoDB CHARACTER SET utf8mb4;
CREATE TABLE `CollectionUsers` (
`CollectionId` char(36) COLLATE ascii_general_ci NOT NULL,
`OrganizationUserId` char(36) COLLATE ascii_general_ci NOT NULL,
`UserId` char(36) COLLATE ascii_general_ci NULL,
`ReadOnly` tinyint(1) NOT NULL,
`HidePasswords` tinyint(1) NOT NULL,
CONSTRAINT `PK_CollectionUsers` PRIMARY KEY (`CollectionId`, `OrganizationUserId`),
CONSTRAINT `FK_CollectionUsers_Collection_CollectionId` FOREIGN KEY (`CollectionId`) REFERENCES `Collection` (`Id`) ON DELETE CASCADE,
CONSTRAINT `FK_CollectionUsers_OrganizationUser_OrganizationUserId` FOREIGN KEY (`OrganizationUserId`) REFERENCES `OrganizationUser` (`Id`) ON DELETE CASCADE,
CONSTRAINT `FK_CollectionUsers_User_UserId` FOREIGN KEY (`UserId`) REFERENCES `User` (`Id`) ON DELETE RESTRICT
) ENGINE=InnoDB CHARACTER SET utf8mb4;
CREATE TABLE `GroupUser` (
`GroupId` char(36) COLLATE ascii_general_ci NOT NULL,
`OrganizationUserId` char(36) COLLATE ascii_general_ci NOT NULL,
`UserId` char(36) COLLATE ascii_general_ci NULL,
CONSTRAINT `PK_GroupUser` PRIMARY KEY (`GroupId`, `OrganizationUserId`),
CONSTRAINT `FK_GroupUser_Group_GroupId` FOREIGN KEY (`GroupId`) REFERENCES `Group` (`Id`) ON DELETE CASCADE,
CONSTRAINT `FK_GroupUser_OrganizationUser_OrganizationUserId` FOREIGN KEY (`OrganizationUserId`) REFERENCES `OrganizationUser` (`Id`) ON DELETE CASCADE,
CONSTRAINT `FK_GroupUser_User_UserId` FOREIGN KEY (`UserId`) REFERENCES `User` (`Id`) ON DELETE RESTRICT
) ENGINE=InnoDB CHARACTER SET utf8mb4;
CREATE TABLE `ProviderOrganizationProviderUser` (
`Id` char(36) COLLATE ascii_general_ci NOT NULL,
`ProviderOrganizationId` char(36) COLLATE ascii_general_ci NOT NULL,
`ProviderUserId` char(36) COLLATE ascii_general_ci NOT NULL,
`Type` tinyint unsigned NOT NULL,
`Permissions` longtext CHARACTER SET utf8mb4 NULL,
`CreationDate` datetime(6) NOT NULL,
`RevisionDate` datetime(6) NOT NULL,
CONSTRAINT `PK_ProviderOrganizationProviderUser` PRIMARY KEY (`Id`),
CONSTRAINT `FK_ProviderOrganizationProviderUser_ProviderOrganization_Provid~` FOREIGN KEY (`ProviderOrganizationId`) REFERENCES `ProviderOrganization` (`Id`) ON DELETE CASCADE,
CONSTRAINT `FK_ProviderOrganizationProviderUser_ProviderUser_ProviderUserId` FOREIGN KEY (`ProviderUserId`) REFERENCES `ProviderUser` (`Id`) ON DELETE CASCADE
) ENGINE=InnoDB CHARACTER SET utf8mb4;
CREATE INDEX `IX_Cipher_OrganizationId` ON `Cipher` (`OrganizationId`);
CREATE INDEX `IX_Cipher_UserId` ON `Cipher` (`UserId`);
CREATE INDEX `IX_Collection_OrganizationId` ON `Collection` (`OrganizationId`);
CREATE INDEX `IX_CollectionCipher_CipherId` ON `CollectionCipher` (`CipherId`);
CREATE INDEX `IX_CollectionGroups_GroupId` ON `CollectionGroups` (`GroupId`);
CREATE INDEX `IX_CollectionUsers_OrganizationUserId` ON `CollectionUsers` (`OrganizationUserId`);
CREATE INDEX `IX_CollectionUsers_UserId` ON `CollectionUsers` (`UserId`);
CREATE INDEX `IX_Device_UserId` ON `Device` (`UserId`);
CREATE INDEX `IX_EmergencyAccess_GranteeId` ON `EmergencyAccess` (`GranteeId`);
CREATE INDEX `IX_EmergencyAccess_GrantorId` ON `EmergencyAccess` (`GrantorId`);
CREATE INDEX `IX_Folder_UserId` ON `Folder` (`UserId`);
CREATE INDEX `IX_Group_OrganizationId` ON `Group` (`OrganizationId`);
CREATE INDEX `IX_GroupUser_OrganizationUserId` ON `GroupUser` (`OrganizationUserId`);
CREATE INDEX `IX_GroupUser_UserId` ON `GroupUser` (`UserId`);
CREATE INDEX `IX_OrganizationUser_OrganizationId` ON `OrganizationUser` (`OrganizationId`);
CREATE INDEX `IX_OrganizationUser_UserId` ON `OrganizationUser` (`UserId`);
CREATE INDEX `IX_Policy_OrganizationId` ON `Policy` (`OrganizationId`);
CREATE INDEX `IX_ProviderOrganization_OrganizationId` ON `ProviderOrganization` (`OrganizationId`);
CREATE INDEX `IX_ProviderOrganization_ProviderId` ON `ProviderOrganization` (`ProviderId`);
CREATE INDEX `IX_ProviderOrganizationProviderUser_ProviderOrganizationId` ON `ProviderOrganizationProviderUser` (`ProviderOrganizationId`);
CREATE INDEX `IX_ProviderOrganizationProviderUser_ProviderUserId` ON `ProviderOrganizationProviderUser` (`ProviderUserId`);
CREATE INDEX `IX_ProviderUser_ProviderId` ON `ProviderUser` (`ProviderId`);
CREATE INDEX `IX_ProviderUser_UserId` ON `ProviderUser` (`UserId`);
CREATE INDEX `IX_Send_OrganizationId` ON `Send` (`OrganizationId`);
CREATE INDEX `IX_Send_UserId` ON `Send` (`UserId`);
CREATE INDEX `IX_SsoConfig_OrganizationId` ON `SsoConfig` (`OrganizationId`);
CREATE INDEX `IX_SsoUser_OrganizationId` ON `SsoUser` (`OrganizationId`);
CREATE INDEX `IX_SsoUser_UserId` ON `SsoUser` (`UserId`);
CREATE INDEX `IX_Transaction_OrganizationId` ON `Transaction` (`OrganizationId`);
CREATE INDEX `IX_Transaction_UserId` ON `Transaction` (`UserId`);
CREATE INDEX `IX_U2f_UserId` ON `U2f` (`UserId`);
INSERT INTO `__EFMigrationsHistory` (`MigrationId`, `ProductVersion`)
VALUES ('20210617183900_Init', '5.0.5');
COMMIT;

14
util/MySqlMigrations/Scripts/2021-07-09_00_RemoveProviderOrganizationProviderUser.sql
View File

@@ -1,14 +0,0 @@
START TRANSACTION;
DROP TABLE `ProviderOrganizationProviderUser`;
ALTER TABLE `Provider` ADD `UseEvents` tinyint(1) NOT NULL DEFAULT FALSE;
ALTER TABLE `Event` ADD `ProviderId` char(36) COLLATE ascii_general_ci NULL;
ALTER TABLE `Event` ADD `ProviderUserId` char(36) COLLATE ascii_general_ci NULL;
INSERT INTO `__EFMigrationsHistory` (`MigrationId`, `ProductVersion`)
VALUES ('20210709095522_RemoveProviderOrganizationProviderUser', '5.0.5');
COMMIT;

8
util/MySqlMigrations/Scripts/2021-07-13_00_UserForcePasswordReset.sql
View File

@@ -1,8 +0,0 @@
START TRANSACTION;
ALTER TABLE `User` ADD `ForcePasswordReset` tinyint(1) NOT NULL DEFAULT FALSE;
INSERT INTO `__EFMigrationsHistory` (`MigrationId`, `ProductVersion`)
VALUES ('20210716142145_UserForcePasswordReset', '5.0.5');
COMMIT;

12
util/MySqlMigrations/Scripts/2021-09-21_00_AddMaxAutoscaleSeatsToOrganization.sql
View File

@@ -1,12 +0,0 @@
START TRANSACTION;
ALTER TABLE `Organization` ADD `MaxAutoscaleSeats` int NULL;
ALTER TABLE `Organization` ADD `OwnersNotifiedOfAutoscaling` datetime(6) NULL;
ALTER TABLE `Event` ADD `ProviderOrganizationId` char(36) COLLATE ascii_general_ci NULL;
INSERT INTO `__EFMigrationsHistory` (`MigrationId`, `ProductVersion`)
VALUES ('20210921132418_AddMaxAutoscaleSeatsToOrganization', '5.0.9');
COMMIT;

33
util/MySqlMigrations/Scripts/2021-11-02_00_OrganizationSponsorship.sql
View File

@@ -1,33 +0,0 @@
START TRANSACTION;
ALTER TABLE `User` ADD `UsesCryptoAgent` tinyint(1) NOT NULL DEFAULT FALSE;
CREATE TABLE `OrganizationSponsorship` (
`Id` char(36) COLLATE ascii_general_ci NOT NULL,
`InstallationId` char(36) COLLATE ascii_general_ci NULL,
`SponsoringOrganizationId` char(36) COLLATE ascii_general_ci NULL,
`SponsoringOrganizationUserId` char(36) COLLATE ascii_general_ci NULL,
`SponsoredOrganizationId` char(36) COLLATE ascii_general_ci NULL,
`FriendlyName` varchar(256) CHARACTER SET utf8mb4 NULL,
`OfferedToEmail` varchar(256) CHARACTER SET utf8mb4 NULL,
`PlanSponsorshipType` tinyint unsigned NULL,
`CloudSponsor` tinyint(1) NOT NULL,
`LastSyncDate` datetime(6) NULL,
`TimesRenewedWithoutValidation` tinyint unsigned NOT NULL,
`SponsorshipLapsedDate` datetime(6) NULL,
CONSTRAINT `PK_OrganizationSponsorship` PRIMARY KEY (`Id`),
CONSTRAINT `FK_OrganizationSponsorship_Installation_InstallationId` FOREIGN KEY (`InstallationId`) REFERENCES `Installation` (`Id`) ON DELETE RESTRICT,
CONSTRAINT `FK_OrganizationSponsorship_Organization_SponsoredOrganizationId` FOREIGN KEY (`SponsoredOrganizationId`) REFERENCES `Organization` (`Id`) ON DELETE RESTRICT,
CONSTRAINT `FK_OrganizationSponsorship_Organization_SponsoringOrganizationId` FOREIGN KEY (`SponsoringOrganizationId`) REFERENCES `Organization` (`Id`) ON DELETE RESTRICT
) CHARACTER SET utf8mb4;
CREATE INDEX `IX_OrganizationSponsorship_InstallationId` ON `OrganizationSponsorship` (`InstallationId`);
CREATE INDEX `IX_OrganizationSponsorship_SponsoredOrganizationId` ON `OrganizationSponsorship` (`SponsoredOrganizationId`);
CREATE INDEX `IX_OrganizationSponsorship_SponsoringOrganizationId` ON `OrganizationSponsorship` (`SponsoringOrganizationId`);
INSERT INTO `__EFMigrationsHistory` (`MigrationId`, `ProductVersion`)
VALUES ('20211108225243_OrganizationSponsorship', '5.0.9');
COMMIT;

9
util/MySqlMigrations/Scripts/2021-11-08_00_KeyConnector.sql
View File

@@ -1,9 +0,0 @@
START TRANSACTION;
ALTER TABLE `User` ADD `UsesKeyConnector` tinyint(1) NOT NULL DEFAULT FALSE;
INSERT INTO `__EFMigrationsHistory` (`MigrationId`, `ProductVersion`)
VALUES ('20211108041911_KeyConnector', '5.0.9');
COMMIT;

BIN
util/MySqlMigrations/Scripts/2021-11-12_00_KeyConnectorFlag.sql
View File

Binary file not shown.

BIN
util/MySqlMigrations/Scripts/2022-01-21_00_RemoveU2F.sql
View File

Binary file not shown.

10
util/MySqlMigrations/Scripts/2022-02-10_00_FailedLoginCaptcha.sql
View File

@@ -1,10 +0,0 @@
START TRANSACTION;
ALTER TABLE `User` ADD `FailedLoginCount` int NOT NULL DEFAULT 0;
ALTER TABLE `User` ADD `LastFailedLoginDate` datetime(6) NULL;
INSERT INTO `__EFMigrationsHistory` (`MigrationId`, `ProductVersion`)
VALUES ('20220301215315_FailedLoginCaptcha', '5.0.12');
COMMIT;

50
util/MySqlMigrations/Scripts/2022-03-25_00_SelfHostF4E.sql
View File

@@ -1,50 +0,0 @@
START TRANSACTION;
ALTER TABLE `OrganizationSponsorship` DROP FOREIGN KEY `FK_OrganizationSponsorship_Installation_InstallationId`;
ALTER TABLE `OrganizationSponsorship` DROP INDEX `IX_OrganizationSponsorship_InstallationId`;
ALTER TABLE `OrganizationSponsorship` DROP COLUMN `InstallationId`;
ALTER TABLE `OrganizationSponsorship` DROP COLUMN `TimesRenewedWithoutValidation`;
CREATE TABLE `OrganizationApiKey` (
`Id` char(36) COLLATE ascii_general_ci NOT NULL,
`OrganizationId` char(36) COLLATE ascii_general_ci NOT NULL,
`Type` tinyint unsigned NOT NULL,
`ApiKey` varchar(30) CHARACTER SET utf8mb4 NULL,
`RevisionDate` datetime(6) NOT NULL,
CONSTRAINT `PK_OrganizationApiKey` PRIMARY KEY (`Id`),
CONSTRAINT `FK_OrganizationApiKey_Organization_OrganizationId` FOREIGN KEY (`OrganizationId`) REFERENCES `Organization` (`Id`) ON DELETE CASCADE
) CHARACTER SET utf8mb4;
INSERT INTO OrganizationApiKey(Id, OrganizationId, Type, ApiKey, RevisionDate)
SELECT UUID(), Id, 0, ApiKey, RevisionDate
FROM Organization;
ALTER TABLE `Organization` DROP COLUMN `ApiKey`;
ALTER TABLE `OrganizationSponsorship` RENAME COLUMN `SponsorshipLapsedDate` TO `ValidUntil`;
ALTER TABLE `OrganizationSponsorship` RENAME COLUMN `CloudSponsor` TO `ToDelete`;
CREATE TABLE `OrganizationConnection` (
`Id` char(36) COLLATE ascii_general_ci NOT NULL,
`Type` tinyint unsigned NOT NULL,
`OrganizationId` char(36) COLLATE ascii_general_ci NOT NULL,
`Enabled` tinyint(1) NOT NULL,
`Config` longtext CHARACTER SET utf8mb4 NULL,
CONSTRAINT `PK_OrganizationConnection` PRIMARY KEY (`Id`),
CONSTRAINT `FK_OrganizationConnection_Organization_OrganizationId` FOREIGN KEY (`OrganizationId`) REFERENCES `Organization` (`Id`) ON DELETE CASCADE
) CHARACTER SET utf8mb4;
CREATE INDEX `IX_OrganizationApiKey_OrganizationId` ON `OrganizationApiKey` (`OrganizationId`);
CREATE INDEX `IX_OrganizationConnection_OrganizationId` ON `OrganizationConnection` (`OrganizationId`);
INSERT INTO `__EFMigrationsHistory` (`MigrationId`, `ProductVersion`)
VALUES ('20220322191314_SelfHostF4E', '5.0.12');
COMMIT;

14
util/MySqlMigrations/Scripts/2022-04-11_00_SelfHostF4EModelChanges.sql
View File

@@ -1,14 +0,0 @@
START TRANSACTION;
ALTER TABLE `OrganizationSponsorship` DROP FOREIGN KEY `FK_OrganizationSponsorship_Organization_SponsoringOrganizationId`;
ALTER TABLE `OrganizationSponsorship` MODIFY COLUMN `SponsoringOrganizationUserId` char(36) COLLATE ascii_general_ci NOT NULL DEFAULT '00000000-0000-0000-0000-000000000000';
ALTER TABLE `OrganizationSponsorship` MODIFY COLUMN `SponsoringOrganizationId` char(36) COLLATE ascii_general_ci NOT NULL DEFAULT '00000000-0000-0000-0000-000000000000';
ALTER TABLE `OrganizationSponsorship` ADD CONSTRAINT `FK_OrganizationSponsorship_Organization_SponsoringOrganizationId` FOREIGN KEY (`SponsoringOrganizationId`) REFERENCES `Organization` (`Id`) ON DELETE CASCADE;
INSERT INTO `__EFMigrationsHistory` (`MigrationId`, `ProductVersion`)
VALUES ('20220411191518_SponsorshipBulkActions', '5.0.12');
COMMIT;

14
util/MySqlMigrations/Scripts/2022-04-20_00_AddInstallationIdToEvents.sql
View File

@@ -1,14 +0,0 @@
START TRANSACTION;
ALTER TABLE `OrganizationSponsorship` DROP FOREIGN KEY `FK_OrganizationSponsorship_Organization_SponsoringOrganizationId`;
ALTER TABLE `OrganizationSponsorship` MODIFY COLUMN `SponsoringOrganizationId` char(36) COLLATE ascii_general_ci NULL;
ALTER TABLE `Event` ADD `InstallationId` char(36) COLLATE ascii_general_ci NULL;
ALTER TABLE `OrganizationSponsorship` ADD CONSTRAINT `FK_OrganizationSponsorship_Organization_SponsoringOrganizationId` FOREIGN KEY (`SponsoringOrganizationId`) REFERENCES `Organization` (`Id`) ON DELETE RESTRICT;
INSERT INTO `__EFMigrationsHistory` (`MigrationId`, `ProductVersion`)
VALUES ('20220420170738_AddInstallationIdToEvents', '5.0.12');
COMMIT;

8
util/MySqlMigrations/Scripts/2022-05-24_00_DeviceUnknownVerification.sql
View File

@@ -1,8 +0,0 @@
START TRANSACTION;
ALTER TABLE `User` ADD `UnknownDeviceVerificationEnabled` tinyint(1) NOT NULL DEFAULT 1;
INSERT INTO `__EFMigrationsHistory` (`MigrationId`, `ProductVersion`)
VALUES ('20220524171600_DeviceUnknownVerification', '5.0.12');
COMMIT;

8
util/MySqlMigrations/Scripts/2022-06-08_00_DeactivatedUserStatus.sql
View File

@@ -1,8 +0,0 @@
START TRANSACTION;
ALTER TABLE `OrganizationUser` MODIFY COLUMN `Status` smallint NOT NULL;
INSERT INTO `__EFMigrationsHistory` (`MigrationId`, `ProductVersion`)
VALUES ('20220608191914_DeactivatedUserStatus', '5.0.12');
COMMIT;

17
util/MySqlMigrations/Scripts/2022-07-07_00_UseScimFlag.sql
View File

@@ -1,17 +0,0 @@
START TRANSACTION;
ALTER TABLE `OrganizationUser` MODIFY COLUMN `Status` smallint NOT NULL;
INSERT INTO `__EFMigrationsHistory` (`MigrationId`, `ProductVersion`)
VALUES ('20220608191914_DeactivatedUserStatus', '6.0.4');
COMMIT;
START TRANSACTION;
ALTER TABLE `Organization` ADD `UseScim` tinyint(1) NOT NULL DEFAULT FALSE;
INSERT INTO `__EFMigrationsHistory` (`MigrationId`, `ProductVersion`)
VALUES ('20220707163017_UseScimFlag', '6.0.4');
COMMIT;

31
util/MySqlMigrations/Scripts/2022-09-12_00_PasswordlessAuth.sql
View File

@@ -1,31 +0,0 @@
START TRANSACTION;
CREATE TABLE `AuthRequest` (
`Id` char(36) COLLATE ascii_general_ci NOT NULL,
`UserId` char(36) COLLATE ascii_general_ci NOT NULL,
`Type` tinyint unsigned NOT NULL,
`RequestDeviceIdentifier` varchar(50) CHARACTER SET utf8mb4 NULL,
`RequestDeviceType` tinyint unsigned NOT NULL,
`RequestIpAddress` varchar(50) CHARACTER SET utf8mb4 NULL,
`RequestFingerprint` longtext CHARACTER SET utf8mb4 NULL,
`ResponseDeviceId` char(36) COLLATE ascii_general_ci NULL,
`AccessCode` varchar(25) CHARACTER SET utf8mb4 NULL,
`PublicKey` longtext CHARACTER SET utf8mb4 NULL,
`Key` longtext CHARACTER SET utf8mb4 NULL,
`MasterPasswordHash` longtext CHARACTER SET utf8mb4 NULL,
`CreationDate` datetime(6) NOT NULL,
`ResponseDate` datetime(6) NULL,
`AuthenticationDate` datetime(6) NULL,
CONSTRAINT `PK_AuthRequest` PRIMARY KEY (`Id`),
CONSTRAINT `FK_AuthRequest_Device_ResponseDeviceId` FOREIGN KEY (`ResponseDeviceId`) REFERENCES `Device` (`Id`),
CONSTRAINT `FK_AuthRequest_User_UserId` FOREIGN KEY (`UserId`) REFERENCES `User` (`Id`) ON DELETE CASCADE
) CHARACTER SET=utf8mb4;
CREATE INDEX `IX_AuthRequest_ResponseDeviceId` ON `AuthRequest` (`ResponseDeviceId`);
CREATE INDEX `IX_AuthRequest_UserId` ON `AuthRequest` (`UserId`);
INSERT INTO `__EFMigrationsHistory` (`MigrationId`, `ProductVersion`)
VALUES ('20220912144222_PasswordlessAuthRequests', '6.0.4');
COMMIT;

8
util/MySqlMigrations/Scripts/2022-09-27_00_EventsSystemUser.sql
View File

@@ -1,8 +0,0 @@
START TRANSACTION;
ALTER TABLE `Event` ADD `SystemUser` tinyint unsigned NULL;
INSERT INTO `__EFMigrationsHistory` (`MigrationId`, `ProductVersion`)
VALUES ('20220927142038_EventsSystemUser', '6.0.4');
COMMIT;

8
util/MySqlMigrations/Scripts/2022-10-11_00_UseCustomPermissions.sql
View File

@@ -1,8 +0,0 @@
START TRANSACTION;
ALTER TABLE `Organization` ADD `UseCustomPermissions` tinyint(1) NOT NULL DEFAULT FALSE;
INSERT INTO `__EFMigrationsHistory` (`MigrationId`, `ProductVersion`)
VALUES ('20221020154432_UseCustomPermissionsFlag', '6.0.4');
COMMIT;

8
util/MySqlMigrations/Scripts/2022-10-24_00_PasswordlessAuthRequestAddApprovedColumn.sql
View File

@@ -1,8 +0,0 @@
START TRANSACTION;
ALTER TABLE `AuthRequest` ADD `Approved` tinyint(1) NULL;
INSERT INTO `__EFMigrationsHistory` (`MigrationId`, `ProductVersion`)
VALUES ('20221024210500_PasswordlessAuthRequestAddApprovedColumn', '6.0.4');
COMMIT;

109
util/MySqlMigrations/packages.lock.json
View File

@@ -72,8 +72,8 @@
},
"Azure.Core": {
"type": "Transitive",
"resolved": "1.22.0",
"contentHash": "ze/xRCHSSDe5TIk5vBDbVrauW1EN7UIbnBvIBfMH8KSt/I9+/7yPAjTBDgNBk0IwG6WBV+BBHp4IUtS/PGAQwQ==",
"resolved": "1.24.0",
"contentHash": "+/qI1j2oU1S4/nvxb2k/wDsol00iGf1AyJX5g3epV7eOpQEP/2xcgh/cxgKMeFgn3U2fmgSiBnQZdkV+l5y0Uw==",
"dependencies": {
"Microsoft.Bcl.AsyncInterfaces": "1.1.1",
"System.Diagnostics.DiagnosticSource": "4.6.0",
@@ -96,16 +96,16 @@
},
"Azure.Identity": {
"type": "Transitive",
"resolved": "1.3.0",
"contentHash": "l1SYfZKOFBuUFG7C2SWHmJcrQQaiXgBdVCycx4vcZQkC6efDVt7mzZ5pfJAFEJDBUq7mjRQ0RPq9ZDGdSswqMg==",
"resolved": "1.6.0",
"contentHash": "EycyMsb6rD2PK9P0SyibFfEhvWWttdrYhyPF4f41uzdB/44yQlV+2Wehxyg489Rj6gbPvSPgbKq0xsHJBhipZA==",
"dependencies": {
"Azure.Core": "1.6.0",
"Microsoft.Identity.Client": "4.22.0",
"Microsoft.Identity.Client.Extensions.Msal": "2.16.5",
"System.Memory": "4.5.3",
"System.Security.Cryptography.ProtectedData": "4.5.0",
"System.Text.Json": "4.6.0",
"System.Threading.Tasks.Extensions": "4.5.2"
"Azure.Core": "1.24.0",
"Microsoft.Identity.Client": "4.39.0",
"Microsoft.Identity.Client.Extensions.Msal": "2.19.3",
"System.Memory": "4.5.4",
"System.Security.Cryptography.ProtectedData": "4.7.0",
"System.Text.Json": "4.7.2",
"System.Threading.Tasks.Extensions": "4.5.4"
}
},
"Azure.Storage.Blobs": {
@@ -462,14 +462,15 @@
},
"Microsoft.Data.SqlClient": {
"type": "Transitive",
"resolved": "4.1.0",
"contentHash": "o/sIRlcKEcI9vg5z9USqJ/VCxtUUBYEOXYr4TrkMNu+gGBh0KfUi06Jqpe+xZgeoxcqYruV9dLOn046uFA4vHQ==",
"resolved": "5.0.1",
"contentHash": "uu8dfrsx081cSbEevWuZAvqdmANDGJkbLBL2G3j0LAZxX1Oy8RCVAaC4Lcuak6jNicWP6CWvHqBTIEmQNSxQlw==",
"dependencies": {
"Azure.Identity": "1.3.0",
"Microsoft.Data.SqlClient.SNI.runtime": "4.0.0",
"Microsoft.Identity.Client": "4.22.0",
"Microsoft.IdentityModel.JsonWebTokens": "6.8.0",
"Microsoft.IdentityModel.Protocols.OpenIdConnect": "6.8.0",
"Azure.Identity": "1.6.0",
"Microsoft.Data.SqlClient.SNI.runtime": "5.0.1",
"Microsoft.Identity.Client": "4.45.0",
"Microsoft.IdentityModel.JsonWebTokens": "6.21.0",
"Microsoft.IdentityModel.Protocols.OpenIdConnect": "6.21.0",
"Microsoft.SqlServer.Server": "1.0.0",
"Microsoft.Win32.Registry": "5.0.0",
"System.Buffers": "4.5.1",
"System.Configuration.ConfigurationManager": "5.0.0",
@@ -485,8 +486,8 @@
},
"Microsoft.Data.SqlClient.SNI.runtime": {
"type": "Transitive",
"resolved": "4.0.0",
"contentHash": "wtLlRwQX7YoBUYm25xBjJ3UsuLgycme1xXqDn8t3S5kPCWiZrx8uOkyZHLKzH4kkCiQ9m2/J5JeCKNRbZNn3Qg=="
"resolved": "5.0.1",
"contentHash": "y0X5MxiNdbITJYoafJ2ruaX6hqO0twpCGR/ipiDOe85JKLU8WL4TuAQfDe5qtt3bND5Je26HnrarLSAMMnVTNg=="
},
"Microsoft.Data.Sqlite.Core": {
"type": "Transitive",
@@ -774,18 +775,26 @@
},
"Microsoft.Identity.Client": {
"type": "Transitive",
"resolved": "4.22.0",
"contentHash": "GlamU9rs8cSVIx9WSGv5QKpt66KkE+ImxNa/wNZZUJ3knt3PM98T9sOY8B7NcEfhw7NoxU2/0TSOcmnRSJQgqw=="
"resolved": "4.45.0",
"contentHash": "ircobISCLWbtE5eEoLKU+ldfZ8O41vg4lcy38KRj/znH17jvBiAl8oxcyNp89CsuqE3onxIpn21Ca7riyDDrRw==",
"dependencies": {
"Microsoft.IdentityModel.Abstractions": "6.18.0"
}
},
"Microsoft.Identity.Client.Extensions.Msal": {
"type": "Transitive",
"resolved": "2.16.5",
"contentHash": "VlGUZEpF8KP/GCfFI59sdE0WA0o9quqwM1YQY0dSp6jpGy5EOBkureaybLfpwCuYUUjQbLkN2p7neUIcQCfbzA==",
"resolved": "2.19.3",
"contentHash": "zVVZjn8aW7W79rC1crioDgdOwaFTQorsSO6RgVlDDjc7MvbEGz071wSNrjVhzR0CdQn6Sefx7Abf1o7vasmrLg==",
"dependencies": {
"Microsoft.Identity.Client": "4.22.0",
"Microsoft.Identity.Client": "4.38.0",
"System.Security.Cryptography.ProtectedData": "4.5.0"
}
},
"Microsoft.IdentityModel.Abstractions": {
"type": "Transitive",
"resolved": "6.21.0",
"contentHash": "XeE6LQtD719Qs2IG7HDi1TSw9LIkDbJ33xFiOBoHbApVw/8GpIBCbW+t7RwOjErUDyXZvjhZliwRkkLb8Z1uzg=="
},
"Microsoft.IdentityModel.Clients.ActiveDirectory": {
"type": "Transitive",
"resolved": "3.14.2",
@@ -798,42 +807,45 @@
},
"Microsoft.IdentityModel.JsonWebTokens": {
"type": "Transitive",
"resolved": "6.10.0",
"contentHash": "0qjS31rN1MQTc46tAYbzmMTSRfdV5ndZxSjYxIGqKSidd4wpNJfNII/pdhU5Fx8olarQoKL9lqqYw4yNOIwT0Q==",
"resolved": "6.21.0",
"contentHash": "d3h1/BaMeylKTkdP6XwRCxuOoDJZ44V9xaXr6gl5QxmpnZGdoK3bySo3OQN8ehRLJHShb94ElLUvoXyglQtgAw==",
"dependencies": {
"Microsoft.IdentityModel.Tokens": "6.10.0"
"Microsoft.IdentityModel.Tokens": "6.21.0"
}
},
"Microsoft.IdentityModel.Logging": {
"type": "Transitive",
"resolved": "6.10.0",
"contentHash": "zbcwV6esnNzhZZ/VP87dji6VrUBLB5rxnZBkDMqNYpyG+nrBnBsbm4PUYLCBMUflHCM9EMLDG0rLnqqT+l0ldA=="
"resolved": "6.21.0",
"contentHash": "tuEhHIQwvBEhMf8I50hy8FHmRSUkffDFP5EdLsSDV4qRcl2wvOPkQxYqEzWkh+ytW6sbdJGEXElGhmhDfAxAKg==",
"dependencies": {
"Microsoft.IdentityModel.Abstractions": "6.21.0"
}
},
"Microsoft.IdentityModel.Protocols": {
"type": "Transitive",
"resolved": "6.10.0",
"contentHash": "DFyXD0xylP+DknCT3hzJ7q/Q5qRNu0hO/gCU90O0ATdR0twZmlcuY9RNYaaDofXKVbzcShYNCFCGle2G/o8mkg==",
"resolved": "6.21.0",
"contentHash": "0FqY5cTLQKtHrClzHEI+QxJl8OBT2vUiEQQB7UKk832JDiJJmetzYZ3AdSrPjN/3l3nkhByeWzXnhrX0JbifKg==",
"dependencies": {
"Microsoft.IdentityModel.Logging": "6.10.0",
"Microsoft.IdentityModel.Tokens": "6.10.0"
"Microsoft.IdentityModel.Logging": "6.21.0",
"Microsoft.IdentityModel.Tokens": "6.21.0"
}
},
"Microsoft.IdentityModel.Protocols.OpenIdConnect": {
"type": "Transitive",
"resolved": "6.10.0",
"contentHash": "LVvMXAWPbPeEWTylDrxunlHH2wFyE4Mv0L4gZrJHC4HTESbWHquKZb/y/S8jgiQEDycOP0PDQvbG4RR/tr2TVQ==",
"resolved": "6.21.0",
"contentHash": "vtSKL7n6EnAsLyxmiviusm6LKrblT2ndnNqN6rvVq6iIHAnPCK9E2DkDx6h1Jrpy1cvbp40r0cnTg23nhEAGTA==",
"dependencies": {
"Microsoft.IdentityModel.Protocols": "6.10.0",
"System.IdentityModel.Tokens.Jwt": "6.10.0"
"Microsoft.IdentityModel.Protocols": "6.21.0",
"System.IdentityModel.Tokens.Jwt": "6.21.0"
}
},
"Microsoft.IdentityModel.Tokens": {
"type": "Transitive",
"resolved": "6.10.0",
"contentHash": "qbf1NslutDB4oLrriYTJpy7oB1pbh2ej2lEHd2IPDQH9C74ysOdhU5wAC7KoXblldbo7YsNR2QYFOqQM/b0Rsg==",
"resolved": "6.21.0",
"contentHash": "AAEHZvZyb597a+QJSmtxH3n2P1nIJGpZ4Q89GTenknRx6T6zyfzf592yW/jA5e8EHN4tNMjjXHQaYWEq5+L05w==",
"dependencies": {
"Microsoft.CSharp": "4.5.0",
"Microsoft.IdentityModel.Logging": "6.10.0",
"Microsoft.IdentityModel.Logging": "6.21.0",
"System.Security.Cryptography.Cng": "4.5.0"
}
},
@@ -866,6 +878,11 @@
"resolved": "7.6.4",
"contentHash": "3mB+Frn4LU4yb5ie9R752QiRn0Hvp9PITkSRofV/Lzm9EyLM87Fy9ziqgz75O/c712dh6GxuypMSBUGmNFwMeA=="
},
"Microsoft.SqlServer.Server": {
"type": "Transitive",
"resolved": "1.0.0",
"contentHash": "N4KeF3cpcm1PUHym1RmakkzfkEv3GRMyofVv40uXsQhCQeglr2OHNcUk2WOG51AKpGO8ynGpo9M/kFXSzghwug=="
},
"Microsoft.Win32.Primitives": {
"type": "Transitive",
"resolved": "4.3.0",
@@ -1631,11 +1648,11 @@
},
"System.IdentityModel.Tokens.Jwt": {
"type": "Transitive",
"resolved": "6.10.0",
"contentHash": "C+Q5ORsFycRkRuvy/Xd0Pv5xVpmWSAvQYZAGs7VQogmkqlLhvfZXTgBIlHqC3cxkstSoLJAYx6xZB7foQ2y5eg==",
"resolved": "6.21.0",
"contentHash": "JRD8AuypBE+2zYxT3dMJomQVsPYsCqlyZhWel3J1d5nzQokSRyTueF+Q4ID3Jcu6zSZKuzOdJ1MLTkbQsDqcvQ==",
"dependencies": {
"Microsoft.IdentityModel.JsonWebTokens": "6.10.0",
"Microsoft.IdentityModel.Tokens": "6.10.0"
"Microsoft.IdentityModel.JsonWebTokens": "6.21.0",
"Microsoft.IdentityModel.Tokens": "6.21.0"
}
},
"System.IO": {
@@ -2715,7 +2732,7 @@
"Microsoft.Azure.Cosmos.Table": "[1.0.8, )",
"Microsoft.Azure.NotificationHubs": "[4.1.0, )",
"Microsoft.Azure.ServiceBus": "[5.2.0, )",
"Microsoft.Data.SqlClient": "[4.1.0, )",
"Microsoft.Data.SqlClient": "[5.0.1, )",
"Microsoft.Extensions.Caching.StackExchangeRedis": "[6.0.6, )",
"Microsoft.Extensions.Configuration.EnvironmentVariables": "[6.0.1, )",
"Microsoft.Extensions.Configuration.UserSecrets": "[6.0.1, )",

3
util/PostgresMigrations/Factories.cs
View File

@@ -25,9 +25,6 @@ public class DatabaseContextFactory : IDesignTimeDbContextFactory<DatabaseContex
var globalSettings = GlobalSettingsFactory.GlobalSettings;
var optionsBuilder = new DbContextOptionsBuilder<DatabaseContext>();
var connectionString = globalSettings.PostgreSql?.ConnectionString;
// NpgSql 6.0 changed how timezones works. We have not yet updated our projects to support this new behavior and need to fallback to the previous behavior.
// Check https://www.npgsql.org/doc/release-notes/6.0.html#timestamp-rationalization-and-improvements for more details.
AppContext.SetSwitch("Npgsql.EnableLegacyTimestampBehavior", true);
if (string.IsNullOrWhiteSpace(connectionString))
{
throw new Exception("No Postgres connection string found.");

0
util/PostgresMigrations/Scripts/2021-09-21_01_SplitManageCollectionsPermission.psql → util/PostgresMigrations/HelperScripts/2021-09-21_01_SplitManageCollectionsPermission.psql
View File

0
util/PostgresMigrations/Scripts/2021-10-21_00_SetMaxAutoscaleSeatCount.psql → util/PostgresMigrations/HelperScripts/2021-10-21_00_SetMaxAutoscaleSeatCount.psql
View File

2
util/PostgresMigrations/Migrations/20211011145128_SplitManageCollectionsPermissions2.cs
View File

@@ -6,7 +6,7 @@ namespace Bit.PostgresMigrations.Migrations;
public partial class SplitManageCollectionsPermissions2 : Migration
{
private const string _scriptLocation =
"PostgresMigrations.Scripts.2021-09-21_01_SplitManageCollectionsPermission.psql";
"PostgresMigrations.HelperScripts.2021-09-21_01_SplitManageCollectionsPermission.psql";
protected override void Up(MigrationBuilder migrationBuilder)
{

2
util/PostgresMigrations/Migrations/20211021204521_SetMaxAutoscaleSeatsToCurrentSeatCount.cs
View File

@@ -6,7 +6,7 @@ namespace Bit.PostgresMigrations.Migrations;
public partial class SetMaxAutoscaleSeatsToCurrentSeatCount : Migration
{
private const string _scriptLocation =
"PostgresMigrations.Scripts.2021-10-21_00_SetMaxAutoscaleSeatCount.psql";
"PostgresMigrations.HelperScripts.2021-10-21_00_SetMaxAutoscaleSeatCount.psql";
protected override void Up(MigrationBuilder migrationBuilder)
{

1684
util/PostgresMigrations/Migrations/20221115034053_AvatarColor.Designer.cs generated Normal file
View File

File diff suppressed because it is too large Load Diff

26
util/PostgresMigrations/Migrations/20221115034053_AvatarColor.cs Normal file
View File

@@ -0,0 +1,26 @@
using Microsoft.EntityFrameworkCore.Migrations;
#nullable disable
namespace Bit.PostgresMigrations.Migrations;
public partial class AvatarColor : Migration
{
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.AddColumn<string>(
name: "AvatarColor",
table: "User",
type: "character varying(7)",
maxLength: 7,
nullable: true);
}
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropColumn(
name: "AvatarColor",
table: "User");
}
}

4
util/PostgresMigrations/Migrations/DatabaseContextModelSnapshot.cs
View File

@@ -1173,6 +1173,10 @@ namespace Bit.PostgresMigrations.Migrations
.HasMaxLength(30)
.HasColumnType("character varying(30)");
b.Property<string>("AvatarColor")
.HasMaxLength(7)
.HasColumnType("character varying(7)");
b.Property<DateTime>("CreationDate")
.HasColumnType("timestamp with time zone");

9
util/PostgresMigrations/PostgresMigrations.csproj
View File

@@ -15,14 +15,13 @@
<ItemGroup>
<Compile Include="..\EfShared\MigrationBuilderExtensions.cs" />
</ItemGroup>
<ItemGroup>
<None Remove="Scripts\2021-09-21_01_SplitManageCollectionsPermission.psql" />
<None Remove="Scripts\2021-10-21_00_SetMaxAutoscaleSeatCount.psql" />
<None Remove="HelperScripts\2021-09-21_01_SplitManageCollectionsPermission.psql" />
<None Remove="HelperScripts\2021-10-21_00_SetMaxAutoscaleSeatCount.psql" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="Scripts\2021-09-21_01_SplitManageCollectionsPermission.psql" />
<EmbeddedResource Include="Scripts\2021-10-21_00_SetMaxAutoscaleSeatCount.psql" />
<EmbeddedResource Include="HelperScripts\2021-09-21_01_SplitManageCollectionsPermission.psql" />
<EmbeddedResource Include="HelperScripts\2021-10-21_00_SetMaxAutoscaleSeatCount.psql" />
<EmbeddedResource Include="HelperScripts\2022-03-01_00_Up_MigrateOrganizationApiKeys.psql" />
<EmbeddedResource Include="HelperScripts\2022-03-01_00_Down_MigrateOrganizationApiKeys.psql" />
</ItemGroup>

497
util/PostgresMigrations/Scripts/2021-07-08_00_Init.psql
View File

@@ -1,497 +0,0 @@
CREATE TABLE IF NOT EXISTS "__EFMigrationsHistory" (
"MigrationId" character varying(150) NOT NULL,
"ProductVersion" character varying(32) NOT NULL,
CONSTRAINT "PK___EFMigrationsHistory" PRIMARY KEY ("MigrationId")
);
START TRANSACTION;
CREATE COLLATION "postgresIndetermanisticCollation" (LC_COLLATE = 'en-u-ks-primary',
LC_CTYPE = 'en-u-ks-primary',
PROVIDER = icu,
DETERMINISTIC = False
);
CREATE TABLE "Event" (
"Id" uuid NOT NULL,
"Date" timestamp without time zone NOT NULL,
"Type" integer NOT NULL,
"UserId" uuid NULL,
"OrganizationId" uuid NULL,
"CipherId" uuid NULL,
"CollectionId" uuid NULL,
"PolicyId" uuid NULL,
"GroupId" uuid NULL,
"OrganizationUserId" uuid NULL,
"DeviceType" smallint NULL,
"IpAddress" character varying(50) NULL,
"ActingUserId" uuid NULL,
CONSTRAINT "PK_Event" PRIMARY KEY ("Id")
);
CREATE TABLE "Grant" (
"Key" character varying(200) NOT NULL,
"Type" character varying(50) NULL,
"SubjectId" character varying(200) NULL,
"SessionId" character varying(100) NULL,
"ClientId" character varying(200) NULL,
"Description" character varying(200) NULL,
"CreationDate" timestamp without time zone NOT NULL,
"ExpirationDate" timestamp without time zone NULL,
"ConsumedDate" timestamp without time zone NULL,
"Data" text NULL,
CONSTRAINT "PK_Grant" PRIMARY KEY ("Key")
);
CREATE TABLE "Installation" (
"Id" uuid NOT NULL,
"Email" character varying(256) NULL,
"Key" character varying(150) NULL,
"Enabled" boolean NOT NULL,
"CreationDate" timestamp without time zone NOT NULL,
CONSTRAINT "PK_Installation" PRIMARY KEY ("Id")
);
CREATE TABLE "Organization" (
"Id" uuid NOT NULL,
"Identifier" character varying(50) COLLATE "postgresIndetermanisticCollation" NULL,
"Name" character varying(50) NULL,
"BusinessName" character varying(50) NULL,
"BusinessAddress1" character varying(50) NULL,
"BusinessAddress2" character varying(50) NULL,
"BusinessAddress3" character varying(50) NULL,
"BusinessCountry" character varying(2) NULL,
"BusinessTaxNumber" character varying(30) NULL,
"BillingEmail" character varying(256) NULL,
"Plan" character varying(50) NULL,
"PlanType" smallint NOT NULL,
"Seats" integer NULL,
"MaxCollections" smallint NULL,
"UsePolicies" boolean NOT NULL,
"UseSso" boolean NOT NULL,
"UseGroups" boolean NOT NULL,
"UseDirectory" boolean NOT NULL,
"UseEvents" boolean NOT NULL,
"UseTotp" boolean NOT NULL,
"Use2fa" boolean NOT NULL,
"UseApi" boolean NOT NULL,
"UseResetPassword" boolean NOT NULL,
"SelfHost" boolean NOT NULL,
"UsersGetPremium" boolean NOT NULL,
"Storage" bigint NULL,
"MaxStorageGb" smallint NULL,
"Gateway" smallint NULL,
"GatewayCustomerId" character varying(50) NULL,
"GatewaySubscriptionId" character varying(50) NULL,
"ReferenceData" text NULL,
"Enabled" boolean NOT NULL,
"LicenseKey" character varying(100) NULL,
"ApiKey" character varying(30) NULL,
"PublicKey" text NULL,
"PrivateKey" text NULL,
"TwoFactorProviders" text NULL,
"ExpirationDate" timestamp without time zone NULL,
"CreationDate" timestamp without time zone NOT NULL,
"RevisionDate" timestamp without time zone NOT NULL,
CONSTRAINT "PK_Organization" PRIMARY KEY ("Id")
);
CREATE TABLE "Provider" (
"Id" uuid NOT NULL,
"Name" text NULL,
"BusinessName" text NULL,
"BusinessAddress1" text NULL,
"BusinessAddress2" text NULL,
"BusinessAddress3" text NULL,
"BusinessCountry" text NULL,
"BusinessTaxNumber" text NULL,
"BillingEmail" text NULL,
"Status" smallint NOT NULL,
"UseEvents" boolean NOT NULL,
"Enabled" boolean NOT NULL,
"CreationDate" timestamp without time zone NOT NULL,
"RevisionDate" timestamp without time zone NOT NULL,
CONSTRAINT "PK_Provider" PRIMARY KEY ("Id")
);
CREATE TABLE "TaxRate" (
"Id" character varying(40) NOT NULL,
"Country" character varying(50) NULL,
"State" character varying(2) NULL,
"PostalCode" character varying(10) NULL,
"Rate" numeric NOT NULL,
"Active" boolean NOT NULL,
CONSTRAINT "PK_TaxRate" PRIMARY KEY ("Id")
);
CREATE TABLE "User" (
"Id" uuid NOT NULL,
"Name" character varying(50) NULL,
"Email" character varying(256) COLLATE "postgresIndetermanisticCollation" NOT NULL,
"EmailVerified" boolean NOT NULL,
"MasterPassword" character varying(300) NULL,
"MasterPasswordHint" character varying(50) NULL,
"Culture" character varying(10) NULL,
"SecurityStamp" character varying(50) NOT NULL,
"TwoFactorProviders" text NULL,
"TwoFactorRecoveryCode" character varying(32) NULL,
"EquivalentDomains" text NULL,
"ExcludedGlobalEquivalentDomains" text NULL,
"AccountRevisionDate" timestamp without time zone NOT NULL,
"Key" text NULL,
"PublicKey" text NULL,
"PrivateKey" text NULL,
"Premium" boolean NOT NULL,
"PremiumExpirationDate" timestamp without time zone NULL,
"RenewalReminderDate" timestamp without time zone NULL,
"Storage" bigint NULL,
"MaxStorageGb" smallint NULL,
"Gateway" smallint NULL,
"GatewayCustomerId" character varying(50) NULL,
"GatewaySubscriptionId" character varying(50) NULL,
"ReferenceData" text NULL,
"LicenseKey" character varying(100) NULL,
"ApiKey" character varying(30) NOT NULL,
"Kdf" smallint NOT NULL,
"KdfIterations" integer NOT NULL,
"CreationDate" timestamp without time zone NOT NULL,
"RevisionDate" timestamp without time zone NOT NULL,
CONSTRAINT "PK_User" PRIMARY KEY ("Id")
);
CREATE TABLE "Collection" (
"Id" uuid NOT NULL,
"OrganizationId" uuid NOT NULL,
"Name" text NULL,
"ExternalId" character varying(300) NULL,
"CreationDate" timestamp without time zone NOT NULL,
"RevisionDate" timestamp without time zone NOT NULL,
CONSTRAINT "PK_Collection" PRIMARY KEY ("Id"),
CONSTRAINT "FK_Collection_Organization_OrganizationId" FOREIGN KEY ("OrganizationId") REFERENCES "Organization" ("Id") ON DELETE CASCADE
);
CREATE TABLE "Group" (
"Id" uuid NOT NULL,
"OrganizationId" uuid NOT NULL,
"Name" character varying(100) NULL,
"AccessAll" boolean NOT NULL,
"ExternalId" character varying(300) NULL,
"CreationDate" timestamp without time zone NOT NULL,
"RevisionDate" timestamp without time zone NOT NULL,
CONSTRAINT "PK_Group" PRIMARY KEY ("Id"),
CONSTRAINT "FK_Group_Organization_OrganizationId" FOREIGN KEY ("OrganizationId") REFERENCES "Organization" ("Id") ON DELETE CASCADE
);
CREATE TABLE "Policy" (
"Id" uuid NOT NULL,
"OrganizationId" uuid NOT NULL,
"Type" smallint NOT NULL,
"Data" text NULL,
"Enabled" boolean NOT NULL,
"CreationDate" timestamp without time zone NOT NULL,
"RevisionDate" timestamp without time zone NOT NULL,
CONSTRAINT "PK_Policy" PRIMARY KEY ("Id"),
CONSTRAINT "FK_Policy_Organization_OrganizationId" FOREIGN KEY ("OrganizationId") REFERENCES "Organization" ("Id") ON DELETE CASCADE
);
CREATE TABLE "SsoConfig" (
"Id" bigint NOT NULL GENERATED BY DEFAULT AS IDENTITY,
"Enabled" boolean NOT NULL,
"OrganizationId" uuid NOT NULL,
"Data" text NULL,
"CreationDate" timestamp without time zone NOT NULL,
"RevisionDate" timestamp without time zone NOT NULL,
CONSTRAINT "PK_SsoConfig" PRIMARY KEY ("Id"),
CONSTRAINT "FK_SsoConfig_Organization_OrganizationId" FOREIGN KEY ("OrganizationId") REFERENCES "Organization" ("Id") ON DELETE CASCADE
);
CREATE TABLE "ProviderOrganization" (
"Id" uuid NOT NULL,
"ProviderId" uuid NOT NULL,
"OrganizationId" uuid NOT NULL,
"Key" text NULL,
"Settings" text NULL,
"CreationDate" timestamp without time zone NOT NULL,
"RevisionDate" timestamp without time zone NOT NULL,
CONSTRAINT "PK_ProviderOrganization" PRIMARY KEY ("Id"),
CONSTRAINT "FK_ProviderOrganization_Organization_OrganizationId" FOREIGN KEY ("OrganizationId") REFERENCES "Organization" ("Id") ON DELETE CASCADE,
CONSTRAINT "FK_ProviderOrganization_Provider_ProviderId" FOREIGN KEY ("ProviderId") REFERENCES "Provider" ("Id") ON DELETE CASCADE
);
CREATE TABLE "Cipher" (
"Id" uuid NOT NULL,
"UserId" uuid NULL,
"OrganizationId" uuid NULL,
"Type" smallint NOT NULL,
"Data" text NULL,
"Favorites" text NULL,
"Folders" text NULL,
"Attachments" text NULL,
"CreationDate" timestamp without time zone NOT NULL,
"RevisionDate" timestamp without time zone NOT NULL,
"DeletedDate" timestamp without time zone NULL,
"Reprompt" smallint NULL,
CONSTRAINT "PK_Cipher" PRIMARY KEY ("Id"),
CONSTRAINT "FK_Cipher_Organization_OrganizationId" FOREIGN KEY ("OrganizationId") REFERENCES "Organization" ("Id") ON DELETE RESTRICT,
CONSTRAINT "FK_Cipher_User_UserId" FOREIGN KEY ("UserId") REFERENCES "User" ("Id") ON DELETE RESTRICT
);
CREATE TABLE "Device" (
"Id" uuid NOT NULL,
"UserId" uuid NOT NULL,
"Name" character varying(50) NULL,
"Type" smallint NOT NULL,
"Identifier" character varying(50) NULL,
"PushToken" character varying(255) NULL,
"CreationDate" timestamp without time zone NOT NULL,
"RevisionDate" timestamp without time zone NOT NULL,
CONSTRAINT "PK_Device" PRIMARY KEY ("Id"),
CONSTRAINT "FK_Device_User_UserId" FOREIGN KEY ("UserId") REFERENCES "User" ("Id") ON DELETE CASCADE
);
CREATE TABLE "EmergencyAccess" (
"Id" uuid NOT NULL,
"GrantorId" uuid NOT NULL,
"GranteeId" uuid NULL,
"Email" character varying(256) NULL,
"KeyEncrypted" text NULL,
"Type" smallint NOT NULL,
"Status" smallint NOT NULL,
"WaitTimeDays" integer NOT NULL,
"RecoveryInitiatedDate" timestamp without time zone NULL,
"LastNotificationDate" timestamp without time zone NULL,
"CreationDate" timestamp without time zone NOT NULL,
"RevisionDate" timestamp without time zone NOT NULL,
CONSTRAINT "PK_EmergencyAccess" PRIMARY KEY ("Id"),
CONSTRAINT "FK_EmergencyAccess_User_GranteeId" FOREIGN KEY ("GranteeId") REFERENCES "User" ("Id") ON DELETE RESTRICT,
CONSTRAINT "FK_EmergencyAccess_User_GrantorId" FOREIGN KEY ("GrantorId") REFERENCES "User" ("Id") ON DELETE CASCADE
);
CREATE TABLE "Folder" (
"Id" uuid NOT NULL,
"UserId" uuid NOT NULL,
"Name" text NULL,
"CreationDate" timestamp without time zone NOT NULL,
"RevisionDate" timestamp without time zone NOT NULL,
CONSTRAINT "PK_Folder" PRIMARY KEY ("Id"),
CONSTRAINT "FK_Folder_User_UserId" FOREIGN KEY ("UserId") REFERENCES "User" ("Id") ON DELETE CASCADE
);
CREATE TABLE "OrganizationUser" (
"Id" uuid NOT NULL,
"OrganizationId" uuid NOT NULL,
"UserId" uuid NULL,
"Email" character varying(256) NULL,
"Key" text NULL,
"ResetPasswordKey" text NULL,
"Status" smallint NOT NULL,
"Type" smallint NOT NULL,
"AccessAll" boolean NOT NULL,
"ExternalId" character varying(300) NULL,
"CreationDate" timestamp without time zone NOT NULL,
"RevisionDate" timestamp without time zone NOT NULL,
"Permissions" text NULL,
CONSTRAINT "PK_OrganizationUser" PRIMARY KEY ("Id"),
CONSTRAINT "FK_OrganizationUser_Organization_OrganizationId" FOREIGN KEY ("OrganizationId") REFERENCES "Organization" ("Id") ON DELETE CASCADE,
CONSTRAINT "FK_OrganizationUser_User_UserId" FOREIGN KEY ("UserId") REFERENCES "User" ("Id") ON DELETE RESTRICT
);
CREATE TABLE "ProviderUser" (
"Id" uuid NOT NULL,
"ProviderId" uuid NOT NULL,
"UserId" uuid NULL,
"Email" text NULL,
"Key" text NULL,
"Status" smallint NOT NULL,
"Type" smallint NOT NULL,
"Permissions" text NULL,
"CreationDate" timestamp without time zone NOT NULL,
"RevisionDate" timestamp without time zone NOT NULL,
CONSTRAINT "PK_ProviderUser" PRIMARY KEY ("Id"),
CONSTRAINT "FK_ProviderUser_Provider_ProviderId" FOREIGN KEY ("ProviderId") REFERENCES "Provider" ("Id") ON DELETE CASCADE,
CONSTRAINT "FK_ProviderUser_User_UserId" FOREIGN KEY ("UserId") REFERENCES "User" ("Id") ON DELETE RESTRICT
);
CREATE TABLE "Send" (
"Id" uuid NOT NULL,
"UserId" uuid NULL,
"OrganizationId" uuid NULL,
"Type" smallint NOT NULL,
"Data" text NULL,
"Key" text NULL,
"Password" character varying(300) NULL,
"MaxAccessCount" integer NULL,
"AccessCount" integer NOT NULL,
"CreationDate" timestamp without time zone NOT NULL,
"RevisionDate" timestamp without time zone NOT NULL,
"ExpirationDate" timestamp without time zone NULL,
"DeletionDate" timestamp without time zone NOT NULL,
"Disabled" boolean NOT NULL,
"HideEmail" boolean NULL,
CONSTRAINT "PK_Send" PRIMARY KEY ("Id"),
CONSTRAINT "FK_Send_Organization_OrganizationId" FOREIGN KEY ("OrganizationId") REFERENCES "Organization" ("Id") ON DELETE RESTRICT,
CONSTRAINT "FK_Send_User_UserId" FOREIGN KEY ("UserId") REFERENCES "User" ("Id") ON DELETE RESTRICT
);
CREATE TABLE "SsoUser" (
"Id" bigint NOT NULL GENERATED BY DEFAULT AS IDENTITY,
"UserId" uuid NOT NULL,
"OrganizationId" uuid NULL,
"ExternalId" character varying(50) COLLATE "postgresIndetermanisticCollation" NULL,
"CreationDate" timestamp without time zone NOT NULL,
CONSTRAINT "PK_SsoUser" PRIMARY KEY ("Id"),
CONSTRAINT "FK_SsoUser_Organization_OrganizationId" FOREIGN KEY ("OrganizationId") REFERENCES "Organization" ("Id") ON DELETE RESTRICT,
CONSTRAINT "FK_SsoUser_User_UserId" FOREIGN KEY ("UserId") REFERENCES "User" ("Id") ON DELETE CASCADE
);
CREATE TABLE "Transaction" (
"Id" uuid NOT NULL,
"UserId" uuid NULL,
"OrganizationId" uuid NULL,
"Type" smallint NOT NULL,
"Amount" numeric NOT NULL,
"Refunded" boolean NULL,
"RefundedAmount" numeric NULL,
"Details" character varying(100) NULL,
"PaymentMethodType" smallint NULL,
"Gateway" smallint NULL,
"GatewayId" character varying(50) NULL,
"CreationDate" timestamp without time zone NOT NULL,
CONSTRAINT "PK_Transaction" PRIMARY KEY ("Id"),
CONSTRAINT "FK_Transaction_Organization_OrganizationId" FOREIGN KEY ("OrganizationId") REFERENCES "Organization" ("Id") ON DELETE RESTRICT,
CONSTRAINT "FK_Transaction_User_UserId" FOREIGN KEY ("UserId") REFERENCES "User" ("Id") ON DELETE RESTRICT
);
CREATE TABLE "U2f" (
"Id" integer NOT NULL GENERATED BY DEFAULT AS IDENTITY,
"UserId" uuid NOT NULL,
"KeyHandle" character varying(200) NULL,
"Challenge" character varying(200) NULL,
"AppId" character varying(50) NULL,
"Version" character varying(20) NULL,
"CreationDate" timestamp without time zone NOT NULL,
CONSTRAINT "PK_U2f" PRIMARY KEY ("Id"),
CONSTRAINT "FK_U2f_User_UserId" FOREIGN KEY ("UserId") REFERENCES "User" ("Id") ON DELETE CASCADE
);
CREATE TABLE "CollectionGroups" (
"CollectionId" uuid NOT NULL,
"GroupId" uuid NOT NULL,
"ReadOnly" boolean NOT NULL,
"HidePasswords" boolean NOT NULL,
CONSTRAINT "PK_CollectionGroups" PRIMARY KEY ("CollectionId", "GroupId"),
CONSTRAINT "FK_CollectionGroups_Collection_CollectionId" FOREIGN KEY ("CollectionId") REFERENCES "Collection" ("Id") ON DELETE CASCADE,
CONSTRAINT "FK_CollectionGroups_Group_GroupId" FOREIGN KEY ("GroupId") REFERENCES "Group" ("Id") ON DELETE CASCADE
);
CREATE TABLE "CollectionCipher" (
"CollectionId" uuid NOT NULL,
"CipherId" uuid NOT NULL,
CONSTRAINT "PK_CollectionCipher" PRIMARY KEY ("CollectionId", "CipherId"),
CONSTRAINT "FK_CollectionCipher_Cipher_CipherId" FOREIGN KEY ("CipherId") REFERENCES "Cipher" ("Id") ON DELETE CASCADE,
CONSTRAINT "FK_CollectionCipher_Collection_CollectionId" FOREIGN KEY ("CollectionId") REFERENCES "Collection" ("Id") ON DELETE CASCADE
);
CREATE TABLE "CollectionUsers" (
"CollectionId" uuid NOT NULL,
"OrganizationUserId" uuid NOT NULL,
"UserId" uuid NULL,
"ReadOnly" boolean NOT NULL,
"HidePasswords" boolean NOT NULL,
CONSTRAINT "PK_CollectionUsers" PRIMARY KEY ("CollectionId", "OrganizationUserId"),
CONSTRAINT "FK_CollectionUsers_Collection_CollectionId" FOREIGN KEY ("CollectionId") REFERENCES "Collection" ("Id") ON DELETE CASCADE,
CONSTRAINT "FK_CollectionUsers_OrganizationUser_OrganizationUserId" FOREIGN KEY ("OrganizationUserId") REFERENCES "OrganizationUser" ("Id") ON DELETE CASCADE,
CONSTRAINT "FK_CollectionUsers_User_UserId" FOREIGN KEY ("UserId") REFERENCES "User" ("Id") ON DELETE RESTRICT
);
CREATE TABLE "GroupUser" (
"GroupId" uuid NOT NULL,
"OrganizationUserId" uuid NOT NULL,
"UserId" uuid NULL,
CONSTRAINT "PK_GroupUser" PRIMARY KEY ("GroupId", "OrganizationUserId"),
CONSTRAINT "FK_GroupUser_Group_GroupId" FOREIGN KEY ("GroupId") REFERENCES "Group" ("Id") ON DELETE CASCADE,
CONSTRAINT "FK_GroupUser_OrganizationUser_OrganizationUserId" FOREIGN KEY ("OrganizationUserId") REFERENCES "OrganizationUser" ("Id") ON DELETE CASCADE,
CONSTRAINT "FK_GroupUser_User_UserId" FOREIGN KEY ("UserId") REFERENCES "User" ("Id") ON DELETE RESTRICT
);
CREATE TABLE "ProviderOrganizationProviderUser" (
"Id" uuid NOT NULL,
"ProviderOrganizationId" uuid NOT NULL,
"ProviderUserId" uuid NOT NULL,
"Type" smallint NOT NULL,
"Permissions" text NULL,
"CreationDate" timestamp without time zone NOT NULL,
"RevisionDate" timestamp without time zone NOT NULL,
CONSTRAINT "PK_ProviderOrganizationProviderUser" PRIMARY KEY ("Id"),
CONSTRAINT "FK_ProviderOrganizationProviderUser_ProviderOrganization_Provi~" FOREIGN KEY ("ProviderOrganizationId") REFERENCES "ProviderOrganization" ("Id") ON DELETE CASCADE,
CONSTRAINT "FK_ProviderOrganizationProviderUser_ProviderUser_ProviderUserId" FOREIGN KEY ("ProviderUserId") REFERENCES "ProviderUser" ("Id") ON DELETE CASCADE
);
CREATE INDEX "IX_Cipher_OrganizationId" ON "Cipher" ("OrganizationId");
CREATE INDEX "IX_Cipher_UserId" ON "Cipher" ("UserId");
CREATE INDEX "IX_Collection_OrganizationId" ON "Collection" ("OrganizationId");
CREATE INDEX "IX_CollectionCipher_CipherId" ON "CollectionCipher" ("CipherId");
CREATE INDEX "IX_CollectionGroups_GroupId" ON "CollectionGroups" ("GroupId");
CREATE INDEX "IX_CollectionUsers_OrganizationUserId" ON "CollectionUsers" ("OrganizationUserId");
CREATE INDEX "IX_CollectionUsers_UserId" ON "CollectionUsers" ("UserId");
CREATE INDEX "IX_Device_UserId" ON "Device" ("UserId");
CREATE INDEX "IX_EmergencyAccess_GranteeId" ON "EmergencyAccess" ("GranteeId");
CREATE INDEX "IX_EmergencyAccess_GrantorId" ON "EmergencyAccess" ("GrantorId");
CREATE INDEX "IX_Folder_UserId" ON "Folder" ("UserId");
CREATE INDEX "IX_Group_OrganizationId" ON "Group" ("OrganizationId");
CREATE INDEX "IX_GroupUser_OrganizationUserId" ON "GroupUser" ("OrganizationUserId");
CREATE INDEX "IX_GroupUser_UserId" ON "GroupUser" ("UserId");
CREATE INDEX "IX_OrganizationUser_OrganizationId" ON "OrganizationUser" ("OrganizationId");
CREATE INDEX "IX_OrganizationUser_UserId" ON "OrganizationUser" ("UserId");
CREATE INDEX "IX_Policy_OrganizationId" ON "Policy" ("OrganizationId");
CREATE INDEX "IX_ProviderOrganization_OrganizationId" ON "ProviderOrganization" ("OrganizationId");
CREATE INDEX "IX_ProviderOrganization_ProviderId" ON "ProviderOrganization" ("ProviderId");
CREATE INDEX "IX_ProviderOrganizationProviderUser_ProviderOrganizationId" ON "ProviderOrganizationProviderUser" ("ProviderOrganizationId");
CREATE INDEX "IX_ProviderOrganizationProviderUser_ProviderUserId" ON "ProviderOrganizationProviderUser" ("ProviderUserId");
CREATE INDEX "IX_ProviderUser_ProviderId" ON "ProviderUser" ("ProviderId");
CREATE INDEX "IX_ProviderUser_UserId" ON "ProviderUser" ("UserId");
CREATE INDEX "IX_Send_OrganizationId" ON "Send" ("OrganizationId");
CREATE INDEX "IX_Send_UserId" ON "Send" ("UserId");
CREATE INDEX "IX_SsoConfig_OrganizationId" ON "SsoConfig" ("OrganizationId");
CREATE INDEX "IX_SsoUser_OrganizationId" ON "SsoUser" ("OrganizationId");
CREATE INDEX "IX_SsoUser_UserId" ON "SsoUser" ("UserId");
CREATE INDEX "IX_Transaction_OrganizationId" ON "Transaction" ("OrganizationId");
CREATE INDEX "IX_Transaction_UserId" ON "Transaction" ("UserId");
CREATE INDEX "IX_U2f_UserId" ON "U2f" ("UserId");
INSERT INTO "__EFMigrationsHistory" ("MigrationId", "ProductVersion")
VALUES ('20210708191531_Init', '5.0.5');
COMMIT;

12
util/PostgresMigrations/Scripts/2021-07-09_00_RemoveProviderOrganizationProviderUser.psql
View File

@@ -1,12 +0,0 @@
START TRANSACTION;
DROP TABLE "ProviderOrganizationProviderUser";
ALTER TABLE "Event" ADD "ProviderId" uuid NULL;
ALTER TABLE "Event" ADD "ProviderUserId" uuid NULL;
INSERT INTO "__EFMigrationsHistory" ("MigrationId", "ProductVersion")
VALUES ('20210709092227_RemoveProviderOrganizationProviderUser', '5.0.5');
COMMIT;

8
util/PostgresMigrations/Scripts/2021-07-13_00_UserForcePasswordReset.psql
View File

@@ -1,8 +0,0 @@
START TRANSACTION;
ALTER TABLE "User" ADD "ForcePasswordReset" boolean NOT NULL DEFAULT FALSE;
INSERT INTO "__EFMigrationsHistory" ("MigrationId", "ProductVersion")
VALUES ('20210716141748_UserForcePasswordReset', '5.0.5');
COMMIT;

12
util/PostgresMigrations/Scripts/2021-09-20_00_AddMaxAutoscaleSeatsToOrganization.psql
View File

@@ -1,12 +0,0 @@
START TRANSACTION;
ALTER TABLE "Organization" ADD "MaxAutoscaleSeats" integer NULL;
ALTER TABLE "Organization" ADD "OwnersNotifiedOfAutoscaling" timestamp without time zone NULL;
ALTER TABLE "Event" ADD "ProviderOrganizationId" uuid NULL;
INSERT INTO "__EFMigrationsHistory" ("MigrationId", "ProductVersion")
VALUES ('20210920201829_AddMaxAutoscaleSeatsToOrganization', '5.0.9');
COMMIT;

33
util/PostgresMigrations/Scripts/2021-11-02_00_OrganizationSponsorship.psql
View File

@@ -1,33 +0,0 @@
START TRANSACTION;
ALTER TABLE "User" ADD "UsesCryptoAgent" boolean NOT NULL DEFAULT FALSE;
CREATE TABLE "OrganizationSponsorship" (
"Id" uuid NOT NULL,
"InstallationId" uuid NULL,
"SponsoringOrganizationId" uuid NULL,
"SponsoringOrganizationUserId" uuid NULL,
"SponsoredOrganizationId" uuid NULL,
"FriendlyName" character varying(256) NULL,
"OfferedToEmail" character varying(256) NULL,
"PlanSponsorshipType" smallint NULL,
"CloudSponsor" boolean NOT NULL,
"LastSyncDate" timestamp without time zone NULL,
"TimesRenewedWithoutValidation" smallint NOT NULL,
"SponsorshipLapsedDate" timestamp without time zone NULL,
CONSTRAINT "PK_OrganizationSponsorship" PRIMARY KEY ("Id"),
CONSTRAINT "FK_OrganizationSponsorship_Installation_InstallationId" FOREIGN KEY ("InstallationId") REFERENCES "Installation" ("Id") ON DELETE RESTRICT,
CONSTRAINT "FK_OrganizationSponsorship_Organization_SponsoredOrganizationId" FOREIGN KEY ("SponsoredOrganizationId") REFERENCES "Organization" ("Id") ON DELETE RESTRICT,
CONSTRAINT "FK_OrganizationSponsorship_Organization_SponsoringOrganization~" FOREIGN KEY ("SponsoringOrganizationId") REFERENCES "Organization" ("Id") ON DELETE RESTRICT
);
CREATE INDEX "IX_OrganizationSponsorship_InstallationId" ON "OrganizationSponsorship" ("InstallationId");
CREATE INDEX "IX_OrganizationSponsorship_SponsoredOrganizationId" ON "OrganizationSponsorship" ("SponsoredOrganizationId");
CREATE INDEX "IX_OrganizationSponsorship_SponsoringOrganizationId" ON "OrganizationSponsorship" ("SponsoringOrganizationId");
INSERT INTO "__EFMigrationsHistory" ("MigrationId", "ProductVersion")
VALUES ('20211108225011_OrganizationSponsorship', '5.0.9');
COMMIT;

9
util/PostgresMigrations/Scripts/2021-11-08_00_KeyConnector.psql
View File

@@ -1,9 +0,0 @@
START TRANSACTION;
ALTER TABLE "User" ADD "UsesKeyConnector" boolean NOT NULL DEFAULT FALSE;
INSERT INTO "__EFMigrationsHistory" ("MigrationId", "ProductVersion")
VALUES ('20211108041547_KeyConnector', '5.0.9');
COMMIT;

BIN
util/PostgresMigrations/Scripts/2021-11-12_00_KeyConnectorFlag.psql
View File

Binary file not shown.

BIN
util/PostgresMigrations/Scripts/2022-01-21_00_RemoveU2F.psql
View File

Binary file not shown.

10
util/PostgresMigrations/Scripts/2022-02-10_00_FailedLoginCaptcha.psql
View File

@@ -1,10 +0,0 @@
START TRANSACTION;
ALTER TABLE "User" ADD "FailedLoginCount" integer NOT NULL DEFAULT 0;
ALTER TABLE "User" ADD "LastFailedLoginDate" timestamp without time zone NULL;
INSERT INTO "__EFMigrationsHistory" ("MigrationId", "ProductVersion")
VALUES ('20220301211818_FailedLoginCaptcha', '5.0.12');
COMMIT;

59
util/PostgresMigrations/Scripts/2022-03-25_00_SelfHostF4E.psql
View File

@@ -1,59 +0,0 @@
START TRANSACTION;
ALTER TABLE "OrganizationSponsorship" DROP CONSTRAINT "FK_OrganizationSponsorship_Installation_InstallationId";
DROP INDEX "IX_OrganizationSponsorship_InstallationId";
ALTER TABLE "OrganizationSponsorship" DROP COLUMN "InstallationId";
ALTER TABLE "OrganizationSponsorship" DROP COLUMN "TimesRenewedWithoutValidation";
CREATE TABLE "OrganizationApiKey" (
"Id" uuid NOT NULL,
"OrganizationId" uuid NOT NULL,
"Type" smallint NOT NULL,
"ApiKey" character varying(30) NULL,
"RevisionDate" timestamp without time zone NOT NULL,
CONSTRAINT "PK_OrganizationApiKey" PRIMARY KEY ("Id"),
CONSTRAINT "FK_OrganizationApiKey_Organization_OrganizationId" FOREIGN KEY ("OrganizationId") REFERENCES "Organization" ("Id") ON DELETE CASCADE
);
INSERT INTO "OrganizationApiKey"(
"Id",
"OrganizationId",
"ApiKey",
"Type",
"RevisionDate")
SELECT uuid_in(overlay(overlay(md5(random()::text || ':' || random()::text) placing '4' from 13) placing to_hex(floor(random()*(11-8+1) + 8)::int)::text from 17)::cstring),
"Id" AS "OrganizationId",
"ApiKey",
0 AS "Type",
"RevisionDate"
FROM "Organization";
ALTER TABLE "Organization" DROP COLUMN "ApiKey";
ALTER TABLE "OrganizationSponsorship" RENAME COLUMN "SponsorshipLapsedDate" TO "ValidUntil";
ALTER TABLE "OrganizationSponsorship" RENAME COLUMN "CloudSponsor" TO "ToDelete";
CREATE TABLE "OrganizationConnection" (
"Id" uuid NOT NULL,
"Type" smallint NOT NULL,
"OrganizationId" uuid NOT NULL,
"Enabled" boolean NOT NULL,
"Config" text NULL,
CONSTRAINT "PK_OrganizationConnection" PRIMARY KEY ("Id"),
CONSTRAINT "FK_OrganizationConnection_Organization_OrganizationId" FOREIGN KEY ("OrganizationId") REFERENCES "Organization" ("Id") ON DELETE CASCADE
);
CREATE INDEX "IX_OrganizationApiKey_OrganizationId" ON "OrganizationApiKey" ("OrganizationId");
CREATE INDEX "IX_OrganizationConnection_OrganizationId" ON "OrganizationConnection" ("OrganizationId");
INSERT INTO "__EFMigrationsHistory" ("MigrationId", "ProductVersion")
VALUES ('20220322183505_SelfHostF4E', '5.0.12');
COMMIT;

16
util/PostgresMigrations/Scripts/2022-04-11_00_SelfHostF4EModelChanges.sql
View File

@@ -1,16 +0,0 @@
START TRANSACTION;
ALTER TABLE "OrganizationSponsorship" DROP CONSTRAINT "FK_OrganizationSponsorship_Organization_SponsoringOrganization~";
ALTER TABLE "OrganizationSponsorship" ALTER COLUMN "SponsoringOrganizationUserId" SET NOT NULL;
ALTER TABLE "OrganizationSponsorship" ALTER COLUMN "SponsoringOrganizationUserId" SET DEFAULT '00000000-0000-0000-0000-000000000000';
ALTER TABLE "OrganizationSponsorship" ALTER COLUMN "SponsoringOrganizationId" SET NOT NULL;
ALTER TABLE "OrganizationSponsorship" ALTER COLUMN "SponsoringOrganizationId" SET DEFAULT '00000000-0000-0000-0000-000000000000';
ALTER TABLE "OrganizationSponsorship" ADD CONSTRAINT "FK_OrganizationSponsorship_Organization_SponsoringOrganization~" FOREIGN KEY ("SponsoringOrganizationId") REFERENCES "Organization" ("Id") ON DELETE CASCADE;
INSERT INTO "__EFMigrationsHistory" ("MigrationId", "ProductVersion")
VALUES ('20220411190525_SponsorshipBulkActions', '5.0.12');
COMMIT;

14
util/PostgresMigrations/Scripts/2022-04-20_00_AddInstallationToEvents.psql
View File

@@ -1,14 +0,0 @@
START TRANSACTION;
ALTER TABLE "OrganizationSponsorship" DROP CONSTRAINT "FK_OrganizationSponsorship_Organization_SponsoringOrganization~";
ALTER TABLE "OrganizationSponsorship" ALTER COLUMN "SponsoringOrganizationId" DROP NOT NULL;
ALTER TABLE "Event" ADD "InstallationId" uuid NULL;
ALTER TABLE "OrganizationSponsorship" ADD CONSTRAINT "FK_OrganizationSponsorship_Organization_SponsoringOrganization~" FOREIGN KEY ("SponsoringOrganizationId") REFERENCES "Organization" ("Id") ON DELETE RESTRICT;
INSERT INTO "__EFMigrationsHistory" ("MigrationId", "ProductVersion")
VALUES ('20220420171153_AddInstallationIdToEvents', '5.0.12');
COMMIT;

8
util/PostgresMigrations/Scripts/2022-05-24_00_DeviceUnknownVerification.psql
View File

@@ -1,8 +0,0 @@
START TRANSACTION;
ALTER TABLE "User" ADD "UnknownDeviceVerificationEnabled" boolean NOT NULL DEFAULT true;
INSERT INTO "__EFMigrationsHistory" ("MigrationId", "ProductVersion")
VALUES ('20220524170740_DeviceUnknownVerification', '5.0.12');
COMMIT;

8
util/PostgresMigrations/Scripts/2022-07-07_00_UseScimFlag.psql
View File

@@ -1,8 +0,0 @@
START TRANSACTION;
ALTER TABLE "Organization" ADD "UseScim" boolean NOT NULL DEFAULT FALSE;
INSERT INTO "__EFMigrationsHistory" ("MigrationId", "ProductVersion")
VALUES ('20220707162231_UseScimFlag', '6.0.4');
COMMIT;

133
util/PostgresMigrations/Scripts/2022-09-12_00_PasswordlessAuthRequests.psql
View File

@@ -1,133 +0,0 @@
START TRANSACTION;
ALTER TABLE "User" ALTER COLUMN "RevisionDate" TYPE timestamp with time zone;
ALTER TABLE "User" ALTER COLUMN "RenewalReminderDate" TYPE timestamp with time zone;
ALTER TABLE "User" ALTER COLUMN "PremiumExpirationDate" TYPE timestamp with time zone;
ALTER TABLE "User" ALTER COLUMN "LastFailedLoginDate" TYPE timestamp with time zone;
ALTER TABLE "User" ALTER COLUMN "CreationDate" TYPE timestamp with time zone;
ALTER TABLE "User" ALTER COLUMN "AccountRevisionDate" TYPE timestamp with time zone;
ALTER TABLE "Transaction" ALTER COLUMN "CreationDate" TYPE timestamp with time zone;
ALTER TABLE "SsoUser" ALTER COLUMN "CreationDate" TYPE timestamp with time zone;
ALTER TABLE "SsoConfig" ALTER COLUMN "RevisionDate" TYPE timestamp with time zone;
ALTER TABLE "SsoConfig" ALTER COLUMN "CreationDate" TYPE timestamp with time zone;
ALTER TABLE "Send" ALTER COLUMN "RevisionDate" TYPE timestamp with time zone;
ALTER TABLE "Send" ALTER COLUMN "ExpirationDate" TYPE timestamp with time zone;
ALTER TABLE "Send" ALTER COLUMN "DeletionDate" TYPE timestamp with time zone;
ALTER TABLE "Send" ALTER COLUMN "CreationDate" TYPE timestamp with time zone;
ALTER TABLE "ProviderUser" ALTER COLUMN "RevisionDate" TYPE timestamp with time zone;
ALTER TABLE "ProviderUser" ALTER COLUMN "CreationDate" TYPE timestamp with time zone;
ALTER TABLE "ProviderOrganization" ALTER COLUMN "RevisionDate" TYPE timestamp with time zone;
ALTER TABLE "ProviderOrganization" ALTER COLUMN "CreationDate" TYPE timestamp with time zone;
ALTER TABLE "Provider" ALTER COLUMN "RevisionDate" TYPE timestamp with time zone;
ALTER TABLE "Provider" ALTER COLUMN "CreationDate" TYPE timestamp with time zone;
ALTER TABLE "Policy" ALTER COLUMN "RevisionDate" TYPE timestamp with time zone;
ALTER TABLE "Policy" ALTER COLUMN "CreationDate" TYPE timestamp with time zone;
ALTER TABLE "OrganizationUser" ALTER COLUMN "RevisionDate" TYPE timestamp with time zone;
ALTER TABLE "OrganizationUser" ALTER COLUMN "CreationDate" TYPE timestamp with time zone;
ALTER TABLE "OrganizationSponsorship" ALTER COLUMN "ValidUntil" TYPE timestamp with time zone;
ALTER TABLE "OrganizationSponsorship" ALTER COLUMN "LastSyncDate" TYPE timestamp with time zone;
ALTER TABLE "OrganizationApiKey" ALTER COLUMN "RevisionDate" TYPE timestamp with time zone;
ALTER TABLE "Organization" ALTER COLUMN "RevisionDate" TYPE timestamp with time zone;
ALTER TABLE "Organization" ALTER COLUMN "OwnersNotifiedOfAutoscaling" TYPE timestamp with time zone;
ALTER TABLE "Organization" ALTER COLUMN "ExpirationDate" TYPE timestamp with time zone;
ALTER TABLE "Organization" ALTER COLUMN "CreationDate" TYPE timestamp with time zone;
ALTER TABLE "Installation" ALTER COLUMN "CreationDate" TYPE timestamp with time zone;
ALTER TABLE "Group" ALTER COLUMN "RevisionDate" TYPE timestamp with time zone;
ALTER TABLE "Group" ALTER COLUMN "CreationDate" TYPE timestamp with time zone;
ALTER TABLE "Grant" ALTER COLUMN "ExpirationDate" TYPE timestamp with time zone;
ALTER TABLE "Grant" ALTER COLUMN "CreationDate" TYPE timestamp with time zone;
ALTER TABLE "Grant" ALTER COLUMN "ConsumedDate" TYPE timestamp with time zone;
ALTER TABLE "Folder" ALTER COLUMN "RevisionDate" TYPE timestamp with time zone;
ALTER TABLE "Folder" ALTER COLUMN "CreationDate" TYPE timestamp with time zone;
ALTER TABLE "Event" ALTER COLUMN "Date" TYPE timestamp with time zone;
ALTER TABLE "EmergencyAccess" ALTER COLUMN "RevisionDate" TYPE timestamp with time zone;
ALTER TABLE "EmergencyAccess" ALTER COLUMN "RecoveryInitiatedDate" TYPE timestamp with time zone;
ALTER TABLE "EmergencyAccess" ALTER COLUMN "LastNotificationDate" TYPE timestamp with time zone;
ALTER TABLE "EmergencyAccess" ALTER COLUMN "CreationDate" TYPE timestamp with time zone;
ALTER TABLE "Device" ALTER COLUMN "RevisionDate" TYPE timestamp with time zone;
ALTER TABLE "Device" ALTER COLUMN "CreationDate" TYPE timestamp with time zone;
ALTER TABLE "Collection" ALTER COLUMN "RevisionDate" TYPE timestamp with time zone;
ALTER TABLE "Collection" ALTER COLUMN "CreationDate" TYPE timestamp with time zone;
ALTER TABLE "Cipher" ALTER COLUMN "RevisionDate" TYPE timestamp with time zone;
ALTER TABLE "Cipher" ALTER COLUMN "DeletedDate" TYPE timestamp with time zone;
ALTER TABLE "Cipher" ALTER COLUMN "CreationDate" TYPE timestamp with time zone;
CREATE TABLE "AuthRequest" (
"Id" uuid NOT NULL,
"UserId" uuid NOT NULL,
"Type" smallint NOT NULL,
"RequestDeviceIdentifier" text NULL,
"RequestDeviceType" smallint NOT NULL,
"RequestIpAddress" text NULL,
"RequestFingerprint" text NULL,
"ResponseDeviceId" uuid NULL,
"AccessCode" text NULL,
"PublicKey" text NULL,
"Key" text NULL,
"MasterPasswordHash" text NULL,
"CreationDate" timestamp with time zone NOT NULL,
"ResponseDate" timestamp with time zone NULL,
"AuthenticationDate" timestamp with time zone NULL,
CONSTRAINT "PK_AuthRequest" PRIMARY KEY ("Id"),
CONSTRAINT "FK_AuthRequest_Device_ResponseDeviceId" FOREIGN KEY ("ResponseDeviceId") REFERENCES "Device" ("Id"),
CONSTRAINT "FK_AuthRequest_User_UserId" FOREIGN KEY ("UserId") REFERENCES "User" ("Id") ON DELETE CASCADE
);
CREATE INDEX "IX_AuthRequest_ResponseDeviceId" ON "AuthRequest" ("ResponseDeviceId");
CREATE INDEX "IX_AuthRequest_UserId" ON "AuthRequest" ("UserId");
INSERT INTO "__EFMigrationsHistory" ("MigrationId", "ProductVersion")
VALUES ('20220830163921_PasswordlessAuthRequests', '6.0.4');
COMMIT;

8
util/PostgresMigrations/Scripts/2022-09-27_00_EventsSystemUser.psql
View File

@@ -1,8 +0,0 @@
START TRANSACTION;
ALTER TABLE "Event" ADD "SystemUser" smallint NULL;
INSERT INTO "__EFMigrationsHistory" ("MigrationId", "ProductVersion")
VALUES ('20220927142152_EventsSystemUser', '6.0.4');
COMMIT;

8
util/PostgresMigrations/Scripts/2022-10-11_00_UseCustomPermissions.psql
View File

@@ -1,8 +0,0 @@
START TRANSACTION;
ALTER TABLE "Organization" ADD "UseCustomPermissions" boolean NOT NULL DEFAULT FALSE;
INSERT INTO "__EFMigrationsHistory" ("MigrationId", "ProductVersion")
VALUES ('20221116102326_UseCustomPermissionsFlag', '6.0.4');
COMMIT;

8
util/PostgresMigrations/Scripts/2022-10-24_00_PasswordlessAuthRequestAddApprovedColumn.psql
View File

@@ -1,8 +0,0 @@
START TRANSACTION;
ALTER TABLE "AuthRequest" ADD "Approved" boolean NULL;
INSERT INTO "__EFMigrationsHistory" ("MigrationId", "ProductVersion")
VALUES ('20221025033204_PasswordlessAuthRequestAddApprovedColumn', '6.0.4');
COMMIT;

109
util/PostgresMigrations/packages.lock.json
View File

@@ -72,8 +72,8 @@
},
"Azure.Core": {
"type": "Transitive",
"resolved": "1.22.0",
"contentHash": "ze/xRCHSSDe5TIk5vBDbVrauW1EN7UIbnBvIBfMH8KSt/I9+/7yPAjTBDgNBk0IwG6WBV+BBHp4IUtS/PGAQwQ==",
"resolved": "1.24.0",
"contentHash": "+/qI1j2oU1S4/nvxb2k/wDsol00iGf1AyJX5g3epV7eOpQEP/2xcgh/cxgKMeFgn3U2fmgSiBnQZdkV+l5y0Uw==",
"dependencies": {
"Microsoft.Bcl.AsyncInterfaces": "1.1.1",
"System.Diagnostics.DiagnosticSource": "4.6.0",
@@ -96,16 +96,16 @@
},
"Azure.Identity": {
"type": "Transitive",
"resolved": "1.3.0",
"contentHash": "l1SYfZKOFBuUFG7C2SWHmJcrQQaiXgBdVCycx4vcZQkC6efDVt7mzZ5pfJAFEJDBUq7mjRQ0RPq9ZDGdSswqMg==",
"resolved": "1.6.0",
"contentHash": "EycyMsb6rD2PK9P0SyibFfEhvWWttdrYhyPF4f41uzdB/44yQlV+2Wehxyg489Rj6gbPvSPgbKq0xsHJBhipZA==",
"dependencies": {
"Azure.Core": "1.6.0",
"Microsoft.Identity.Client": "4.22.0",
"Microsoft.Identity.Client.Extensions.Msal": "2.16.5",
"System.Memory": "4.5.3",
"System.Security.Cryptography.ProtectedData": "4.5.0",
"System.Text.Json": "4.6.0",
"System.Threading.Tasks.Extensions": "4.5.2"
"Azure.Core": "1.24.0",
"Microsoft.Identity.Client": "4.39.0",
"Microsoft.Identity.Client.Extensions.Msal": "2.19.3",
"System.Memory": "4.5.4",
"System.Security.Cryptography.ProtectedData": "4.7.0",
"System.Text.Json": "4.7.2",
"System.Threading.Tasks.Extensions": "4.5.4"
}
},
"Azure.Storage.Blobs": {
@@ -462,14 +462,15 @@
},
"Microsoft.Data.SqlClient": {
"type": "Transitive",
"resolved": "4.1.0",
"contentHash": "o/sIRlcKEcI9vg5z9USqJ/VCxtUUBYEOXYr4TrkMNu+gGBh0KfUi06Jqpe+xZgeoxcqYruV9dLOn046uFA4vHQ==",
"resolved": "5.0.1",
"contentHash": "uu8dfrsx081cSbEevWuZAvqdmANDGJkbLBL2G3j0LAZxX1Oy8RCVAaC4Lcuak6jNicWP6CWvHqBTIEmQNSxQlw==",
"dependencies": {
"Azure.Identity": "1.3.0",
"Microsoft.Data.SqlClient.SNI.runtime": "4.0.0",
"Microsoft.Identity.Client": "4.22.0",
"Microsoft.IdentityModel.JsonWebTokens": "6.8.0",
"Microsoft.IdentityModel.Protocols.OpenIdConnect": "6.8.0",
"Azure.Identity": "1.6.0",
"Microsoft.Data.SqlClient.SNI.runtime": "5.0.1",
"Microsoft.Identity.Client": "4.45.0",
"Microsoft.IdentityModel.JsonWebTokens": "6.21.0",
"Microsoft.IdentityModel.Protocols.OpenIdConnect": "6.21.0",
"Microsoft.SqlServer.Server": "1.0.0",
"Microsoft.Win32.Registry": "5.0.0",
"System.Buffers": "4.5.1",
"System.Configuration.ConfigurationManager": "5.0.0",
@@ -485,8 +486,8 @@
},
"Microsoft.Data.SqlClient.SNI.runtime": {
"type": "Transitive",
"resolved": "4.0.0",
"contentHash": "wtLlRwQX7YoBUYm25xBjJ3UsuLgycme1xXqDn8t3S5kPCWiZrx8uOkyZHLKzH4kkCiQ9m2/J5JeCKNRbZNn3Qg=="
"resolved": "5.0.1",
"contentHash": "y0X5MxiNdbITJYoafJ2ruaX6hqO0twpCGR/ipiDOe85JKLU8WL4TuAQfDe5qtt3bND5Je26HnrarLSAMMnVTNg=="
},
"Microsoft.Data.Sqlite.Core": {
"type": "Transitive",
@@ -774,18 +775,26 @@
},
"Microsoft.Identity.Client": {
"type": "Transitive",
"resolved": "4.22.0",
"contentHash": "GlamU9rs8cSVIx9WSGv5QKpt66KkE+ImxNa/wNZZUJ3knt3PM98T9sOY8B7NcEfhw7NoxU2/0TSOcmnRSJQgqw=="
"resolved": "4.45.0",
"contentHash": "ircobISCLWbtE5eEoLKU+ldfZ8O41vg4lcy38KRj/znH17jvBiAl8oxcyNp89CsuqE3onxIpn21Ca7riyDDrRw==",
"dependencies": {
"Microsoft.IdentityModel.Abstractions": "6.18.0"
}
},
"Microsoft.Identity.Client.Extensions.Msal": {
"type": "Transitive",
"resolved": "2.16.5",
"contentHash": "VlGUZEpF8KP/GCfFI59sdE0WA0o9quqwM1YQY0dSp6jpGy5EOBkureaybLfpwCuYUUjQbLkN2p7neUIcQCfbzA==",
"resolved": "2.19.3",
"contentHash": "zVVZjn8aW7W79rC1crioDgdOwaFTQorsSO6RgVlDDjc7MvbEGz071wSNrjVhzR0CdQn6Sefx7Abf1o7vasmrLg==",
"dependencies": {
"Microsoft.Identity.Client": "4.22.0",
"Microsoft.Identity.Client": "4.38.0",
"System.Security.Cryptography.ProtectedData": "4.5.0"
}
},
"Microsoft.IdentityModel.Abstractions": {
"type": "Transitive",
"resolved": "6.21.0",
"contentHash": "XeE6LQtD719Qs2IG7HDi1TSw9LIkDbJ33xFiOBoHbApVw/8GpIBCbW+t7RwOjErUDyXZvjhZliwRkkLb8Z1uzg=="
},
"Microsoft.IdentityModel.Clients.ActiveDirectory": {
"type": "Transitive",
"resolved": "3.14.2",
@@ -798,42 +807,45 @@
},
"Microsoft.IdentityModel.JsonWebTokens": {
"type": "Transitive",
"resolved": "6.10.0",
"contentHash": "0qjS31rN1MQTc46tAYbzmMTSRfdV5ndZxSjYxIGqKSidd4wpNJfNII/pdhU5Fx8olarQoKL9lqqYw4yNOIwT0Q==",
"resolved": "6.21.0",
"contentHash": "d3h1/BaMeylKTkdP6XwRCxuOoDJZ44V9xaXr6gl5QxmpnZGdoK3bySo3OQN8ehRLJHShb94ElLUvoXyglQtgAw==",
"dependencies": {
"Microsoft.IdentityModel.Tokens": "6.10.0"
"Microsoft.IdentityModel.Tokens": "6.21.0"
}
},
"Microsoft.IdentityModel.Logging": {
"type": "Transitive",
"resolved": "6.10.0",
"contentHash": "zbcwV6esnNzhZZ/VP87dji6VrUBLB5rxnZBkDMqNYpyG+nrBnBsbm4PUYLCBMUflHCM9EMLDG0rLnqqT+l0ldA=="
"resolved": "6.21.0",
"contentHash": "tuEhHIQwvBEhMf8I50hy8FHmRSUkffDFP5EdLsSDV4qRcl2wvOPkQxYqEzWkh+ytW6sbdJGEXElGhmhDfAxAKg==",
"dependencies": {
"Microsoft.IdentityModel.Abstractions": "6.21.0"
}
},
"Microsoft.IdentityModel.Protocols": {
"type": "Transitive",
"resolved": "6.10.0",
"contentHash": "DFyXD0xylP+DknCT3hzJ7q/Q5qRNu0hO/gCU90O0ATdR0twZmlcuY9RNYaaDofXKVbzcShYNCFCGle2G/o8mkg==",
"resolved": "6.21.0",
"contentHash": "0FqY5cTLQKtHrClzHEI+QxJl8OBT2vUiEQQB7UKk832JDiJJmetzYZ3AdSrPjN/3l3nkhByeWzXnhrX0JbifKg==",
"dependencies": {
"Microsoft.IdentityModel.Logging": "6.10.0",
"Microsoft.IdentityModel.Tokens": "6.10.0"
"Microsoft.IdentityModel.Logging": "6.21.0",
"Microsoft.IdentityModel.Tokens": "6.21.0"
}
},
"Microsoft.IdentityModel.Protocols.OpenIdConnect": {
"type": "Transitive",
"resolved": "6.10.0",
"contentHash": "LVvMXAWPbPeEWTylDrxunlHH2wFyE4Mv0L4gZrJHC4HTESbWHquKZb/y/S8jgiQEDycOP0PDQvbG4RR/tr2TVQ==",
"resolved": "6.21.0",
"contentHash": "vtSKL7n6EnAsLyxmiviusm6LKrblT2ndnNqN6rvVq6iIHAnPCK9E2DkDx6h1Jrpy1cvbp40r0cnTg23nhEAGTA==",
"dependencies": {
"Microsoft.IdentityModel.Protocols": "6.10.0",
"System.IdentityModel.Tokens.Jwt": "6.10.0"
"Microsoft.IdentityModel.Protocols": "6.21.0",
"System.IdentityModel.Tokens.Jwt": "6.21.0"
}
},
"Microsoft.IdentityModel.Tokens": {
"type": "Transitive",
"resolved": "6.10.0",
"contentHash": "qbf1NslutDB4oLrriYTJpy7oB1pbh2ej2lEHd2IPDQH9C74ysOdhU5wAC7KoXblldbo7YsNR2QYFOqQM/b0Rsg==",
"resolved": "6.21.0",
"contentHash": "AAEHZvZyb597a+QJSmtxH3n2P1nIJGpZ4Q89GTenknRx6T6zyfzf592yW/jA5e8EHN4tNMjjXHQaYWEq5+L05w==",
"dependencies": {
"Microsoft.CSharp": "4.5.0",
"Microsoft.IdentityModel.Logging": "6.10.0",
"Microsoft.IdentityModel.Logging": "6.21.0",
"System.Security.Cryptography.Cng": "4.5.0"
}
},
@@ -866,6 +878,11 @@
"resolved": "7.6.4",
"contentHash": "3mB+Frn4LU4yb5ie9R752QiRn0Hvp9PITkSRofV/Lzm9EyLM87Fy9ziqgz75O/c712dh6GxuypMSBUGmNFwMeA=="
},
"Microsoft.SqlServer.Server": {
"type": "Transitive",
"resolved": "1.0.0",
"contentHash": "N4KeF3cpcm1PUHym1RmakkzfkEv3GRMyofVv40uXsQhCQeglr2OHNcUk2WOG51AKpGO8ynGpo9M/kFXSzghwug=="
},
"Microsoft.Win32.Primitives": {
"type": "Transitive",
"resolved": "4.3.0",
@@ -1631,11 +1648,11 @@
},
"System.IdentityModel.Tokens.Jwt": {
"type": "Transitive",
"resolved": "6.10.0",
"contentHash": "C+Q5ORsFycRkRuvy/Xd0Pv5xVpmWSAvQYZAGs7VQogmkqlLhvfZXTgBIlHqC3cxkstSoLJAYx6xZB7foQ2y5eg==",
"resolved": "6.21.0",
"contentHash": "JRD8AuypBE+2zYxT3dMJomQVsPYsCqlyZhWel3J1d5nzQokSRyTueF+Q4ID3Jcu6zSZKuzOdJ1MLTkbQsDqcvQ==",
"dependencies": {
"Microsoft.IdentityModel.JsonWebTokens": "6.10.0",
"Microsoft.IdentityModel.Tokens": "6.10.0"
"Microsoft.IdentityModel.JsonWebTokens": "6.21.0",
"Microsoft.IdentityModel.Tokens": "6.21.0"
}
},
"System.IO": {
@@ -2715,7 +2732,7 @@
"Microsoft.Azure.Cosmos.Table": "[1.0.8, )",
"Microsoft.Azure.NotificationHubs": "[4.1.0, )",
"Microsoft.Azure.ServiceBus": "[5.2.0, )",
"Microsoft.Data.SqlClient": "[4.1.0, )",
"Microsoft.Data.SqlClient": "[5.0.1, )",
"Microsoft.Extensions.Caching.StackExchangeRedis": "[6.0.6, )",
"Microsoft.Extensions.Configuration.EnvironmentVariables": "[6.0.1, )",
"Microsoft.Extensions.Configuration.UserSecrets": "[6.0.1, )",

4
util/Setup/Configuration.cs
View File

@@ -77,11 +77,11 @@ public class Configuration
"WARNING: Reconfiguring this parameter may break features. By changing this parameter\n" +
"you become responsible for maintaining this value.")]
public string NginxHeaderContentSecurityPolicy { get; set; } = "default-src 'self'; style-src 'self' " +
"'unsafe-inline'; img-src 'self' data: https://haveibeenpwned.com https://www.gravatar.com; " +
"'unsafe-inline'; img-src 'self' data: https://haveibeenpwned.com; " +
"child-src 'self' https://*.duosecurity.com https://*.duofederal.com; " +
"frame-src 'self' https://*.duosecurity.com https://*.duofederal.com; " +
"connect-src 'self' wss://{0} https://api.pwnedpasswords.com " +
"https://2fa.directory; object-src 'self' blob:;";
"https://api.2fa.directory; object-src 'self' blob:;";
[Description("Communicate with the Bitwarden push relay service (push.bitwarden.com) for mobile\n" +
"app live sync.")]

2
util/Setup/EnvironmentFileBuilder.cs
View File

@@ -1,4 +1,4 @@
using System.Data.SqlClient;
using Microsoft.Data.SqlClient;
namespace Bit.Setup;

4
util/Setup/Program.cs
View File

@@ -1,7 +1,7 @@
using System.Data.SqlClient;
using System.Globalization;
using System.Globalization;
using System.Net.Http.Json;
using Bit.Migrator;
using Microsoft.Data.SqlClient;
namespace Bit.Setup;

183
util/Setup/packages.lock.json
View File

@@ -73,8 +73,8 @@
},
"Azure.Core": {
"type": "Transitive",
"resolved": "1.22.0",
"contentHash": "ze/xRCHSSDe5TIk5vBDbVrauW1EN7UIbnBvIBfMH8KSt/I9+/7yPAjTBDgNBk0IwG6WBV+BBHp4IUtS/PGAQwQ==",
"resolved": "1.24.0",
"contentHash": "+/qI1j2oU1S4/nvxb2k/wDsol00iGf1AyJX5g3epV7eOpQEP/2xcgh/cxgKMeFgn3U2fmgSiBnQZdkV+l5y0Uw==",
"dependencies": {
"Microsoft.Bcl.AsyncInterfaces": "1.1.1",
"System.Diagnostics.DiagnosticSource": "4.6.0",
@@ -97,16 +97,16 @@
},
"Azure.Identity": {
"type": "Transitive",
"resolved": "1.3.0",
"contentHash": "l1SYfZKOFBuUFG7C2SWHmJcrQQaiXgBdVCycx4vcZQkC6efDVt7mzZ5pfJAFEJDBUq7mjRQ0RPq9ZDGdSswqMg==",
"resolved": "1.6.0",
"contentHash": "EycyMsb6rD2PK9P0SyibFfEhvWWttdrYhyPF4f41uzdB/44yQlV+2Wehxyg489Rj6gbPvSPgbKq0xsHJBhipZA==",
"dependencies": {
"Azure.Core": "1.6.0",
"Microsoft.Identity.Client": "4.22.0",
"Microsoft.Identity.Client.Extensions.Msal": "2.16.5",
"System.Memory": "4.5.3",
"System.Security.Cryptography.ProtectedData": "4.5.0",
"System.Text.Json": "4.6.0",
"System.Threading.Tasks.Extensions": "4.5.2"
"Azure.Core": "1.24.0",
"Microsoft.Identity.Client": "4.39.0",
"Microsoft.Identity.Client.Extensions.Msal": "2.19.3",
"System.Memory": "4.5.4",
"System.Security.Cryptography.ProtectedData": "4.7.0",
"System.Text.Json": "4.7.2",
"System.Threading.Tasks.Extensions": "4.5.4"
}
},
"Azure.Storage.Blobs": {
@@ -454,14 +454,15 @@
},
"Microsoft.Data.SqlClient": {
"type": "Transitive",
"resolved": "4.1.0",
"contentHash": "o/sIRlcKEcI9vg5z9USqJ/VCxtUUBYEOXYr4TrkMNu+gGBh0KfUi06Jqpe+xZgeoxcqYruV9dLOn046uFA4vHQ==",
"resolved": "5.0.1",
"contentHash": "uu8dfrsx081cSbEevWuZAvqdmANDGJkbLBL2G3j0LAZxX1Oy8RCVAaC4Lcuak6jNicWP6CWvHqBTIEmQNSxQlw==",
"dependencies": {
"Azure.Identity": "1.3.0",
"Microsoft.Data.SqlClient.SNI.runtime": "4.0.0",
"Microsoft.Identity.Client": "4.22.0",
"Microsoft.IdentityModel.JsonWebTokens": "6.8.0",
"Microsoft.IdentityModel.Protocols.OpenIdConnect": "6.8.0",
"Azure.Identity": "1.6.0",
"Microsoft.Data.SqlClient.SNI.runtime": "5.0.1",
"Microsoft.Identity.Client": "4.45.0",
"Microsoft.IdentityModel.JsonWebTokens": "6.21.0",
"Microsoft.IdentityModel.Protocols.OpenIdConnect": "6.21.0",
"Microsoft.SqlServer.Server": "1.0.0",
"Microsoft.Win32.Registry": "5.0.0",
"System.Buffers": "4.5.1",
"System.Configuration.ConfigurationManager": "5.0.0",
@@ -477,8 +478,8 @@
},
"Microsoft.Data.SqlClient.SNI.runtime": {
"type": "Transitive",
"resolved": "4.0.0",
"contentHash": "wtLlRwQX7YoBUYm25xBjJ3UsuLgycme1xXqDn8t3S5kPCWiZrx8uOkyZHLKzH4kkCiQ9m2/J5JeCKNRbZNn3Qg=="
"resolved": "5.0.1",
"contentHash": "y0X5MxiNdbITJYoafJ2ruaX6hqO0twpCGR/ipiDOe85JKLU8WL4TuAQfDe5qtt3bND5Je26HnrarLSAMMnVTNg=="
},
"Microsoft.Extensions.Caching.Abstractions": {
"type": "Transitive",
@@ -689,18 +690,26 @@
},
"Microsoft.Identity.Client": {
"type": "Transitive",
"resolved": "4.22.0",
"contentHash": "GlamU9rs8cSVIx9WSGv5QKpt66KkE+ImxNa/wNZZUJ3knt3PM98T9sOY8B7NcEfhw7NoxU2/0TSOcmnRSJQgqw=="
"resolved": "4.45.0",
"contentHash": "ircobISCLWbtE5eEoLKU+ldfZ8O41vg4lcy38KRj/znH17jvBiAl8oxcyNp89CsuqE3onxIpn21Ca7riyDDrRw==",
"dependencies": {
"Microsoft.IdentityModel.Abstractions": "6.18.0"
}
},
"Microsoft.Identity.Client.Extensions.Msal": {
"type": "Transitive",
"resolved": "2.16.5",
"contentHash": "VlGUZEpF8KP/GCfFI59sdE0WA0o9quqwM1YQY0dSp6jpGy5EOBkureaybLfpwCuYUUjQbLkN2p7neUIcQCfbzA==",
"resolved": "2.19.3",
"contentHash": "zVVZjn8aW7W79rC1crioDgdOwaFTQorsSO6RgVlDDjc7MvbEGz071wSNrjVhzR0CdQn6Sefx7Abf1o7vasmrLg==",
"dependencies": {
"Microsoft.Identity.Client": "4.22.0",
"Microsoft.Identity.Client": "4.38.0",
"System.Security.Cryptography.ProtectedData": "4.5.0"
}
},
"Microsoft.IdentityModel.Abstractions": {
"type": "Transitive",
"resolved": "6.21.0",
"contentHash": "XeE6LQtD719Qs2IG7HDi1TSw9LIkDbJ33xFiOBoHbApVw/8GpIBCbW+t7RwOjErUDyXZvjhZliwRkkLb8Z1uzg=="
},
"Microsoft.IdentityModel.Clients.ActiveDirectory": {
"type": "Transitive",
"resolved": "4.3.0",
@@ -716,42 +725,45 @@
},
"Microsoft.IdentityModel.JsonWebTokens": {
"type": "Transitive",
"resolved": "6.10.0",
"contentHash": "0qjS31rN1MQTc46tAYbzmMTSRfdV5ndZxSjYxIGqKSidd4wpNJfNII/pdhU5Fx8olarQoKL9lqqYw4yNOIwT0Q==",
"resolved": "6.21.0",
"contentHash": "d3h1/BaMeylKTkdP6XwRCxuOoDJZ44V9xaXr6gl5QxmpnZGdoK3bySo3OQN8ehRLJHShb94ElLUvoXyglQtgAw==",
"dependencies": {
"Microsoft.IdentityModel.Tokens": "6.10.0"
"Microsoft.IdentityModel.Tokens": "6.21.0"
}
},
"Microsoft.IdentityModel.Logging": {
"type": "Transitive",
"resolved": "6.10.0",
"contentHash": "zbcwV6esnNzhZZ/VP87dji6VrUBLB5rxnZBkDMqNYpyG+nrBnBsbm4PUYLCBMUflHCM9EMLDG0rLnqqT+l0ldA=="
"resolved": "6.21.0",
"contentHash": "tuEhHIQwvBEhMf8I50hy8FHmRSUkffDFP5EdLsSDV4qRcl2wvOPkQxYqEzWkh+ytW6sbdJGEXElGhmhDfAxAKg==",
"dependencies": {
"Microsoft.IdentityModel.Abstractions": "6.21.0"
}
},
"Microsoft.IdentityModel.Protocols": {
"type": "Transitive",
"resolved": "6.10.0",
"contentHash": "DFyXD0xylP+DknCT3hzJ7q/Q5qRNu0hO/gCU90O0ATdR0twZmlcuY9RNYaaDofXKVbzcShYNCFCGle2G/o8mkg==",
"resolved": "6.21.0",
"contentHash": "0FqY5cTLQKtHrClzHEI+QxJl8OBT2vUiEQQB7UKk832JDiJJmetzYZ3AdSrPjN/3l3nkhByeWzXnhrX0JbifKg==",
"dependencies": {
"Microsoft.IdentityModel.Logging": "6.10.0",
"Microsoft.IdentityModel.Tokens": "6.10.0"
"Microsoft.IdentityModel.Logging": "6.21.0",
"Microsoft.IdentityModel.Tokens": "6.21.0"
}
},
"Microsoft.IdentityModel.Protocols.OpenIdConnect": {
"type": "Transitive",
"resolved": "6.10.0",
"contentHash": "LVvMXAWPbPeEWTylDrxunlHH2wFyE4Mv0L4gZrJHC4HTESbWHquKZb/y/S8jgiQEDycOP0PDQvbG4RR/tr2TVQ==",
"resolved": "6.21.0",
"contentHash": "vtSKL7n6EnAsLyxmiviusm6LKrblT2ndnNqN6rvVq6iIHAnPCK9E2DkDx6h1Jrpy1cvbp40r0cnTg23nhEAGTA==",
"dependencies": {
"Microsoft.IdentityModel.Protocols": "6.10.0",
"System.IdentityModel.Tokens.Jwt": "6.10.0"
"Microsoft.IdentityModel.Protocols": "6.21.0",
"System.IdentityModel.Tokens.Jwt": "6.21.0"
}
},
"Microsoft.IdentityModel.Tokens": {
"type": "Transitive",
"resolved": "6.10.0",
"contentHash": "qbf1NslutDB4oLrriYTJpy7oB1pbh2ej2lEHd2IPDQH9C74ysOdhU5wAC7KoXblldbo7YsNR2QYFOqQM/b0Rsg==",
"resolved": "6.21.0",
"contentHash": "AAEHZvZyb597a+QJSmtxH3n2P1nIJGpZ4Q89GTenknRx6T6zyfzf592yW/jA5e8EHN4tNMjjXHQaYWEq5+L05w==",
"dependencies": {
"Microsoft.CSharp": "4.5.0",
"Microsoft.IdentityModel.Logging": "6.10.0",
"Microsoft.IdentityModel.Logging": "6.21.0",
"System.Security.Cryptography.Cng": "4.5.0"
}
},
@@ -784,6 +796,11 @@
"resolved": "7.6.4",
"contentHash": "3mB+Frn4LU4yb5ie9R752QiRn0Hvp9PITkSRofV/Lzm9EyLM87Fy9ziqgz75O/c712dh6GxuypMSBUGmNFwMeA=="
},
"Microsoft.SqlServer.Server": {
"type": "Transitive",
"resolved": "1.0.0",
"contentHash": "N4KeF3cpcm1PUHym1RmakkzfkEv3GRMyofVv40uXsQhCQeglr2OHNcUk2WOG51AKpGO8ynGpo9M/kFXSzghwug=="
},
"Microsoft.Win32.Primitives": {
"type": "Transitive",
"resolved": "4.3.0",
@@ -1518,11 +1535,11 @@
},
"System.IdentityModel.Tokens.Jwt": {
"type": "Transitive",
"resolved": "6.10.0",
"contentHash": "C+Q5ORsFycRkRuvy/Xd0Pv5xVpmWSAvQYZAGs7VQogmkqlLhvfZXTgBIlHqC3cxkstSoLJAYx6xZB7foQ2y5eg==",
"resolved": "6.21.0",
"contentHash": "JRD8AuypBE+2zYxT3dMJomQVsPYsCqlyZhWel3J1d5nzQokSRyTueF+Q4ID3Jcu6zSZKuzOdJ1MLTkbQsDqcvQ==",
"dependencies": {
"Microsoft.IdentityModel.JsonWebTokens": "6.10.0",
"Microsoft.IdentityModel.Tokens": "6.10.0"
"Microsoft.IdentityModel.JsonWebTokens": "6.21.0",
"Microsoft.IdentityModel.Tokens": "6.21.0"
}
},
"System.IO": {
@@ -2585,49 +2602,49 @@
"core": {
"type": "Project",
"dependencies": {
"AWSSDK.SQS": "3.7.2.47",
"AWSSDK.SimpleEmail": "3.7.0.150",
"AspNetCoreRateLimit": "4.0.2",
"AspNetCoreRateLimit.Redis": "1.0.1",
"Azure.Extensions.AspNetCore.DataProtection.Blobs": "1.2.1",
"Azure.Storage.Blobs": "12.11.0",
"Azure.Storage.Queues": "12.9.0",
"BitPay.Light": "1.0.1907",
"Braintree": "5.12.0",
"Fido2.AspNet": "3.0.0-beta2",
"Handlebars.Net": "2.1.2",
"IdentityServer4": "4.1.2",
"IdentityServer4.AccessTokenValidation": "3.0.1",
"MailKit": "3.2.0",
"Microsoft.AspNetCore.Authentication.JwtBearer": "6.0.4",
"Microsoft.Azure.Cosmos.Table": "1.0.8",
"Microsoft.Azure.NotificationHubs": "4.1.0",
"Microsoft.Azure.ServiceBus": "5.2.0",
"Microsoft.Data.SqlClient": "4.1.0",
"Microsoft.Extensions.Caching.StackExchangeRedis": "6.0.6",
"Microsoft.Extensions.Configuration.EnvironmentVariables": "6.0.1",
"Microsoft.Extensions.Configuration.UserSecrets": "6.0.1",
"Microsoft.Extensions.Identity.Stores": "6.0.4",
"Newtonsoft.Json": "13.0.1",
"Otp.NET": "1.2.2",
"Quartz": "3.4.0",
"SendGrid": "9.27.0",
"Sentry.Serilog": "3.16.0",
"Serilog.AspNetCore": "5.0.0",
"Serilog.Extensions.Logging": "3.1.0",
"Serilog.Extensions.Logging.File": "2.0.0",
"Serilog.Sinks.AzureCosmosDB": "2.0.0",
"Serilog.Sinks.SyslogMessages": "2.0.6",
"Stripe.net": "40.0.0",
"YubicoDotNetClient": "1.2.0"
"AWSSDK.SQS": "[3.7.2.47, )",
"AWSSDK.SimpleEmail": "[3.7.0.150, )",
"AspNetCoreRateLimit": "[4.0.2, )",
"AspNetCoreRateLimit.Redis": "[1.0.1, )",
"Azure.Extensions.AspNetCore.DataProtection.Blobs": "[1.2.1, )",
"Azure.Storage.Blobs": "[12.11.0, )",
"Azure.Storage.Queues": "[12.9.0, )",
"BitPay.Light": "[1.0.1907, )",
"Braintree": "[5.12.0, )",
"Fido2.AspNet": "[3.0.0-beta2, )",
"Handlebars.Net": "[2.1.2, )",
"IdentityServer4": "[4.1.2, )",
"IdentityServer4.AccessTokenValidation": "[3.0.1, )",
"MailKit": "[3.2.0, )",
"Microsoft.AspNetCore.Authentication.JwtBearer": "[6.0.4, )",
"Microsoft.Azure.Cosmos.Table": "[1.0.8, )",
"Microsoft.Azure.NotificationHubs": "[4.1.0, )",
"Microsoft.Azure.ServiceBus": "[5.2.0, )",
"Microsoft.Data.SqlClient": "[5.0.1, )",
"Microsoft.Extensions.Caching.StackExchangeRedis": "[6.0.6, )",
"Microsoft.Extensions.Configuration.EnvironmentVariables": "[6.0.1, )",
"Microsoft.Extensions.Configuration.UserSecrets": "[6.0.1, )",
"Microsoft.Extensions.Identity.Stores": "[6.0.4, )",
"Newtonsoft.Json": "[13.0.1, )",
"Otp.NET": "[1.2.2, )",
"Quartz": "[3.4.0, )",
"SendGrid": "[9.27.0, )",
"Sentry.Serilog": "[3.16.0, )",
"Serilog.AspNetCore": "[5.0.0, )",
"Serilog.Extensions.Logging": "[3.1.0, )",
"Serilog.Extensions.Logging.File": "[2.0.0, )",
"Serilog.Sinks.AzureCosmosDB": "[2.0.0, )",
"Serilog.Sinks.SyslogMessages": "[2.0.6, )",
"Stripe.net": "[40.0.0, )",
"YubicoDotNetClient": "[1.2.0, )"
}
},
"migrator": {
"type": "Project",
"dependencies": {
"Core": "2022.8.4",
"Microsoft.Extensions.Logging": "6.0.0",
"dbup-sqlserver": "4.5.0"
"Core": "[2022.12.0, )",
"Microsoft.Extensions.Logging": "[6.0.0, )",
"dbup-sqlserver": "[4.5.0, )"
}
}
}

1683
util/SqliteMigrations/Migrations/20230106025949_AvatarColor.Designer.cs generated Normal file
View File

File diff suppressed because it is too large Load Diff

25
util/SqliteMigrations/Migrations/20230106025949_AvatarColor.cs Normal file
View File

@@ -0,0 +1,25 @@
using Microsoft.EntityFrameworkCore.Migrations;
#nullable disable
namespace Bit.SqliteMigrations.Migrations;
public partial class AvatarColor : Migration
{
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.AddColumn<string>(
name: "AvatarColor",
table: "User",
type: "TEXT",
maxLength: 7,
nullable: true);
}
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropColumn(
name: "AvatarColor",
table: "User");
}
}

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

@@ -1164,6 +1164,10 @@ namespace Bit.SqliteMigrations.Migrations
.HasMaxLength(30)
.HasColumnType("TEXT");
b.Property<string>("AvatarColor")
.HasMaxLength(7)
.HasColumnType("TEXT");
b.Property<DateTime>("CreationDate")
.HasColumnType("TEXT");

109
util/SqliteMigrations/packages.lock.json
View File

@@ -72,8 +72,8 @@
},
"Azure.Core": {
"type": "Transitive",
"resolved": "1.22.0",
"contentHash": "ze/xRCHSSDe5TIk5vBDbVrauW1EN7UIbnBvIBfMH8KSt/I9+/7yPAjTBDgNBk0IwG6WBV+BBHp4IUtS/PGAQwQ==",
"resolved": "1.24.0",
"contentHash": "+/qI1j2oU1S4/nvxb2k/wDsol00iGf1AyJX5g3epV7eOpQEP/2xcgh/cxgKMeFgn3U2fmgSiBnQZdkV+l5y0Uw==",
"dependencies": {
"Microsoft.Bcl.AsyncInterfaces": "1.1.1",
"System.Diagnostics.DiagnosticSource": "4.6.0",
@@ -96,16 +96,16 @@
},
"Azure.Identity": {
"type": "Transitive",
"resolved": "1.3.0",
"contentHash": "l1SYfZKOFBuUFG7C2SWHmJcrQQaiXgBdVCycx4vcZQkC6efDVt7mzZ5pfJAFEJDBUq7mjRQ0RPq9ZDGdSswqMg==",
"resolved": "1.6.0",
"contentHash": "EycyMsb6rD2PK9P0SyibFfEhvWWttdrYhyPF4f41uzdB/44yQlV+2Wehxyg489Rj6gbPvSPgbKq0xsHJBhipZA==",
"dependencies": {
"Azure.Core": "1.6.0",
"Microsoft.Identity.Client": "4.22.0",
"Microsoft.Identity.Client.Extensions.Msal": "2.16.5",
"System.Memory": "4.5.3",
"System.Security.Cryptography.ProtectedData": "4.5.0",
"System.Text.Json": "4.6.0",
"System.Threading.Tasks.Extensions": "4.5.2"
"Azure.Core": "1.24.0",
"Microsoft.Identity.Client": "4.39.0",
"Microsoft.Identity.Client.Extensions.Msal": "2.19.3",
"System.Memory": "4.5.4",
"System.Security.Cryptography.ProtectedData": "4.7.0",
"System.Text.Json": "4.7.2",
"System.Threading.Tasks.Extensions": "4.5.4"
}
},
"Azure.Storage.Blobs": {
@@ -462,14 +462,15 @@
},
"Microsoft.Data.SqlClient": {
"type": "Transitive",
"resolved": "4.1.0",
"contentHash": "o/sIRlcKEcI9vg5z9USqJ/VCxtUUBYEOXYr4TrkMNu+gGBh0KfUi06Jqpe+xZgeoxcqYruV9dLOn046uFA4vHQ==",
"resolved": "5.0.1",
"contentHash": "uu8dfrsx081cSbEevWuZAvqdmANDGJkbLBL2G3j0LAZxX1Oy8RCVAaC4Lcuak6jNicWP6CWvHqBTIEmQNSxQlw==",
"dependencies": {
"Azure.Identity": "1.3.0",
"Microsoft.Data.SqlClient.SNI.runtime": "4.0.0",
"Microsoft.Identity.Client": "4.22.0",
"Microsoft.IdentityModel.JsonWebTokens": "6.8.0",
"Microsoft.IdentityModel.Protocols.OpenIdConnect": "6.8.0",
"Azure.Identity": "1.6.0",
"Microsoft.Data.SqlClient.SNI.runtime": "5.0.1",
"Microsoft.Identity.Client": "4.45.0",
"Microsoft.IdentityModel.JsonWebTokens": "6.21.0",
"Microsoft.IdentityModel.Protocols.OpenIdConnect": "6.21.0",
"Microsoft.SqlServer.Server": "1.0.0",
"Microsoft.Win32.Registry": "5.0.0",
"System.Buffers": "4.5.1",
"System.Configuration.ConfigurationManager": "5.0.0",
@@ -485,8 +486,8 @@
},
"Microsoft.Data.SqlClient.SNI.runtime": {
"type": "Transitive",
"resolved": "4.0.0",
"contentHash": "wtLlRwQX7YoBUYm25xBjJ3UsuLgycme1xXqDn8t3S5kPCWiZrx8uOkyZHLKzH4kkCiQ9m2/J5JeCKNRbZNn3Qg=="
"resolved": "5.0.1",
"contentHash": "y0X5MxiNdbITJYoafJ2ruaX6hqO0twpCGR/ipiDOe85JKLU8WL4TuAQfDe5qtt3bND5Je26HnrarLSAMMnVTNg=="
},
"Microsoft.Data.Sqlite.Core": {
"type": "Transitive",
@@ -774,18 +775,26 @@
},
"Microsoft.Identity.Client": {
"type": "Transitive",
"resolved": "4.22.0",
"contentHash": "GlamU9rs8cSVIx9WSGv5QKpt66KkE+ImxNa/wNZZUJ3knt3PM98T9sOY8B7NcEfhw7NoxU2/0TSOcmnRSJQgqw=="
"resolved": "4.45.0",
"contentHash": "ircobISCLWbtE5eEoLKU+ldfZ8O41vg4lcy38KRj/znH17jvBiAl8oxcyNp89CsuqE3onxIpn21Ca7riyDDrRw==",
"dependencies": {
"Microsoft.IdentityModel.Abstractions": "6.18.0"
}
},
"Microsoft.Identity.Client.Extensions.Msal": {
"type": "Transitive",
"resolved": "2.16.5",
"contentHash": "VlGUZEpF8KP/GCfFI59sdE0WA0o9quqwM1YQY0dSp6jpGy5EOBkureaybLfpwCuYUUjQbLkN2p7neUIcQCfbzA==",
"resolved": "2.19.3",
"contentHash": "zVVZjn8aW7W79rC1crioDgdOwaFTQorsSO6RgVlDDjc7MvbEGz071wSNrjVhzR0CdQn6Sefx7Abf1o7vasmrLg==",
"dependencies": {
"Microsoft.Identity.Client": "4.22.0",
"Microsoft.Identity.Client": "4.38.0",
"System.Security.Cryptography.ProtectedData": "4.5.0"
}
},
"Microsoft.IdentityModel.Abstractions": {
"type": "Transitive",
"resolved": "6.21.0",
"contentHash": "XeE6LQtD719Qs2IG7HDi1TSw9LIkDbJ33xFiOBoHbApVw/8GpIBCbW+t7RwOjErUDyXZvjhZliwRkkLb8Z1uzg=="
},
"Microsoft.IdentityModel.Clients.ActiveDirectory": {
"type": "Transitive",
"resolved": "3.14.2",
@@ -798,42 +807,45 @@
},
"Microsoft.IdentityModel.JsonWebTokens": {
"type": "Transitive",
"resolved": "6.10.0",
"contentHash": "0qjS31rN1MQTc46tAYbzmMTSRfdV5ndZxSjYxIGqKSidd4wpNJfNII/pdhU5Fx8olarQoKL9lqqYw4yNOIwT0Q==",
"resolved": "6.21.0",
"contentHash": "d3h1/BaMeylKTkdP6XwRCxuOoDJZ44V9xaXr6gl5QxmpnZGdoK3bySo3OQN8ehRLJHShb94ElLUvoXyglQtgAw==",
"dependencies": {
"Microsoft.IdentityModel.Tokens": "6.10.0"
"Microsoft.IdentityModel.Tokens": "6.21.0"
}
},
"Microsoft.IdentityModel.Logging": {
"type": "Transitive",
"resolved": "6.10.0",
"contentHash": "zbcwV6esnNzhZZ/VP87dji6VrUBLB5rxnZBkDMqNYpyG+nrBnBsbm4PUYLCBMUflHCM9EMLDG0rLnqqT+l0ldA=="
"resolved": "6.21.0",
"contentHash": "tuEhHIQwvBEhMf8I50hy8FHmRSUkffDFP5EdLsSDV4qRcl2wvOPkQxYqEzWkh+ytW6sbdJGEXElGhmhDfAxAKg==",
"dependencies": {
"Microsoft.IdentityModel.Abstractions": "6.21.0"
}
},
"Microsoft.IdentityModel.Protocols": {
"type": "Transitive",
"resolved": "6.10.0",
"contentHash": "DFyXD0xylP+DknCT3hzJ7q/Q5qRNu0hO/gCU90O0ATdR0twZmlcuY9RNYaaDofXKVbzcShYNCFCGle2G/o8mkg==",
"resolved": "6.21.0",
"contentHash": "0FqY5cTLQKtHrClzHEI+QxJl8OBT2vUiEQQB7UKk832JDiJJmetzYZ3AdSrPjN/3l3nkhByeWzXnhrX0JbifKg==",
"dependencies": {
"Microsoft.IdentityModel.Logging": "6.10.0",
"Microsoft.IdentityModel.Tokens": "6.10.0"
"Microsoft.IdentityModel.Logging": "6.21.0",
"Microsoft.IdentityModel.Tokens": "6.21.0"
}
},
"Microsoft.IdentityModel.Protocols.OpenIdConnect": {
"type": "Transitive",
"resolved": "6.10.0",
"contentHash": "LVvMXAWPbPeEWTylDrxunlHH2wFyE4Mv0L4gZrJHC4HTESbWHquKZb/y/S8jgiQEDycOP0PDQvbG4RR/tr2TVQ==",
"resolved": "6.21.0",
"contentHash": "vtSKL7n6EnAsLyxmiviusm6LKrblT2ndnNqN6rvVq6iIHAnPCK9E2DkDx6h1Jrpy1cvbp40r0cnTg23nhEAGTA==",
"dependencies": {
"Microsoft.IdentityModel.Protocols": "6.10.0",
"System.IdentityModel.Tokens.Jwt": "6.10.0"
"Microsoft.IdentityModel.Protocols": "6.21.0",
"System.IdentityModel.Tokens.Jwt": "6.21.0"
}
},
"Microsoft.IdentityModel.Tokens": {
"type": "Transitive",
"resolved": "6.10.0",
"contentHash": "qbf1NslutDB4oLrriYTJpy7oB1pbh2ej2lEHd2IPDQH9C74ysOdhU5wAC7KoXblldbo7YsNR2QYFOqQM/b0Rsg==",
"resolved": "6.21.0",
"contentHash": "AAEHZvZyb597a+QJSmtxH3n2P1nIJGpZ4Q89GTenknRx6T6zyfzf592yW/jA5e8EHN4tNMjjXHQaYWEq5+L05w==",
"dependencies": {
"Microsoft.CSharp": "4.5.0",
"Microsoft.IdentityModel.Logging": "6.10.0",
"Microsoft.IdentityModel.Logging": "6.21.0",
"System.Security.Cryptography.Cng": "4.5.0"
}
},
@@ -866,6 +878,11 @@
"resolved": "7.6.4",
"contentHash": "3mB+Frn4LU4yb5ie9R752QiRn0Hvp9PITkSRofV/Lzm9EyLM87Fy9ziqgz75O/c712dh6GxuypMSBUGmNFwMeA=="
},
"Microsoft.SqlServer.Server": {
"type": "Transitive",
"resolved": "1.0.0",
"contentHash": "N4KeF3cpcm1PUHym1RmakkzfkEv3GRMyofVv40uXsQhCQeglr2OHNcUk2WOG51AKpGO8ynGpo9M/kFXSzghwug=="
},
"Microsoft.Win32.Primitives": {
"type": "Transitive",
"resolved": "4.3.0",
@@ -1631,11 +1648,11 @@
},
"System.IdentityModel.Tokens.Jwt": {
"type": "Transitive",
"resolved": "6.10.0",
"contentHash": "C+Q5ORsFycRkRuvy/Xd0Pv5xVpmWSAvQYZAGs7VQogmkqlLhvfZXTgBIlHqC3cxkstSoLJAYx6xZB7foQ2y5eg==",
"resolved": "6.21.0",
"contentHash": "JRD8AuypBE+2zYxT3dMJomQVsPYsCqlyZhWel3J1d5nzQokSRyTueF+Q4ID3Jcu6zSZKuzOdJ1MLTkbQsDqcvQ==",
"dependencies": {
"Microsoft.IdentityModel.JsonWebTokens": "6.10.0",
"Microsoft.IdentityModel.Tokens": "6.10.0"
"Microsoft.IdentityModel.JsonWebTokens": "6.21.0",
"Microsoft.IdentityModel.Tokens": "6.21.0"
}
},
"System.IO": {
@@ -2715,7 +2732,7 @@
"Microsoft.Azure.Cosmos.Table": "[1.0.8, )",
"Microsoft.Azure.NotificationHubs": "[4.1.0, )",
"Microsoft.Azure.ServiceBus": "[5.2.0, )",
"Microsoft.Data.SqlClient": "[4.1.0, )",
"Microsoft.Data.SqlClient": "[5.0.1, )",
"Microsoft.Extensions.Caching.StackExchangeRedis": "[6.0.6, )",
"Microsoft.Extensions.Configuration.EnvironmentVariables": "[6.0.1, )",
"Microsoft.Extensions.Configuration.UserSecrets": "[6.0.1, )",