nhyatt/bitwarden
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2025-07-04 01:22:50 -05:00
Code Activity

return collection associations with group response

Browse Source
This commit is contained in:
Kyle Spearrin
2019-03-05 10:55:02 -05:00
parent 41ab456bbd
commit df09b02ecc
5 changed files with 58 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/Api/Public/Controllers/GroupsController.cs
View File

@ -42,12 +42,13 @@ namespace Bit.Api.Public.Controllers
[ProducesResponseType((int)HttpStatusCode.NotFound)]
public async Task<IActionResult> Get(Guid id)
{
var group = await _groupRepository.GetByIdAsync(id);
var groupDetails = await _groupRepository.GetByIdWithCollectionsAsync(id);
var group = groupDetails?.Item1;
if(group == null || group.OrganizationId != _currentContext.OrganizationId)
{
return new NotFoundResult();
}
var response = new GroupResponseModel(group);
var response = new GroupResponseModel(group, groupDetails.Item2);
return new JsonResult(response);
}
@ -56,13 +57,15 @@ namespace Bit.Api.Public.Controllers
/// </summary>
/// <remarks>
/// Returns a list of your organization's groups.
/// Group objects listed in this call do not include information about their associated collections.
/// </remarks>
[HttpGet]
[ProducesResponseType(typeof(ListResponseModel<GroupResponseModel>), (int)HttpStatusCode.OK)]
public async Task<IActionResult> List()
{
var groups = await _groupRepository.GetManyByOrganizationIdAsync(_currentContext.OrganizationId.Value);
var groupResponses = groups.Select(g => new GroupResponseModel(g));
// TODO: Get all CollectionGroup associations for the organization and marry them up here for the response.
var groupResponses = groups.Select(g => new GroupResponseModel(g, null));
var response = new ListResponseModel<GroupResponseModel>(groupResponses);
return new JsonResult(response);
}
@ -82,7 +85,7 @@ namespace Bit.Api.Public.Controllers
var group = model.ToGroup(_currentContext.OrganizationId.Value);
var associations = model.Collections?.Select(c => c.ToSelectionReadOnly());
await _groupService.SaveAsync(group, associations);
var response = new GroupResponseModel(group);
var response = new GroupResponseModel(group, associations);
return new JsonResult(response);
}
@ -109,7 +112,7 @@ namespace Bit.Api.Public.Controllers
var updatedGroup = model.ToGroup(existingGroup);
var associations = model.Collections?.Select(c => c.ToSelectionReadOnly());
await _groupService.SaveAsync(updatedGroup, associations);
var response = new GroupResponseModel(updatedGroup);
var response = new GroupResponseModel(updatedGroup, associations);
return new JsonResult(response);
}