Revert filescoped (#2227)

* Revert "Add git blame entry (#2226)"

This reverts commit 239286737d.

* Revert "Turn on file scoped namespaces (#2225)"

This reverts commit 34fb4cca2a.

src/Api/Models/Request/Accounts/DeleteRecoverRequestModel.cs

@@ -1,11 +1,12 @@
 using System.ComponentModel.DataAnnotations;
 
-namespace Bit.Api.Models.Request.Accounts;
-
-public class DeleteRecoverRequestModel
+namespace Bit.Api.Models.Request.Accounts
 {
-    [Required]
-    [EmailAddress]
-    [StringLength(256)]
-    public string Email { get; set; }
+    public class DeleteRecoverRequestModel
+    {
+        [Required]
+        [EmailAddress]
+        [StringLength(256)]
+        public string Email { get; set; }
+    }
 }

src/Api/Models/Request/Accounts/EmailRequestModel.cs

@@ -1,19 +1,20 @@
 using System.ComponentModel.DataAnnotations;
 using Bit.Core.Utilities;
 
-namespace Bit.Api.Models.Request.Accounts;
-
-public class EmailRequestModel : SecretVerificationRequestModel
+namespace Bit.Api.Models.Request.Accounts
 {
-    [Required]
-    [StrictEmailAddress]
-    [StringLength(256)]
-    public string NewEmail { get; set; }
-    [Required]
-    [StringLength(300)]
-    public string NewMasterPasswordHash { get; set; }
-    [Required]
-    public string Token { get; set; }
-    [Required]
-    public string Key { get; set; }
+    public class EmailRequestModel : SecretVerificationRequestModel
+    {
+        [Required]
+        [StrictEmailAddress]
+        [StringLength(256)]
+        public string NewEmail { get; set; }
+        [Required]
+        [StringLength(300)]
+        public string NewMasterPasswordHash { get; set; }
+        [Required]
+        public string Token { get; set; }
+        [Required]
+        public string Key { get; set; }
+    }
 }

src/Api/Models/Request/Accounts/EmailTokenRequestModel.cs

@@ -1,12 +1,13 @@
 using System.ComponentModel.DataAnnotations;
 using Bit.Core.Utilities;
 
-namespace Bit.Api.Models.Request.Accounts;
-
-public class EmailTokenRequestModel : SecretVerificationRequestModel
+namespace Bit.Api.Models.Request.Accounts
 {
-    [Required]
-    [StrictEmailAddress]
-    [StringLength(256)]
-    public string NewEmail { get; set; }
+    public class EmailTokenRequestModel : SecretVerificationRequestModel
+    {
+        [Required]
+        [StrictEmailAddress]
+        [StringLength(256)]
+        public string NewEmail { get; set; }
+    }
 }

src/Api/Models/Request/Accounts/ImportCiphersRequestModel.cs

@@ -1,8 +1,9 @@
-namespace Bit.Api.Models.Request.Accounts;
-
-public class ImportCiphersRequestModel
+namespace Bit.Api.Models.Request.Accounts
 {
-    public FolderRequestModel[] Folders { get; set; }
-    public CipherRequestModel[] Ciphers { get; set; }
-    public KeyValuePair<int, int>[] FolderRelationships { get; set; }
+    public class ImportCiphersRequestModel
+    {
+        public FolderRequestModel[] Folders { get; set; }
+        public CipherRequestModel[] Ciphers { get; set; }
+        public KeyValuePair<int, int>[] FolderRelationships { get; set; }
+    }
 }

src/Api/Models/Request/Accounts/KdfRequestModel.cs

@@ -1,29 +1,30 @@
 using System.ComponentModel.DataAnnotations;
 using Bit.Core.Enums;
 
-namespace Bit.Api.Models.Request.Accounts;
-
-public class KdfRequestModel : PasswordRequestModel, IValidatableObject
+namespace Bit.Api.Models.Request.Accounts
 {
-    [Required]
-    public KdfType? Kdf { get; set; }
-    [Required]
-    public int? KdfIterations { get; set; }
-
-    public IEnumerable<ValidationResult> Validate(ValidationContext validationContext)
+    public class KdfRequestModel : PasswordRequestModel, IValidatableObject
     {
-        if (Kdf.HasValue && KdfIterations.HasValue)
+        [Required]
+        public KdfType? Kdf { get; set; }
+        [Required]
+        public int? KdfIterations { get; set; }
+
+        public IEnumerable<ValidationResult> Validate(ValidationContext validationContext)
         {
-            switch (Kdf.Value)
+            if (Kdf.HasValue && KdfIterations.HasValue)
             {
-                case KdfType.PBKDF2_SHA256:
-                    if (KdfIterations.Value < 5000 || KdfIterations.Value > 2_000_000)
-                    {
-                        yield return new ValidationResult("KDF iterations must be between 5000 and 2000000.");
-                    }
-                    break;
-                default:
-                    break;
+                switch (Kdf.Value)
+                {
+                    case KdfType.PBKDF2_SHA256:
+                        if (KdfIterations.Value < 5000 || KdfIterations.Value > 2_000_000)
+                        {
+                            yield return new ValidationResult("KDF iterations must be between 5000 and 2000000.");
+                        }
+                        break;
+                    default:
+                        break;
+                }
             }
         }
     }

src/Api/Models/Request/Accounts/OrganizationApiKeyRequestModel.cs

@@ -1,8 +1,9 @@
 using Bit.Core.Enums;
 
-namespace Bit.Api.Models.Request.Accounts;
-
-public class OrganizationApiKeyRequestModel : SecretVerificationRequestModel
+namespace Bit.Api.Models.Request.Accounts
 {
-    public OrganizationApiKeyType Type { get; set; }
+    public class OrganizationApiKeyRequestModel : SecretVerificationRequestModel
+    {
+        public OrganizationApiKeyType Type { get; set; }
+    }
 }

src/Api/Models/Request/Accounts/PasswordHintRequestModel.cs

@@ -1,11 +1,12 @@
 using System.ComponentModel.DataAnnotations;
 
-namespace Bit.Api.Models.Request.Accounts;
-
-public class PasswordHintRequestModel
+namespace Bit.Api.Models.Request.Accounts
 {
-    [Required]
-    [EmailAddress]
-    [StringLength(256)]
-    public string Email { get; set; }
+    public class PasswordHintRequestModel
+    {
+        [Required]
+        [EmailAddress]
+        [StringLength(256)]
+        public string Email { get; set; }
+    }
 }

src/Api/Models/Request/Accounts/PasswordRequestModel.cs

@@ -1,14 +1,15 @@
 using System.ComponentModel.DataAnnotations;
 
-namespace Bit.Api.Models.Request.Accounts;
-
-public class PasswordRequestModel : SecretVerificationRequestModel
+namespace Bit.Api.Models.Request.Accounts
 {
-    [Required]
-    [StringLength(300)]
-    public string NewMasterPasswordHash { get; set; }
-    [StringLength(50)]
-    public string MasterPasswordHint { get; set; }
-    [Required]
-    public string Key { get; set; }
+    public class PasswordRequestModel : SecretVerificationRequestModel
+    {
+        [Required]
+        [StringLength(300)]
+        public string NewMasterPasswordHash { get; set; }
+        [StringLength(50)]
+        public string MasterPasswordHint { get; set; }
+        [Required]
+        public string Key { get; set; }
+    }
 }

src/Api/Models/Request/Accounts/PremiumRequestModel.cs

@@ -2,40 +2,41 @@
 using Bit.Core.Settings;
 using Enums = Bit.Core.Enums;
 
-namespace Bit.Api.Models.Request.Accounts;
-
-public class PremiumRequestModel : IValidatableObject
+namespace Bit.Api.Models.Request.Accounts
 {
-    [Required]
-    public Enums.PaymentMethodType? PaymentMethodType { get; set; }
-    public string PaymentToken { get; set; }
-    [Range(0, 99)]
-    public short? AdditionalStorageGb { get; set; }
-    public IFormFile License { get; set; }
-    public string Country { get; set; }
-    public string PostalCode { get; set; }
-
-    public bool Validate(GlobalSettings globalSettings)
+    public class PremiumRequestModel : IValidatableObject
     {
-        if (!(License == null && !globalSettings.SelfHosted) ||
-            (License != null && globalSettings.SelfHosted))
-        {
-            return false;
-        }
-        return globalSettings.SelfHosted || !string.IsNullOrWhiteSpace(Country);
-    }
+        [Required]
+        public Enums.PaymentMethodType? PaymentMethodType { get; set; }
+        public string PaymentToken { get; set; }
+        [Range(0, 99)]
+        public short? AdditionalStorageGb { get; set; }
+        public IFormFile License { get; set; }
+        public string Country { get; set; }
+        public string PostalCode { get; set; }
 
-    public IEnumerable<ValidationResult> Validate(ValidationContext validationContext)
-    {
-        var creditType = PaymentMethodType.HasValue && PaymentMethodType.Value == Enums.PaymentMethodType.Credit;
-        if (string.IsNullOrWhiteSpace(PaymentToken) && !creditType && License == null)
+        public bool Validate(GlobalSettings globalSettings)
         {
-            yield return new ValidationResult("Payment token or license is required.");
+            if (!(License == null && !globalSettings.SelfHosted) ||
+                (License != null && globalSettings.SelfHosted))
+            {
+                return false;
+            }
+            return globalSettings.SelfHosted || !string.IsNullOrWhiteSpace(Country);
         }
-        if (Country == "US" && string.IsNullOrWhiteSpace(PostalCode))
+
+        public IEnumerable<ValidationResult> Validate(ValidationContext validationContext)
         {
-            yield return new ValidationResult("Zip / postal code is required.",
-                new string[] { nameof(PostalCode) });
+            var creditType = PaymentMethodType.HasValue && PaymentMethodType.Value == Enums.PaymentMethodType.Credit;
+            if (string.IsNullOrWhiteSpace(PaymentToken) && !creditType && License == null)
+            {
+                yield return new ValidationResult("Payment token or license is required.");
+            }
+            if (Country == "US" && string.IsNullOrWhiteSpace(PostalCode))
+            {
+                yield return new ValidationResult("Zip / postal code is required.",
+                    new string[] { nameof(PostalCode) });
+            }
         }
     }
 }

src/Api/Models/Request/Accounts/RegenerateTwoFactorRequestModel.cs

@@ -1,12 +1,13 @@
 using System.ComponentModel.DataAnnotations;
 
-namespace Bit.Api.Models.Request.Accounts;
-
-public class RegenerateTwoFactorRequestModel
+namespace Bit.Api.Models.Request.Accounts
 {
-    [Required]
-    public string MasterPasswordHash { get; set; }
-    [Required]
-    [StringLength(50)]
-    public string Token { get; set; }
+    public class RegenerateTwoFactorRequestModel
+    {
+        [Required]
+        public string MasterPasswordHash { get; set; }
+        [Required]
+        [StringLength(50)]
+        public string Token { get; set; }
+    }
 }

src/Api/Models/Request/Accounts/SecretVerificationRequestModel.cs

@@ -1,19 +1,20 @@
 using System.ComponentModel.DataAnnotations;
 
-namespace Bit.Api.Models.Request.Accounts;
-
-public class SecretVerificationRequestModel : IValidatableObject
+namespace Bit.Api.Models.Request.Accounts
 {
-    [StringLength(300)]
-    public string MasterPasswordHash { get; set; }
-    public string OTP { get; set; }
-    public string Secret => !string.IsNullOrEmpty(MasterPasswordHash) ? MasterPasswordHash : OTP;
-
-    public virtual IEnumerable<ValidationResult> Validate(ValidationContext validationContext)
+    public class SecretVerificationRequestModel : IValidatableObject
     {
-        if (string.IsNullOrEmpty(Secret))
+        [StringLength(300)]
+        public string MasterPasswordHash { get; set; }
+        public string OTP { get; set; }
+        public string Secret => !string.IsNullOrEmpty(MasterPasswordHash) ? MasterPasswordHash : OTP;
+
+        public virtual IEnumerable<ValidationResult> Validate(ValidationContext validationContext)
         {
-            yield return new ValidationResult("MasterPasswordHash or OTP must be supplied.");
+            if (string.IsNullOrEmpty(Secret))
+            {
+                yield return new ValidationResult("MasterPasswordHash or OTP must be supplied.");
+            }
         }
     }
 }

src/Api/Models/Request/Accounts/SetKeyConnectorKeyRequestModel.cs

@@ -3,27 +3,28 @@ using Bit.Core.Entities;
 using Bit.Core.Enums;
 using Bit.Core.Models.Api.Request.Accounts;
 
-namespace Bit.Api.Models.Request.Accounts;
-
-public class SetKeyConnectorKeyRequestModel
+namespace Bit.Api.Models.Request.Accounts
 {
-    [Required]
-    public string Key { get; set; }
-    [Required]
-    public KeysRequestModel Keys { get; set; }
-    [Required]
-    public KdfType Kdf { get; set; }
-    [Required]
-    public int KdfIterations { get; set; }
-    [Required]
-    public string OrgIdentifier { get; set; }
-
-    public User ToUser(User existingUser)
+    public class SetKeyConnectorKeyRequestModel
     {
-        existingUser.Kdf = Kdf;
-        existingUser.KdfIterations = KdfIterations;
-        existingUser.Key = Key;
-        Keys.ToUser(existingUser);
-        return existingUser;
+        [Required]
+        public string Key { get; set; }
+        [Required]
+        public KeysRequestModel Keys { get; set; }
+        [Required]
+        public KdfType Kdf { get; set; }
+        [Required]
+        public int KdfIterations { get; set; }
+        [Required]
+        public string OrgIdentifier { get; set; }
+
+        public User ToUser(User existingUser)
+        {
+            existingUser.Kdf = Kdf;
+            existingUser.KdfIterations = KdfIterations;
+            existingUser.Key = Key;
+            Keys.ToUser(existingUser);
+            return existingUser;
+        }
     }
 }

src/Api/Models/Request/Accounts/SetPasswordRequestModel.cs

@@ -3,32 +3,33 @@ using Bit.Core.Entities;
 using Bit.Core.Enums;
 using Bit.Core.Models.Api.Request.Accounts;
 
-namespace Bit.Api.Models.Request.Accounts;
-
-public class SetPasswordRequestModel
+namespace Bit.Api.Models.Request.Accounts
 {
-    [Required]
-    [StringLength(300)]
-    public string MasterPasswordHash { get; set; }
-    [Required]
-    public string Key { get; set; }
-    [StringLength(50)]
-    public string MasterPasswordHint { get; set; }
-    [Required]
-    public KeysRequestModel Keys { get; set; }
-    [Required]
-    public KdfType Kdf { get; set; }
-    [Required]
-    public int KdfIterations { get; set; }
-    public string OrgIdentifier { get; set; }
-
-    public User ToUser(User existingUser)
+    public class SetPasswordRequestModel
     {
-        existingUser.MasterPasswordHint = MasterPasswordHint;
-        existingUser.Kdf = Kdf;
-        existingUser.KdfIterations = KdfIterations;
-        existingUser.Key = Key;
-        Keys.ToUser(existingUser);
-        return existingUser;
+        [Required]
+        [StringLength(300)]
+        public string MasterPasswordHash { get; set; }
+        [Required]
+        public string Key { get; set; }
+        [StringLength(50)]
+        public string MasterPasswordHint { get; set; }
+        [Required]
+        public KeysRequestModel Keys { get; set; }
+        [Required]
+        public KdfType Kdf { get; set; }
+        [Required]
+        public int KdfIterations { get; set; }
+        public string OrgIdentifier { get; set; }
+
+        public User ToUser(User existingUser)
+        {
+            existingUser.MasterPasswordHint = MasterPasswordHint;
+            existingUser.Kdf = Kdf;
+            existingUser.KdfIterations = KdfIterations;
+            existingUser.Key = Key;
+            Keys.ToUser(existingUser);
+            return existingUser;
+        }
     }
 }

src/Api/Models/Request/Accounts/StorageRequestModel.cs

@@ -1,18 +1,19 @@
 using System.ComponentModel.DataAnnotations;
 
-namespace Bit.Api.Models.Request.Accounts;
-
-public class StorageRequestModel : IValidatableObject
+namespace Bit.Api.Models.Request.Accounts
 {
-    [Required]
-    public short? StorageGbAdjustment { get; set; }
-
-    public IEnumerable<ValidationResult> Validate(ValidationContext validationContext)
+    public class StorageRequestModel : IValidatableObject
     {
-        if (StorageGbAdjustment == 0)
+        [Required]
+        public short? StorageGbAdjustment { get; set; }
+
+        public IEnumerable<ValidationResult> Validate(ValidationContext validationContext)
         {
-            yield return new ValidationResult("Storage adjustment cannot be 0.",
-                new string[] { nameof(StorageGbAdjustment) });
+            if (StorageGbAdjustment == 0)
+            {
+                yield return new ValidationResult("Storage adjustment cannot be 0.",
+                    new string[] { nameof(StorageGbAdjustment) });
+            }
         }
     }
 }

src/Api/Models/Request/Accounts/TaxInfoUpdateRequestModel.cs

@@ -1,19 +1,20 @@
 using System.ComponentModel.DataAnnotations;
 
-namespace Bit.Api.Models.Request.Accounts;
-
-public class TaxInfoUpdateRequestModel : IValidatableObject
+namespace Bit.Api.Models.Request.Accounts
 {
-    [Required]
-    public string Country { get; set; }
-    public string PostalCode { get; set; }
-
-    public virtual IEnumerable<ValidationResult> Validate(ValidationContext validationContext)
+    public class TaxInfoUpdateRequestModel : IValidatableObject
     {
-        if (Country == "US" && string.IsNullOrWhiteSpace(PostalCode))
+        [Required]
+        public string Country { get; set; }
+        public string PostalCode { get; set; }
+
+        public virtual IEnumerable<ValidationResult> Validate(ValidationContext validationContext)
         {
-            yield return new ValidationResult("Zip / postal code is required.",
-                new string[] { nameof(PostalCode) });
+            if (Country == "US" && string.IsNullOrWhiteSpace(PostalCode))
+            {
+                yield return new ValidationResult("Zip / postal code is required.",
+                    new string[] { nameof(PostalCode) });
+            }
         }
     }
 }

src/Api/Models/Request/Accounts/UpdateKeyRequestModel.cs

@@ -1,19 +1,20 @@
 using System.ComponentModel.DataAnnotations;
 
-namespace Bit.Api.Models.Request.Accounts;
-
-public class UpdateKeyRequestModel
+namespace Bit.Api.Models.Request.Accounts
 {
-    [Required]
-    [StringLength(300)]
-    public string MasterPasswordHash { get; set; }
-    [Required]
-    public IEnumerable<CipherWithIdRequestModel> Ciphers { get; set; }
-    [Required]
-    public IEnumerable<FolderWithIdRequestModel> Folders { get; set; }
-    public IEnumerable<SendWithIdRequestModel> Sends { get; set; }
-    [Required]
-    public string PrivateKey { get; set; }
-    [Required]
-    public string Key { get; set; }
+    public class UpdateKeyRequestModel
+    {
+        [Required]
+        [StringLength(300)]
+        public string MasterPasswordHash { get; set; }
+        [Required]
+        public IEnumerable<CipherWithIdRequestModel> Ciphers { get; set; }
+        [Required]
+        public IEnumerable<FolderWithIdRequestModel> Folders { get; set; }
+        public IEnumerable<SendWithIdRequestModel> Sends { get; set; }
+        [Required]
+        public string PrivateKey { get; set; }
+        [Required]
+        public string Key { get; set; }
+    }
 }

src/Api/Models/Request/Accounts/UpdateProfileRequestModel.cs

@@ -1,20 +1,21 @@
 using System.ComponentModel.DataAnnotations;
 using Bit.Core.Entities;
 
-namespace Bit.Api.Models.Request.Accounts;
-
-public class UpdateProfileRequestModel
+namespace Bit.Api.Models.Request.Accounts
 {
-    [StringLength(50)]
-    public string Name { get; set; }
-    [StringLength(50)]
-    [Obsolete("Changes will be made via the 'password' endpoint going forward.")]
-    public string MasterPasswordHint { get; set; }
-
-    public User ToUser(User existingUser)
+    public class UpdateProfileRequestModel
     {
-        existingUser.Name = Name;
-        existingUser.MasterPasswordHint = string.IsNullOrWhiteSpace(MasterPasswordHint) ? null : MasterPasswordHint;
-        return existingUser;
+        [StringLength(50)]
+        public string Name { get; set; }
+        [StringLength(50)]
+        [Obsolete("Changes will be made via the 'password' endpoint going forward.")]
+        public string MasterPasswordHint { get; set; }
+
+        public User ToUser(User existingUser)
+        {
+            existingUser.Name = Name;
+            existingUser.MasterPasswordHint = string.IsNullOrWhiteSpace(MasterPasswordHint) ? null : MasterPasswordHint;
+            return existingUser;
+        }
     }
 }

src/Api/Models/Request/Accounts/UpdateTempPasswordRequestModel.cs

@@ -1,10 +1,11 @@
 using System.ComponentModel.DataAnnotations;
 using Bit.Api.Models.Request.Organizations;
 
-namespace Bit.Api.Models.Request.Accounts;
-
-public class UpdateTempPasswordRequestModel : OrganizationUserResetPasswordRequestModel
+namespace Bit.Api.Models.Request.Accounts
 {
-    [StringLength(50)]
-    public string MasterPasswordHint { get; set; }
+    public class UpdateTempPasswordRequestModel : OrganizationUserResetPasswordRequestModel
+    {
+        [StringLength(50)]
+        public string MasterPasswordHint { get; set; }
+    }
 }

src/Api/Models/Request/Accounts/VerifyDeleteRecoverRequestModel.cs

@@ -1,11 +1,12 @@
 using System.ComponentModel.DataAnnotations;
 
-namespace Bit.Api.Models.Request.Accounts;
-
-public class VerifyDeleteRecoverRequestModel
+namespace Bit.Api.Models.Request.Accounts
 {
-    [Required]
-    public string UserId { get; set; }
-    [Required]
-    public string Token { get; set; }
+    public class VerifyDeleteRecoverRequestModel
+    {
+        [Required]
+        public string UserId { get; set; }
+        [Required]
+        public string Token { get; set; }
+    }
 }

src/Api/Models/Request/Accounts/VerifyEmailRequestModel.cs

@@ -1,11 +1,12 @@
 using System.ComponentModel.DataAnnotations;
 
-namespace Bit.Api.Models.Request.Accounts;
-
-public class VerifyEmailRequestModel
+namespace Bit.Api.Models.Request.Accounts
 {
-    [Required]
-    public string UserId { get; set; }
-    [Required]
-    public string Token { get; set; }
+    public class VerifyEmailRequestModel
+    {
+        [Required]
+        public string UserId { get; set; }
+        [Required]
+        public string Token { get; set; }
+    }
 }

src/Api/Models/Request/Accounts/VerifyOTPRequestModel.cs

@@ -1,9 +1,10 @@
 using System.ComponentModel.DataAnnotations;
 
-namespace Bit.Api.Models.Request.Accounts;
-
-public class VerifyOTPRequestModel
+namespace Bit.Api.Models.Request.Accounts
 {
-    [Required]
-    public string OTP { get; set; }
+    public class VerifyOTPRequestModel
+    {
+        [Required]
+        public string OTP { get; set; }
+    }
 }