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/Controllers/PoliciesController.cs

@@ -11,144 +11,145 @@ using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.DataProtection;
 using Microsoft.AspNetCore.Mvc;
 
-namespace Bit.Api.Controllers;
-
-[Route("organizations/{orgId}/policies")]
-[Authorize("Application")]
-public class PoliciesController : Controller
+namespace Bit.Api.Controllers
 {
-    private readonly IPolicyRepository _policyRepository;
-    private readonly IPolicyService _policyService;
-    private readonly IOrganizationService _organizationService;
-    private readonly IOrganizationUserRepository _organizationUserRepository;
-    private readonly IUserService _userService;
-    private readonly ICurrentContext _currentContext;
-    private readonly GlobalSettings _globalSettings;
-    private readonly IDataProtector _organizationServiceDataProtector;
-
-    public PoliciesController(
-        IPolicyRepository policyRepository,
-        IPolicyService policyService,
-        IOrganizationService organizationService,
-        IOrganizationUserRepository organizationUserRepository,
-        IUserService userService,
-        ICurrentContext currentContext,
-        GlobalSettings globalSettings,
-        IDataProtectionProvider dataProtectionProvider)
+    [Route("organizations/{orgId}/policies")]
+    [Authorize("Application")]
+    public class PoliciesController : Controller
     {
-        _policyRepository = policyRepository;
-        _policyService = policyService;
-        _organizationService = organizationService;
-        _organizationUserRepository = organizationUserRepository;
-        _userService = userService;
-        _currentContext = currentContext;
-        _globalSettings = globalSettings;
-        _organizationServiceDataProtector = dataProtectionProvider.CreateProtector(
-            "OrganizationServiceDataProtector");
-    }
+        private readonly IPolicyRepository _policyRepository;
+        private readonly IPolicyService _policyService;
+        private readonly IOrganizationService _organizationService;
+        private readonly IOrganizationUserRepository _organizationUserRepository;
+        private readonly IUserService _userService;
+        private readonly ICurrentContext _currentContext;
+        private readonly GlobalSettings _globalSettings;
+        private readonly IDataProtector _organizationServiceDataProtector;
 
-    [HttpGet("{type}")]
-    public async Task<PolicyResponseModel> Get(string orgId, int type)
-    {
-        var orgIdGuid = new Guid(orgId);
-        if (!await _currentContext.ManagePolicies(orgIdGuid))
+        public PoliciesController(
+            IPolicyRepository policyRepository,
+            IPolicyService policyService,
+            IOrganizationService organizationService,
+            IOrganizationUserRepository organizationUserRepository,
+            IUserService userService,
+            ICurrentContext currentContext,
+            GlobalSettings globalSettings,
+            IDataProtectionProvider dataProtectionProvider)
         {
-            throw new NotFoundException();
-        }
-        var policy = await _policyRepository.GetByOrganizationIdTypeAsync(orgIdGuid, (PolicyType)type);
-        if (policy == null)
-        {
-            throw new NotFoundException();
+            _policyRepository = policyRepository;
+            _policyService = policyService;
+            _organizationService = organizationService;
+            _organizationUserRepository = organizationUserRepository;
+            _userService = userService;
+            _currentContext = currentContext;
+            _globalSettings = globalSettings;
+            _organizationServiceDataProtector = dataProtectionProvider.CreateProtector(
+                "OrganizationServiceDataProtector");
         }
 
-        return new PolicyResponseModel(policy);
-    }
-
-    [HttpGet("")]
-    public async Task<ListResponseModel<PolicyResponseModel>> Get(string orgId)
-    {
-        var orgIdGuid = new Guid(orgId);
-        if (!await _currentContext.ManagePolicies(orgIdGuid))
+        [HttpGet("{type}")]
+        public async Task<PolicyResponseModel> Get(string orgId, int type)
         {
-            throw new NotFoundException();
+            var orgIdGuid = new Guid(orgId);
+            if (!await _currentContext.ManagePolicies(orgIdGuid))
+            {
+                throw new NotFoundException();
+            }
+            var policy = await _policyRepository.GetByOrganizationIdTypeAsync(orgIdGuid, (PolicyType)type);
+            if (policy == null)
+            {
+                throw new NotFoundException();
+            }
+
+            return new PolicyResponseModel(policy);
         }
 
-        var policies = await _policyRepository.GetManyByOrganizationIdAsync(orgIdGuid);
-        var responses = policies.Select(p => new PolicyResponseModel(p));
-        return new ListResponseModel<PolicyResponseModel>(responses);
-    }
-
-    [AllowAnonymous]
-    [HttpGet("token")]
-    public async Task<ListResponseModel<PolicyResponseModel>> GetByToken(string orgId, [FromQuery] string email,
-        [FromQuery] string token, [FromQuery] string organizationUserId)
-    {
-        var orgUserId = new Guid(organizationUserId);
-        var tokenValid = CoreHelpers.UserInviteTokenIsValid(_organizationServiceDataProtector, token,
-            email, orgUserId, _globalSettings);
-        if (!tokenValid)
+        [HttpGet("")]
+        public async Task<ListResponseModel<PolicyResponseModel>> Get(string orgId)
         {
-            throw new NotFoundException();
+            var orgIdGuid = new Guid(orgId);
+            if (!await _currentContext.ManagePolicies(orgIdGuid))
+            {
+                throw new NotFoundException();
+            }
+
+            var policies = await _policyRepository.GetManyByOrganizationIdAsync(orgIdGuid);
+            var responses = policies.Select(p => new PolicyResponseModel(p));
+            return new ListResponseModel<PolicyResponseModel>(responses);
         }
 
-        var orgIdGuid = new Guid(orgId);
-        var orgUser = await _organizationUserRepository.GetByIdAsync(orgUserId);
-        if (orgUser == null || orgUser.OrganizationId != orgIdGuid)
+        [AllowAnonymous]
+        [HttpGet("token")]
+        public async Task<ListResponseModel<PolicyResponseModel>> GetByToken(string orgId, [FromQuery] string email,
+            [FromQuery] string token, [FromQuery] string organizationUserId)
         {
-            throw new NotFoundException();
+            var orgUserId = new Guid(organizationUserId);
+            var tokenValid = CoreHelpers.UserInviteTokenIsValid(_organizationServiceDataProtector, token,
+                email, orgUserId, _globalSettings);
+            if (!tokenValid)
+            {
+                throw new NotFoundException();
+            }
+
+            var orgIdGuid = new Guid(orgId);
+            var orgUser = await _organizationUserRepository.GetByIdAsync(orgUserId);
+            if (orgUser == null || orgUser.OrganizationId != orgIdGuid)
+            {
+                throw new NotFoundException();
+            }
+
+            var policies = await _policyRepository.GetManyByOrganizationIdAsync(orgIdGuid);
+            var responses = policies.Where(p => p.Enabled).Select(p => new PolicyResponseModel(p));
+            return new ListResponseModel<PolicyResponseModel>(responses);
         }
 
-        var policies = await _policyRepository.GetManyByOrganizationIdAsync(orgIdGuid);
-        var responses = policies.Where(p => p.Enabled).Select(p => new PolicyResponseModel(p));
-        return new ListResponseModel<PolicyResponseModel>(responses);
-    }
+        [AllowAnonymous]
+        [HttpGet("invited-user")]
+        public async Task<ListResponseModel<PolicyResponseModel>> GetByInvitedUser(string orgId, [FromQuery] string userId)
+        {
+            var user = await _userService.GetUserByIdAsync(new Guid(userId));
+            if (user == null)
+            {
+                throw new UnauthorizedAccessException();
+            }
+            var orgIdGuid = new Guid(orgId);
+            var orgUsersByUserId = await _organizationUserRepository.GetManyByUserAsync(user.Id);
+            var orgUser = orgUsersByUserId.SingleOrDefault(u => u.OrganizationId == orgIdGuid);
+            if (orgUser == null)
+            {
+                throw new NotFoundException();
+            }
+            if (orgUser.Status != OrganizationUserStatusType.Invited)
+            {
+                throw new UnauthorizedAccessException();
+            }
 
-    [AllowAnonymous]
-    [HttpGet("invited-user")]
-    public async Task<ListResponseModel<PolicyResponseModel>> GetByInvitedUser(string orgId, [FromQuery] string userId)
-    {
-        var user = await _userService.GetUserByIdAsync(new Guid(userId));
-        if (user == null)
-        {
-            throw new UnauthorizedAccessException();
-        }
-        var orgIdGuid = new Guid(orgId);
-        var orgUsersByUserId = await _organizationUserRepository.GetManyByUserAsync(user.Id);
-        var orgUser = orgUsersByUserId.SingleOrDefault(u => u.OrganizationId == orgIdGuid);
-        if (orgUser == null)
-        {
-            throw new NotFoundException();
-        }
-        if (orgUser.Status != OrganizationUserStatusType.Invited)
-        {
-            throw new UnauthorizedAccessException();
+            var policies = await _policyRepository.GetManyByOrganizationIdAsync(orgIdGuid);
+            var responses = policies.Where(p => p.Enabled).Select(p => new PolicyResponseModel(p));
+            return new ListResponseModel<PolicyResponseModel>(responses);
         }
 
-        var policies = await _policyRepository.GetManyByOrganizationIdAsync(orgIdGuid);
-        var responses = policies.Where(p => p.Enabled).Select(p => new PolicyResponseModel(p));
-        return new ListResponseModel<PolicyResponseModel>(responses);
-    }
+        [HttpPut("{type}")]
+        public async Task<PolicyResponseModel> Put(string orgId, int type, [FromBody] PolicyRequestModel model)
+        {
+            var orgIdGuid = new Guid(orgId);
+            if (!await _currentContext.ManagePolicies(orgIdGuid))
+            {
+                throw new NotFoundException();
+            }
+            var policy = await _policyRepository.GetByOrganizationIdTypeAsync(new Guid(orgId), (PolicyType)type);
+            if (policy == null)
+            {
+                policy = model.ToPolicy(orgIdGuid);
+            }
+            else
+            {
+                policy = model.ToPolicy(policy);
+            }
 
-    [HttpPut("{type}")]
-    public async Task<PolicyResponseModel> Put(string orgId, int type, [FromBody] PolicyRequestModel model)
-    {
-        var orgIdGuid = new Guid(orgId);
-        if (!await _currentContext.ManagePolicies(orgIdGuid))
-        {
-            throw new NotFoundException();
+            var userId = _userService.GetProperUserId(User);
+            await _policyService.SaveAsync(policy, _userService, _organizationService, userId);
+            return new PolicyResponseModel(policy);
         }
-        var policy = await _policyRepository.GetByOrganizationIdTypeAsync(new Guid(orgId), (PolicyType)type);
-        if (policy == null)
-        {
-            policy = model.ToPolicy(orgIdGuid);
-        }
-        else
-        {
-            policy = model.ToPolicy(policy);
-        }
-
-        var userId = _userService.GetProperUserId(User);
-        await _policyService.SaveAsync(policy, _userService, _organizationService, userId);
-        return new PolicyResponseModel(policy);
     }
 }