nhyatt/bitwarden
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2025-04-05 05:00:19 -05:00
Code

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
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 36 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Api/Controllers/OrganizationUsersController.cs
View File

@ -219,7 +219,7 @@ namespace Bit.Api.Controllers
}
var result = await _organizationUserRepository.GetManyPublicKeysByOrganizationUserAsync(orgGuidId, model.Ids);
var responses = result.Select(r => new OrganizationUserPublicKeyResponseModel(r.Id, r.PublicKey)).ToList();
var responses = result.Select(r => new OrganizationUserPublicKeyResponseModel(r.Id, r.UserId, r.PublicKey)).ToList();
return new ListResponseModel<OrganizationUserPublicKeyResponseModel>(responses);
}

7
src/Core/Models/Api/Response/OrganizationUserResponseModel.cs
View File

@ -111,14 +111,17 @@ namespace Bit.Core.Models.Api
public class OrganizationUserPublicKeyResponseModel : ResponseModel
{
public OrganizationUserPublicKeyResponseModel(Guid id, string key,
string obj = "organizationUserPublicKeyResponseModel") : base(obj)
public OrganizationUserPublicKeyResponseModel(Guid id, Guid userId,
string key, string obj = "organizationUserPublicKeyResponseModel") :
base(obj)
{
Id = id;
UserId = userId;
Key = key;
}
public Guid Id { get; set; }
public Guid UserId { get; set; }
public string Key { get; set; }
}

1
src/Core/Models/Data/OrganizationUserPublicKey.cs
View File

@ -5,6 +5,7 @@ namespace Bit.Core.Models.Data
public class OrganizationUserPublicKey
{
public Guid Id { get; set; }
public Guid UserId { get; set; }
public string PublicKey { get; set; }
}
}

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

@ -7,6 +7,7 @@ BEGIN
SELECT
OU.[Id],
OU.[UserId],
U.[PublicKey]
FROM
@OrganizationUserIds OUIDs

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