Revert filescoped (#2227)

* Revert "Add git blame entry (#2226)" This reverts commit 239286737d. * Revert "Turn on file scoped namespaces (#2225)" This reverts commit 34fb4cca2a.
2026-02-01 06:33:17 +08:00 · 2022-08-29 15:53:48 -04:00
parent 239286737d
commit bae03feffe
1208 changed files with 74317 additions and 73126 deletions
--- a/src/Admin/Models/UserEditModel.cs
+++ b/src/Admin/Models/UserEditModel.cs
@@ -4,70 +4,71 @@ using Bit.Core.Models.Business;
 using Bit.Core.Settings;
 using Bit.Core.Utilities;

-namespace Bit.Admin.Models;
-
-public class UserEditModel : UserViewModel
+namespace Bit.Admin.Models
 {
-    public UserEditModel() { }
-
-    public UserEditModel(User user, IEnumerable<Cipher> ciphers, BillingInfo billingInfo,
-        GlobalSettings globalSettings)
-        : base(user, ciphers)
+    public class UserEditModel : UserViewModel
    {
-        BillingInfo = billingInfo;
-        BraintreeMerchantId = globalSettings.Braintree.MerchantId;
+        public UserEditModel() { }

-        Name = user.Name;
-        Email = user.Email;
-        EmailVerified = user.EmailVerified;
-        Premium = user.Premium;
-        MaxStorageGb = user.MaxStorageGb;
-        Gateway = user.Gateway;
-        GatewayCustomerId = user.GatewayCustomerId;
-        GatewaySubscriptionId = user.GatewaySubscriptionId;
-        LicenseKey = user.LicenseKey;
-        PremiumExpirationDate = user.PremiumExpirationDate;
-    }
+        public UserEditModel(User user, IEnumerable<Cipher> ciphers, BillingInfo billingInfo,
+            GlobalSettings globalSettings)
+            : base(user, ciphers)
+        {
+            BillingInfo = billingInfo;
+            BraintreeMerchantId = globalSettings.Braintree.MerchantId;

-    public BillingInfo BillingInfo { get; set; }
-    public string RandomLicenseKey => CoreHelpers.SecureRandomString(20);
-    public string OneYearExpirationDate => DateTime.Now.AddYears(1).ToString("yyyy-MM-ddTHH:mm");
-    public string BraintreeMerchantId { get; set; }
+            Name = user.Name;
+            Email = user.Email;
+            EmailVerified = user.EmailVerified;
+            Premium = user.Premium;
+            MaxStorageGb = user.MaxStorageGb;
+            Gateway = user.Gateway;
+            GatewayCustomerId = user.GatewayCustomerId;
+            GatewaySubscriptionId = user.GatewaySubscriptionId;
+            LicenseKey = user.LicenseKey;
+            PremiumExpirationDate = user.PremiumExpirationDate;
+        }

-    [Display(Name = "Name")]
-    public string Name { get; set; }
-    [Required]
-    [Display(Name = "Email")]
-    public string Email { get; set; }
-    [Display(Name = "Email Verified")]
-    public bool EmailVerified { get; set; }
-    [Display(Name = "Premium")]
-    public bool Premium { get; set; }
-    [Display(Name = "Max. Storage GB")]
-    public short? MaxStorageGb { get; set; }
-    [Display(Name = "Gateway")]
-    public Core.Enums.GatewayType? Gateway { get; set; }
-    [Display(Name = "Gateway Customer Id")]
-    public string GatewayCustomerId { get; set; }
-    [Display(Name = "Gateway Subscription Id")]
-    public string GatewaySubscriptionId { get; set; }
-    [Display(Name = "License Key")]
-    public string LicenseKey { get; set; }
-    [Display(Name = "Premium Expiration Date")]
-    public DateTime? PremiumExpirationDate { get; set; }
+        public BillingInfo BillingInfo { get; set; }
+        public string RandomLicenseKey => CoreHelpers.SecureRandomString(20);
+        public string OneYearExpirationDate => DateTime.Now.AddYears(1).ToString("yyyy-MM-ddTHH:mm");
+        public string BraintreeMerchantId { get; set; }

-    public User ToUser(User existingUser)
-    {
-        existingUser.Name = Name;
-        existingUser.Email = Email;
-        existingUser.EmailVerified = EmailVerified;
-        existingUser.Premium = Premium;
-        existingUser.MaxStorageGb = MaxStorageGb;
-        existingUser.Gateway = Gateway;
-        existingUser.GatewayCustomerId = GatewayCustomerId;
-        existingUser.GatewaySubscriptionId = GatewaySubscriptionId;
-        existingUser.LicenseKey = LicenseKey;
-        existingUser.PremiumExpirationDate = PremiumExpirationDate;
-        return existingUser;
+        [Display(Name = "Name")]
+        public string Name { get; set; }
+        [Required]
+        [Display(Name = "Email")]
+        public string Email { get; set; }
+        [Display(Name = "Email Verified")]
+        public bool EmailVerified { get; set; }
+        [Display(Name = "Premium")]
+        public bool Premium { get; set; }
+        [Display(Name = "Max. Storage GB")]
+        public short? MaxStorageGb { get; set; }
+        [Display(Name = "Gateway")]
+        public Core.Enums.GatewayType? Gateway { get; set; }
+        [Display(Name = "Gateway Customer Id")]
+        public string GatewayCustomerId { get; set; }
+        [Display(Name = "Gateway Subscription Id")]
+        public string GatewaySubscriptionId { get; set; }
+        [Display(Name = "License Key")]
+        public string LicenseKey { get; set; }
+        [Display(Name = "Premium Expiration Date")]
+        public DateTime? PremiumExpirationDate { get; set; }
+
+        public User ToUser(User existingUser)
+        {
+            existingUser.Name = Name;
+            existingUser.Email = Email;
+            existingUser.EmailVerified = EmailVerified;
+            existingUser.Premium = Premium;
+            existingUser.MaxStorageGb = MaxStorageGb;
+            existingUser.Gateway = Gateway;
+            existingUser.GatewayCustomerId = GatewayCustomerId;
+            existingUser.GatewaySubscriptionId = GatewaySubscriptionId;
+            existingUser.LicenseKey = LicenseKey;
+            existingUser.PremiumExpirationDate = PremiumExpirationDate;
+            return existingUser;
+        }
    }
 }