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

org totp and storage flags

Browse Source
This commit is contained in:
Kyle Spearrin
2017-07-07 14:08:30 -04:00
parent 43262e577c
commit fbc189544b
20 changed files with 97 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/Api/Controllers/LoginsController.cs
View File

@ -54,14 +54,15 @@ namespace Bit.Api.Controllers
[HttpGet("{id}/admin")]
public async Task<LoginResponseModel> GetAdmin(string id)
{
var login = await _cipherRepository.GetByIdAsync(new Guid(id));
var userId = _userService.GetProperUserId(User).Value;
var login = await _cipherRepository.GetByIdAsync(new Guid(id), userId);
if(login == null || !login.OrganizationId.HasValue ||
!_currentContext.OrganizationAdmin(login.OrganizationId.Value))
{
throw new NotFoundException();
}
var response = new LoginResponseModel(login, _globalSettings);
var response = new LoginResponseModel(login, _globalSettings, login.OrganizationUseTotp);
return response;
}
@ -97,7 +98,7 @@ namespace Bit.Api.Controllers
var userId = _userService.GetProperUserId(User).Value;
await _cipherService.SaveAsync(login, userId, true);
var response = new LoginResponseModel(login, _globalSettings);
var response = new LoginResponseModel(login, _globalSettings, false);
return response;
}
@ -129,17 +130,17 @@ namespace Bit.Api.Controllers
[HttpPost("{id}/admin")]
public async Task<LoginResponseModel> PutAdmin(string id, [FromBody]LoginRequestModel model)
{
var login = await _cipherRepository.GetByIdAsync(new Guid(id));
var userId = _userService.GetProperUserId(User).Value;
var login = await _cipherRepository.GetByIdAsync(new Guid(id), userId);
if(login == null || !login.OrganizationId.HasValue ||
!_currentContext.OrganizationAdmin(login.OrganizationId.Value))
{
throw new NotFoundException();
}
var userId = _userService.GetProperUserId(User).Value;
await _cipherService.SaveAsync(model.ToCipher(login), userId, true);
var response = new LoginResponseModel(login, _globalSettings);
var response = new LoginResponseModel(login, _globalSettings, login.OrganizationUseTotp);
return response;
}