From 61b73060e5321a1d36ff0baa5b7faf6ce79f0d18 Mon Sep 17 00:00:00 2001
From: Shaun Walker <shaun.walker@siliqon.com>
Date: Fri, 2 Apr 2021 16:14:02 -0400
Subject: [PATCH] login form validation

---
 Oqtane.Client/Modules/Admin/Login/Index.razor | 119 ++++++++++--------
 Oqtane.Client/UI/Interop.cs                   |  15 +++
 .../Modules/[Owner].[Module]/Edit.razor       |  29 +++--
 Oqtane.Server/wwwroot/js/interop.js           |   3 +
 4 files changed, 102 insertions(+), 64 deletions(-)

diff --git a/Oqtane.Client/Modules/Admin/Login/Index.razor b/Oqtane.Client/Modules/Admin/Login/Index.razor
index 2ba8c918..86ec7b0a 100644
--- a/Oqtane.Client/Modules/Admin/Login/Index.razor
+++ b/Oqtane.Client/Modules/Admin/Login/Index.razor
@@ -11,26 +11,28 @@
 }
 <AuthorizeView>
     <NotAuthorized>
-        <div class="container Oqtane-Modules-Admin-Login" @onkeypress="@(e => KeyPressed(e))">
-            <div class="form-group">
-                <label for="Username" class="control-label">@Localizer["Username:"] </label>
-                <input type="text" @ref="username" name="Username" class="form-control username" placeholder="Username" @bind="@_username" id="Username" />
-            </div>
-            <div class="form-group">
-                <label for="Password" class="control-label">@Localizer["Password:"] </label>
-                <input type="password" name="Password" class="form-control password" placeholder="Password" @bind="@_password" id="Password" />
-            </div>
-            <div class="form-group">
-                <div class="form-check form-check-inline">
-                    <label class="form-check-label" for="Remember">@Localizer["Remember Me?"]</label>&nbsp;
-                    <input type="checkbox" class="form-check-input" name="Remember" @bind="@_remember" id="Remember" />
+        <form @ref="login" class="@(validated ? "was-validated" : "needs-validation")" novalidate>
+            <div class="container Oqtane-Modules-Admin-Login" @onkeypress="@(e => KeyPressed(e))">
+                <div class="form-group">
+                    <label for="Username" class="control-label">@Localizer["Username:"] </label>
+                    <input type="text" @ref="username" name="Username" class="form-control username" placeholder="Username" @bind="@_username" id="Username" required />
                 </div>
+                <div class="form-group">
+                    <label for="Password" class="control-label">@Localizer["Password:"] </label>
+                    <input type="password" name="Password" class="form-control password" placeholder="Password" @bind="@_password" id="Password" required />
+                </div>
+                <div class="form-group">
+                    <div class="form-check form-check-inline">
+                        <label class="form-check-label" for="Remember">@Localizer["Remember Me?"]</label>&nbsp;
+                        <input type="checkbox" class="form-check-input" name="Remember" @bind="@_remember" id="Remember" />
+                    </div>
+                </div>
+                <button type="button" class="btn btn-primary" @onclick="Login">@Localizer["Login"]</button>
+                <button type="button" class="btn btn-secondary" @onclick="Cancel">@Localizer["Cancel"]</button>
+                <br /><br />
+                <button type="button" class="btn btn-secondary" @onclick="Forgot">@Localizer["Forgot Password"]</button>
             </div>
-            <button type="button" class="btn btn-primary" @onclick="Login">@Localizer["Login"]</button>
-            <button type="button" class="btn btn-secondary" @onclick="Cancel">@Localizer["Cancel"]</button>
-            <br /><br />
-            <button type="button" class="btn btn-secondary" @onclick="Forgot">@Localizer["Forgot Password"]</button>
-        </div>
+        </form>
     </NotAuthorized>
 </AuthorizeView>
 
@@ -41,6 +43,9 @@
     private string _username = string.Empty;
     private string _password = string.Empty;
     private bool _remember = false;
+    private bool validated = false;
+
+    private ElementReference login;
     private ElementReference username;
 
     public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Anonymous;
@@ -91,50 +96,58 @@
 
     private async Task Login()
     {
-        if (PageState.Runtime == Oqtane.Shared.Runtime.Server)
+        validated = true;
+        var interop = new Interop(JSRuntime);
+        if (await interop.FormValid(login))
         {
-            // server-side Blazor
-            var user = new User();
-            user.SiteId = PageState.Site.SiteId;
-            user.Username = _username;
-            user.Password = _password;
-            user = await UserService.LoginUserAsync(user, false, false);
-
-            if (user.IsAuthenticated)
+            if (PageState.Runtime == Oqtane.Shared.Runtime.Server)
             {
-                await logger.LogInformation("Login Successful For Username {Username}", _username);
-                // complete the login on the server so that the cookies are set correctly on SignalR
-                var interop = new Interop(JSRuntime);
-                string antiforgerytoken = await interop.GetElementByName("__RequestVerificationToken");
-                var fields = new { __RequestVerificationToken = antiforgerytoken, username = _username, password = _password, remember = _remember, returnurl = _returnUrl };
-                await interop.SubmitForm($"/{PageState.Alias.AliasId}/pages/login/", fields);
+                // server-side Blazor
+                var user = new User();
+                user.SiteId = PageState.Site.SiteId;
+                user.Username = _username;
+                user.Password = _password;
+                user = await UserService.LoginUserAsync(user, false, false);
+
+                if (user.IsAuthenticated)
+                {
+                    await logger.LogInformation("Login Successful For Username {Username}", _username);
+                    // complete the login on the server so that the cookies are set correctly on SignalR
+                    string antiforgerytoken = await interop.GetElementByName("__RequestVerificationToken");
+                    var fields = new { __RequestVerificationToken = antiforgerytoken, username = _username, password = _password, remember = _remember, returnurl = _returnUrl };
+                    await interop.SubmitForm($"/{PageState.Alias.AliasId}/pages/login/", fields);
+                }
+                else
+                {
+                    await logger.LogInformation("Login Failed For Username {Username}", _username);
+                    AddModuleMessage(Localizer["Login Failed. Please Remember That Passwords Are Case Sensitive And User Accounts Require Verification When They Are Initially Created So You May Wish To Check Your Email."], MessageType.Error);
+                }
             }
             else
             {
-                await logger.LogInformation("Login Failed For Username {Username}", _username);
-                AddModuleMessage(Localizer["Login Failed. Please Remember That Passwords Are Case Sensitive And User Accounts Require Email Verification When They Initially Created."], MessageType.Error);
+                // client-side Blazor
+                var user = new User();
+                user.SiteId = PageState.Site.SiteId;
+                user.Username = _username;
+                user.Password = _password;
+                user = await UserService.LoginUserAsync(user, true, _remember);
+                if (user.IsAuthenticated)
+                {
+                    await logger.LogInformation("Login Successful For Username {Username}", _username);
+                    var authstateprovider = (IdentityAuthenticationStateProvider)ServiceProvider.GetService(typeof(IdentityAuthenticationStateProvider));
+                    authstateprovider.NotifyAuthenticationChanged();
+                    NavigationManager.NavigateTo(NavigateUrl(_returnUrl, "reload"));
+                }
+                else
+                {
+                    await logger.LogInformation("Login Failed For Username {Username}", _username);
+                    AddModuleMessage(Localizer["Login Failed. Please Remember That Passwords Are Case Sensitive And User Accounts Require Verification When They Are Initially Created So You May Wish To Check Your Email."], MessageType.Error);
+                }
             }
         }
         else
         {
-            // client-side Blazor
-            var user = new User();
-            user.SiteId = PageState.Site.SiteId;
-            user.Username = _username;
-            user.Password = _password;
-            user = await UserService.LoginUserAsync(user, true, _remember);
-            if (user.IsAuthenticated)
-            {
-                await logger.LogInformation("Login Successful For Username {Username}", _username);
-                var authstateprovider = (IdentityAuthenticationStateProvider)ServiceProvider.GetService(typeof(IdentityAuthenticationStateProvider));
-                authstateprovider.NotifyAuthenticationChanged();
-                NavigationManager.NavigateTo(NavigateUrl(_returnUrl, "reload"));
-            }
-            else
-            {
-                await logger.LogInformation("Login Failed For Username {Username}", _username);
-                AddModuleMessage(Localizer["Login Failed. Please Remember That Passwords Are Case Sensitive And User Accounts Require Verification When They Are Initially Created So You May Wish To Check Your Email."], MessageType.Error);
-            }
+            AddModuleMessage(Localizer["Please Provide Your Username And Password"], MessageType.Warning);
         }
     }
 
diff --git a/Oqtane.Client/UI/Interop.cs b/Oqtane.Client/UI/Interop.cs
index 3964b070..b54fde6f 100644
--- a/Oqtane.Client/UI/Interop.cs
+++ b/Oqtane.Client/UI/Interop.cs
@@ -1,3 +1,4 @@
+using Microsoft.AspNetCore.Components;
 using Microsoft.JSInterop;
 using System.Threading.Tasks;
 
@@ -232,5 +233,19 @@ namespace Oqtane.UI
                 return Task.CompletedTask;
             }
         }
+
+        public ValueTask<bool> FormValid(ElementReference form)
+        {
+            try
+            {
+                return _jsRuntime.InvokeAsync<bool>(
+                    "Oqtane.Interop.formValid",
+                    form);
+            }
+            catch
+            {
+                return new ValueTask<bool>(Task.FromResult(false));
+            }
+        }
     }
 }
diff --git a/Oqtane.Server/wwwroot/Modules/Templates/External/Client/Modules/[Owner].[Module]/Edit.razor b/Oqtane.Server/wwwroot/Modules/Templates/External/Client/Modules/[Owner].[Module]/Edit.razor
index 339879f8..9858a044 100644
--- a/Oqtane.Server/wwwroot/Modules/Templates/External/Client/Modules/[Owner].[Module]/Edit.razor
+++ b/Oqtane.Server/wwwroot/Modules/Templates/External/Client/Modules/[Owner].[Module]/Edit.razor
@@ -74,22 +74,29 @@
     {
         try
         {
-            if (PageState.Action == "Add")
+            if (string.IsNullOrEmpty(_name))
             {
-                [Module] [Module] = new [Module]();
-                [Module].ModuleId = ModuleState.ModuleId;
-                [Module].Name = _name;
-                [Module] = await [Module]Service.Add[Module]Async([Module]);
-                await logger.LogInformation("[Module] Added {[Module]}", [Module]);
+                if (PageState.Action == "Add")
+                {
+                    [Module] [Module] = new [Module]();
+                    [Module].ModuleId = ModuleState.ModuleId;
+                    [Module].Name = _name;
+                    [Module] = await [Module]Service.Add[Module]Async([Module]);
+                    await logger.LogInformation("[Module] Added {[Module]}", [Module]);
+                }
+                else
+                {
+                    [Module] [Module] = await [Module]Service.Get[Module]Async(_id, ModuleState.ModuleId);
+                    [Module].Name = _name;
+                    await [Module]Service.Update[Module]Async([Module]);
+                    await logger.LogInformation("[Module] Updated {[Module]}", [Module]);
+                }
+                NavigationManager.NavigateTo(NavigateUrl());
             }
             else
             {
-                [Module] [Module] = await [Module]Service.Get[Module]Async(_id, ModuleState.ModuleId);
-                [Module].Name = _name;
-                await [Module]Service.Update[Module]Async([Module]);
-                await logger.LogInformation("[Module] Updated {[Module]}", [Module]);
+                AddModuleMessage("The Name Is Required", MessageType.Warning);
             }
-            NavigationManager.NavigateTo(NavigateUrl());
         }
         catch (Exception ex)
         {
diff --git a/Oqtane.Server/wwwroot/js/interop.js b/Oqtane.Server/wwwroot/js/interop.js
index 2e4092e4..6d1b549d 100644
--- a/Oqtane.Server/wwwroot/js/interop.js
+++ b/Oqtane.Server/wwwroot/js/interop.js
@@ -362,5 +362,8 @@ Oqtane.Interop = {
         setInterval(function () {
             window.location.href = url;
         }, wait * 1000);
+    },
+    formValid: function (formRef) {
+        return formRef.checkValidity();
     }
 };