nhyatt/bitwarden
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2025-07-19 08:30:59 -05:00
Code Activity

Fix password re-prompt not working in org view (#1296)

Browse Source 
* Fix password reprompt not working in org view

* Also fix Cipher_UpdateWithCollections and CipherDetails_CreateWithCollections. Rename migration script
This commit is contained in:
Oscar Hinton
2021-05-04 20:36:35 +02:00
committed by GitHub
parent 179e6aa76b
commit 6ada46f906
11 changed files with 472 additions and 210 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/Sql/dbo/Stored Procedures/CipherDetails_CreateWithCollections.sql
View File

@ -15,6 +15,7 @@
@ViewPassword BIT, -- not used
@OrganizationUseTotp BIT, -- not used
@DeletedDate DATETIME2(7),
@Reprompt TINYINT,
@CollectionIds AS [dbo].[GuidIdArray] READONLY
AS
BEGIN
@ -22,7 +23,7 @@ BEGIN
EXEC [dbo].[CipherDetails_Create] @Id, @UserId, @OrganizationId, @Type, @Data, @Favorites, @Folders,
@Attachments, @CreationDate, @RevisionDate, @FolderId, @Favorite, @Edit, @ViewPassword,
@OrganizationUseTotp, @DeletedDate
@OrganizationUseTotp, @DeletedDate, @Reprompt
DECLARE @UpdateCollectionsSuccess INT
EXEC @UpdateCollectionsSuccess = [dbo].[Cipher_UpdateCollections] @Id, @UserId, @OrganizationId, @CollectionIds

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

@ -9,7 +9,8 @@
@Attachments NVARCHAR(MAX),
@CreationDate DATETIME2(7),
@RevisionDate DATETIME2(7),
@DeletedDate DATETIME2(7)
@DeletedDate DATETIME2(7),
@Reprompt TINYINT
AS
BEGIN
SET NOCOUNT ON
@ -26,7 +27,8 @@ BEGIN
[Attachments],
[CreationDate],
[RevisionDate],
[DeletedDate]
[DeletedDate],
[Reprompt]
)
VALUES
(
@ -40,7 +42,8 @@ BEGIN
@Attachments,
@CreationDate,
@RevisionDate,
@DeletedDate
@DeletedDate,
@Reprompt
)
IF @OrganizationId IS NOT NULL

3
src/Sql/dbo/Stored Procedures/Cipher_CreateWithCollections.sql
View File

@ -10,13 +10,14 @@
@CreationDate DATETIME2(7),
@RevisionDate DATETIME2(7),
@DeletedDate DATETIME2(7),
@Reprompt TINYINT,
@CollectionIds AS [dbo].[GuidIdArray] READONLY
AS
BEGIN
SET NOCOUNT ON
EXEC [dbo].[Cipher_Create] @Id, @UserId, @OrganizationId, @Type, @Data, @Favorites, @Folders,
@Attachments, @CreationDate, @RevisionDate, @DeletedDate
@Attachments, @CreationDate, @RevisionDate, @DeletedDate, @Reprompt
DECLARE @UpdateCollectionsSuccess INT
EXEC @UpdateCollectionsSuccess = [dbo].[Cipher_UpdateCollections] @Id, @UserId, @OrganizationId, @CollectionIds

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

@ -9,7 +9,8 @@
@Attachments NVARCHAR(MAX),
@CreationDate DATETIME2(7),
@RevisionDate DATETIME2(7),
@DeletedDate DATETIME2(7)
@DeletedDate DATETIME2(7),
@Reprompt TINYINT
AS
BEGIN
SET NOCOUNT ON
@ -26,7 +27,8 @@ BEGIN
[Attachments] = @Attachments,
[CreationDate] = @CreationDate,
[RevisionDate] = @RevisionDate,
[DeletedDate] = @DeletedDate
[DeletedDate] = @DeletedDate,
[Reprompt] = @Reprompt
WHERE
[Id] = @Id

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

@ -10,6 +10,7 @@
@CreationDate DATETIME2(7),
@RevisionDate DATETIME2(7),
@DeletedDate DATETIME2(7),
@Reprompt TINYINT,
@CollectionIds AS [dbo].[GuidIdArray] READONLY
AS
BEGIN