admin/server
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2026-02-14 21:03:51 +08:00
Code Issues Packages Projects Releases Wiki Activity

react to contact changes not being set from identity

Browse Source
This commit is contained in:
Kyle Spearrin
2017-01-24 22:46:54 -05:00
parent 9a10382b46
commit 0648c2d0a3
13 changed files with 104 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -5,7 +5,7 @@ using Bit.Core.Identity;
using Bit.Api.Models;
using Microsoft.AspNetCore.Authorization;
using Bit.Core.Exceptions;
using Bit.Core;
using Bit.Core.Services;
namespace Bit.Api.Controllers
{
@@ -14,21 +14,22 @@ namespace Bit.Api.Controllers
public class AuthController : Controller
{
private readonly JwtBearerSignInManager _signInManager;
private readonly CurrentContext _currentContext;
private readonly IUserService _userService;
public AuthController(
JwtBearerSignInManager signInManager,
CurrentContext currentContext)
IUserService userService)
{
_signInManager = signInManager;
_currentContext = currentContext;
_userService = userService;
}
[HttpPost("token")]
[AllowAnonymous]
public async Task<AuthTokenResponseModel> PostToken([FromBody]AuthTokenRequestModel model)
{
var result = await _signInManager.PasswordSignInAsync(model.Email.ToLower(), model.MasterPasswordHash, model.Device?.ToDevice());
var result = await _signInManager.PasswordSignInAsync(model.Email.ToLower(), model.MasterPasswordHash,
model.Device?.ToDevice());
if(result == JwtBearerSignInResult.Success)
{
return new AuthTokenResponseModel(result.Token, result.User);
@@ -46,7 +47,8 @@ namespace Bit.Api.Controllers
[Authorize("TwoFactor")]
public async Task<AuthTokenResponseModel> PostTokenTwoFactor([FromBody]AuthTokenTwoFactorRequestModel model)
{
var result = await _signInManager.TwoFactorSignInAsync(_currentContext.User, model.Provider, model.Code, model.Device?.ToDevice());
var user = await _userService.GetUserByPrincipalAsync(User);
var result = await _signInManager.TwoFactorSignInAsync(user, model.Provider, model.Code, model.Device?.ToDevice());
if(result == JwtBearerSignInResult.Success)
{
return new AuthTokenResponseModel(result.Token, result.User);