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

move some 2fa logic functions to userService

Browse Source
This commit is contained in:
Kyle Spearrin
2018-12-19 10:47:53 -05:00
parent b7362ae741
commit ac7c7b5077
15 changed files with 64 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/Core/IdentityServer/ResourceOwnerPasswordValidator.cs
View File

@ -164,7 +164,7 @@ namespace Bit.Core.IdentityServer
{
foreach(var p in user.GetTwoFactorProviders())
{
if(await user.TwoFactorProviderIsEnabledAsync(p.Key, _userService))
if(await _userService.TwoFactorProviderIsEnabledAsync(p.Key, user))
{
enabledProviders.Add(p);
}
@ -279,13 +279,13 @@ namespace Bit.Core.IdentityServer
case TwoFactorProviderType.U2f:
case TwoFactorProviderType.Remember:
if(type != TwoFactorProviderType.Remember &&
!(await user.TwoFactorProviderIsEnabledAsync(type, _userService)))
!(await _userService.TwoFactorProviderIsEnabledAsync(type, user)))
{
return false;
}
return await _userManager.VerifyTwoFactorTokenAsync(user, type.ToString(), token);
case TwoFactorProviderType.Email:
if(!(await user.TwoFactorProviderIsEnabledAsync(type, _userService)))
if(!(await _userService.TwoFactorProviderIsEnabledAsync(type, user)))
{
return false;
}
@ -311,7 +311,7 @@ namespace Bit.Core.IdentityServer
case TwoFactorProviderType.U2f:
case TwoFactorProviderType.Email:
case TwoFactorProviderType.YubiKey:
if(!(await user.TwoFactorProviderIsEnabledAsync(type, _userService)))
if(!(await _userService.TwoFactorProviderIsEnabledAsync(type, user)))
{
return null;
}