mirror of
https://github.com/bitwarden/server.git
synced 2025-04-05 05:00:19 -05:00
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 <fedemkr@gmail.com> Co-authored-by: Hinton <hinton@users.noreply.github.com>
This commit is contained in:
parent
1c0c6cc879
commit
dd8ffa2cbc
@ -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
|
|
@ -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
|
|
@ -36,7 +36,6 @@
|
|||||||
@UsesKeyConnector BIT = 0,
|
@UsesKeyConnector BIT = 0,
|
||||||
@FailedLoginCount INT = 0,
|
@FailedLoginCount INT = 0,
|
||||||
@LastFailedLoginDate DATETIME2(7),
|
@LastFailedLoginDate DATETIME2(7),
|
||||||
@UnknownDeviceVerificationEnabled BIT = 1,
|
|
||||||
@AvatarColor VARCHAR(7) = NULL,
|
@AvatarColor VARCHAR(7) = NULL,
|
||||||
@LastPasswordChangeDate DATETIME2(7) = NULL,
|
@LastPasswordChangeDate DATETIME2(7) = NULL,
|
||||||
@LastKdfChangeDate DATETIME2(7) = NULL,
|
@LastKdfChangeDate DATETIME2(7) = NULL,
|
||||||
@ -83,7 +82,6 @@ BEGIN
|
|||||||
[UsesKeyConnector],
|
[UsesKeyConnector],
|
||||||
[FailedLoginCount],
|
[FailedLoginCount],
|
||||||
[LastFailedLoginDate],
|
[LastFailedLoginDate],
|
||||||
[UnknownDeviceVerificationEnabled],
|
|
||||||
[AvatarColor],
|
[AvatarColor],
|
||||||
[KdfMemory],
|
[KdfMemory],
|
||||||
[KdfParallelism],
|
[KdfParallelism],
|
||||||
@ -129,7 +127,6 @@ BEGIN
|
|||||||
@UsesKeyConnector,
|
@UsesKeyConnector,
|
||||||
@FailedLoginCount,
|
@FailedLoginCount,
|
||||||
@LastFailedLoginDate,
|
@LastFailedLoginDate,
|
||||||
@UnknownDeviceVerificationEnabled,
|
|
||||||
@AvatarColor,
|
@AvatarColor,
|
||||||
@KdfMemory,
|
@KdfMemory,
|
||||||
@KdfParallelism,
|
@KdfParallelism,
|
||||||
|
@ -36,7 +36,6 @@
|
|||||||
@UsesKeyConnector BIT = 0,
|
@UsesKeyConnector BIT = 0,
|
||||||
@FailedLoginCount INT,
|
@FailedLoginCount INT,
|
||||||
@LastFailedLoginDate DATETIME2(7),
|
@LastFailedLoginDate DATETIME2(7),
|
||||||
@UnknownDeviceVerificationEnabled BIT = 1,
|
|
||||||
@AvatarColor VARCHAR(7),
|
@AvatarColor VARCHAR(7),
|
||||||
@LastPasswordChangeDate DATETIME2(7) = NULL,
|
@LastPasswordChangeDate DATETIME2(7) = NULL,
|
||||||
@LastKdfChangeDate DATETIME2(7) = NULL,
|
@LastKdfChangeDate DATETIME2(7) = NULL,
|
||||||
@ -85,7 +84,6 @@ BEGIN
|
|||||||
[UsesKeyConnector] = @UsesKeyConnector,
|
[UsesKeyConnector] = @UsesKeyConnector,
|
||||||
[FailedLoginCount] = @FailedLoginCount,
|
[FailedLoginCount] = @FailedLoginCount,
|
||||||
[LastFailedLoginDate] = @LastFailedLoginDate,
|
[LastFailedLoginDate] = @LastFailedLoginDate,
|
||||||
[UnknownDeviceVerificationEnabled] = @UnknownDeviceVerificationEnabled,
|
|
||||||
[AvatarColor] = @AvatarColor,
|
[AvatarColor] = @AvatarColor,
|
||||||
[LastPasswordChangeDate] = @LastPasswordChangeDate,
|
[LastPasswordChangeDate] = @LastPasswordChangeDate,
|
||||||
[LastKdfChangeDate] = @LastKdfChangeDate,
|
[LastKdfChangeDate] = @LastKdfChangeDate,
|
||||||
|
@ -36,8 +36,7 @@
|
|||||||
[UsesKeyConnector] BIT NOT NULL,
|
[UsesKeyConnector] BIT NOT NULL,
|
||||||
[FailedLoginCount] INT CONSTRAINT [D_User_FailedLoginCount] DEFAULT ((0)) NOT NULL,
|
[FailedLoginCount] INT CONSTRAINT [D_User_FailedLoginCount] DEFAULT ((0)) NOT NULL,
|
||||||
[LastFailedLoginDate] DATETIME2 (7) 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,
|
[LastPasswordChangeDate] DATETIME2 (7) NULL,
|
||||||
[LastKdfChangeDate] DATETIME2 (7) NULL,
|
[LastKdfChangeDate] DATETIME2 (7) NULL,
|
||||||
[LastKeyRotationDate] DATETIME2 (7) NULL,
|
[LastKeyRotationDate] DATETIME2 (7) 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)
|
|
||||||
)
|
|
@ -1,2 +0,0 @@
|
|||||||
-- Created 2023-03
|
|
||||||
-- DELETE FILE
|
|
@ -1,2 +0,0 @@
|
|||||||
-- Created 2022-11
|
|
||||||
-- DELETE FILE
|
|
@ -1,2 +0,0 @@
|
|||||||
-- Created 2022-11
|
|
||||||
-- DELETE FILE
|
|
@ -1,2 +0,0 @@
|
|||||||
-- Created 2022-11
|
|
||||||
-- DELETE FILE
|
|
@ -1,2 +0,0 @@
|
|||||||
-- Created 2022-11
|
|
||||||
-- DELETE FILE
|
|
@ -1,2 +0,0 @@
|
|||||||
-- Created 2023-01
|
|
||||||
-- DELETE FILE
|
|
@ -1,2 +0,0 @@
|
|||||||
-- Created 2023-01
|
|
||||||
-- DELETE FILE
|
|
@ -1,2 +0,0 @@
|
|||||||
-- Created 2023-03
|
|
||||||
-- DELETE FILE
|
|
@ -1,2 +0,0 @@
|
|||||||
-- Created 2023-03
|
|
||||||
-- DELETE FILE
|
|
@ -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
|
|
@ -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
|
|
@ -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);
|
|
||||||
|
|
@ -1,2 +0,0 @@
|
|||||||
-- Created 2023-01
|
|
||||||
-- DELETE FILE
|
|
@ -51,6 +51,8 @@ CREATE OR ALTER PROCEDURE [dbo].[User_Create]
|
|||||||
@LicenseKey VARCHAR(100),
|
@LicenseKey VARCHAR(100),
|
||||||
@Kdf TINYINT,
|
@Kdf TINYINT,
|
||||||
@KdfIterations INT,
|
@KdfIterations INT,
|
||||||
|
@KdfMemory INT = NULL,
|
||||||
|
@KdfParallelism INT = NULL,
|
||||||
@CreationDate DATETIME2(7),
|
@CreationDate DATETIME2(7),
|
||||||
@RevisionDate DATETIME2(7),
|
@RevisionDate DATETIME2(7),
|
||||||
@ApiKey VARCHAR(30),
|
@ApiKey VARCHAR(30),
|
||||||
@ -58,7 +60,11 @@ CREATE OR ALTER PROCEDURE [dbo].[User_Create]
|
|||||||
@UsesKeyConnector BIT = 0,
|
@UsesKeyConnector BIT = 0,
|
||||||
@FailedLoginCount INT = 0,
|
@FailedLoginCount INT = 0,
|
||||||
@LastFailedLoginDate DATETIME2(7),
|
@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
|
AS
|
||||||
BEGIN
|
BEGIN
|
||||||
SET NOCOUNT ON
|
SET NOCOUNT ON
|
||||||
@ -100,7 +106,13 @@ BEGIN
|
|||||||
[UsesKeyConnector],
|
[UsesKeyConnector],
|
||||||
[FailedLoginCount],
|
[FailedLoginCount],
|
||||||
[LastFailedLoginDate],
|
[LastFailedLoginDate],
|
||||||
[AvatarColor]
|
[AvatarColor],
|
||||||
|
[KdfMemory],
|
||||||
|
[KdfParallelism],
|
||||||
|
[LastPasswordChangeDate],
|
||||||
|
[LastKdfChangeDate],
|
||||||
|
[LastKeyRotationDate],
|
||||||
|
[LastEmailChangeDate]
|
||||||
)
|
)
|
||||||
VALUES
|
VALUES
|
||||||
(
|
(
|
||||||
@ -139,7 +151,13 @@ BEGIN
|
|||||||
@UsesKeyConnector,
|
@UsesKeyConnector,
|
||||||
@FailedLoginCount,
|
@FailedLoginCount,
|
||||||
@LastFailedLoginDate,
|
@LastFailedLoginDate,
|
||||||
@AvatarColor
|
@AvatarColor,
|
||||||
|
@KdfMemory,
|
||||||
|
@KdfParallelism,
|
||||||
|
@LastPasswordChangeDate,
|
||||||
|
@LastKdfChangeDate,
|
||||||
|
@LastKeyRotationDate,
|
||||||
|
@LastEmailChangeDate
|
||||||
)
|
)
|
||||||
END
|
END
|
||||||
GO
|
GO
|
||||||
@ -174,6 +192,8 @@ CREATE OR ALTER PROCEDURE [dbo].[User_Update]
|
|||||||
@LicenseKey VARCHAR(100),
|
@LicenseKey VARCHAR(100),
|
||||||
@Kdf TINYINT,
|
@Kdf TINYINT,
|
||||||
@KdfIterations INT,
|
@KdfIterations INT,
|
||||||
|
@KdfMemory INT = NULL,
|
||||||
|
@KdfParallelism INT = NULL,
|
||||||
@CreationDate DATETIME2(7),
|
@CreationDate DATETIME2(7),
|
||||||
@RevisionDate DATETIME2(7),
|
@RevisionDate DATETIME2(7),
|
||||||
@ApiKey VARCHAR(30),
|
@ApiKey VARCHAR(30),
|
||||||
@ -181,7 +201,11 @@ CREATE OR ALTER PROCEDURE [dbo].[User_Update]
|
|||||||
@UsesKeyConnector BIT = 0,
|
@UsesKeyConnector BIT = 0,
|
||||||
@FailedLoginCount INT,
|
@FailedLoginCount INT,
|
||||||
@LastFailedLoginDate DATETIME2(7),
|
@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
|
AS
|
||||||
BEGIN
|
BEGIN
|
||||||
SET NOCOUNT ON
|
SET NOCOUNT ON
|
||||||
@ -216,6 +240,8 @@ BEGIN
|
|||||||
[LicenseKey] = @LicenseKey,
|
[LicenseKey] = @LicenseKey,
|
||||||
[Kdf] = @Kdf,
|
[Kdf] = @Kdf,
|
||||||
[KdfIterations] = @KdfIterations,
|
[KdfIterations] = @KdfIterations,
|
||||||
|
[KdfMemory] = @KdfMemory,
|
||||||
|
[KdfParallelism] = @KdfParallelism,
|
||||||
[CreationDate] = @CreationDate,
|
[CreationDate] = @CreationDate,
|
||||||
[RevisionDate] = @RevisionDate,
|
[RevisionDate] = @RevisionDate,
|
||||||
[ApiKey] = @ApiKey,
|
[ApiKey] = @ApiKey,
|
||||||
@ -223,7 +249,11 @@ BEGIN
|
|||||||
[UsesKeyConnector] = @UsesKeyConnector,
|
[UsesKeyConnector] = @UsesKeyConnector,
|
||||||
[FailedLoginCount] = @FailedLoginCount,
|
[FailedLoginCount] = @FailedLoginCount,
|
||||||
[LastFailedLoginDate] = @LastFailedLoginDate,
|
[LastFailedLoginDate] = @LastFailedLoginDate,
|
||||||
[AvatarColor] = @AvatarColor
|
[AvatarColor] = @AvatarColor,
|
||||||
|
[LastPasswordChangeDate] = @LastPasswordChangeDate,
|
||||||
|
[LastKdfChangeDate] = @LastKdfChangeDate,
|
||||||
|
[LastKeyRotationDate] = @LastKeyRotationDate,
|
||||||
|
[LastEmailChangeDate] = @LastEmailChangeDate
|
||||||
WHERE
|
WHERE
|
||||||
[Id] = @Id
|
[Id] = @Id
|
||||||
END
|
END
|
Loading…
x
Reference in New Issue
Block a user