kham/carparkvalidation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add new login post one.

Browse Source
This commit is contained in:
Kham
2021-11-16 14:09:49 +11:00
parent 9dab5536c2
commit 87c89897c2
3 changed files with 34 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CarParkValidationAPI/CarParkValidationAPI.csproj
+1
View File
@@ -5,6 +5,7 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="8.1.1" />
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="5.0.9" /> <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="5.0.9" />
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="5.0.9" /> <PackageReference Include="Microsoft.EntityFrameworkCore" Version="5.0.9" />
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="5.0.9" /> <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="5.0.9" />
CarParkValidationAPI/Repository/UserFakeRepository.cs
+16 -16
View File
@@ -89,10 +89,10 @@ namespace CarParkValidationAPI.Repository
if (loginInfo != null && loginInfo.result) if (loginInfo != null && loginInfo.result)
{ {
myUser = new User(); myUser = new User();
myUser.Email = loginInfo.Email; myUser.Email = loginInfo.email;
myUser.FirstName = loginInfo.FirstName; myUser.FirstName = loginInfo.firstName;
myUser.LastName = loginInfo.LastName; myUser.LastName = loginInfo.lastName;
myUser.Username = loginInfo.StafflinkNo; myUser.Username = loginInfo.stafflinkNo;
//now check the adminuser table //now check the adminuser table
var user = _context.AdminUsers.SingleOrDefault(x => x.StafflinkNo == model.Username); var user = _context.AdminUsers.SingleOrDefault(x => x.StafflinkNo == model.Username);
if (user != null) if (user != null)
@@ -178,10 +178,10 @@ namespace CarParkValidationAPI.Repository
if (loginInfo != null && loginInfo.result) if (loginInfo != null && loginInfo.result)
{ {
myUser = new User(); myUser = new User();
myUser.Email = loginInfo.Email; myUser.Email = loginInfo.email;
myUser.FirstName = loginInfo.FirstName; myUser.FirstName = loginInfo.firstName;
myUser.LastName = loginInfo.LastName; myUser.LastName = loginInfo.lastName;
myUser.Username = loginInfo.StafflinkNo; myUser.Username = loginInfo.stafflinkNo;
statuscode = 1; statuscode = 1;
} }
@@ -222,10 +222,10 @@ namespace CarParkValidationAPI.Repository
MyADObject myADObj = staffLink.SearchStaff(username); MyADObject myADObj = staffLink.SearchStaff(username);
User user = new() User user = new()
{ {
Username = myADObj.StafflinkNo, Username = myADObj.stafflinkNo,
Email = myADObj.Email, Email = myADObj.email,
FirstName = myADObj.FirstName, FirstName = myADObj.firstName,
LastName = myADObj.LastName LastName = myADObj.lastName
}; };
// myADObj.JobTitle; // myADObj.JobTitle;
return user; return user;
@@ -239,10 +239,10 @@ namespace CarParkValidationAPI.Repository
MyADObject myADObj = staffLink.CheckADCredentials(username,password); MyADObject myADObj = staffLink.CheckADCredentials(username,password);
User user = new() User user = new()
{ {
Username = myADObj.StafflinkNo, Username = myADObj.stafflinkNo,
Email = myADObj.Email, Email = myADObj.email,
FirstName = myADObj.FirstName, FirstName = myADObj.firstName,
LastName = myADObj.LastName LastName = myADObj.lastName
}; };
// myADObj.JobTitle; // myADObj.JobTitle;
return user; return user;
CarParkValidationAPI/Repository/UserRepository.cs
+17 -17
View File
@@ -55,14 +55,14 @@ namespace CarParkValidationAPI.Repository
int statuscode = 0; int statuscode = 0;
string webAPIUrl = _appSettings.LoginWebAPI; 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) if (loginInfo != null && loginInfo.result)
{ {
myUser = new User(); myUser = new User();
myUser.Email = loginInfo.Email; myUser.Email = loginInfo.email;
myUser.FirstName = loginInfo.FirstName; myUser.FirstName = loginInfo.firstName;
myUser.LastName = loginInfo.LastName; myUser.LastName = loginInfo.lastName;
myUser.Username = loginInfo.StafflinkNo; myUser.Username = loginInfo.stafflinkNo;
//now check the adminuser table //now check the adminuser table
var user = _context.AdminUsers. var user = _context.AdminUsers.
SingleOrDefault(x => x.StafflinkNo == model.Username SingleOrDefault(x => x.StafflinkNo == model.Username
@@ -154,10 +154,10 @@ namespace CarParkValidationAPI.Repository
if (loginInfo != null && loginInfo.result) if (loginInfo != null && loginInfo.result)
{ {
myUser = new User(); myUser = new User();
myUser.Email = loginInfo.Email; myUser.Email = loginInfo.email;
myUser.FirstName = loginInfo.FirstName; myUser.FirstName = loginInfo.firstName;
myUser.LastName = loginInfo.LastName; myUser.LastName = loginInfo.lastName;
myUser.Username = loginInfo.StafflinkNo; myUser.Username = loginInfo.stafflinkNo;
statuscode = 1; statuscode = 1;
} }
@@ -198,10 +198,10 @@ namespace CarParkValidationAPI.Repository
MyADObject myADObj = staffLink.SearchStaff(username); MyADObject myADObj = staffLink.SearchStaff(username);
User user = new() User user = new()
{ {
Username = myADObj.StafflinkNo, Username = myADObj.stafflinkNo,
Email = myADObj.Email, Email = myADObj.email,
FirstName = myADObj.FirstName, FirstName = myADObj.firstName,
LastName = myADObj.LastName LastName = myADObj.lastName
}; };
// myADObj.JobTitle; // myADObj.JobTitle;
return user; return user;
@@ -215,10 +215,10 @@ namespace CarParkValidationAPI.Repository
MyADObject myADObj = staffLink.CheckADCredentials(username,password); MyADObject myADObj = staffLink.CheckADCredentials(username,password);
User user = new() User user = new()
{ {
Username = myADObj.StafflinkNo, Username = myADObj.stafflinkNo,
Email = myADObj.Email, Email = myADObj.email,
FirstName = myADObj.FirstName, FirstName = myADObj.firstName,
LastName = myADObj.LastName LastName = myADObj.lastName
}; };
// myADObj.JobTitle; // myADObj.JobTitle;
return user; return user;