nhyatt/bitwarden
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2025-05-20 11:04:31 -05:00
Code

Added support for device registration during two factor login

Browse Source
This commit is contained in:
Kyle Spearrin 2016-07-23 02:49:57 -04:00
parent 452d74a266
commit d300c82ffd
3 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Api/Controllers/AuthController.cs
View File

@ -45,7 +45,7 @@ namespace Bit.Api.Controllers
[Authorize("TwoFactor")] [Authorize("TwoFactor")]
public async Task<AuthTokenResponseModel> PostTokenTwoFactor([FromBody]AuthTokenTwoFactorRequestModel model) public async Task<AuthTokenResponseModel> PostTokenTwoFactor([FromBody]AuthTokenTwoFactorRequestModel model)
{ {
var result = await _signInManager.TwoFactorSignInAsync(_currentContext.User, model.Provider, model.Code); var result = await _signInManager.TwoFactorSignInAsync(_currentContext.User, model.Provider, model.Code, model.Device?.ToDevice());
if(result == JwtBearerSignInResult.Success) if(result == JwtBearerSignInResult.Success)
{ {
return new AuthTokenResponseModel(result.Token, result.User); return new AuthTokenResponseModel(result.Token, result.User);

1
src/Api/Models/Request/AuthTokenTwoFactorRequestModel.cs
View File

@ -8,5 +8,6 @@ namespace Bit.Api.Models
public string Code { get; set; } public string Code { get; set; }
[Required] [Required]
public string Provider { get; set; } public string Provider { get; set; }
public DeviceRequestModel Device { get; set; }
} }
} }

9
src/Core/Identity/JwtBearerSignInManager.cs
View File

@ -96,7 +96,7 @@ namespace Bit.Core.Identity
return await PasswordSignInAsync(user, password, device); return await PasswordSignInAsync(user, password, device);
} }
public async Task<JwtBearerSignInResult> TwoFactorSignInAsync(User user, string provider, string code) public async Task<JwtBearerSignInResult> TwoFactorSignInAsync(User user, string provider, string code, Device device = null)
{ {
if(user == null) if(user == null)
{ {
@ -111,6 +111,13 @@ namespace Bit.Core.Identity
success.Token = token; success.Token = token;
success.User = user; success.User = user;
var existingDevice = await _deviceRepository.GetByIdentifierAsync(device.Identifier, user.Id);
if(existingDevice == null)
{
device.UserId = user.Id;
await _deviceRepository.CreateAsync(device);
}
return success; return success;
} }