nhyatt/bitwarden
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2025-06-09 20:50:31 -05:00
Code

Add more renames

Browse Source
This commit is contained in:
Bernd Schoolmann 2025-06-02 15:53:37 +02:00
parent 7821015398
commit 58374dce36
No known key found for this signature in database
3 changed files with 28 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/Sql/dbo/Stored Procedures/User_Update.sql
View File

@ -14,7 +14,6 @@
@AccountRevisionDate DATETIME2(7), @AccountRevisionDate DATETIME2(7),
@Key NVARCHAR(MAX), @Key NVARCHAR(MAX),
@PublicKey NVARCHAR(MAX), @PublicKey NVARCHAR(MAX),
@SignedPublicKey NVARCHAR(MAX),
@PrivateKey NVARCHAR(MAX), @PrivateKey NVARCHAR(MAX),
@Premium BIT, @Premium BIT,
@PremiumExpirationDate DATETIME2(7), @PremiumExpirationDate DATETIME2(7),
@ -42,7 +41,8 @@
@LastKdfChangeDate DATETIME2(7) = NULL, @LastKdfChangeDate DATETIME2(7) = NULL,
@LastKeyRotationDate DATETIME2(7) = NULL, @LastKeyRotationDate DATETIME2(7) = NULL,
@LastEmailChangeDate DATETIME2(7) = NULL, @LastEmailChangeDate DATETIME2(7) = NULL,
@VerifyDevices BIT = 1 @VerifyDevices BIT = 1,
@SignedPublicKey NVARCHAR(MAX)
AS AS
BEGIN BEGIN
SET NOCOUNT ON SET NOCOUNT ON
@ -64,7 +64,6 @@ BEGIN
[AccountRevisionDate] = @AccountRevisionDate, [AccountRevisionDate] = @AccountRevisionDate,
[Key] = @Key, [Key] = @Key,
[PublicKey] = @PublicKey, [PublicKey] = @PublicKey,
[SignedPublicKey] = @SignedPublicKey,
[PrivateKey] = @PrivateKey, [PrivateKey] = @PrivateKey,
[Premium] = @Premium, [Premium] = @Premium,
[PremiumExpirationDate] = @PremiumExpirationDate, [PremiumExpirationDate] = @PremiumExpirationDate,
@ -92,7 +91,8 @@ BEGIN
[LastKdfChangeDate] = @LastKdfChangeDate, [LastKdfChangeDate] = @LastKdfChangeDate,
[LastKeyRotationDate] = @LastKeyRotationDate, [LastKeyRotationDate] = @LastKeyRotationDate,
[LastEmailChangeDate] = @LastEmailChangeDate, [LastEmailChangeDate] = @LastEmailChangeDate,
[VerifyDevices] = @VerifyDevices [VerifyDevices] = @VerifyDevices,
[SignedPublicKey] = @SignedPublicKey
WHERE WHERE
[Id] = @Id [Id] = @Id
END END

2
src/Sql/dbo/Tables/User.sql
View File

@ -14,7 +14,6 @@
[AccountRevisionDate] DATETIME2 (7) NOT NULL, [AccountRevisionDate] DATETIME2 (7) NOT NULL,
[Key] VARCHAR (MAX) NULL, [Key] VARCHAR (MAX) NULL,
[PublicKey] VARCHAR (MAX) NULL, [PublicKey] VARCHAR (MAX) NULL,
[SignedPublicKey] VARCHAR (MAX) NULL,
[PrivateKey] VARCHAR (MAX) NULL, [PrivateKey] VARCHAR (MAX) NULL,
[Premium] BIT NOT NULL, [Premium] BIT NOT NULL,
[PremiumExpirationDate] DATETIME2 (7) NULL, [PremiumExpirationDate] DATETIME2 (7) NULL,
@ -43,6 +42,7 @@
[LastKeyRotationDate] DATETIME2 (7) NULL, [LastKeyRotationDate] DATETIME2 (7) NULL,
[LastEmailChangeDate] DATETIME2 (7) NULL, [LastEmailChangeDate] DATETIME2 (7) NULL,
[VerifyDevices] BIT DEFAULT ((1)) NOT NULL, [VerifyDevices] BIT DEFAULT ((1)) NOT NULL,
[SignedPublicKey] VARCHAR (MAX) NULL,
CONSTRAINT [PK_User] PRIMARY KEY CLUSTERED ([Id] ASC) CONSTRAINT [PK_User] PRIMARY KEY CLUSTERED ([Id] ASC)
); );

46
util/Migrator/DbScripts/2025-05-01_00_AddSigningKeysTable.sql → util/Migrator/DbScripts/2025-05-01_00_AddSignatureKeyPairTable.sql
View File

@ -1,13 +1,13 @@
CREATE TABLE [dbo].[UserSignatureKeyPair] ( CREATE TABLE [dbo].[UserSignatureKeyPair] (
[Id] UNIQUEIDENTIFIER NOT NULL, [Id] UNIQUEIDENTIFIER NOT NULL,
[UserId] UNIQUEIDENTIFIER, [UserId] UNIQUEIDENTIFIER NOT NULL,
[KeyType] TINYINT NOT NULL, [SignatureKeyPairAlgorithm] TINYINT NOT NULL,
[VerifyingKey] VARCHAR(MAX) NOT NULL,
[SigningKey] VARCHAR(MAX) NOT NULL, [SigningKey] VARCHAR(MAX) NOT NULL,
[VerifyingKey] VARCHAR(MAX) NOT NULL,
[CreationDate] DATETIME2 (7) NOT NULL, [CreationDate] DATETIME2 (7) NOT NULL,
[RevisionDate] DATETIME2 (7) NOT NULL, [RevisionDate] DATETIME2 (7) NOT NULL,
CONSTRAINT [PK_UserSigningKeys] PRIMARY KEY CLUSTERED ([Id] ASC), CONSTRAINT [PK_UserSignatureKeyPair] PRIMARY KEY CLUSTERED ([Id] ASC),
CONSTRAINT [FK_UserSigningKeys_User] FOREIGN KEY ([UserId]) REFERENCES [dbo].[User] ([Id]) CONSTRAINT [FK_UserSignatureKeyPair_User] FOREIGN KEY ([UserId]) REFERENCES [dbo].[User] ([Id])
); );
GO GO
@ -23,16 +23,16 @@ GO
CREATE PROCEDURE [dbo].[UserSignatureKeyPair_UpdateForRotation] CREATE PROCEDURE [dbo].[UserSignatureKeyPair_UpdateForRotation]
@UserId UNIQUEIDENTIFIER, @UserId UNIQUEIDENTIFIER,
@KeyType TINYINT, @SignatureKeyPairAlgorithm TINYINT,
@VerifyingKey VARCHAR(MAX),
@SigningKey VARCHAR(MAX), @SigningKey VARCHAR(MAX),
@VerifyingKey VARCHAR(MAX),
@RevisionDate DATETIME2(7) @RevisionDate DATETIME2(7)
AS AS
BEGIN BEGIN
UPDATE [dbo].[UserSignatureKeyPair] UPDATE [dbo].[UserSignatureKeyPair]
SET [KeyType] = @KeyType, SET [SignatureKeyPairAlgorithm] = @SignatureKeyPairAlgorithm,
[VerifyingKey] = @VerifyingKey,
[SigningKey] = @SigningKey, [SigningKey] = @SigningKey,
[VerifyingKey] = @VerifyingKey,
[RevisionDate] = @RevisionDate [RevisionDate] = @RevisionDate
WHERE [UserId] = @UserId; WHERE [UserId] = @UserId;
END END
@ -41,15 +41,15 @@ GO
CREATE PROCEDURE [dbo].[UserSignatureKeyPair_SetForRotation] CREATE PROCEDURE [dbo].[UserSignatureKeyPair_SetForRotation]
@Id UNIQUEIDENTIFIER, @Id UNIQUEIDENTIFIER,
@UserId UNIQUEIDENTIFIER, @UserId UNIQUEIDENTIFIER,
@KeyType TINYINT, @SignatureKeyPairAlgorithm TINYINT,
@VerifyingKey VARCHAR(MAX),
@SigningKey VARCHAR(MAX), @SigningKey VARCHAR(MAX),
@VerifyingKey VARCHAR(MAX),
@CreationDate DATETIME2(7), @CreationDate DATETIME2(7),
@RevisionDate DATETIME2(7) @RevisionDate DATETIME2(7)
AS AS
BEGIN BEGIN
INSERT INTO [dbo].[UserSignatureKeyPair] ([Id], [UserId], [KeyType], [VerifyingKey], [SigningKey], [CreationDate], [RevisionDate]) INSERT INTO [dbo].[UserSignatureKeyPair] ([Id], [UserId], [SignatureKeyPairAlgorithm], [SigningKey], [VerifyingKey], [CreationDate], [RevisionDate])
VALUES (@Id, @UserId, @KeyType, @VerifyingKey, @SigningKey, @CreationDate, @RevisionDate) VALUES (@Id, @UserId, @SignatureKeyPairAlgorithm, @SigningKey, @VerifyingKey, @CreationDate, @RevisionDate)
END END
GO GO
@ -81,7 +81,6 @@ CREATE OR ALTER PROCEDURE [dbo].[User_Create]
@AccountRevisionDate DATETIME2(7), @AccountRevisionDate DATETIME2(7),
@Key NVARCHAR(MAX), @Key NVARCHAR(MAX),
@PublicKey NVARCHAR(MAX), @PublicKey NVARCHAR(MAX),
@SignedPublicKey NVARCHAR(MAX),
@PrivateKey NVARCHAR(MAX), @PrivateKey NVARCHAR(MAX),
@Premium BIT, @Premium BIT,
@PremiumExpirationDate DATETIME2(7), @PremiumExpirationDate DATETIME2(7),
@ -109,7 +108,8 @@ CREATE OR ALTER PROCEDURE [dbo].[User_Create]
@LastKdfChangeDate DATETIME2(7) = NULL, @LastKdfChangeDate DATETIME2(7) = NULL,
@LastKeyRotationDate DATETIME2(7) = NULL, @LastKeyRotationDate DATETIME2(7) = NULL,
@LastEmailChangeDate DATETIME2(7) = NULL, @LastEmailChangeDate DATETIME2(7) = NULL,
@VerifyDevices BIT = 1 @VerifyDevices BIT = 1,
@SignedPublicKey NVARCHAR(MAX)
AS AS
BEGIN BEGIN
SET NOCOUNT ON SET NOCOUNT ON
@ -131,7 +131,6 @@ BEGIN
[AccountRevisionDate], [AccountRevisionDate],
[Key], [Key],
[PublicKey], [PublicKey],
[SignedPublicKey],
[PrivateKey], [PrivateKey],
[Premium], [Premium],
[PremiumExpirationDate], [PremiumExpirationDate],
@ -159,7 +158,8 @@ BEGIN
[LastKdfChangeDate], [LastKdfChangeDate],
[LastKeyRotationDate], [LastKeyRotationDate],
[LastEmailChangeDate], [LastEmailChangeDate],
[VerifyDevices] [VerifyDevices],
[SignedPublicKey]
) )
VALUES VALUES
( (
@ -178,7 +178,6 @@ BEGIN
@AccountRevisionDate, @AccountRevisionDate,
@Key, @Key,
@PublicKey, @PublicKey,
@SignedPublicKey,
@PrivateKey, @PrivateKey,
@Premium, @Premium,
@PremiumExpirationDate, @PremiumExpirationDate,
@ -206,7 +205,8 @@ BEGIN
@LastKdfChangeDate, @LastKdfChangeDate,
@LastKeyRotationDate, @LastKeyRotationDate,
@LastEmailChangeDate, @LastEmailChangeDate,
@VerifyDevices @VerifyDevices,
@SignedPublicKey
) )
END END
GO GO
@ -227,7 +227,6 @@ CREATE OR ALTER PROCEDURE [dbo].[User_Update]
@AccountRevisionDate DATETIME2(7), @AccountRevisionDate DATETIME2(7),
@Key NVARCHAR(MAX), @Key NVARCHAR(MAX),
@PublicKey NVARCHAR(MAX), @PublicKey NVARCHAR(MAX),
@SignedPublicKey NVARCHAR(MAX),
@PrivateKey NVARCHAR(MAX), @PrivateKey NVARCHAR(MAX),
@Premium BIT, @Premium BIT,
@PremiumExpirationDate DATETIME2(7), @PremiumExpirationDate DATETIME2(7),
@ -255,7 +254,8 @@ CREATE OR ALTER PROCEDURE [dbo].[User_Update]
@LastKdfChangeDate DATETIME2(7) = NULL, @LastKdfChangeDate DATETIME2(7) = NULL,
@LastKeyRotationDate DATETIME2(7) = NULL, @LastKeyRotationDate DATETIME2(7) = NULL,
@LastEmailChangeDate DATETIME2(7) = NULL, @LastEmailChangeDate DATETIME2(7) = NULL,
@VerifyDevices BIT = 1 @VerifyDevices BIT = 1,
@SignedPublicKey NVARCHAR(MAX)
AS AS
BEGIN BEGIN
SET NOCOUNT ON SET NOCOUNT ON
@ -277,7 +277,6 @@ BEGIN
[AccountRevisionDate] = @AccountRevisionDate, [AccountRevisionDate] = @AccountRevisionDate,
[Key] = @Key, [Key] = @Key,
[PublicKey] = @PublicKey, [PublicKey] = @PublicKey,
[SignedPublicKey] = @SignedPublicKey,
[PrivateKey] = @PrivateKey, [PrivateKey] = @PrivateKey,
[Premium] = @Premium, [Premium] = @Premium,
[PremiumExpirationDate] = @PremiumExpirationDate, [PremiumExpirationDate] = @PremiumExpirationDate,
@ -305,7 +304,8 @@ BEGIN
[LastKdfChangeDate] = @LastKdfChangeDate, [LastKdfChangeDate] = @LastKdfChangeDate,
[LastKeyRotationDate] = @LastKeyRotationDate, [LastKeyRotationDate] = @LastKeyRotationDate,
[LastEmailChangeDate] = @LastEmailChangeDate, [LastEmailChangeDate] = @LastEmailChangeDate,
[VerifyDevices] = @VerifyDevices [VerifyDevices] = @VerifyDevices,
[SignedPublicKey] = @SignedPublicKey
WHERE WHERE
[Id] = @Id [Id] = @Id
END END