From 37512d3f16ac193a416383d0f4caefd5953b888d Mon Sep 17 00:00:00 2001
From: Nana Antwi <nanastef10@hotmail.com>
Date: Sun, 4 Jun 2023 19:55:54 +0000
Subject: [PATCH] Added validation to login form

---
 Client/Biskilog Accounting.Client.csproj |  6 ++++
 Client/Pages/Auth/Login.razor            |  4 +++
 Client/Properties/launchSettings.json    | 10 +++---
 Server/Biskilog Accounting.Server.csproj |  2 ++
 Server/Properties/launchSettings.json    | 40 ++++++++++++------------
 Shared/ClientContractModels/Userauth.cs  |  3 ++
 6 files changed, 40 insertions(+), 25 deletions(-)

diff --git a/Client/Biskilog Accounting.Client.csproj b/Client/Biskilog Accounting.Client.csproj
index f344a0f..39d8fb6 100644
--- a/Client/Biskilog Accounting.Client.csproj	
+++ b/Client/Biskilog Accounting.Client.csproj	
@@ -8,6 +8,12 @@
     <AssemblyName>$(AssemblyName.Replace(' ', '_'))</AssemblyName>
   </PropertyGroup>
 
+  <PropertyGroup Condition=" '$(RunConfiguration)' == 'https' ">
+    <ExternalConsole>true</ExternalConsole>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(RunConfiguration)' == 'http' ">
+    <ExternalConsole>true</ExternalConsole>
+  </PropertyGroup>
   <ItemGroup>
     <None Include="..\.editorconfig" Link=".editorconfig" />
   </ItemGroup>
diff --git a/Client/Pages/Auth/Login.razor b/Client/Pages/Auth/Login.razor
index 96af7a1..96965ec 100644
--- a/Client/Pages/Auth/Login.razor
+++ b/Client/Pages/Auth/Login.razor
@@ -81,15 +81,19 @@
                                 <form>
                                     <p>Please login to your account</p>
 
+                                    <Microsoft.AspNetCore.Components.Forms.DataAnnotationsValidator/>
+
                                     <div class="form-outline mb-4">
                                         <input type="email" id="form2Example11" class="form-control"
                                                placeholder="Phone number or email address" @oninput="@(args => usernameInput(args.Value.ToString()))" @onkeydown="@Enter" />
                                         <label class="form-label" for="form2Example11">Username</label>
+                                        <Microsoft.AspNetCore.Components.Forms.ValidationMessage For="@(() => authenticatedUser.Username)"/>
                                     </div>
 
                                     <div class="form-outline mb-4">
                                         <input type="password" id="form2Example22" class="form-control" @oninput="@(args => passwordInput(args.Value.ToString()))" @onkeydown="@Enter" />
                                         <label class="form-label" for="form2Example22">Password</label>
+                                        <Microsoft.AspNetCore.Components.Forms.ValidationMessage For="@(() => authenticatedUser.Passsword)"/>
                                     </div>
 
                                     <div class="text-center pt-1 mb-5 pb-1">
diff --git a/Client/Properties/launchSettings.json b/Client/Properties/launchSettings.json
index 62cae75..94bcda6 100644
--- a/Client/Properties/launchSettings.json
+++ b/Client/Properties/launchSettings.json
@@ -8,23 +8,23 @@
   "profiles": {
     "http": {
       "commandName": "Project",
-      "dotnetRunMessages": true,
       "launchBrowser": true,
       "inspectUri": "{wsProtocol}://{url.hostname}:{url.port}/_framework/debug/ws-proxy?browser={browserInspectUri}",
       "applicationUrl": "http://localhost:5136",
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development"
-      }
+      },
+      "dotnetRunMessages": true
     },
     "https": {
       "commandName": "Project",
-      "dotnetRunMessages": true,
       "launchBrowser": true,
       "inspectUri": "{wsProtocol}://{url.hostname}:{url.port}/_framework/debug/ws-proxy?browser={browserInspectUri}",
       "applicationUrl": "https://localhost:7247;http://localhost:5136",
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development"
-      }
+      },
+      "dotnetRunMessages": true
     },
     "IIS Express": {
       "commandName": "IISExpress",
@@ -35,4 +35,4 @@
       }
     }
   }
-}
+}
\ No newline at end of file
diff --git a/Server/Biskilog Accounting.Server.csproj b/Server/Biskilog Accounting.Server.csproj
index 02e123a..6357be7 100644
--- a/Server/Biskilog Accounting.Server.csproj	
+++ b/Server/Biskilog Accounting.Server.csproj	
@@ -8,6 +8,8 @@
     <AssemblyName>$(AssemblyName.Replace(' ', '_'))</AssemblyName>
   </PropertyGroup>
 
+  <PropertyGroup Condition=" '$(RunConfiguration)' == 'https' " />
+  <PropertyGroup Condition=" '$(RunConfiguration)' == 'http' " />
 	<ItemGroup>
 		<PackageReference Include="Blazored.LocalStorage" Version="4.3.0" />
 		<PackageReference Include="Blazored.SessionStorage" Version="2.3.0" />
diff --git a/Server/Properties/launchSettings.json b/Server/Properties/launchSettings.json
index 5e250c1..6bad409 100644
--- a/Server/Properties/launchSettings.json
+++ b/Server/Properties/launchSettings.json
@@ -1,44 +1,44 @@
 {
+  "iisExpress": {
+    "applicationUrl": "http://localhost:24369",
+    "sslPort": 44366
+  },
+  "iisSettings": {
+    "windowsAuthentication": false,
+    "anonymousAuthentication": true,
+    "iisExpress": {
+      "applicationUrl": "http://localhost:54487/",
+      "sslPort": 44383
+    }
+  },
   "profiles": {
     "http": {
       "commandName": "Project",
       "launchBrowser": true,
+      "inspectUri": "{wsProtocol}://{url.hostname}:{url.port}/_framework/debug/ws-proxy?browser={browserInspectUri}",
+      "applicationUrl": "http://localhost:5136",
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development"
       },
-      "dotnetRunMessages": true,
-      "inspectUri": "{wsProtocol}://{url.hostname}:{url.port}/_framework/debug/ws-proxy?browser={browserInspectUri}",
-      "applicationUrl": "http://localhost:5136"
+      "dotnetRunMessages": true
     },
     "https": {
       "commandName": "Project",
       "launchBrowser": true,
+      "inspectUri": "{wsProtocol}://{url.hostname}:{url.port}/_framework/debug/ws-proxy?browser={browserInspectUri}",
+      "applicationUrl": "https://localhost:7247;http://localhost:5136",
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development"
       },
-      "dotnetRunMessages": true,
-      "inspectUri": "{wsProtocol}://{url.hostname}:{url.port}/_framework/debug/ws-proxy?browser={browserInspectUri}",
-      "applicationUrl": "https://localhost:7247;http://localhost:5136"
+      "dotnetRunMessages": true
     },
     "IIS Express": {
       "commandName": "IISExpress",
       "launchBrowser": true,
+      "inspectUri": "{wsProtocol}://{url.hostname}:{url.port}/_framework/debug/ws-proxy?browser={browserInspectUri}",
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development"
-      },
-      "inspectUri": "{wsProtocol}://{url.hostname}:{url.port}/_framework/debug/ws-proxy?browser={browserInspectUri}"
-    }
-  },
-  "iisExpress": {
-    "applicationUrl": "http://localhost:24369",
-    "sslPort": 44366
-  },
-  "iisSettings": {
-    "windowsAuthentication": false,
-    "anonymousAuthentication": true,
-    "iisExpress": {
-      "applicationUrl": "http://localhost:54487/",
-      "sslPort": 44383
+      }
     }
   }
 }
\ No newline at end of file
diff --git a/Shared/ClientContractModels/Userauth.cs b/Shared/ClientContractModels/Userauth.cs
index d8b010a..bcf8334 100644
--- a/Shared/ClientContractModels/Userauth.cs
+++ b/Shared/ClientContractModels/Userauth.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
 
 namespace Biskilog_Accounting.Shared.ClientContractModels;
 
@@ -9,10 +10,12 @@ public partial class Userauth
 
     public int ClientId { get; set; }
 
+    [Required(ErrorMessage = "Invalid username")]
     public string? Username { get; set; }
 
     public string? Email { get; set; }
 
+    [Required(ErrorMessage = "Invalid password")]
     public string? Passsword { get; set; }
 
     public string? PhoneNumber { get; set; }