Add validation and error handling

Author: Kaliumhexacyanoferrat

Modules/Authentication.Web/Controllers/BaseController.cs

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

Modules/Authentication.Web/Controllers/LoginController.cs

@@ -24,12 +24,17 @@ public LoginController(Func<IRequest, string, string, ValueTask<IUser?>> perform
         public IHandlerBuilder Index()
         {
             // ToDo: already logged in
-            return RenderAccountEntry("Login", "Login");
+            return RenderLogin();
         }
 
         [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.");
+            }
+
             var authenticatedUser = await PerformLogin(request, user, password);
 
             if (authenticatedUser != null)
@@ -40,10 +45,12 @@ public async Task<IHandlerBuilder> Index(string user, string password, IRequest
             }
             else
             {
-                return RenderAccountEntry("Login", "Login");
+                return RenderLogin(user, "Invalid username or password.");
             }
         }
 
+        private IHandlerBuilder RenderLogin(string? username = null, string? errorMessage = null) => RenderAccountEntry("Login", "Login", username, errorMessage);
+
     }
 
 }

Modules/Authentication.Web/Controllers/SetupController.cs

@@ -2,13 +2,10 @@
 using System.Threading.Tasks;
 
 using GenHTTP.Api.Content;
-using GenHTTP.Api.Content.Templating;
 using GenHTTP.Api.Protocol;
 
 using GenHTTP.Modules.Basics;
 using GenHTTP.Modules.Controllers;
-using GenHTTP.Modules.IO;
-using GenHTTP.Modules.Razor;
 
 namespace GenHTTP.Modules.Authentication.Web.Controllers
 {
@@ -25,17 +22,24 @@ public SetupController(Func<IRequest, string, string, ValueTask> performSetup)
 
         public IHandlerBuilder Index()
         {
-            return RenderAccountEntry("Setup", "Create Account");
+            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.");
+            }
+
             await PerformSetup(request, user, password);
 
             return Redirect.To("{web-auth}/", true);
         }
 
+        private IHandlerBuilder RenderSetup(string? username = null, string? errorMessage = null) => RenderAccountEntry("Setup", "Create Account", username, errorMessage);
+
     }
 
 }

Modules/Authentication.Web/Resources/style.css

@@ -21,6 +21,7 @@
     flex-flow: column wrap;
     gap: 20px;
     margin-left: 10px;
+    margin-right: 15px;
 }
 
 .user_cont, .pass_cont {
@@ -37,7 +38,6 @@
 }
 
 button {
-    width: 100%;
     border: none;
     outline: none;
     padding: 5px 8px;
@@ -46,6 +46,14 @@ button {
     background-color: #DEDEDE;
 }
 
+.error_message {
+    background-color: #C5532F;
+    padding: 8px;
+    border-radius: 10px;
+    font-style: italic;
+    font-size: 10pt;
+}
+
 button:hover {
     transform: translateY(-1px);
     cursor: pointer;

Modules/Authentication.Web/ViewModels/EnterAccountModel.cs

@@ -4,7 +4,11 @@
     public record EnterAccountModel
     (
 
-        string ButtonCaption
+        string ButtonCaption,
+
+        string? Username = null,
+
+        string? ErrorMessage = null
 
     );
 

Modules/Authentication.Web/Views/EnterAccount.cshtml

@@ -5,7 +5,7 @@
         <div class="inputs">
 
             <div class="user_cont">
-                <input type="text" id="user" name="user" placeholder="username" />
+                <input type="text" id="user" name="user" placeholder="username" value="@Model.Data.Username" />
                 <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="#333333" class="icon w-6 h-6">
                     <path stroke-linecap="round" d="M16.5 12a4.5 4.5 0 11-9 0 4.5 4.5 0 019 0zm0 0c0 1.657 1.007 3 2.25 3S21 13.657 21 12a9 9 0 10-2.636 6.364M16.5 12V8.25" />
                 </svg>
@@ -17,6 +17,13 @@
                     <path stroke-linecap="round" stroke-linejoin="round" d="M16.5 10.5V6.75a4.5 4.5 0 10-9 0v3.75m-.75 11.25h10.5a2.25 2.25 0 002.25-2.25v-6.75a2.25 2.25 0 00-2.25-2.25H6.75a2.25 2.25 0 00-2.25 2.25v6.75a2.25 2.25 0 002.25 2.25z" />
                 </svg>
             </div>
+
+            @if (@Model.Data.ErrorMessage != null)
+            {
+                <div class="error_message">
+                    @Model.Data.ErrorMessage
+                </div>
+            }
 
             <button>@Model.Data.ButtonCaption</button>