nhyatt/bitwarden
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2025-07-04 09:32:48 -05:00
Code Activity

return twofactor enabled property on org users api

Browse Source
This commit is contained in:
Kyle Spearrin
2018-12-19 11:48:36 -05:00
parent 866cfefd80
commit 4a38713c4b
10 changed files with 117 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/Core/Services/Implementations/UserService.cs
View File

@ -900,13 +900,18 @@ namespace Bit.Core.Services
return success;
}
public async Task<bool> CanAccessPremium(User user)
public async Task<bool> CanAccessPremium(ITwoFactorProvidersUser user)
{
if(user.Premium)
var userId = user.GetUserId();
if(!userId.HasValue)
{
return false;
}
if(user.GetPremium())
{
return true;
}
var orgs = await _currentContext.OrganizationMembershipAsync(_organizationUserRepository, user.Id);
var orgs = await _currentContext.OrganizationMembershipAsync(_organizationUserRepository, userId.Value);
if(!orgs.Any())
{
return false;
@ -916,7 +921,7 @@ namespace Bit.Core.Services
orgAbilities[o.Id].UsersGetPremium && orgAbilities[o.Id].Enabled);
}
public async Task<bool> TwoFactorIsEnabledAsync(User user)
public async Task<bool> TwoFactorIsEnabledAsync(ITwoFactorProvidersUser user)
{
var providers = user.GetTwoFactorProviders();
if(providers == null)
@ -941,7 +946,7 @@ namespace Bit.Core.Services
return false;
}
public async Task<bool> TwoFactorProviderIsEnabledAsync(TwoFactorProviderType provider, User user)
public async Task<bool> TwoFactorProviderIsEnabledAsync(TwoFactorProviderType provider, ITwoFactorProvidersUser user)
{
var providers = user.GetTwoFactorProviders();
if(providers == null || !providers.ContainsKey(provider) || !providers[provider].Enabled)