refactor code to with user TwoFactorProviders

src/Core/Models/Api/Response/ProfileResponseModel.cs

@@ -22,7 +22,7 @@ namespace Bit.Core.Models.Api
             Email = user.Email;
             MasterPasswordHint = string.IsNullOrWhiteSpace(user.MasterPasswordHint) ? null : user.MasterPasswordHint;
             Culture = user.Culture;
-            TwoFactorEnabled = user.TwoFactorEnabled;
+            TwoFactorEnabled = user.TwoFactorIsEnabled();
             Key = user.Key;
             PrivateKey = user.PrivateKey;
             SecurityStamp = user.SecurityStamp;

src/Core/Models/Api/Response/TwoFactorResponseModel.cs

@@ -14,8 +14,25 @@ namespace Bit.Core.Models.Api
                 throw new ArgumentNullException(nameof(user));
             }
 
-            TwoFactorEnabled = user.TwoFactorEnabled;
-            AuthenticatorKey = user.AuthenticatorKey;
+            var providers = user.GetTwoFactorProviders();
+            if(user.TwoFactorProvider.HasValue && providers.ContainsKey(user.TwoFactorProvider.Value))
+            {
+                var provider = providers[user.TwoFactorProvider.Value];
+                switch(user.TwoFactorProvider.Value)
+                {
+                    case TwoFactorProviderType.Authenticator:
+                        AuthenticatorKey = provider.MetaData["Key"];
+                        break;
+                    default:
+                        break;
+                }
+            }
+            else
+            {
+                TwoFactorEnabled = false;
+            }
+
+            TwoFactorEnabled = user.TwoFactorIsEnabled();
             TwoFactorProvider = user.TwoFactorProvider;
             TwoFactorRecoveryCode = user.TwoFactorRecoveryCode;
         }

src/Core/Models/Table/User.cs

@@ -1,11 +1,15 @@
 using System;
 using Bit.Core.Enums;
 using Bit.Core.Utilities;
+using System.Collections.Generic;
+using Newtonsoft.Json;
 
 namespace Bit.Core.Models.Table
 {
     public class User : IDataObject<Guid>
     {
+        private Dictionary<TwoFactorProviderType, TwoFactorProvider> _twoFactorProviders;
+
         public Guid Id { get; set; }
         public string Name { get; set; }
         public string Email { get; set; }
@@ -32,5 +36,69 @@ namespace Bit.Core.Models.Table
         {
             Id = CoreHelpers.GenerateComb();
         }
+
+        public Dictionary<TwoFactorProviderType, TwoFactorProvider> GetTwoFactorProviders()
+        {
+            if(string.IsNullOrWhiteSpace(TwoFactorProviders))
+            {
+                return null;
+            }
+
+            try
+            {
+                if(_twoFactorProviders == null)
+                {
+                    _twoFactorProviders =
+                        JsonConvert.DeserializeObject<Dictionary<TwoFactorProviderType, TwoFactorProvider>>(TwoFactorProviders);
+                }
+
+                return _twoFactorProviders;
+            }
+            catch(JsonSerializationException)
+            {
+                return null;
+            }
+        }
+
+        public void SetTwoFactorProviders(Dictionary<TwoFactorProviderType, TwoFactorProvider> providers)
+        {
+            TwoFactorProviders = JsonConvert.SerializeObject(providers, new JsonSerializerSettings
+            {
+                ContractResolver = new EnumKeyResolver<byte>()
+            });
+            _twoFactorProviders = providers;
+        }
+
+        public bool TwoFactorProviderIsEnabled(TwoFactorProviderType provider)
+        {
+            var providers = GetTwoFactorProviders();
+            if(providers == null || !providers.ContainsKey(provider))
+            {
+                return false;
+            }
+
+            return providers[provider].Enabled;
+        }
+
+        public bool TwoFactorIsEnabled(TwoFactorProviderType provider)
+        {
+            return TwoFactorEnabled && TwoFactorProviderIsEnabled(provider);
+        }
+
+        public bool TwoFactorIsEnabled()
+        {
+            return TwoFactorEnabled && TwoFactorProvider.HasValue && TwoFactorProviderIsEnabled(TwoFactorProvider.Value);
+        }
+
+        public TwoFactorProvider GetTwoFactorProvider(TwoFactorProviderType provider)
+        {
+            var providers = GetTwoFactorProviders();
+            if(providers == null || !providers.ContainsKey(provider))
+            {
+                return null;
+            }
+
+            return providers[provider];
+        }
     }
 }

src/Core/Models/TwoFactorProvider.cs

@@ -7,6 +7,6 @@ namespace Bit.Core.Models
     {
         public bool Enabled { get; set; }
         public bool Remember { get; set; }
-        public Dictionary<string, object> MetaData { get; set; }
+        public Dictionary<string, string> MetaData { get; set; } = new Dictionary<string, string>();
     }
 }