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

re-working claims for aspnet core identity integration and backwards compat

Browse Source
This commit is contained in:
Kyle Spearrin
2017-01-11 21:46:36 -05:00
parent 54711e634b
commit 038c98cfaf
8 changed files with 35 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -64,6 +64,7 @@ namespace Bit.Api.Controllers
[HttpPost("email-token")]
public async Task PostEmailToken([FromBody]EmailTokenRequestModel model)
{
_currentContext.User = await _userService.GetUserByIdAsync(_userManager.GetUserId(User));
if(!await _userManager.CheckPasswordAsync(_currentContext.User, model.MasterPasswordHash))
{
await Task.Delay(2000);
@ -151,10 +152,11 @@ namespace Bit.Api.Controllers
}
[HttpGet("profile")]
public Task<ProfileResponseModel> GetProfile()
public async Task<ProfileResponseModel> GetProfile()
{
_currentContext.User = await _userService.GetUserByIdAsync(_userManager.GetUserId(User));
var response = new ProfileResponseModel(_currentContext.User);
return Task.FromResult(response);
return response;
}
[HttpPut("profile")]
@ -165,7 +167,7 @@ namespace Bit.Api.Controllers
var response = new ProfileResponseModel(_currentContext.User);
return response;
}
}
[HttpGet("two-factor")]
public async Task<TwoFactorResponseModel> GetTwoFactor(string masterPasswordHash, TwoFactorProviderType provider)