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

remove user twofactorenabled property

Browse Source
This commit is contained in:
Kyle Spearrin
2017-06-19 22:25:19 -04:00
parent 3b5b24531b
commit 2eaaecd95c
9 changed files with 25 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/Core/Models/Table/User.cs
View File

@ -3,6 +3,7 @@ using Bit.Core.Enums;
using Bit.Core.Utilities;
using System.Collections.Generic;
using Newtonsoft.Json;
using System.Linq;
namespace Bit.Core.Models.Table
{
@ -18,7 +19,6 @@ namespace Bit.Core.Models.Table
public string MasterPasswordHint { get; set; }
public string Culture { get; set; } = "en-US";
public string SecurityStamp { get; set; }
public bool TwoFactorEnabled { get; set; }
public TwoFactorProviderType? TwoFactorProvider { get; set; }
public string TwoFactorProviders { get; set; }
public string TwoFactorRecoveryCode { get; set; }
@ -79,14 +79,15 @@ namespace Bit.Core.Models.Table
return providers[provider].Enabled;
}
public bool TwoFactorIsEnabled(TwoFactorProviderType provider)
{
return TwoFactorEnabled && TwoFactorProviderIsEnabled(provider);
}
public bool TwoFactorIsEnabled()
{
return TwoFactorEnabled && TwoFactorProvider.HasValue && TwoFactorProviderIsEnabled(TwoFactorProvider.Value);
var providers = GetTwoFactorProviders();
if(providers == null)
{
return false;
}
return providers.Any(p => p.Value?.Enabled ?? false);
}
public TwoFactorProvider GetTwoFactorProvider(TwoFactorProviderType provider)