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-15 13:23:26 +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/Core/Models/Data/Organizations/OrganizationAbility.cs
+++ b/src/Core/Models/Data/Organizations/OrganizationAbility.cs
@@ -1,34 +1,35 @@
 using Bit.Core.Entities;

-namespace Bit.Core.Models.Data.Organizations;
-
-public class OrganizationAbility
+namespace Bit.Core.Models.Data.Organizations
 {
-    public OrganizationAbility() { }
-
-    public OrganizationAbility(Organization organization)
+    public class OrganizationAbility
    {
-        Id = organization.Id;
-        UseEvents = organization.UseEvents;
-        Use2fa = organization.Use2fa;
-        Using2fa = organization.Use2fa && organization.TwoFactorProviders != null &&
-            organization.TwoFactorProviders != "{}";
-        UsersGetPremium = organization.UsersGetPremium;
-        Enabled = organization.Enabled;
-        UseSso = organization.UseSso;
-        UseKeyConnector = organization.UseKeyConnector;
-        UseScim = organization.UseScim;
-        UseResetPassword = organization.UseResetPassword;
-    }
+        public OrganizationAbility() { }

-    public Guid Id { get; set; }
-    public bool UseEvents { get; set; }
-    public bool Use2fa { get; set; }
-    public bool Using2fa { get; set; }
-    public bool UsersGetPremium { get; set; }
-    public bool Enabled { get; set; }
-    public bool UseSso { get; set; }
-    public bool UseKeyConnector { get; set; }
-    public bool UseScim { get; set; }
-    public bool UseResetPassword { get; set; }
+        public OrganizationAbility(Organization organization)
+        {
+            Id = organization.Id;
+            UseEvents = organization.UseEvents;
+            Use2fa = organization.Use2fa;
+            Using2fa = organization.Use2fa && organization.TwoFactorProviders != null &&
+                organization.TwoFactorProviders != "{}";
+            UsersGetPremium = organization.UsersGetPremium;
+            Enabled = organization.Enabled;
+            UseSso = organization.UseSso;
+            UseKeyConnector = organization.UseKeyConnector;
+            UseScim = organization.UseScim;
+            UseResetPassword = organization.UseResetPassword;
+        }
+
+        public Guid Id { get; set; }
+        public bool UseEvents { get; set; }
+        public bool Use2fa { get; set; }
+        public bool Using2fa { get; set; }
+        public bool UsersGetPremium { get; set; }
+        public bool Enabled { get; set; }
+        public bool UseSso { get; set; }
+        public bool UseKeyConnector { get; set; }
+        public bool UseScim { get; set; }
+        public bool UseResetPassword { get; set; }
+    }
 }
--- a/src/Core/Models/Data/Organizations/OrganizationConnections/OrganizationConnectionData.cs
+++ b/src/Core/Models/Data/Organizations/OrganizationConnections/OrganizationConnectionData.cs
@@ -1,31 +1,32 @@
 using Bit.Core.Entities;
 using Bit.Core.Enums;

-namespace Bit.Core.Models.Data.Organizations.OrganizationConnections;
-
-public class OrganizationConnectionData<T> where T : new()
+namespace Bit.Core.Models.Data.Organizations.OrganizationConnections
 {
-    public Guid? Id { get; set; }
-    public OrganizationConnectionType Type { get; set; }
-    public Guid OrganizationId { get; set; }
-    public bool Enabled { get; set; }
-    public T Config { get; set; }
-
-    public OrganizationConnection ToEntity()
+    public class OrganizationConnectionData<T> where T : new()
    {
-        var result = new OrganizationConnection()
-        {
-            Type = Type,
-            OrganizationId = OrganizationId,
-            Enabled = Enabled,
-        };
-        result.SetConfig(Config);
+        public Guid? Id { get; set; }
+        public OrganizationConnectionType Type { get; set; }
+        public Guid OrganizationId { get; set; }
+        public bool Enabled { get; set; }
+        public T Config { get; set; }

-        if (Id.HasValue)
+        public OrganizationConnection ToEntity()
        {
-            result.Id = Id.Value;
+            var result = new OrganizationConnection()
+            {
+                Type = Type,
+                OrganizationId = OrganizationId,
+                Enabled = Enabled,
+            };
+            result.SetConfig(Config);
+
+            if (Id.HasValue)
+            {
+                result.Id = Id.Value;
+            }
+
+            return result;
        }
-
-        return result;
    }
 }
--- a/src/Core/Models/Data/Organizations/OrganizationSponsorships/OrganizationSponsorshipData.cs
+++ b/src/Core/Models/Data/Organizations/OrganizationSponsorships/OrganizationSponsorshipData.cs
@@ -1,30 +1,31 @@
 using Bit.Core.Entities;
 using Bit.Core.Enums;

-namespace Bit.Core.Models.Data.Organizations.OrganizationSponsorships;
-
-public class OrganizationSponsorshipData
+namespace Bit.Core.Models.Data.Organizations.OrganizationSponsorships
 {
-    public OrganizationSponsorshipData() { }
-    public OrganizationSponsorshipData(OrganizationSponsorship sponsorship)
+    public class OrganizationSponsorshipData
    {
-        SponsoringOrganizationUserId = sponsorship.SponsoringOrganizationUserId;
-        SponsoredOrganizationId = sponsorship.SponsoredOrganizationId;
-        FriendlyName = sponsorship.FriendlyName;
-        OfferedToEmail = sponsorship.OfferedToEmail;
-        PlanSponsorshipType = sponsorship.PlanSponsorshipType.GetValueOrDefault();
-        LastSyncDate = sponsorship.LastSyncDate;
-        ValidUntil = sponsorship.ValidUntil;
-        ToDelete = sponsorship.ToDelete;
-    }
-    public Guid SponsoringOrganizationUserId { get; set; }
-    public Guid? SponsoredOrganizationId { get; set; }
-    public string FriendlyName { get; set; }
-    public string OfferedToEmail { get; set; }
-    public PlanSponsorshipType PlanSponsorshipType { get; set; }
-    public DateTime? LastSyncDate { get; set; }
-    public DateTime? ValidUntil { get; set; }
-    public bool ToDelete { get; set; }
+        public OrganizationSponsorshipData() { }
+        public OrganizationSponsorshipData(OrganizationSponsorship sponsorship)
+        {
+            SponsoringOrganizationUserId = sponsorship.SponsoringOrganizationUserId;
+            SponsoredOrganizationId = sponsorship.SponsoredOrganizationId;
+            FriendlyName = sponsorship.FriendlyName;
+            OfferedToEmail = sponsorship.OfferedToEmail;
+            PlanSponsorshipType = sponsorship.PlanSponsorshipType.GetValueOrDefault();
+            LastSyncDate = sponsorship.LastSyncDate;
+            ValidUntil = sponsorship.ValidUntil;
+            ToDelete = sponsorship.ToDelete;
+        }
+        public Guid SponsoringOrganizationUserId { get; set; }
+        public Guid? SponsoredOrganizationId { get; set; }
+        public string FriendlyName { get; set; }
+        public string OfferedToEmail { get; set; }
+        public PlanSponsorshipType PlanSponsorshipType { get; set; }
+        public DateTime? LastSyncDate { get; set; }
+        public DateTime? ValidUntil { get; set; }
+        public bool ToDelete { get; set; }

-    public bool CloudSponsorshipRemoved { get; set; }
+        public bool CloudSponsorshipRemoved { get; set; }
+    }
 }
--- a/src/Core/Models/Data/Organizations/OrganizationSponsorships/OrganizationSponsorshipSyncData.cs
+++ b/src/Core/Models/Data/Organizations/OrganizationSponsorships/OrganizationSponsorshipSyncData.cs
@@ -1,8 +1,9 @@
-namespace Bit.Core.Models.Data.Organizations.OrganizationSponsorships;
-
-public class OrganizationSponsorshipSyncData
+namespace Bit.Core.Models.Data.Organizations.OrganizationSponsorships
 {
-    public string BillingSyncKey { get; set; }
-    public Guid SponsoringOrganizationCloudId { get; set; }
-    public IEnumerable<OrganizationSponsorshipData> SponsorshipsBatch { get; set; }
+    public class OrganizationSponsorshipSyncData
+    {
+        public string BillingSyncKey { get; set; }
+        public Guid SponsoringOrganizationCloudId { get; set; }
+        public IEnumerable<OrganizationSponsorshipData> SponsorshipsBatch { get; set; }
+    }
 }
--- a/src/Core/Models/Data/Organizations/OrganizationUsers/OrganizationUserInviteData.cs
+++ b/src/Core/Models/Data/Organizations/OrganizationUsers/OrganizationUserInviteData.cs
@@ -1,12 +1,13 @@
 using Bit.Core.Enums;

-namespace Bit.Core.Models.Data.Organizations.OrganizationUsers;
-
-public class OrganizationUserInviteData
+namespace Bit.Core.Models.Data.Organizations.OrganizationUsers
 {
-    public IEnumerable<string> Emails { get; set; }
-    public OrganizationUserType? Type { get; set; }
-    public bool AccessAll { get; set; }
-    public IEnumerable<SelectionReadOnly> Collections { get; set; }
-    public Permissions Permissions { get; set; }
+    public class OrganizationUserInviteData
+    {
+        public IEnumerable<string> Emails { get; set; }
+        public OrganizationUserType? Type { get; set; }
+        public bool AccessAll { get; set; }
+        public IEnumerable<SelectionReadOnly> Collections { get; set; }
+        public Permissions Permissions { get; set; }
+    }
 }
--- a/src/Core/Models/Data/Organizations/OrganizationUsers/OrganizationUserOrganizationDetails.cs
+++ b/src/Core/Models/Data/Organizations/OrganizationUsers/OrganizationUserOrganizationDetails.cs
@@ -1,42 +1,43 @@
-namespace Bit.Core.Models.Data.Organizations.OrganizationUsers;
-
-public class OrganizationUserOrganizationDetails
+namespace Bit.Core.Models.Data.Organizations.OrganizationUsers
 {
-    public Guid OrganizationId { get; set; }
-    public Guid? UserId { get; set; }
-    public string Name { get; set; }
-    public bool UsePolicies { get; set; }
-    public bool UseSso { get; set; }
-    public bool UseKeyConnector { get; set; }
-    public bool UseScim { get; set; }
-    public bool UseGroups { get; set; }
-    public bool UseDirectory { get; set; }
-    public bool UseEvents { get; set; }
-    public bool UseTotp { get; set; }
-    public bool Use2fa { get; set; }
-    public bool UseApi { get; set; }
-    public bool UseResetPassword { get; set; }
-    public bool SelfHost { get; set; }
-    public bool UsersGetPremium { get; set; }
-    public int? Seats { get; set; }
-    public short? MaxCollections { get; set; }
-    public short? MaxStorageGb { get; set; }
-    public string Key { get; set; }
-    public Enums.OrganizationUserStatusType Status { get; set; }
-    public Enums.OrganizationUserType Type { get; set; }
-    public bool Enabled { get; set; }
-    public Enums.PlanType PlanType { get; set; }
-    public string SsoExternalId { get; set; }
-    public string Identifier { get; set; }
-    public string Permissions { get; set; }
-    public string ResetPasswordKey { get; set; }
-    public string PublicKey { get; set; }
-    public string PrivateKey { get; set; }
-    public Guid? ProviderId { get; set; }
-    public string ProviderName { get; set; }
-    public string FamilySponsorshipFriendlyName { get; set; }
-    public string SsoConfig { get; set; }
-    public DateTime? FamilySponsorshipLastSyncDate { get; set; }
-    public DateTime? FamilySponsorshipValidUntil { get; set; }
-    public bool? FamilySponsorshipToDelete { get; set; }
+    public class OrganizationUserOrganizationDetails
+    {
+        public Guid OrganizationId { get; set; }
+        public Guid? UserId { get; set; }
+        public string Name { get; set; }
+        public bool UsePolicies { get; set; }
+        public bool UseSso { get; set; }
+        public bool UseKeyConnector { get; set; }
+        public bool UseScim { get; set; }
+        public bool UseGroups { get; set; }
+        public bool UseDirectory { get; set; }
+        public bool UseEvents { get; set; }
+        public bool UseTotp { get; set; }
+        public bool Use2fa { get; set; }
+        public bool UseApi { get; set; }
+        public bool UseResetPassword { get; set; }
+        public bool SelfHost { get; set; }
+        public bool UsersGetPremium { get; set; }
+        public int? Seats { get; set; }
+        public short? MaxCollections { get; set; }
+        public short? MaxStorageGb { get; set; }
+        public string Key { get; set; }
+        public Enums.OrganizationUserStatusType Status { get; set; }
+        public Enums.OrganizationUserType Type { get; set; }
+        public bool Enabled { get; set; }
+        public Enums.PlanType PlanType { get; set; }
+        public string SsoExternalId { get; set; }
+        public string Identifier { get; set; }
+        public string Permissions { get; set; }
+        public string ResetPasswordKey { get; set; }
+        public string PublicKey { get; set; }
+        public string PrivateKey { get; set; }
+        public Guid? ProviderId { get; set; }
+        public string ProviderName { get; set; }
+        public string FamilySponsorshipFriendlyName { get; set; }
+        public string SsoConfig { get; set; }
+        public DateTime? FamilySponsorshipLastSyncDate { get; set; }
+        public DateTime? FamilySponsorshipValidUntil { get; set; }
+        public bool? FamilySponsorshipToDelete { get; set; }
+    }
 }
--- a/src/Core/Models/Data/Organizations/OrganizationUsers/OrganizationUserPublicKey.cs
+++ b/src/Core/Models/Data/Organizations/OrganizationUsers/OrganizationUserPublicKey.cs
@@ -1,8 +1,9 @@
-namespace Bit.Core.Models.Data.Organizations.OrganizationUsers;
-
-public class OrganizationUserPublicKey
+namespace Bit.Core.Models.Data.Organizations.OrganizationUsers
 {
-    public Guid Id { get; set; }
-    public Guid UserId { get; set; }
-    public string PublicKey { get; set; }
+    public class OrganizationUserPublicKey
+    {
+        public Guid Id { get; set; }
+        public Guid UserId { get; set; }
+        public string PublicKey { get; set; }
+    }
 }
--- a/src/Core/Models/Data/Organizations/OrganizationUsers/OrganizationUserResetPasswordDetails.cs
+++ b/src/Core/Models/Data/Organizations/OrganizationUsers/OrganizationUserResetPasswordDetails.cs
@@ -1,34 +1,35 @@
 using Bit.Core.Entities;
 using Bit.Core.Enums;

-namespace Bit.Core.Models.Data.Organizations.OrganizationUsers;
-
-public class OrganizationUserResetPasswordDetails
+namespace Bit.Core.Models.Data.Organizations.OrganizationUsers
 {
-    public OrganizationUserResetPasswordDetails(OrganizationUser orgUser, User user, Organization org)
+    public class OrganizationUserResetPasswordDetails
    {
-        if (orgUser == null)
+        public OrganizationUserResetPasswordDetails(OrganizationUser orgUser, User user, Organization org)
        {
-            throw new ArgumentNullException(nameof(orgUser));
-        }
+            if (orgUser == null)
+            {
+                throw new ArgumentNullException(nameof(orgUser));
+            }

-        if (user == null)
-        {
-            throw new ArgumentNullException(nameof(user));
-        }
+            if (user == null)
+            {
+                throw new ArgumentNullException(nameof(user));
+            }

-        if (org == null)
-        {
-            throw new ArgumentNullException(nameof(org));
-        }
+            if (org == null)
+            {
+                throw new ArgumentNullException(nameof(org));
+            }

-        Kdf = user.Kdf;
-        KdfIterations = user.KdfIterations;
-        ResetPasswordKey = orgUser.ResetPasswordKey;
-        EncryptedPrivateKey = org.PrivateKey;
+            Kdf = user.Kdf;
+            KdfIterations = user.KdfIterations;
+            ResetPasswordKey = orgUser.ResetPasswordKey;
+            EncryptedPrivateKey = org.PrivateKey;
+        }
+        public KdfType Kdf { get; set; }
+        public int KdfIterations { get; set; }
+        public string ResetPasswordKey { get; set; }
+        public string EncryptedPrivateKey { get; set; }
    }
-    public KdfType Kdf { get; set; }
-    public int KdfIterations { get; set; }
-    public string ResetPasswordKey { get; set; }
-    public string EncryptedPrivateKey { get; set; }
 }
--- a/src/Core/Models/Data/Organizations/OrganizationUsers/OrganizationUserUserDetails.cs
+++ b/src/Core/Models/Data/Organizations/OrganizationUsers/OrganizationUserUserDetails.cs
@@ -1,59 +1,60 @@
 using Bit.Core.Enums;
 using Bit.Core.Utilities;

-namespace Bit.Core.Models.Data.Organizations.OrganizationUsers;
-
-public class OrganizationUserUserDetails : IExternal, ITwoFactorProvidersUser
+namespace Bit.Core.Models.Data.Organizations.OrganizationUsers
 {
-    private Dictionary<TwoFactorProviderType, TwoFactorProvider> _twoFactorProviders;
-
-    public Guid Id { get; set; }
-    public Guid OrganizationId { get; set; }
-    public Guid? UserId { get; set; }
-    public string Name { get; set; }
-    public string Email { get; set; }
-    public string TwoFactorProviders { get; set; }
-    public bool? Premium { get; set; }
-    public OrganizationUserStatusType Status { get; set; }
-    public OrganizationUserType Type { get; set; }
-    public bool AccessAll { get; set; }
-    public string ExternalId { get; set; }
-    public string SsoExternalId { get; set; }
-    public string Permissions { get; set; }
-    public string ResetPasswordKey { get; set; }
-    public bool UsesKeyConnector { get; set; }
-
-    public Dictionary<TwoFactorProviderType, TwoFactorProvider> GetTwoFactorProviders()
+    public class OrganizationUserUserDetails : IExternal, ITwoFactorProvidersUser
    {
-        if (string.IsNullOrWhiteSpace(TwoFactorProviders))
-        {
-            return null;
-        }
+        private Dictionary<TwoFactorProviderType, TwoFactorProvider> _twoFactorProviders;

-        try
+        public Guid Id { get; set; }
+        public Guid OrganizationId { get; set; }
+        public Guid? UserId { get; set; }
+        public string Name { get; set; }
+        public string Email { get; set; }
+        public string TwoFactorProviders { get; set; }
+        public bool? Premium { get; set; }
+        public OrganizationUserStatusType Status { get; set; }
+        public OrganizationUserType Type { get; set; }
+        public bool AccessAll { get; set; }
+        public string ExternalId { get; set; }
+        public string SsoExternalId { get; set; }
+        public string Permissions { get; set; }
+        public string ResetPasswordKey { get; set; }
+        public bool UsesKeyConnector { get; set; }
+
+        public Dictionary<TwoFactorProviderType, TwoFactorProvider> GetTwoFactorProviders()
        {
-            if (_twoFactorProviders == null)
+            if (string.IsNullOrWhiteSpace(TwoFactorProviders))
            {
-                _twoFactorProviders =
-                    JsonHelpers.LegacyDeserialize<Dictionary<TwoFactorProviderType, TwoFactorProvider>>(
-                        TwoFactorProviders);
+                return null;
            }

-            return _twoFactorProviders;
+            try
+            {
+                if (_twoFactorProviders == null)
+                {
+                    _twoFactorProviders =
+                        JsonHelpers.LegacyDeserialize<Dictionary<TwoFactorProviderType, TwoFactorProvider>>(
+                            TwoFactorProviders);
+                }
+
+                return _twoFactorProviders;
+            }
+            catch (Newtonsoft.Json.JsonException)
+            {
+                return null;
+            }
        }
-        catch (Newtonsoft.Json.JsonException)
+
+        public Guid? GetUserId()
        {
-            return null;
+            return UserId;
        }
-    }

-    public Guid? GetUserId()
-    {
-        return UserId;
-    }
-
-    public bool GetPremium()
-    {
-        return Premium.GetValueOrDefault(false);
+        public bool GetPremium()
+        {
+            return Premium.GetValueOrDefault(false);
+        }
    }
 }
--- a/src/Core/Models/Data/Organizations/OrganizationUsers/OrganizationUserWithCollections.cs
+++ b/src/Core/Models/Data/Organizations/OrganizationUsers/OrganizationUserWithCollections.cs
@@ -1,9 +1,10 @@
 using System.Data;
 using Bit.Core.Entities;

-namespace Bit.Core.Models.Data.Organizations.OrganizationUsers;
-
-public class OrganizationUserWithCollections : OrganizationUser
+namespace Bit.Core.Models.Data.Organizations.OrganizationUsers
 {
-    public DataTable Collections { get; set; }
+    public class OrganizationUserWithCollections : OrganizationUser
+    {
+        public DataTable Collections { get; set; }
+    }
 }
--- a/src/Core/Models/Data/Organizations/Policies/IPolicyDataModel.cs
+++ b/src/Core/Models/Data/Organizations/Policies/IPolicyDataModel.cs
@@ -1,5 +1,6 @@
-namespace Bit.Core.Models.Data.Organizations.Policies;
-
-public interface IPolicyDataModel
+namespace Bit.Core.Models.Data.Organizations.Policies
 {
+    public interface IPolicyDataModel
+    {
+    }
 }
--- a/src/Core/Models/Data/Organizations/Policies/ResetPasswordDataModel.cs
+++ b/src/Core/Models/Data/Organizations/Policies/ResetPasswordDataModel.cs
@@ -1,9 +1,10 @@
 using System.ComponentModel.DataAnnotations;

-namespace Bit.Core.Models.Data.Organizations.Policies;
-
-public class ResetPasswordDataModel : IPolicyDataModel
+namespace Bit.Core.Models.Data.Organizations.Policies
 {
-    [Display(Name = "ResetPasswordAutoEnrollCheckbox")]
-    public bool AutoEnrollEnabled { get; set; }
+    public class ResetPasswordDataModel : IPolicyDataModel
+    {
+        [Display(Name = "ResetPasswordAutoEnrollCheckbox")]
+        public bool AutoEnrollEnabled { get; set; }
+    }
 }
--- a/src/Core/Models/Data/Organizations/Policies/SendOptionsPolicyData.cs
+++ b/src/Core/Models/Data/Organizations/Policies/SendOptionsPolicyData.cs
@@ -1,9 +1,10 @@
 using System.ComponentModel.DataAnnotations;

-namespace Bit.Core.Models.Data.Organizations.Policies;
-
-public class SendOptionsPolicyData : IPolicyDataModel
+namespace Bit.Core.Models.Data.Organizations.Policies
 {
-    [Display(Name = "DisableHideEmail")]
-    public bool DisableHideEmail { get; set; }
+    public class SendOptionsPolicyData : IPolicyDataModel
+    {
+        [Display(Name = "DisableHideEmail")]
+        public bool DisableHideEmail { get; set; }
+    }
 }