Turn on file scoped namespaces (#2225)

2025-12-31 23:53:17 +00:00 · 2022-08-29 14:53:16 -04:00
parent 7c4521e0b4
commit 34fb4cca2a
1206 changed files with 73816 additions and 75022 deletions
--- a/src/Api/Models/Response/TwoFactor/TwoFactorAuthenticatorResponseModel.cs
+++ b/src/Api/Models/Response/TwoFactor/TwoFactorAuthenticatorResponseModel.cs
@@ -3,33 +3,32 @@ using Bit.Core.Enums;
 using Bit.Core.Models.Api;
 using OtpNet;

-namespace Bit.Api.Models.Response.TwoFactor
-{
-    public class TwoFactorAuthenticatorResponseModel : ResponseModel
-    {
-        public TwoFactorAuthenticatorResponseModel(User user)
-            : base("twoFactorAuthenticator")
-        {
-            if (user == null)
-            {
-                throw new ArgumentNullException(nameof(user));
-            }
+namespace Bit.Api.Models.Response.TwoFactor;

-            var provider = user.GetTwoFactorProvider(TwoFactorProviderType.Authenticator);
-            if (provider?.MetaData?.ContainsKey("Key") ?? false)
-            {
-                Key = (string)provider.MetaData["Key"];
-                Enabled = provider.Enabled;
-            }
-            else
-            {
-                var key = KeyGeneration.GenerateRandomKey(20);
-                Key = Base32Encoding.ToString(key);
-                Enabled = false;
-            }
+public class TwoFactorAuthenticatorResponseModel : ResponseModel
+{
+    public TwoFactorAuthenticatorResponseModel(User user)
+        : base("twoFactorAuthenticator")
+    {
+        if (user == null)
+        {
+            throw new ArgumentNullException(nameof(user));
        }

-        public bool Enabled { get; set; }
-        public string Key { get; set; }
+        var provider = user.GetTwoFactorProvider(TwoFactorProviderType.Authenticator);
+        if (provider?.MetaData?.ContainsKey("Key") ?? false)
+        {
+            Key = (string)provider.MetaData["Key"];
+            Enabled = provider.Enabled;
+        }
+        else
+        {
+            var key = KeyGeneration.GenerateRandomKey(20);
+            Key = Base32Encoding.ToString(key);
+            Enabled = false;
+        }
    }
+
+    public bool Enabled { get; set; }
+    public string Key { get; set; }
 }
--- a/src/Api/Models/Response/TwoFactor/TwoFactorDuoResponseModel.cs
+++ b/src/Api/Models/Response/TwoFactor/TwoFactorDuoResponseModel.cs
@@ -3,64 +3,63 @@ using Bit.Core.Enums;
 using Bit.Core.Models;
 using Bit.Core.Models.Api;

-namespace Bit.Api.Models.Response.TwoFactor
+namespace Bit.Api.Models.Response.TwoFactor;
+
+public class TwoFactorDuoResponseModel : ResponseModel
 {
-    public class TwoFactorDuoResponseModel : ResponseModel
+    private const string ResponseObj = "twoFactorDuo";
+
+    public TwoFactorDuoResponseModel(User user)
+        : base(ResponseObj)
    {
-        private const string ResponseObj = "twoFactorDuo";
-
-        public TwoFactorDuoResponseModel(User user)
-            : base(ResponseObj)
+        if (user == null)
        {
-            if (user == null)
-            {
-                throw new ArgumentNullException(nameof(user));
-            }
-
-            var provider = user.GetTwoFactorProvider(TwoFactorProviderType.Duo);
-            Build(provider);
+            throw new ArgumentNullException(nameof(user));
        }

-        public TwoFactorDuoResponseModel(Organization org)
-            : base(ResponseObj)
-        {
-            if (org == null)
-            {
-                throw new ArgumentNullException(nameof(org));
-            }
+        var provider = user.GetTwoFactorProvider(TwoFactorProviderType.Duo);
+        Build(provider);
+    }

-            var provider = org.GetTwoFactorProvider(TwoFactorProviderType.OrganizationDuo);
-            Build(provider);
+    public TwoFactorDuoResponseModel(Organization org)
+        : base(ResponseObj)
+    {
+        if (org == null)
+        {
+            throw new ArgumentNullException(nameof(org));
        }

-        public bool Enabled { get; set; }
-        public string Host { get; set; }
-        public string SecretKey { get; set; }
-        public string IntegrationKey { get; set; }
+        var provider = org.GetTwoFactorProvider(TwoFactorProviderType.OrganizationDuo);
+        Build(provider);
+    }

-        private void Build(TwoFactorProvider provider)
+    public bool Enabled { get; set; }
+    public string Host { get; set; }
+    public string SecretKey { get; set; }
+    public string IntegrationKey { get; set; }
+
+    private void Build(TwoFactorProvider provider)
+    {
+        if (provider?.MetaData != null && provider.MetaData.Count > 0)
        {
-            if (provider?.MetaData != null && provider.MetaData.Count > 0)
-            {
-                Enabled = provider.Enabled;
+            Enabled = provider.Enabled;

-                if (provider.MetaData.ContainsKey("Host"))
-                {
-                    Host = (string)provider.MetaData["Host"];
-                }
-                if (provider.MetaData.ContainsKey("SKey"))
-                {
-                    SecretKey = (string)provider.MetaData["SKey"];
-                }
-                if (provider.MetaData.ContainsKey("IKey"))
-                {
-                    IntegrationKey = (string)provider.MetaData["IKey"];
-                }
-            }
-            else
+            if (provider.MetaData.ContainsKey("Host"))
            {
-                Enabled = false;
+                Host = (string)provider.MetaData["Host"];
            }
+            if (provider.MetaData.ContainsKey("SKey"))
+            {
+                SecretKey = (string)provider.MetaData["SKey"];
+            }
+            if (provider.MetaData.ContainsKey("IKey"))
+            {
+                IntegrationKey = (string)provider.MetaData["IKey"];
+            }
+        }
+        else
+        {
+            Enabled = false;
        }
    }
 }
--- a/src/Api/Models/Response/TwoFactor/TwoFactorEmailResponseModel.cs
+++ b/src/Api/Models/Response/TwoFactor/TwoFactorEmailResponseModel.cs
@@ -2,31 +2,30 @@
 using Bit.Core.Enums;
 using Bit.Core.Models.Api;

-namespace Bit.Api.Models.Response.TwoFactor
-{
-    public class TwoFactorEmailResponseModel : ResponseModel
-    {
-        public TwoFactorEmailResponseModel(User user)
-            : base("twoFactorEmail")
-        {
-            if (user == null)
-            {
-                throw new ArgumentNullException(nameof(user));
-            }
+namespace Bit.Api.Models.Response.TwoFactor;

-            var provider = user.GetTwoFactorProvider(TwoFactorProviderType.Email);
-            if (provider?.MetaData?.ContainsKey("Email") ?? false)
-            {
-                Email = (string)provider.MetaData["Email"];
-                Enabled = provider.Enabled;
-            }
-            else
-            {
-                Enabled = false;
-            }
+public class TwoFactorEmailResponseModel : ResponseModel
+{
+    public TwoFactorEmailResponseModel(User user)
+        : base("twoFactorEmail")
+    {
+        if (user == null)
+        {
+            throw new ArgumentNullException(nameof(user));
        }

-        public bool Enabled { get; set; }
-        public string Email { get; set; }
+        var provider = user.GetTwoFactorProvider(TwoFactorProviderType.Email);
+        if (provider?.MetaData?.ContainsKey("Email") ?? false)
+        {
+            Email = (string)provider.MetaData["Email"];
+            Enabled = provider.Enabled;
+        }
+        else
+        {
+            Enabled = false;
+        }
    }
+
+    public bool Enabled { get; set; }
+    public string Email { get; set; }
 }
--- a/src/Api/Models/Response/TwoFactor/TwoFactorProviderResponseModel.cs
+++ b/src/Api/Models/Response/TwoFactor/TwoFactorProviderResponseModel.cs
@@ -3,51 +3,50 @@ using Bit.Core.Enums;
 using Bit.Core.Models;
 using Bit.Core.Models.Api;

-namespace Bit.Api.Models.Response.TwoFactor
+namespace Bit.Api.Models.Response.TwoFactor;
+
+public class TwoFactorProviderResponseModel : ResponseModel
 {
-    public class TwoFactorProviderResponseModel : ResponseModel
+    private const string ResponseObj = "twoFactorProvider";
+
+    public TwoFactorProviderResponseModel(TwoFactorProviderType type, TwoFactorProvider provider)
+        : base(ResponseObj)
    {
-        private const string ResponseObj = "twoFactorProvider";
-
-        public TwoFactorProviderResponseModel(TwoFactorProviderType type, TwoFactorProvider provider)
-            : base(ResponseObj)
+        if (provider == null)
        {
-            if (provider == null)
-            {
-                throw new ArgumentNullException(nameof(provider));
-            }
-
-            Enabled = provider.Enabled;
-            Type = type;
+            throw new ArgumentNullException(nameof(provider));
        }

-        public TwoFactorProviderResponseModel(TwoFactorProviderType type, User user)
-            : base(ResponseObj)
-        {
-            if (user == null)
-            {
-                throw new ArgumentNullException(nameof(user));
-            }
-
-            var provider = user.GetTwoFactorProvider(type);
-            Enabled = provider?.Enabled ?? false;
-            Type = type;
-        }
-
-        public TwoFactorProviderResponseModel(TwoFactorProviderType type, Organization organization)
-            : base(ResponseObj)
-        {
-            if (organization == null)
-            {
-                throw new ArgumentNullException(nameof(organization));
-            }
-
-            var provider = organization.GetTwoFactorProvider(type);
-            Enabled = provider?.Enabled ?? false;
-            Type = type;
-        }
-
-        public bool Enabled { get; set; }
-        public TwoFactorProviderType Type { get; set; }
+        Enabled = provider.Enabled;
+        Type = type;
    }
+
+    public TwoFactorProviderResponseModel(TwoFactorProviderType type, User user)
+        : base(ResponseObj)
+    {
+        if (user == null)
+        {
+            throw new ArgumentNullException(nameof(user));
+        }
+
+        var provider = user.GetTwoFactorProvider(type);
+        Enabled = provider?.Enabled ?? false;
+        Type = type;
+    }
+
+    public TwoFactorProviderResponseModel(TwoFactorProviderType type, Organization organization)
+        : base(ResponseObj)
+    {
+        if (organization == null)
+        {
+            throw new ArgumentNullException(nameof(organization));
+        }
+
+        var provider = organization.GetTwoFactorProvider(type);
+        Enabled = provider?.Enabled ?? false;
+        Type = type;
+    }
+
+    public bool Enabled { get; set; }
+    public TwoFactorProviderType Type { get; set; }
 }
--- a/src/Api/Models/Response/TwoFactor/TwoFactorRecoverResponseModel.cs
+++ b/src/Api/Models/Response/TwoFactor/TwoFactorRecoverResponseModel.cs
@@ -1,21 +1,20 @@
 using Bit.Core.Entities;
 using Bit.Core.Models.Api;

-namespace Bit.Api.Models.Response.TwoFactor
-{
-    public class TwoFactorRecoverResponseModel : ResponseModel
-    {
-        public TwoFactorRecoverResponseModel(User user)
-            : base("twoFactorRecover")
-        {
-            if (user == null)
-            {
-                throw new ArgumentNullException(nameof(user));
-            }
+namespace Bit.Api.Models.Response.TwoFactor;

-            Code = user.TwoFactorRecoveryCode;
+public class TwoFactorRecoverResponseModel : ResponseModel
+{
+    public TwoFactorRecoverResponseModel(User user)
+        : base("twoFactorRecover")
+    {
+        if (user == null)
+        {
+            throw new ArgumentNullException(nameof(user));
        }

-        public string Code { get; set; }
+        Code = user.TwoFactorRecoveryCode;
    }
+
+    public string Code { get; set; }
 }
--- a/src/Api/Models/Response/TwoFactor/TwoFactorWebAuthnResponseModel.cs
+++ b/src/Api/Models/Response/TwoFactor/TwoFactorWebAuthnResponseModel.cs
@@ -3,40 +3,39 @@ using Bit.Core.Enums;
 using Bit.Core.Models;
 using Bit.Core.Models.Api;

-namespace Bit.Api.Models.Response.TwoFactor
+namespace Bit.Api.Models.Response.TwoFactor;
+
+public class TwoFactorWebAuthnResponseModel : ResponseModel
 {
-    public class TwoFactorWebAuthnResponseModel : ResponseModel
+    public TwoFactorWebAuthnResponseModel(User user)
+        : base("twoFactorWebAuthn")
    {
-        public TwoFactorWebAuthnResponseModel(User user)
-            : base("twoFactorWebAuthn")
+        if (user == null)
        {
-            if (user == null)
-            {
-                throw new ArgumentNullException(nameof(user));
-            }
-
-            var provider = user.GetTwoFactorProvider(TwoFactorProviderType.WebAuthn);
-            Enabled = provider?.Enabled ?? false;
-            Keys = provider?.MetaData?
-                .Where(k => k.Key.StartsWith("Key"))
-                .Select(k => new KeyModel(k.Key, new TwoFactorProvider.WebAuthnData((dynamic)k.Value)));
+            throw new ArgumentNullException(nameof(user));
        }

-        public bool Enabled { get; set; }
-        public IEnumerable<KeyModel> Keys { get; set; }
+        var provider = user.GetTwoFactorProvider(TwoFactorProviderType.WebAuthn);
+        Enabled = provider?.Enabled ?? false;
+        Keys = provider?.MetaData?
+            .Where(k => k.Key.StartsWith("Key"))
+            .Select(k => new KeyModel(k.Key, new TwoFactorProvider.WebAuthnData((dynamic)k.Value)));
+    }

-        public class KeyModel
+    public bool Enabled { get; set; }
+    public IEnumerable<KeyModel> Keys { get; set; }
+
+    public class KeyModel
+    {
+        public KeyModel(string id, TwoFactorProvider.WebAuthnData data)
        {
-            public KeyModel(string id, TwoFactorProvider.WebAuthnData data)
-            {
-                Name = data.Name;
-                Id = Convert.ToInt32(id.Replace("Key", string.Empty));
-                Migrated = data.Migrated;
-            }
-
-            public string Name { get; set; }
-            public int Id { get; set; }
-            public bool Migrated { get; set; }
+            Name = data.Name;
+            Id = Convert.ToInt32(id.Replace("Key", string.Empty));
+            Migrated = data.Migrated;
        }
+
+        public string Name { get; set; }
+        public int Id { get; set; }
+        public bool Migrated { get; set; }
    }
 }
--- a/src/Api/Models/Response/TwoFactor/TwoFactorYubiKeyResponseModel.cs
+++ b/src/Api/Models/Response/TwoFactor/TwoFactorYubiKeyResponseModel.cs
@@ -2,60 +2,59 @@
 using Bit.Core.Enums;
 using Bit.Core.Models.Api;

-namespace Bit.Api.Models.Response.TwoFactor
+namespace Bit.Api.Models.Response.TwoFactor;
+
+public class TwoFactorYubiKeyResponseModel : ResponseModel
 {
-    public class TwoFactorYubiKeyResponseModel : ResponseModel
+    public TwoFactorYubiKeyResponseModel(User user)
+        : base("twoFactorYubiKey")
    {
-        public TwoFactorYubiKeyResponseModel(User user)
-            : base("twoFactorYubiKey")
+        if (user == null)
        {
-            if (user == null)
-            {
-                throw new ArgumentNullException(nameof(user));
-            }
-
-            var provider = user.GetTwoFactorProvider(TwoFactorProviderType.YubiKey);
-            if (provider?.MetaData != null && provider.MetaData.Count > 0)
-            {
-                Enabled = provider.Enabled;
-
-                if (provider.MetaData.ContainsKey("Key1"))
-                {
-                    Key1 = (string)provider.MetaData["Key1"];
-                }
-                if (provider.MetaData.ContainsKey("Key2"))
-                {
-                    Key2 = (string)provider.MetaData["Key2"];
-                }
-                if (provider.MetaData.ContainsKey("Key3"))
-                {
-                    Key3 = (string)provider.MetaData["Key3"];
-                }
-                if (provider.MetaData.ContainsKey("Key4"))
-                {
-                    Key4 = (string)provider.MetaData["Key4"];
-                }
-                if (provider.MetaData.ContainsKey("Key5"))
-                {
-                    Key5 = (string)provider.MetaData["Key5"];
-                }
-                if (provider.MetaData.ContainsKey("Nfc"))
-                {
-                    Nfc = (bool)provider.MetaData["Nfc"];
-                }
-            }
-            else
-            {
-                Enabled = false;
-            }
+            throw new ArgumentNullException(nameof(user));
        }

-        public bool Enabled { get; set; }
-        public string Key1 { get; set; }
-        public string Key2 { get; set; }
-        public string Key3 { get; set; }
-        public string Key4 { get; set; }
-        public string Key5 { get; set; }
-        public bool Nfc { get; set; }
+        var provider = user.GetTwoFactorProvider(TwoFactorProviderType.YubiKey);
+        if (provider?.MetaData != null && provider.MetaData.Count > 0)
+        {
+            Enabled = provider.Enabled;
+
+            if (provider.MetaData.ContainsKey("Key1"))
+            {
+                Key1 = (string)provider.MetaData["Key1"];
+            }
+            if (provider.MetaData.ContainsKey("Key2"))
+            {
+                Key2 = (string)provider.MetaData["Key2"];
+            }
+            if (provider.MetaData.ContainsKey("Key3"))
+            {
+                Key3 = (string)provider.MetaData["Key3"];
+            }
+            if (provider.MetaData.ContainsKey("Key4"))
+            {
+                Key4 = (string)provider.MetaData["Key4"];
+            }
+            if (provider.MetaData.ContainsKey("Key5"))
+            {
+                Key5 = (string)provider.MetaData["Key5"];
+            }
+            if (provider.MetaData.ContainsKey("Nfc"))
+            {
+                Nfc = (bool)provider.MetaData["Nfc"];
+            }
+        }
+        else
+        {
+            Enabled = false;
+        }
    }
+
+    public bool Enabled { get; set; }
+    public string Key1 { get; set; }
+    public string Key2 { get; set; }
+    public string Key3 { get; set; }
+    public string Key4 { get; set; }
+    public string Key5 { get; set; }
+    public bool Nfc { get; set; }
 }