nhyatt/bitwarden
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2025-07-07 02:52:50 -05:00
Code Activity

Add support for Key Connector OTP and account migration (#1663)

Browse Source 
Co-authored-by: Thomas Rittson <trittson@bitwarden.com>
This commit is contained in:
Oscar Hinton
2021-11-09 16:37:32 +01:00
committed by GitHub
parent f6bc35b2d0
commit fd37cb5a12
62 changed files with 3799 additions and 306 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Sql/dbo/Stored Procedures/User_Create.sql
View File

@ -31,7 +31,7 @@
@RevisionDate DATETIME2(7),
@ApiKey VARCHAR(30),
@ForcePasswordReset BIT = 0,
@UsesCryptoAgent BIT = 0
@UsesKeyConnector BIT = 0
AS
BEGIN
SET NOCOUNT ON
@ -70,7 +70,7 @@ BEGIN
[RevisionDate],
[ApiKey],
[ForcePasswordReset],
[UsesCryptoAgent]
[UsesKeyConnector]
)
VALUES
(
@ -106,6 +106,6 @@ BEGIN
@RevisionDate,
@ApiKey,
@ForcePasswordReset,
@UsesCryptoAgent
@UsesKeyConnector
)
END

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

@ -31,7 +31,7 @@
@RevisionDate DATETIME2(7),
@ApiKey VARCHAR(30),
@ForcePasswordReset BIT = 0,
@UsesCryptoAgent BIT = 0
@UsesKeyConnector BIT = 0
AS
BEGIN
SET NOCOUNT ON
@ -70,7 +70,7 @@ BEGIN
[RevisionDate] = @RevisionDate,
[ApiKey] = @ApiKey,
[ForcePasswordReset] = @ForcePasswordReset,
[UsesCryptoAgent] = @UsesCryptoAgent
[UsesKeyConnector] = @UsesKeyConnector
WHERE
[Id] = @Id
END

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

@ -31,7 +31,7 @@
[RevisionDate] DATETIME2 (7) NOT NULL,
[ApiKey] VARCHAR (30) NOT NULL,
[ForcePasswordReset] BIT NOT NULL,
[UsesCryptoAgent] BIT NOT NULL,
[UsesKeyConnector] BIT NOT NULL,
CONSTRAINT [PK_User] PRIMARY KEY CLUSTERED ([Id] ASC)
);

5
src/Sql/dbo/Views/OrganizationUserOrganizationDetailsView.sql
View File

@ -29,7 +29,8 @@ SELECT
SU.[ExternalId] SsoExternalId,
OU.[Permissions],
PO.[ProviderId],
P.[Name] ProviderName
P.[Name] ProviderName,
SS.[Data] SsoConfig
FROM
[dbo].[OrganizationUser] OU
INNER JOIN
@ -40,3 +41,5 @@ LEFT JOIN
[dbo].[ProviderOrganization] PO ON PO.[OrganizationId] = O.[Id]
LEFT JOIN
[dbo].[Provider] P ON P.[Id] = PO.[ProviderId]
LEFT JOIN
[dbo].[SsoConfig] SS ON SS.[OrganizationId] = OU.[OrganizationId]

3
src/Sql/dbo/Views/OrganizationUserUserDetailsView.sql
View File

@ -14,7 +14,8 @@ SELECT
OU.[ExternalId],
SU.[ExternalId] SsoExternalId,
OU.[Permissions],
OU.[ResetPasswordKey]
OU.[ResetPasswordKey],
U.[UsesKeyConnector]
FROM
[dbo].[OrganizationUser] OU
LEFT JOIN