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/PushController.cs

@@ -7,108 +7,109 @@ using Bit.Core.Utilities;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 
-namespace Bit.Api.Controllers;
-
-[Route("push")]
-[Authorize("Push")]
-[SelfHosted(NotSelfHostedOnly = true)]
-public class PushController : Controller
+namespace Bit.Api.Controllers
 {
-    private readonly IPushRegistrationService _pushRegistrationService;
-    private readonly IPushNotificationService _pushNotificationService;
-    private readonly IWebHostEnvironment _environment;
-    private readonly ICurrentContext _currentContext;
-    private readonly GlobalSettings _globalSettings;
-
-    public PushController(
-        IPushRegistrationService pushRegistrationService,
-        IPushNotificationService pushNotificationService,
-        IWebHostEnvironment environment,
-        ICurrentContext currentContext,
-        GlobalSettings globalSettings)
+    [Route("push")]
+    [Authorize("Push")]
+    [SelfHosted(NotSelfHostedOnly = true)]
+    public class PushController : Controller
     {
-        _currentContext = currentContext;
-        _environment = environment;
-        _pushRegistrationService = pushRegistrationService;
-        _pushNotificationService = pushNotificationService;
-        _globalSettings = globalSettings;
-    }
+        private readonly IPushRegistrationService _pushRegistrationService;
+        private readonly IPushNotificationService _pushNotificationService;
+        private readonly IWebHostEnvironment _environment;
+        private readonly ICurrentContext _currentContext;
+        private readonly GlobalSettings _globalSettings;
 
-    [HttpPost("register")]
-    public async Task PostRegister([FromBody] PushRegistrationRequestModel model)
-    {
-        CheckUsage();
-        await _pushRegistrationService.CreateOrUpdateRegistrationAsync(model.PushToken, Prefix(model.DeviceId),
-            Prefix(model.UserId), Prefix(model.Identifier), model.Type);
-    }
-
-    [HttpDelete("{id}")]
-    public async Task Delete(string id)
-    {
-        CheckUsage();
-        await _pushRegistrationService.DeleteRegistrationAsync(Prefix(id));
-    }
-
-    [HttpPut("add-organization")]
-    public async Task PutAddOrganization([FromBody] PushUpdateRequestModel model)
-    {
-        CheckUsage();
-        await _pushRegistrationService.AddUserRegistrationOrganizationAsync(
-            model.DeviceIds.Select(d => Prefix(d)), Prefix(model.OrganizationId));
-    }
-
-    [HttpPut("delete-organization")]
-    public async Task PutDeleteOrganization([FromBody] PushUpdateRequestModel model)
-    {
-        CheckUsage();
-        await _pushRegistrationService.DeleteUserRegistrationOrganizationAsync(
-            model.DeviceIds.Select(d => Prefix(d)), Prefix(model.OrganizationId));
-    }
-
-    [HttpPost("send")]
-    public async Task PostSend([FromBody] PushSendRequestModel model)
-    {
-        CheckUsage();
-
-        if (!string.IsNullOrWhiteSpace(model.UserId))
+        public PushController(
+            IPushRegistrationService pushRegistrationService,
+            IPushNotificationService pushNotificationService,
+            IWebHostEnvironment environment,
+            ICurrentContext currentContext,
+            GlobalSettings globalSettings)
         {
-            await _pushNotificationService.SendPayloadToUserAsync(Prefix(model.UserId),
-                   model.Type.Value, model.Payload, Prefix(model.Identifier), Prefix(model.DeviceId));
-        }
-        else if (!string.IsNullOrWhiteSpace(model.OrganizationId))
-        {
-            await _pushNotificationService.SendPayloadToOrganizationAsync(Prefix(model.OrganizationId),
-                model.Type.Value, model.Payload, Prefix(model.Identifier), Prefix(model.DeviceId));
-        }
-    }
-
-    private string Prefix(string value)
-    {
-        if (string.IsNullOrWhiteSpace(value))
-        {
-            return null;
+            _currentContext = currentContext;
+            _environment = environment;
+            _pushRegistrationService = pushRegistrationService;
+            _pushNotificationService = pushNotificationService;
+            _globalSettings = globalSettings;
         }
 
-        return $"{_currentContext.InstallationId.Value}_{value}";
-    }
-
-    private void CheckUsage()
-    {
-        if (CanUse())
+        [HttpPost("register")]
+        public async Task PostRegister([FromBody] PushRegistrationRequestModel model)
         {
-            return;
+            CheckUsage();
+            await _pushRegistrationService.CreateOrUpdateRegistrationAsync(model.PushToken, Prefix(model.DeviceId),
+                Prefix(model.UserId), Prefix(model.Identifier), model.Type);
         }
 
-        throw new BadRequestException("Not correctly configured for push relays.");
-    }
-
-    private bool CanUse()
-    {
-        if (_environment.IsDevelopment())
+        [HttpDelete("{id}")]
+        public async Task Delete(string id)
         {
-            return true;
+            CheckUsage();
+            await _pushRegistrationService.DeleteRegistrationAsync(Prefix(id));
         }
 
-        return _currentContext.InstallationId.HasValue && !_globalSettings.SelfHosted;
+        [HttpPut("add-organization")]
+        public async Task PutAddOrganization([FromBody] PushUpdateRequestModel model)
+        {
+            CheckUsage();
+            await _pushRegistrationService.AddUserRegistrationOrganizationAsync(
+                model.DeviceIds.Select(d => Prefix(d)), Prefix(model.OrganizationId));
+        }
+
+        [HttpPut("delete-organization")]
+        public async Task PutDeleteOrganization([FromBody] PushUpdateRequestModel model)
+        {
+            CheckUsage();
+            await _pushRegistrationService.DeleteUserRegistrationOrganizationAsync(
+                model.DeviceIds.Select(d => Prefix(d)), Prefix(model.OrganizationId));
+        }
+
+        [HttpPost("send")]
+        public async Task PostSend([FromBody] PushSendRequestModel model)
+        {
+            CheckUsage();
+
+            if (!string.IsNullOrWhiteSpace(model.UserId))
+            {
+                await _pushNotificationService.SendPayloadToUserAsync(Prefix(model.UserId),
+                       model.Type.Value, model.Payload, Prefix(model.Identifier), Prefix(model.DeviceId));
+            }
+            else if (!string.IsNullOrWhiteSpace(model.OrganizationId))
+            {
+                await _pushNotificationService.SendPayloadToOrganizationAsync(Prefix(model.OrganizationId),
+                    model.Type.Value, model.Payload, Prefix(model.Identifier), Prefix(model.DeviceId));
+            }
+        }
+
+        private string Prefix(string value)
+        {
+            if (string.IsNullOrWhiteSpace(value))
+            {
+                return null;
+            }
+
+            return $"{_currentContext.InstallationId.Value}_{value}";
+        }
+
+        private void CheckUsage()
+        {
+            if (CanUse())
+            {
+                return;
+            }
+
+            throw new BadRequestException("Not correctly configured for push relays.");
+        }
+
+        private bool CanUse()
+        {
+            if (_environment.IsDevelopment())
+            {
+                return true;
+            }
+
+            return _currentContext.InstallationId.HasValue && !_globalSettings.SelfHosted;
+        }
     }
 }