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

Group access & sproc/model refactoring.

Browse Source
This commit is contained in:
Kyle Spearrin
2017-05-11 10:32:25 -04:00
parent 76cebdd886
commit f0d7dc8023
26 changed files with 238 additions and 183 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/Api/Controllers/CollectionsController.cs
View File

@ -74,12 +74,11 @@ namespace Bit.Api.Controllers
}
[HttpGet("~/collections")]
public async Task<ListResponseModel<CollectionUserDetailsResponseModel>> GetUser()
public async Task<ListResponseModel<CollectionResponseModel>> GetUser()
{
var collections = await _collectionUserRepository.GetManyDetailsByUserIdAsync(
_userService.GetProperUserId(User).Value);
var responses = collections.Select(c => new CollectionUserDetailsResponseModel(c));
return new ListResponseModel<CollectionUserDetailsResponseModel>(responses);
var collections = await _collectionRepository.GetManyByUserIdAsync(_userService.GetProperUserId(User).Value);
var responses = collections.Select(c => new CollectionResponseModel(c));
return new ListResponseModel<CollectionResponseModel>(responses);
}
[HttpPost("")]

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

@ -45,7 +45,7 @@ namespace Bit.Api.Controllers
[HttpGet("{id}")]
public async Task<OrganizationUserDetailsResponseModel> Get(string orgId, string id)
{
var organizationUser = await _organizationUserRepository.GetDetailsByIdAsync(new Guid(id));
var organizationUser = await _organizationUserRepository.GetByIdWithCollectionsAsync(new Guid(id));
if(organizationUser == null || !_currentContext.OrganizationAdmin(organizationUser.Item1.OrganizationId))
{
throw new NotFoundException();
@ -55,7 +55,7 @@ namespace Bit.Api.Controllers
}
[HttpGet("")]
public async Task<ListResponseModel<OrganizationUserResponseModel>> Get(string orgId)
public async Task<ListResponseModel<OrganizationUserUserDetailsResponseModel>> Get(string orgId)
{
var orgGuidId = new Guid(orgId);
if(!_currentContext.OrganizationAdmin(orgGuidId))
@ -64,8 +64,8 @@ namespace Bit.Api.Controllers
}
var organizationUsers = await _organizationUserRepository.GetManyDetailsByOrganizationAsync(orgGuidId);
var responses = organizationUsers.Select(o => new OrganizationUserResponseModel(o));
return new ListResponseModel<OrganizationUserResponseModel>(responses);
var responses = organizationUsers.Select(o => new OrganizationUserUserDetailsResponseModel(o));
return new ListResponseModel<OrganizationUserUserDetailsResponseModel>(responses);
}
[HttpGet("{id}/groups")]