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/Core/IdentityServer/ProfileService.cs

@@ -6,82 +6,83 @@ using Bit.Core.Utilities;
 using IdentityServer4.Models;
 using IdentityServer4.Services;
 
-namespace Bit.Core.IdentityServer;
-
-public class ProfileService : IProfileService
+namespace Bit.Core.IdentityServer
 {
-    private readonly IUserService _userService;
-    private readonly IOrganizationUserRepository _organizationUserRepository;
-    private readonly IProviderUserRepository _providerUserRepository;
-    private readonly IProviderOrganizationRepository _providerOrganizationRepository;
-    private readonly ILicensingService _licensingService;
-    private readonly ICurrentContext _currentContext;
-
-    public ProfileService(
-        IUserService userService,
-        IOrganizationUserRepository organizationUserRepository,
-        IProviderUserRepository providerUserRepository,
-        IProviderOrganizationRepository providerOrganizationRepository,
-        ILicensingService licensingService,
-        ICurrentContext currentContext)
+    public class ProfileService : IProfileService
     {
-        _userService = userService;
-        _organizationUserRepository = organizationUserRepository;
-        _providerUserRepository = providerUserRepository;
-        _providerOrganizationRepository = providerOrganizationRepository;
-        _licensingService = licensingService;
-        _currentContext = currentContext;
-    }
+        private readonly IUserService _userService;
+        private readonly IOrganizationUserRepository _organizationUserRepository;
+        private readonly IProviderUserRepository _providerUserRepository;
+        private readonly IProviderOrganizationRepository _providerOrganizationRepository;
+        private readonly ILicensingService _licensingService;
+        private readonly ICurrentContext _currentContext;
 
-    public async Task GetProfileDataAsync(ProfileDataRequestContext context)
-    {
-        var existingClaims = context.Subject.Claims;
-        var newClaims = new List<Claim>();
-
-        var user = await _userService.GetUserByPrincipalAsync(context.Subject);
-        if (user != null)
+        public ProfileService(
+            IUserService userService,
+            IOrganizationUserRepository organizationUserRepository,
+            IProviderUserRepository providerUserRepository,
+            IProviderOrganizationRepository providerOrganizationRepository,
+            ILicensingService licensingService,
+            ICurrentContext currentContext)
         {
-            var isPremium = await _licensingService.ValidateUserPremiumAsync(user);
-            var orgs = await _currentContext.OrganizationMembershipAsync(_organizationUserRepository, user.Id);
-            var providers = await _currentContext.ProviderMembershipAsync(_providerUserRepository, user.Id);
-            foreach (var claim in CoreHelpers.BuildIdentityClaims(user, orgs, providers, isPremium))
+            _userService = userService;
+            _organizationUserRepository = organizationUserRepository;
+            _providerUserRepository = providerUserRepository;
+            _providerOrganizationRepository = providerOrganizationRepository;
+            _licensingService = licensingService;
+            _currentContext = currentContext;
+        }
+
+        public async Task GetProfileDataAsync(ProfileDataRequestContext context)
+        {
+            var existingClaims = context.Subject.Claims;
+            var newClaims = new List<Claim>();
+
+            var user = await _userService.GetUserByPrincipalAsync(context.Subject);
+            if (user != null)
             {
-                var upperValue = claim.Value.ToUpperInvariant();
-                var isBool = upperValue == "TRUE" || upperValue == "FALSE";
-                newClaims.Add(isBool ?
-                    new Claim(claim.Key, claim.Value, ClaimValueTypes.Boolean) :
-                    new Claim(claim.Key, claim.Value)
-                );
+                var isPremium = await _licensingService.ValidateUserPremiumAsync(user);
+                var orgs = await _currentContext.OrganizationMembershipAsync(_organizationUserRepository, user.Id);
+                var providers = await _currentContext.ProviderMembershipAsync(_providerUserRepository, user.Id);
+                foreach (var claim in CoreHelpers.BuildIdentityClaims(user, orgs, providers, isPremium))
+                {
+                    var upperValue = claim.Value.ToUpperInvariant();
+                    var isBool = upperValue == "TRUE" || upperValue == "FALSE";
+                    newClaims.Add(isBool ?
+                        new Claim(claim.Key, claim.Value, ClaimValueTypes.Boolean) :
+                        new Claim(claim.Key, claim.Value)
+                    );
+                }
+            }
+
+            // filter out any of the new claims
+            var existingClaimsToKeep = existingClaims
+                .Where(c => !c.Type.StartsWith("org") &&
+                    (newClaims.Count == 0 || !newClaims.Any(nc => nc.Type == c.Type)))
+                .ToList();
+
+            newClaims.AddRange(existingClaimsToKeep);
+            if (newClaims.Any())
+            {
+                context.IssuedClaims.AddRange(newClaims);
             }
         }
 
-        // filter out any of the new claims
-        var existingClaimsToKeep = existingClaims
-            .Where(c => !c.Type.StartsWith("org") &&
-                (newClaims.Count == 0 || !newClaims.Any(nc => nc.Type == c.Type)))
-            .ToList();
-
-        newClaims.AddRange(existingClaimsToKeep);
-        if (newClaims.Any())
+        public async Task IsActiveAsync(IsActiveContext context)
         {
-            context.IssuedClaims.AddRange(newClaims);
-        }
-    }
+            var securityTokenClaim = context.Subject?.Claims.FirstOrDefault(c => c.Type == "sstamp");
+            var user = await _userService.GetUserByPrincipalAsync(context.Subject);
 
-    public async Task IsActiveAsync(IsActiveContext context)
-    {
-        var securityTokenClaim = context.Subject?.Claims.FirstOrDefault(c => c.Type == "sstamp");
-        var user = await _userService.GetUserByPrincipalAsync(context.Subject);
-
-        if (user != null && securityTokenClaim != null)
-        {
-            context.IsActive = string.Equals(user.SecurityStamp, securityTokenClaim.Value,
-                StringComparison.InvariantCultureIgnoreCase);
-            return;
-        }
-        else
-        {
-            context.IsActive = true;
+            if (user != null && securityTokenClaim != null)
+            {
+                context.IsActive = string.Equals(user.SecurityStamp, securityTokenClaim.Value,
+                    StringComparison.InvariantCultureIgnoreCase);
+                return;
+            }
+            else
+            {
+                context.IsActive = true;
+            }
         }
     }
 }