Additional sonar warnings

Author: Kaliumhexacyanoferrat

Modules/Authentication.Web/Controllers/LoginController.cs

@@ -1,57 +1,57 @@
-using System;
-using System.Threading.Tasks;
-
-using GenHTTP.Api.Content;
-using GenHTTP.Api.Content.Authentication;
-using GenHTTP.Api.Protocol;
-
-using GenHTTP.Modules.Basics;
-using GenHTTP.Modules.Controllers;
-
-namespace GenHTTP.Modules.Authentication.Web.Controllers
-{
-
-    public class LoginController : BaseController
-    {
-
-        private Func<IRequest, string, string, ValueTask<IUser?>> PerformLogin { get; }
-
-        public LoginController(Func<IRequest, string, string, ValueTask<IUser?>> performLogin)
-        {
-            PerformLogin = performLogin;
-        }
-
-        public IHandlerBuilder Index()
-        {
-            // ToDo: already logged in
-            return RenderLogin(status: ResponseStatus.Unauthorized);
-        }
-
-        [ControllerAction(RequestMethod.POST)]
-        public async Task<IHandlerBuilder> Index(string user, string password, IRequest request)
-        {
-            if (string.IsNullOrWhiteSpace(user) || string.IsNullOrWhiteSpace(password))
-            {
-                return RenderLogin(user, "Please enter username and password.", status: ResponseStatus.BadRequest);
-            }
-
-            var authenticatedUser = await PerformLogin(request, user, password);
-
-            if (authenticatedUser != null)
-            {
-                request.SetUser(authenticatedUser);
-
-                return Redirect.To("{web-auth}/", true);
-            }
-            else
-            {
-                return RenderLogin(user, "Invalid username or password.", status: ResponseStatus.Forbidden);
-            }
-        }
-
-        private IHandlerBuilder RenderLogin(string? username = null, string? errorMessage = null, ResponseStatus? status = null)
-            => RenderAccountEntry("Login", "Login", username, errorMessage, status);
-
-    }
-
-}
+using System;
+using System.Threading.Tasks;
+
+using GenHTTP.Api.Content;
+using GenHTTP.Api.Content.Authentication;
+using GenHTTP.Api.Protocol;
+
+using GenHTTP.Modules.Basics;
+using GenHTTP.Modules.Controllers;
+
+namespace GenHTTP.Modules.Authentication.Web.Controllers
+{
+
+    public class LoginController 
+    {
+
+        private Func<IRequest, string, string, ValueTask<IUser?>> PerformLogin { get; }
+
+        public LoginController(Func<IRequest, string, string, ValueTask<IUser?>> performLogin)
+        {
+            PerformLogin = performLogin;
+        }
+
+        public IHandlerBuilder Index()
+        {
+            // ToDo: already logged in
+            return RenderLogin(status: ResponseStatus.Unauthorized);
+        }
+
+        [ControllerAction(RequestMethod.POST)]
+        public async Task<IHandlerBuilder> Index(string user, string password, IRequest request)
+        {
+            if (string.IsNullOrWhiteSpace(user) || string.IsNullOrWhiteSpace(password))
+            {
+                return RenderLogin(user, "Please enter username and password.", status: ResponseStatus.BadRequest);
+            }
+
+            var authenticatedUser = await PerformLogin(request, user, password);
+
+            if (authenticatedUser != null)
+            {
+                request.SetUser(authenticatedUser);
+
+                return Redirect.To("{web-auth}/", true);
+            }
+            else
+            {
+                return RenderLogin(user, "Invalid username or password.", status: ResponseStatus.Forbidden);
+            }
+        }
+
+        private static IHandlerBuilder RenderLogin(string? username = null, string? errorMessage = null, ResponseStatus? status = null)
+            => View.RenderAccountEntry("Login", "Login", username, errorMessage, status);
+
+    }
+
+}

Modules/Authentication.Web/Controllers/SetupController.cs

@@ -1,46 +1,46 @@
-using System;
-using System.Threading.Tasks;
-
-using GenHTTP.Api.Content;
-using GenHTTP.Api.Protocol;
-
-using GenHTTP.Modules.Basics;
-using GenHTTP.Modules.Controllers;
-
-namespace GenHTTP.Modules.Authentication.Web.Controllers
-{
-
-    public sealed class SetupController : BaseController
-    {
-
-        private Func<IRequest, string, string, ValueTask> PerformSetup { get; }
-
-        public SetupController(Func<IRequest, string, string, ValueTask> performSetup)
-        {
-            PerformSetup = performSetup;
-        }
-
-        public IHandlerBuilder Index()
-        {
-            return RenderSetup();
-        }
-
-        [ControllerAction(RequestMethod.POST)]
-        public async Task<IHandlerBuilder> Index(string user, string password, IRequest request)
-        {
-            if (string.IsNullOrWhiteSpace(user) || string.IsNullOrWhiteSpace(password))
-            {
-                return RenderSetup(user, "Please enter username and password.", ResponseStatus.BadRequest);
-            }
-
-            await PerformSetup(request, user, password);
-
-            return Redirect.To("{login}/", true);
-        }
-
-        private IHandlerBuilder RenderSetup(string? username = null, string? errorMessage = null, ResponseStatus? status = null) 
-            => RenderAccountEntry("Setup", "Create Account", username, errorMessage, status);
-
-    }
-
-}
+using System;
+using System.Threading.Tasks;
+
+using GenHTTP.Api.Content;
+using GenHTTP.Api.Protocol;
+
+using GenHTTP.Modules.Basics;
+using GenHTTP.Modules.Controllers;
+
+namespace GenHTTP.Modules.Authentication.Web.Controllers
+{
+
+    public sealed class SetupController 
+    {
+
+        private Func<IRequest, string, string, ValueTask> PerformSetup { get; }
+
+        public SetupController(Func<IRequest, string, string, ValueTask> performSetup)
+        {
+            PerformSetup = performSetup;
+        }
+
+        public IHandlerBuilder Index()
+        {
+            return RenderSetup();
+        }
+
+        [ControllerAction(RequestMethod.POST)]
+        public async Task<IHandlerBuilder> Index(string user, string password, IRequest request)
+        {
+            if (string.IsNullOrWhiteSpace(user) || string.IsNullOrWhiteSpace(password))
+            {
+                return RenderSetup(user, "Please enter username and password.", ResponseStatus.BadRequest);
+            }
+
+            await PerformSetup(request, user, password);
+
+            return Redirect.To("{login}/", true);
+        }
+
+        private static IHandlerBuilder RenderSetup(string? username = null, string? errorMessage = null, ResponseStatus? status = null) 
+            => View.RenderAccountEntry("Setup", "Create Account", username, errorMessage, status);
+
+    }
+
+}

Modules/Authentication.Web/Controllers/BaseController.cs Modules/Authentication.Web/Controllers/View.cs

@@ -8,11 +8,11 @@
 
 namespace GenHTTP.Modules.Authentication.Web.Controllers
 {
-
-    public class BaseController
+    
+    public static class View
     {
 
-        protected static IHandlerBuilder RenderAccountEntry(string title, string buttonCaption, string? username = null, string? errorMessage = null, ResponseStatus? status = null)
+        public static IHandlerBuilder RenderAccountEntry(string title, string buttonCaption, string? username = null, string? errorMessage = null, ResponseStatus? status = null)
         {
             var response = ModRazor.Page(Resource.FromAssembly("EnterAccount.cshtml"), (r, h) => new ViewModel<EnterAccountModel>(r, h, new(buttonCaption, username, errorMessage)))
                                    .AddStyle("{web-auth-resources}/style.css")