From 87c89897c255db3048fad47fa28c9864cf6e0c5d Mon Sep 17 00:00:00 2001
From: Kham <Kham.vilaythong@health.nsw.gov.au>
Date: Tue, 16 Nov 2021 14:09:49 +1100
Subject: [PATCH] add new login post one.

---
 .../CarParkValidationAPI.csproj               |  1 +
 .../Repository/UserFakeRepository.cs          | 32 ++++++++---------
 .../Repository/UserRepository.cs              | 34 +++++++++----------
 3 files changed, 34 insertions(+), 33 deletions(-)

diff --git a/CarParkValidationAPI/CarParkValidationAPI.csproj b/CarParkValidationAPI/CarParkValidationAPI.csproj
index e5e76ee..b20778c 100644
--- a/CarParkValidationAPI/CarParkValidationAPI.csproj
+++ b/CarParkValidationAPI/CarParkValidationAPI.csproj
@@ -5,6 +5,7 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="8.1.1" />
     <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="5.0.9" />
     <PackageReference Include="Microsoft.EntityFrameworkCore" Version="5.0.9" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="5.0.9" />
diff --git a/CarParkValidationAPI/Repository/UserFakeRepository.cs b/CarParkValidationAPI/Repository/UserFakeRepository.cs
index 0204a96..785d336 100644
--- a/CarParkValidationAPI/Repository/UserFakeRepository.cs
+++ b/CarParkValidationAPI/Repository/UserFakeRepository.cs
@@ -89,10 +89,10 @@ namespace CarParkValidationAPI.Repository
             if (loginInfo != null && loginInfo.result)
             {
                 myUser = new User();
-                myUser.Email = loginInfo.Email;
-                myUser.FirstName = loginInfo.FirstName;
-                myUser.LastName = loginInfo.LastName;
-                myUser.Username = loginInfo.StafflinkNo;
+                myUser.Email = loginInfo.email;
+                myUser.FirstName = loginInfo.firstName;
+                myUser.LastName = loginInfo.lastName;
+                myUser.Username = loginInfo.stafflinkNo;
                 //now check the adminuser table
                 var user = _context.AdminUsers.SingleOrDefault(x => x.StafflinkNo == model.Username);
                 if (user != null)
@@ -178,10 +178,10 @@ namespace CarParkValidationAPI.Repository
             if (loginInfo != null && loginInfo.result)
             {
                 myUser = new User();
-                myUser.Email = loginInfo.Email;
-                myUser.FirstName = loginInfo.FirstName;
-                myUser.LastName = loginInfo.LastName;
-                myUser.Username = loginInfo.StafflinkNo;
+                myUser.Email = loginInfo.email;
+                myUser.FirstName = loginInfo.firstName;
+                myUser.LastName = loginInfo.lastName;
+                myUser.Username = loginInfo.stafflinkNo;
                 statuscode = 1;
             }
 
@@ -222,10 +222,10 @@ namespace CarParkValidationAPI.Repository
             MyADObject myADObj = staffLink.SearchStaff(username);
             User user = new()
             {
-                Username = myADObj.StafflinkNo,
-                Email = myADObj.Email,
-                FirstName = myADObj.FirstName,
-                LastName = myADObj.LastName
+                Username = myADObj.stafflinkNo,
+                Email = myADObj.email,
+                FirstName = myADObj.firstName,
+                LastName = myADObj.lastName
             };
             // myADObj.JobTitle;
             return user;
@@ -239,10 +239,10 @@ namespace CarParkValidationAPI.Repository
             MyADObject myADObj = staffLink.CheckADCredentials(username,password);
             User user = new()
             {
-                Username = myADObj.StafflinkNo,
-                Email = myADObj.Email,
-                FirstName = myADObj.FirstName,
-                LastName = myADObj.LastName
+                Username = myADObj.stafflinkNo,
+                Email = myADObj.email,
+                FirstName = myADObj.firstName,
+                LastName = myADObj.lastName
             };
             // myADObj.JobTitle;
             return user;
diff --git a/CarParkValidationAPI/Repository/UserRepository.cs b/CarParkValidationAPI/Repository/UserRepository.cs
index ee1f7e5..bd8f6d8 100644
--- a/CarParkValidationAPI/Repository/UserRepository.cs
+++ b/CarParkValidationAPI/Repository/UserRepository.cs
@@ -55,14 +55,14 @@ namespace CarParkValidationAPI.Repository
             int statuscode = 0;
             string webAPIUrl = _appSettings.LoginWebAPI;
             
-            var loginInfo = await CommonAD.WebAPIUtil.GetLoginADAsync(webAPIUrl, "CheckADCredentials", model.Username, model.Password);
+            var loginInfo = await CommonAD.WebAPIUtil.PostLoginADAsync(webAPIUrl, "CheckCredentials", model.Username, model.Password);
             if (loginInfo != null && loginInfo.result)
             {
                 myUser = new User();
-                myUser.Email = loginInfo.Email;
-                myUser.FirstName = loginInfo.FirstName;
-                myUser.LastName = loginInfo.LastName;
-                myUser.Username = loginInfo.StafflinkNo;
+                myUser.Email = loginInfo.email;
+                myUser.FirstName = loginInfo.firstName;
+                myUser.LastName = loginInfo.lastName;
+                myUser.Username = loginInfo.stafflinkNo;
                 //now check the adminuser table
                 var user = _context.AdminUsers.
                                   SingleOrDefault(x => x.StafflinkNo == model.Username 
@@ -154,10 +154,10 @@ namespace CarParkValidationAPI.Repository
             if (loginInfo != null && loginInfo.result)
             {
                 myUser = new User();
-                myUser.Email = loginInfo.Email;
-                myUser.FirstName = loginInfo.FirstName;
-                myUser.LastName = loginInfo.LastName;
-                myUser.Username = loginInfo.StafflinkNo;
+                myUser.Email = loginInfo.email;
+                myUser.FirstName = loginInfo.firstName;
+                myUser.LastName = loginInfo.lastName;
+                myUser.Username = loginInfo.stafflinkNo;
                 statuscode = 1;
             }
 
@@ -198,10 +198,10 @@ namespace CarParkValidationAPI.Repository
             MyADObject myADObj = staffLink.SearchStaff(username);
             User user = new()
             {
-                Username = myADObj.StafflinkNo,
-                Email = myADObj.Email,
-                FirstName = myADObj.FirstName,
-                LastName = myADObj.LastName
+                Username = myADObj.stafflinkNo,
+                Email = myADObj.email,
+                FirstName = myADObj.firstName,
+                LastName = myADObj.lastName
             };
             // myADObj.JobTitle;
             return user;
@@ -215,10 +215,10 @@ namespace CarParkValidationAPI.Repository
             MyADObject myADObj = staffLink.CheckADCredentials(username,password);
             User user = new()
             {
-                Username = myADObj.StafflinkNo,
-                Email = myADObj.Email,
-                FirstName = myADObj.FirstName,
-                LastName = myADObj.LastName
+                Username = myADObj.stafflinkNo,
+                Email = myADObj.email,
+                FirstName = myADObj.firstName,
+                LastName = myADObj.lastName
             };
             // myADObj.JobTitle;
             return user;