nhyatt/bitwarden
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2025-06-30 15:42:48 -05:00
Code Activity

Fix bulk fingerprints (#1442)

Browse Source 
* Fix fingerprint phrases in bulk confirm modal

* Fix indentation
This commit is contained in:
Thomas Rittson
2021-07-07 20:21:52 +10:00
committed by GitHub
parent 2c9a5bb4ab
commit 908e1504af
6 changed files with 36 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
util/Migrator/DbScripts/2021-05-18_00_BulkConfirm.sql
View File

@ -42,9 +42,9 @@ BEGIN
U.[PublicKey]
FROM
@OrganizationUserIds OUIDs
INNER JOIN
INNER JOIN
[dbo].[OrganizationUser] OU ON OUIDs.Id = OU.Id AND OU.[Status] = 1 -- Accepted
INNER JOIN
INNER JOIN
[dbo].[User] U ON OU.UserId = U.Id
WHERE
OU.OrganizationId = @OrganizationId

26
util/Migrator/DbScripts/2021-07-07_00_FixBulkConfirm.sql Normal file
View File

@ -0,0 +1,26 @@
IF OBJECT_ID('[dbo].[User_ReadPublicKeysByOrganizationUserIds]') IS NOT NULL
BEGIN
DROP PROCEDURE [dbo].[User_ReadPublicKeysByOrganizationUserIds]
END
GO
CREATE PROCEDURE [dbo].[User_ReadPublicKeysByOrganizationUserIds]
@OrganizationId UNIQUEIDENTIFIER,
@OrganizationUserIds [dbo].[GuidIdArray] READONLY
AS
BEGIN
SET NOCOUNT ON
SELECT
OU.[Id],
OU.[UserId],
U.[PublicKey]
FROM
@OrganizationUserIds OUIDs
INNER JOIN
[dbo].[OrganizationUser] OU ON OUIDs.Id = OU.Id AND OU.[Status] = 1 -- Accepted
INNER JOIN
[dbo].[User] U ON OU.UserId = U.Id
WHERE
OU.OrganizationId = @OrganizationId
END