1
0
mirror of https://github.com/bitwarden/server synced 2025-12-18 01:03:17 +00:00

Fix bulk fingerprints (#1442)

* 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

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);
}

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; }
}

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; }
}
}

View File

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