Run formatting (#2230)

bitwarden_license/src/Sso/Controllers/HomeController.cs

@@ -5,51 +5,50 @@ using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Diagnostics;
 using Microsoft.AspNetCore.Mvc;
 
-namespace Bit.Sso.Controllers
+namespace Bit.Sso.Controllers;
+
+public class HomeController : Controller
 {
-    public class HomeController : Controller
+    private readonly IIdentityServerInteractionService _interaction;
+
+    public HomeController(IIdentityServerInteractionService interaction)
     {
-        private readonly IIdentityServerInteractionService _interaction;
+        _interaction = interaction;
+    }
 
-        public HomeController(IIdentityServerInteractionService interaction)
+    [Route("~/Error")]
+    [Route("~/Home/Error")]
+    [AllowAnonymous]
+    public async Task<IActionResult> Error(string errorId)
+    {
+        var vm = new ErrorViewModel();
+
+        // retrieve error details from identityserver
+        var message = string.IsNullOrWhiteSpace(errorId) ? null :
+            await _interaction.GetErrorContextAsync(errorId);
+        if (message != null)
         {
-            _interaction = interaction;
+            vm.Error = message;
+        }
+        else
+        {
+            vm.RequestId = Activity.Current?.Id ?? HttpContext.TraceIdentifier;
+            var exceptionHandlerPathFeature = HttpContext.Features.Get<IExceptionHandlerPathFeature>();
+            var exception = exceptionHandlerPathFeature?.Error;
+            if (exception is InvalidOperationException opEx && opEx.Message.Contains("schemes are: "))
+            {
+                // Messages coming from aspnetcore with a message
+                //  similar to "The registered sign-in schemes are: {schemes}."
+                //  will expose other Org IDs and sign-in schemes enabled on
+                //  the server. These errors should be truncated to just the
+                //  scheme impacted (always the first sentence)
+                var cleanupPoint = opEx.Message.IndexOf(". ") + 1;
+                var exMessage = opEx.Message.Substring(0, cleanupPoint);
+                exception = new InvalidOperationException(exMessage, opEx);
+            }
+            vm.Exception = exception;
         }
 
-        [Route("~/Error")]
-        [Route("~/Home/Error")]
-        [AllowAnonymous]
-        public async Task<IActionResult> Error(string errorId)
-        {
-            var vm = new ErrorViewModel();
-
-            // retrieve error details from identityserver
-            var message = string.IsNullOrWhiteSpace(errorId) ? null :
-                await _interaction.GetErrorContextAsync(errorId);
-            if (message != null)
-            {
-                vm.Error = message;
-            }
-            else
-            {
-                vm.RequestId = Activity.Current?.Id ?? HttpContext.TraceIdentifier;
-                var exceptionHandlerPathFeature = HttpContext.Features.Get<IExceptionHandlerPathFeature>();
-                var exception = exceptionHandlerPathFeature?.Error;
-                if (exception is InvalidOperationException opEx && opEx.Message.Contains("schemes are: "))
-                {
-                    // Messages coming from aspnetcore with a message
-                    //  similar to "The registered sign-in schemes are: {schemes}."
-                    //  will expose other Org IDs and sign-in schemes enabled on
-                    //  the server. These errors should be truncated to just the
-                    //  scheme impacted (always the first sentence)
-                    var cleanupPoint = opEx.Message.IndexOf(". ") + 1;
-                    var exMessage = opEx.Message.Substring(0, cleanupPoint);
-                    exception = new InvalidOperationException(exMessage, opEx);
-                }
-                vm.Exception = exception;
-            }
-
-            return View("Error", vm);
-        }
+        return View("Error", vm);
     }
 }

bitwarden_license/src/Sso/Controllers/InfoController.cs

@@ -1,21 +1,20 @@
 using Bit.Core.Utilities;
 using Microsoft.AspNetCore.Mvc;
 
-namespace Bit.Sso.Controllers
-{
-    public class InfoController : Controller
-    {
-        [HttpGet("~/alive")]
-        [HttpGet("~/now")]
-        public DateTime GetAlive()
-        {
-            return DateTime.UtcNow;
-        }
+namespace Bit.Sso.Controllers;
 
-        [HttpGet("~/version")]
-        public JsonResult GetVersion()
-        {
-            return Json(CoreHelpers.GetVersion());
-        }
+public class InfoController : Controller
+{
+    [HttpGet("~/alive")]
+    [HttpGet("~/now")]
+    public DateTime GetAlive()
+    {
+        return DateTime.UtcNow;
+    }
+
+    [HttpGet("~/version")]
+    public JsonResult GetVersion()
+    {
+        return Json(CoreHelpers.GetVersion());
     }
 }

bitwarden_license/src/Sso/Controllers/MetadataController.cs

@@ -5,66 +5,65 @@ using Microsoft.AspNetCore.Mvc;
 using Sustainsys.Saml2.AspNetCore2;
 using Sustainsys.Saml2.WebSso;
 
-namespace Bit.Sso.Controllers
+namespace Bit.Sso.Controllers;
+
+public class MetadataController : Controller
 {
-    public class MetadataController : Controller
+    private readonly IAuthenticationSchemeProvider _schemeProvider;
+
+    public MetadataController(
+        IAuthenticationSchemeProvider schemeProvider)
     {
-        private readonly IAuthenticationSchemeProvider _schemeProvider;
+        _schemeProvider = schemeProvider;
+    }
 
-        public MetadataController(
-            IAuthenticationSchemeProvider schemeProvider)
+    [HttpGet("saml2/{scheme}")]
+    public async Task<IActionResult> ViewAsync(string scheme)
+    {
+        if (string.IsNullOrWhiteSpace(scheme))
         {
-            _schemeProvider = schemeProvider;
+            return NotFound();
         }
 
-        [HttpGet("saml2/{scheme}")]
-        public async Task<IActionResult> ViewAsync(string scheme)
+        var authScheme = await _schemeProvider.GetSchemeAsync(scheme);
+        if (authScheme == null ||
+            !(authScheme is DynamicAuthenticationScheme dynamicAuthScheme) ||
+            dynamicAuthScheme?.SsoType != SsoType.Saml2)
         {
-            if (string.IsNullOrWhiteSpace(scheme))
-            {
-                return NotFound();
-            }
-
-            var authScheme = await _schemeProvider.GetSchemeAsync(scheme);
-            if (authScheme == null ||
-                !(authScheme is DynamicAuthenticationScheme dynamicAuthScheme) ||
-                dynamicAuthScheme?.SsoType != SsoType.Saml2)
-            {
-                return NotFound();
-            }
-
-            if (!(dynamicAuthScheme.Options is Saml2Options options))
-            {
-                return NotFound();
-            }
-
-            var uri = new Uri(
-                Request.Scheme
-                + "://"
-                + Request.Host
-                + Request.Path
-                + Request.QueryString);
-
-            var pathBase = Request.PathBase.Value;
-            pathBase = string.IsNullOrEmpty(pathBase) ? "/" : pathBase;
-
-            var requestdata = new HttpRequestData(
-                Request.Method,
-                uri,
-                pathBase,
-                null,
-                Request.Cookies,
-                (data) => data);
-
-            var metadataResult = CommandFactory
-                .GetCommand(CommandFactory.MetadataCommand)
-                .Run(requestdata, options);
-            //Response.Headers.Add("Content-Disposition", $"filename= bitwarden-saml2-meta-{scheme}.xml");
-            return new ContentResult
-            {
-                Content = metadataResult.Content,
-                ContentType = "text/xml",
-            };
+            return NotFound();
         }
+
+        if (!(dynamicAuthScheme.Options is Saml2Options options))
+        {
+            return NotFound();
+        }
+
+        var uri = new Uri(
+            Request.Scheme
+            + "://"
+            + Request.Host
+            + Request.Path
+            + Request.QueryString);
+
+        var pathBase = Request.PathBase.Value;
+        pathBase = string.IsNullOrEmpty(pathBase) ? "/" : pathBase;
+
+        var requestdata = new HttpRequestData(
+            Request.Method,
+            uri,
+            pathBase,
+            null,
+            Request.Cookies,
+            (data) => data);
+
+        var metadataResult = CommandFactory
+            .GetCommand(CommandFactory.MetadataCommand)
+            .Run(requestdata, options);
+        //Response.Headers.Add("Content-Disposition", $"filename= bitwarden-saml2-meta-{scheme}.xml");
+        return new ContentResult
+        {
+            Content = metadataResult.Content,
+            ContentType = "text/xml",
+        };
     }
 }