From dd8ffa2cbcad2a9d967cfb9a7b0c747195bf8e5b Mon Sep 17 00:00:00 2001 From: Joseph Flinn <58369717+joseph-flinn@users.noreply.github.com> Date: Thu, 19 Oct 2023 07:59:46 -0700 Subject: [PATCH] Manually move future migrations (#3263) * Manually move finalization migrations * Rename the migrations to adhere to current EDD process * Updated future migration for dropping UnknownDeviceVerificationEnabled column on User * Moving src/Sql/dbo_future to src/Sql/dbo * Delete files asking to be deleted * Fix tab * Updated migration for User tables update store procedures * Fix formatting * Fix User.sql table end comma * Remove the future scripts that were added back in as finalization scripts by https://github.com/bitwarden/server/pull/3192/files --------- Co-authored-by: Federico Maccaroni Co-authored-by: Hinton --- .../OrganizationUser_CreateMany.sql | 40 ------ .../OrganizationUser_UpdateMany.sql | 33 ----- src/Sql/dbo/Stored Procedures/User_Create.sql | 3 - src/Sql/dbo/Stored Procedures/User_Update.sql | 2 - src/Sql/dbo/Tables/User.sql | 3 +- .../OrganizationUserType.sql | 15 --- .../Functions/PolicyApplicableToUser.sql | 2 - .../Collection_CreateWithGroups.sql | 2 - .../Collection_ReadWithGroupsById.sql | 2 - .../Collection_ReadWithGroupsByIdUserId.sql | 2 - .../Collection_UpdateWithGroups.sql | 2 - .../OrganizationUser_CreateMany.sql | 2 - .../OrganizationUser_UpdateMany.sql | 2 - .../Policy_CountByTypeApplicableToUser.sql | 2 - .../Policy_ReadByTypeApplicableToUser.sql | 2 - .../Stored Procedures/User_Create.sql | 120 ------------------ .../Stored Procedures/User_Update.sql | 82 ------------ src/Sql/dbo_future/Tables/User.sql | 49 ------- .../OrganizationUserType.sql | 2 - ...2023-09-11_00_2023-01-FutureMigration.sql} | 40 +++++- ...2023-09-11_01_2023-02-FutureMigration.sql} | 0 21 files changed, 36 insertions(+), 371 deletions(-) delete mode 100644 src/Sql/dbo/Stored Procedures/OrganizationUser_CreateMany.sql delete mode 100644 src/Sql/dbo/Stored Procedures/OrganizationUser_UpdateMany.sql delete mode 100644 src/Sql/dbo/User Defined Types/OrganizationUserType.sql delete mode 100644 src/Sql/dbo_future/Functions/PolicyApplicableToUser.sql delete mode 100644 src/Sql/dbo_future/Stored Procedures/Collection_CreateWithGroups.sql delete mode 100644 src/Sql/dbo_future/Stored Procedures/Collection_ReadWithGroupsById.sql delete mode 100644 src/Sql/dbo_future/Stored Procedures/Collection_ReadWithGroupsByIdUserId.sql delete mode 100644 src/Sql/dbo_future/Stored Procedures/Collection_UpdateWithGroups.sql delete mode 100644 src/Sql/dbo_future/Stored Procedures/OrganizationUser_CreateMany.sql delete mode 100644 src/Sql/dbo_future/Stored Procedures/OrganizationUser_UpdateMany.sql delete mode 100644 src/Sql/dbo_future/Stored Procedures/Policy_CountByTypeApplicableToUser.sql delete mode 100644 src/Sql/dbo_future/Stored Procedures/Policy_ReadByTypeApplicableToUser.sql delete mode 100644 src/Sql/dbo_future/Stored Procedures/User_Create.sql delete mode 100644 src/Sql/dbo_future/Stored Procedures/User_Update.sql delete mode 100644 src/Sql/dbo_future/Tables/User.sql delete mode 100644 src/Sql/dbo_future/User Defined Types/OrganizationUserType.sql rename util/Migrator/{DbScripts_finalization/2023-01-FutureMigration.sql => DbScripts/2023-09-11_00_2023-01-FutureMigration.sql} (82%) rename util/Migrator/{DbScripts_finalization/2023-02-FutureMigration.sql => DbScripts/2023-09-11_01_2023-02-FutureMigration.sql} (100%) diff --git a/src/Sql/dbo/Stored Procedures/OrganizationUser_CreateMany.sql b/src/Sql/dbo/Stored Procedures/OrganizationUser_CreateMany.sql deleted file mode 100644 index 917553c34e..0000000000 --- a/src/Sql/dbo/Stored Procedures/OrganizationUser_CreateMany.sql +++ /dev/null @@ -1,40 +0,0 @@ -CREATE PROCEDURE [dbo].[OrganizationUser_CreateMany] - @OrganizationUsersInput [dbo].[OrganizationUserType] READONLY -AS -BEGIN - SET NOCOUNT ON - - INSERT INTO [dbo].[OrganizationUser] - ( - [Id], - [OrganizationId], - [UserId], - [Email], - [Key], - [Status], - [Type], - [AccessAll], - [ExternalId], - [CreationDate], - [RevisionDate], - [Permissions], - [ResetPasswordKey] - ) - SELECT - OU.[Id], - OU.[OrganizationId], - OU.[UserId], - OU.[Email], - OU.[Key], - OU.[Status], - OU.[Type], - OU.[AccessAll], - OU.[ExternalId], - OU.[CreationDate], - OU.[RevisionDate], - OU.[Permissions], - OU.[ResetPasswordKey] - FROM - @OrganizationUsersInput OU -END -GO diff --git a/src/Sql/dbo/Stored Procedures/OrganizationUser_UpdateMany.sql b/src/Sql/dbo/Stored Procedures/OrganizationUser_UpdateMany.sql deleted file mode 100644 index aad6ddedc7..0000000000 --- a/src/Sql/dbo/Stored Procedures/OrganizationUser_UpdateMany.sql +++ /dev/null @@ -1,33 +0,0 @@ -CREATE PROCEDURE [dbo].[OrganizationUser_UpdateMany] - @OrganizationUsersInput [dbo].[OrganizationUserType] READONLY -AS -BEGIN - SET NOCOUNT ON - - UPDATE - OU - SET - [OrganizationId] = OUI.[OrganizationId], - [UserId] = OUI.[UserId], - [Email] = OUI.[Email], - [Key] = OUI.[Key], - [Status] = OUI.[Status], - [Type] = OUI.[Type], - [AccessAll] = OUI.[AccessAll], - [ExternalId] = OUI.[ExternalId], - [CreationDate] = OUI.[CreationDate], - [RevisionDate] = OUI.[RevisionDate], - [Permissions] = OUI.[Permissions], - [ResetPasswordKey] = OUI.[ResetPasswordKey] - FROM - [dbo].[OrganizationUser] OU - INNER JOIN - @OrganizationUsersInput OUI ON OU.Id = OUI.Id - - EXEC [dbo].[User_BumpManyAccountRevisionDates] - ( - SELECT UserId - FROM @OrganizationUsersInput - ) -END -GO diff --git a/src/Sql/dbo/Stored Procedures/User_Create.sql b/src/Sql/dbo/Stored Procedures/User_Create.sql index 65c5d21908..3aabab8c23 100644 --- a/src/Sql/dbo/Stored Procedures/User_Create.sql +++ b/src/Sql/dbo/Stored Procedures/User_Create.sql @@ -36,7 +36,6 @@ @UsesKeyConnector BIT = 0, @FailedLoginCount INT = 0, @LastFailedLoginDate DATETIME2(7), - @UnknownDeviceVerificationEnabled BIT = 1, @AvatarColor VARCHAR(7) = NULL, @LastPasswordChangeDate DATETIME2(7) = NULL, @LastKdfChangeDate DATETIME2(7) = NULL, @@ -83,7 +82,6 @@ BEGIN [UsesKeyConnector], [FailedLoginCount], [LastFailedLoginDate], - [UnknownDeviceVerificationEnabled], [AvatarColor], [KdfMemory], [KdfParallelism], @@ -129,7 +127,6 @@ BEGIN @UsesKeyConnector, @FailedLoginCount, @LastFailedLoginDate, - @UnknownDeviceVerificationEnabled, @AvatarColor, @KdfMemory, @KdfParallelism, diff --git a/src/Sql/dbo/Stored Procedures/User_Update.sql b/src/Sql/dbo/Stored Procedures/User_Update.sql index 60a5119366..5725f243ff 100644 --- a/src/Sql/dbo/Stored Procedures/User_Update.sql +++ b/src/Sql/dbo/Stored Procedures/User_Update.sql @@ -36,7 +36,6 @@ @UsesKeyConnector BIT = 0, @FailedLoginCount INT, @LastFailedLoginDate DATETIME2(7), - @UnknownDeviceVerificationEnabled BIT = 1, @AvatarColor VARCHAR(7), @LastPasswordChangeDate DATETIME2(7) = NULL, @LastKdfChangeDate DATETIME2(7) = NULL, @@ -85,7 +84,6 @@ BEGIN [UsesKeyConnector] = @UsesKeyConnector, [FailedLoginCount] = @FailedLoginCount, [LastFailedLoginDate] = @LastFailedLoginDate, - [UnknownDeviceVerificationEnabled] = @UnknownDeviceVerificationEnabled, [AvatarColor] = @AvatarColor, [LastPasswordChangeDate] = @LastPasswordChangeDate, [LastKdfChangeDate] = @LastKdfChangeDate, diff --git a/src/Sql/dbo/Tables/User.sql b/src/Sql/dbo/Tables/User.sql index 62ff0edf2b..0c34784e97 100644 --- a/src/Sql/dbo/Tables/User.sql +++ b/src/Sql/dbo/Tables/User.sql @@ -36,8 +36,7 @@ [UsesKeyConnector] BIT NOT NULL, [FailedLoginCount] INT CONSTRAINT [D_User_FailedLoginCount] DEFAULT ((0)) NOT NULL, [LastFailedLoginDate] DATETIME2 (7) NULL, - [UnknownDeviceVerificationEnabled] BIT CONSTRAINT [D_User_UnknownDeviceVerificationEnabled] DEFAULT ((1)) NOT NULL, - [AvatarColor] VARCHAR (7) NULL, + [AvatarColor] VARCHAR(7) NULL, [LastPasswordChangeDate] DATETIME2 (7) NULL, [LastKdfChangeDate] DATETIME2 (7) NULL, [LastKeyRotationDate] DATETIME2 (7) NULL, diff --git a/src/Sql/dbo/User Defined Types/OrganizationUserType.sql b/src/Sql/dbo/User Defined Types/OrganizationUserType.sql deleted file mode 100644 index 6d18cf0441..0000000000 --- a/src/Sql/dbo/User Defined Types/OrganizationUserType.sql +++ /dev/null @@ -1,15 +0,0 @@ -CREATE TYPE [dbo].[OrganizationUserType] AS TABLE( - [Id] UNIQUEIDENTIFIER, - [OrganizationId] UNIQUEIDENTIFIER, - [UserId] UNIQUEIDENTIFIER, - [Email] NVARCHAR(256), - [Key] VARCHAR(MAX), - [Status] SMALLINT, - [Type] TINYINT, - [AccessAll] BIT, - [ExternalId] NVARCHAR(300), - [CreationDate] DATETIME2(7), - [RevisionDate] DATETIME2(7), - [Permissions] NVARCHAR(MAX), - [ResetPasswordKey] VARCHAR(MAX) -) diff --git a/src/Sql/dbo_future/Functions/PolicyApplicableToUser.sql b/src/Sql/dbo_future/Functions/PolicyApplicableToUser.sql deleted file mode 100644 index a851a1e799..0000000000 --- a/src/Sql/dbo_future/Functions/PolicyApplicableToUser.sql +++ /dev/null @@ -1,2 +0,0 @@ --- Created 2023-03 --- DELETE FILE \ No newline at end of file diff --git a/src/Sql/dbo_future/Stored Procedures/Collection_CreateWithGroups.sql b/src/Sql/dbo_future/Stored Procedures/Collection_CreateWithGroups.sql deleted file mode 100644 index 0c55ab99b7..0000000000 --- a/src/Sql/dbo_future/Stored Procedures/Collection_CreateWithGroups.sql +++ /dev/null @@ -1,2 +0,0 @@ --- Created 2022-11 --- DELETE FILE \ No newline at end of file diff --git a/src/Sql/dbo_future/Stored Procedures/Collection_ReadWithGroupsById.sql b/src/Sql/dbo_future/Stored Procedures/Collection_ReadWithGroupsById.sql deleted file mode 100644 index 0c55ab99b7..0000000000 --- a/src/Sql/dbo_future/Stored Procedures/Collection_ReadWithGroupsById.sql +++ /dev/null @@ -1,2 +0,0 @@ --- Created 2022-11 --- DELETE FILE \ No newline at end of file diff --git a/src/Sql/dbo_future/Stored Procedures/Collection_ReadWithGroupsByIdUserId.sql b/src/Sql/dbo_future/Stored Procedures/Collection_ReadWithGroupsByIdUserId.sql deleted file mode 100644 index 0c55ab99b7..0000000000 --- a/src/Sql/dbo_future/Stored Procedures/Collection_ReadWithGroupsByIdUserId.sql +++ /dev/null @@ -1,2 +0,0 @@ --- Created 2022-11 --- DELETE FILE \ No newline at end of file diff --git a/src/Sql/dbo_future/Stored Procedures/Collection_UpdateWithGroups.sql b/src/Sql/dbo_future/Stored Procedures/Collection_UpdateWithGroups.sql deleted file mode 100644 index 0c55ab99b7..0000000000 --- a/src/Sql/dbo_future/Stored Procedures/Collection_UpdateWithGroups.sql +++ /dev/null @@ -1,2 +0,0 @@ --- Created 2022-11 --- DELETE FILE \ No newline at end of file diff --git a/src/Sql/dbo_future/Stored Procedures/OrganizationUser_CreateMany.sql b/src/Sql/dbo_future/Stored Procedures/OrganizationUser_CreateMany.sql deleted file mode 100644 index 371848cf9d..0000000000 --- a/src/Sql/dbo_future/Stored Procedures/OrganizationUser_CreateMany.sql +++ /dev/null @@ -1,2 +0,0 @@ --- Created 2023-01 --- DELETE FILE diff --git a/src/Sql/dbo_future/Stored Procedures/OrganizationUser_UpdateMany.sql b/src/Sql/dbo_future/Stored Procedures/OrganizationUser_UpdateMany.sql deleted file mode 100644 index 371848cf9d..0000000000 --- a/src/Sql/dbo_future/Stored Procedures/OrganizationUser_UpdateMany.sql +++ /dev/null @@ -1,2 +0,0 @@ --- Created 2023-01 --- DELETE FILE diff --git a/src/Sql/dbo_future/Stored Procedures/Policy_CountByTypeApplicableToUser.sql b/src/Sql/dbo_future/Stored Procedures/Policy_CountByTypeApplicableToUser.sql deleted file mode 100644 index a851a1e799..0000000000 --- a/src/Sql/dbo_future/Stored Procedures/Policy_CountByTypeApplicableToUser.sql +++ /dev/null @@ -1,2 +0,0 @@ --- Created 2023-03 --- DELETE FILE \ No newline at end of file diff --git a/src/Sql/dbo_future/Stored Procedures/Policy_ReadByTypeApplicableToUser.sql b/src/Sql/dbo_future/Stored Procedures/Policy_ReadByTypeApplicableToUser.sql deleted file mode 100644 index a851a1e799..0000000000 --- a/src/Sql/dbo_future/Stored Procedures/Policy_ReadByTypeApplicableToUser.sql +++ /dev/null @@ -1,2 +0,0 @@ --- Created 2023-03 --- DELETE FILE \ No newline at end of file diff --git a/src/Sql/dbo_future/Stored Procedures/User_Create.sql b/src/Sql/dbo_future/Stored Procedures/User_Create.sql deleted file mode 100644 index 7139153950..0000000000 --- a/src/Sql/dbo_future/Stored Procedures/User_Create.sql +++ /dev/null @@ -1,120 +0,0 @@ -CREATE 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), - @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], - [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, - @AvatarColor - ) -END diff --git a/src/Sql/dbo_future/Stored Procedures/User_Update.sql b/src/Sql/dbo_future/Stored Procedures/User_Update.sql deleted file mode 100644 index 1ef314af8e..0000000000 --- a/src/Sql/dbo_future/Stored Procedures/User_Update.sql +++ /dev/null @@ -1,82 +0,0 @@ -CREATE 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), - @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, - [AvatarColor] = @AvatarColor - WHERE - [Id] = @Id -END diff --git a/src/Sql/dbo_future/Tables/User.sql b/src/Sql/dbo_future/Tables/User.sql deleted file mode 100644 index e2d681d1e2..0000000000 --- a/src/Sql/dbo_future/Tables/User.sql +++ /dev/null @@ -1,49 +0,0 @@ -CREATE TABLE [dbo].[User] ( - [Id] UNIQUEIDENTIFIER NOT NULL, - [Name] NVARCHAR (50) NULL, - [Email] NVARCHAR (256) NOT NULL, - [EmailVerified] BIT NOT NULL, - [MasterPassword] NVARCHAR (300) NULL, - [MasterPasswordHint] NVARCHAR (50) NULL, - [Culture] NVARCHAR (10) NOT NULL, - [SecurityStamp] NVARCHAR (50) NOT NULL, - [TwoFactorProviders] NVARCHAR (MAX) NULL, - [TwoFactorRecoveryCode] NVARCHAR (32) NULL, - [EquivalentDomains] NVARCHAR (MAX) NULL, - [ExcludedGlobalEquivalentDomains] NVARCHAR (MAX) NULL, - [AccountRevisionDate] DATETIME2 (7) NOT NULL, - [Key] VARCHAR (MAX) NULL, - [PublicKey] VARCHAR (MAX) NULL, - [PrivateKey] VARCHAR (MAX) NULL, - [Premium] BIT NOT NULL, - [PremiumExpirationDate] DATETIME2 (7) NULL, - [RenewalReminderDate] DATETIME2 (7) NULL, - [Storage] BIGINT NULL, - [MaxStorageGb] SMALLINT NULL, - [Gateway] TINYINT NULL, - [GatewayCustomerId] VARCHAR (50) NULL, - [GatewaySubscriptionId] VARCHAR (50) NULL, - [ReferenceData] NVARCHAR (MAX) NULL, - [LicenseKey] VARCHAR (100) NULL, - [Kdf] TINYINT NOT NULL, - [KdfIterations] INT NOT NULL, - [CreationDate] DATETIME2 (7) NOT NULL, - [RevisionDate] DATETIME2 (7) NOT NULL, - [ApiKey] VARCHAR (30) NOT NULL, - [ForcePasswordReset] BIT NOT NULL, - [UsesKeyConnector] BIT NOT NULL, - [FailedLoginCount] INT CONSTRAINT [D_User_FailedLoginCount] DEFAULT ((0)) NOT NULL, - [LastFailedLoginDate] DATETIME2 (7) NULL, - [AvatarColor] VARCHAR(7) NULL, - CONSTRAINT [PK_User] PRIMARY KEY CLUSTERED ([Id] ASC) -); - - -GO -CREATE UNIQUE NONCLUSTERED INDEX [IX_User_Email] - ON [dbo].[User]([Email] ASC); - -GO -CREATE NONCLUSTERED INDEX [IX_User_Premium_PremiumExpirationDate_RenewalReminderDate] - ON [dbo].[User]([Premium] ASC, [PremiumExpirationDate] ASC, [RenewalReminderDate] ASC); - diff --git a/src/Sql/dbo_future/User Defined Types/OrganizationUserType.sql b/src/Sql/dbo_future/User Defined Types/OrganizationUserType.sql deleted file mode 100644 index 371848cf9d..0000000000 --- a/src/Sql/dbo_future/User Defined Types/OrganizationUserType.sql +++ /dev/null @@ -1,2 +0,0 @@ --- Created 2023-01 --- DELETE FILE diff --git a/util/Migrator/DbScripts_finalization/2023-01-FutureMigration.sql b/util/Migrator/DbScripts/2023-09-11_00_2023-01-FutureMigration.sql similarity index 82% rename from util/Migrator/DbScripts_finalization/2023-01-FutureMigration.sql rename to util/Migrator/DbScripts/2023-09-11_00_2023-01-FutureMigration.sql index 9f725c7be2..1f975f42da 100644 --- a/util/Migrator/DbScripts_finalization/2023-01-FutureMigration.sql +++ b/util/Migrator/DbScripts/2023-09-11_00_2023-01-FutureMigration.sql @@ -51,6 +51,8 @@ CREATE OR ALTER PROCEDURE [dbo].[User_Create] @LicenseKey VARCHAR(100), @Kdf TINYINT, @KdfIterations INT, + @KdfMemory INT = NULL, + @KdfParallelism INT = NULL, @CreationDate DATETIME2(7), @RevisionDate DATETIME2(7), @ApiKey VARCHAR(30), @@ -58,7 +60,11 @@ CREATE OR ALTER PROCEDURE [dbo].[User_Create] @UsesKeyConnector BIT = 0, @FailedLoginCount INT = 0, @LastFailedLoginDate DATETIME2(7), - @AvatarColor VARCHAR(7) = NULL + @AvatarColor VARCHAR(7) = NULL, + @LastPasswordChangeDate DATETIME2(7) = NULL, + @LastKdfChangeDate DATETIME2(7) = NULL, + @LastKeyRotationDate DATETIME2(7) = NULL, + @LastEmailChangeDate DATETIME2(7) = NULL AS BEGIN SET NOCOUNT ON @@ -100,7 +106,13 @@ BEGIN [UsesKeyConnector], [FailedLoginCount], [LastFailedLoginDate], - [AvatarColor] + [AvatarColor], + [KdfMemory], + [KdfParallelism], + [LastPasswordChangeDate], + [LastKdfChangeDate], + [LastKeyRotationDate], + [LastEmailChangeDate] ) VALUES ( @@ -139,7 +151,13 @@ BEGIN @UsesKeyConnector, @FailedLoginCount, @LastFailedLoginDate, - @AvatarColor + @AvatarColor, + @KdfMemory, + @KdfParallelism, + @LastPasswordChangeDate, + @LastKdfChangeDate, + @LastKeyRotationDate, + @LastEmailChangeDate ) END GO @@ -174,6 +192,8 @@ CREATE OR ALTER PROCEDURE [dbo].[User_Update] @LicenseKey VARCHAR(100), @Kdf TINYINT, @KdfIterations INT, + @KdfMemory INT = NULL, + @KdfParallelism INT = NULL, @CreationDate DATETIME2(7), @RevisionDate DATETIME2(7), @ApiKey VARCHAR(30), @@ -181,7 +201,11 @@ CREATE OR ALTER PROCEDURE [dbo].[User_Update] @UsesKeyConnector BIT = 0, @FailedLoginCount INT, @LastFailedLoginDate DATETIME2(7), - @AvatarColor VARCHAR(7) + @AvatarColor VARCHAR(7), + @LastPasswordChangeDate DATETIME2(7) = NULL, + @LastKdfChangeDate DATETIME2(7) = NULL, + @LastKeyRotationDate DATETIME2(7) = NULL, + @LastEmailChangeDate DATETIME2(7) = NULL AS BEGIN SET NOCOUNT ON @@ -216,6 +240,8 @@ BEGIN [LicenseKey] = @LicenseKey, [Kdf] = @Kdf, [KdfIterations] = @KdfIterations, + [KdfMemory] = @KdfMemory, + [KdfParallelism] = @KdfParallelism, [CreationDate] = @CreationDate, [RevisionDate] = @RevisionDate, [ApiKey] = @ApiKey, @@ -223,7 +249,11 @@ BEGIN [UsesKeyConnector] = @UsesKeyConnector, [FailedLoginCount] = @FailedLoginCount, [LastFailedLoginDate] = @LastFailedLoginDate, - [AvatarColor] = @AvatarColor + [AvatarColor] = @AvatarColor, + [LastPasswordChangeDate] = @LastPasswordChangeDate, + [LastKdfChangeDate] = @LastKdfChangeDate, + [LastKeyRotationDate] = @LastKeyRotationDate, + [LastEmailChangeDate] = @LastEmailChangeDate WHERE [Id] = @Id END diff --git a/util/Migrator/DbScripts_finalization/2023-02-FutureMigration.sql b/util/Migrator/DbScripts/2023-09-11_01_2023-02-FutureMigration.sql similarity index 100% rename from util/Migrator/DbScripts_finalization/2023-02-FutureMigration.sql rename to util/Migrator/DbScripts/2023-09-11_01_2023-02-FutureMigration.sql