nhyatt/bitwarden
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2025-07-18 16:11:28 -05:00
Code Activity

[Reset Password] Organization Key Pair (#1292)

Browse Source 
* [Reset Password] Organization Key Pair

* Fixed type in Organization_ReadAbilites sproc

* Fixed broken unit test by making sure premium addon was false

* Updated PublicKey decorator and removed unecessary validation
This commit is contained in:
Vincent Salucci
2021-05-06 14:53:12 -05:00
committed by GitHub
parent cae204cb7c
commit 70ab5b25a1
26 changed files with 535 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/Sql/dbo/Stored Procedures/Organization_Create.sql
View File

@ -21,6 +21,7 @@
@UseTotp BIT,
@Use2fa BIT,
@UseApi BIT,
@UseResetPassword BIT,
@SelfHost BIT,
@UsersGetPremium BIT,
@Storage BIGINT,
@ -32,6 +33,8 @@
@Enabled BIT,
@LicenseKey VARCHAR(100),
@ApiKey VARCHAR(30),
@PublicKey VARCHAR(MAX),
@PrivateKey VARCHAR(MAX),
@TwoFactorProviders NVARCHAR(MAX),
@ExpirationDate DATETIME2(7),
@CreationDate DATETIME2(7),
@ -64,6 +67,7 @@ BEGIN
[UseTotp],
[Use2fa],
[UseApi],
[UseResetPassword],
[SelfHost],
[UsersGetPremium],
[Storage],
@ -75,6 +79,8 @@ BEGIN
[Enabled],
[LicenseKey],
[ApiKey],
[PublicKey],
[PrivateKey],
[TwoFactorProviders],
[ExpirationDate],
[CreationDate],
@ -104,6 +110,7 @@ BEGIN
@UseTotp,
@Use2fa,
@UseApi,
@UseResetPassword,
@SelfHost,
@UsersGetPremium,
@Storage,
@ -115,6 +122,8 @@ BEGIN
@Enabled,
@LicenseKey,
@ApiKey,
@PublicKey,
@PrivateKey,
@TwoFactorProviders,
@ExpirationDate,
@CreationDate,

1
src/Sql/dbo/Stored Procedures/Organization_ReadAbilities.sql
View File

@ -15,6 +15,7 @@ BEGIN
END AS [Using2fa],
[UsersGetPremium],
[UseSso],
[UseResetPassword],
[Enabled]
FROM
[dbo].[Organization]

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

@ -21,6 +21,7 @@
@UseTotp BIT,
@Use2fa BIT,
@UseApi BIT,
@UseResetPassword BIT,
@SelfHost BIT,
@UsersGetPremium BIT,
@Storage BIGINT,
@ -32,6 +33,8 @@
@Enabled BIT,
@LicenseKey VARCHAR(100),
@ApiKey VARCHAR(30),
@PublicKey VARCHAR(MAX),
@PrivateKey VARCHAR(MAX),
@TwoFactorProviders NVARCHAR(MAX),
@ExpirationDate DATETIME2(7),
@CreationDate DATETIME2(7),
@ -64,6 +67,7 @@ BEGIN
[UseTotp] = @UseTotp,
[Use2fa] = @Use2fa,
[UseApi] = @UseApi,
[UseResetPassword] = @UseResetPassword,
[SelfHost] = @SelfHost,
[UsersGetPremium] = @UsersGetPremium,
[Storage] = @Storage,
@ -75,6 +79,8 @@ BEGIN
[Enabled] = @Enabled,
[LicenseKey] = @LicenseKey,
[ApiKey] = @ApiKey,
[PublicKey] = @PublicKey,
[PrivateKey] = @PrivateKey,
[TwoFactorProviders] = @TwoFactorProviders,
[ExpirationDate] = @ExpirationDate,
[CreationDate] = @CreationDate,

3
src/Sql/dbo/Tables/Organization.sql
View File

@ -21,6 +21,7 @@
[UseTotp] BIT NOT NULL,
[Use2fa] BIT NOT NULL,
[UseApi] BIT NOT NULL,
[UseResetPassword] BIT NOT NULL,
[SelfHost] BIT NOT NULL,
[UsersGetPremium] BIT NOT NULL,
[Storage] BIGINT NULL,
@ -32,6 +33,8 @@
[Enabled] BIT NOT NULL,
[LicenseKey] VARCHAR (100) NULL,
[ApiKey] VARCHAR (30) NOT NULL,
[PublicKey] VARCHAR (MAX) NULL,
[PrivateKey] VARCHAR (MAX) NULL,
[TwoFactorProviders] NVARCHAR (MAX) NULL,
[ExpirationDate] DATETIME2 (7) NULL,
[CreationDate] DATETIME2 (7) NOT NULL,

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

@ -13,6 +13,7 @@ SELECT
O.[UseTotp],
O.[Use2fa],
O.[UseApi],
O.[UseResetPassword],
O.[SelfHost],
O.[UsersGetPremium],
O.[Seats],
@ -21,6 +22,8 @@ SELECT
O.[Identifier],
OU.[Key],
OU.[ResetPasswordKey],
O.[PublicKey],
O.[PrivateKey],
OU.[Status],
OU.[Type],
SU.[ExternalId] SsoExternalId,