mirror of
https://github.com/bitwarden/server.git
synced 2025-07-02 16:42:50 -05:00
remove user twofactorenabled property
This commit is contained in:
@ -14,7 +14,7 @@ namespace Bit.Core.Identity
|
||||
{
|
||||
var provider = user.GetTwoFactorProvider(TwoFactorProviderType.Duo);
|
||||
|
||||
var canGenerate = user.TwoFactorIsEnabled(TwoFactorProviderType.Duo)
|
||||
var canGenerate = user.TwoFactorProviderIsEnabled(TwoFactorProviderType.Duo)
|
||||
&& user.TwoFactorProvider.HasValue
|
||||
&& user.TwoFactorProvider.Value == TwoFactorProviderType.Duo
|
||||
&& !string.IsNullOrWhiteSpace(provider?.MetaData["UserId"]);
|
||||
|
@ -1,13 +1,9 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Security.Claims;
|
||||
using System.Threading;
|
||||
using System.Threading.Tasks;
|
||||
using Microsoft.AspNetCore.Identity;
|
||||
using Bit.Core.Models.Table;
|
||||
using Bit.Core.Repositories;
|
||||
using Bit.Core.Services;
|
||||
|
||||
namespace Bit.Core.Identity
|
||||
{
|
||||
@ -162,7 +158,7 @@ namespace Bit.Core.Identity
|
||||
|
||||
public Task SetTwoFactorEnabledAsync(User user, bool enabled, CancellationToken cancellationToken)
|
||||
{
|
||||
user.TwoFactorEnabled = enabled;
|
||||
// Do nothing...
|
||||
return Task.FromResult(0);
|
||||
}
|
||||
|
||||
|
@ -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)
|
||||
|
@ -415,7 +415,8 @@ namespace Bit.Core.Services
|
||||
return false;
|
||||
}
|
||||
|
||||
user.TwoFactorEnabled = false;
|
||||
user.TwoFactorProviders = null;
|
||||
user.TwoFactorProvider = null;
|
||||
user.TwoFactorRecoveryCode = null;
|
||||
await SaveUserAsync(user);
|
||||
|
||||
|
Reference in New Issue
Block a user