first time include all file

This commit is contained in:
2026-06-18 21:39:20 +10:00
commit d48a07a0fe
285 changed files with 31416 additions and 0 deletions
+25
View File
@@ -0,0 +1,25 @@
**/.classpath
**/.dockerignore
**/.env
**/.git
**/.gitignore
**/.project
**/.settings
**/.toolstarget
**/.vs
**/.vscode
**/*.*proj.user
**/*.dbmdl
**/*.jfm
**/azds.yaml
**/bin
**/charts
**/docker-compose*
**/Dockerfile*
**/node_modules
**/npm-debug.log
**/obj
**/secrets.dev.yaml
**/values.dev.yaml
LICENSE
README.md
+63
View File
@@ -0,0 +1,63 @@
###############################################################################
# Set default behavior to automatically normalize line endings.
###############################################################################
* text=auto
###############################################################################
# Set default behavior for command prompt diff.
#
# This is need for earlier builds of msysgit that does not have it on by
# default for csharp files.
# Note: This is only used by command line
###############################################################################
#*.cs diff=csharp
###############################################################################
# Set the merge driver for project and solution files
#
# Merging from the command prompt will add diff markers to the files if there
# are conflicts (Merging from VS is not affected by the settings below, in VS
# the diff markers are never inserted). Diff markers may cause the following
# file extensions to fail to load in VS. An alternative would be to treat
# these files as binary and thus will always conflict and require user
# intervention with every merge. To do so, just uncomment the entries below
###############################################################################
#*.sln merge=binary
#*.csproj merge=binary
#*.vbproj merge=binary
#*.vcxproj merge=binary
#*.vcproj merge=binary
#*.dbproj merge=binary
#*.fsproj merge=binary
#*.lsproj merge=binary
#*.wixproj merge=binary
#*.modelproj merge=binary
#*.sqlproj merge=binary
#*.wwaproj merge=binary
###############################################################################
# behavior for image files
#
# image files are treated as binary by default.
###############################################################################
#*.jpg binary
#*.png binary
#*.gif binary
###############################################################################
# diff behavior for common document formats
#
# Convert binary document formats to text before diffing them. This feature
# is only available from the command line. Turn it on by uncommenting the
# entries below.
###############################################################################
#*.doc diff=astextplain
#*.DOC diff=astextplain
#*.docx diff=astextplain
#*.DOCX diff=astextplain
#*.dot diff=astextplain
#*.DOT diff=astextplain
#*.pdf diff=astextplain
#*.PDF diff=astextplain
#*.rtf diff=astextplain
#*.RTF diff=astextplain
+363
View File
@@ -0,0 +1,363 @@
## Ignore Visual Studio temporary files, build results, and
## files generated by popular Visual Studio add-ons.
##
## Get latest from https://github.com/github/gitignore/blob/master/VisualStudio.gitignore
# User-specific files
*.rsuser
*.suo
*.user
*.userosscache
*.sln.docstates
# User-specific files (MonoDevelop/Xamarin Studio)
*.userprefs
# Mono auto generated files
mono_crash.*
# Build results
[Dd]ebug/
[Dd]ebugPublic/
[Rr]elease/
[Rr]eleases/
x64/
x86/
[Ww][Ii][Nn]32/
[Aa][Rr][Mm]/
[Aa][Rr][Mm]64/
bld/
[Bb]in/
[Oo]bj/
[Oo]ut/
[Ll]og/
[Ll]ogs/
# Visual Studio 2015/2017 cache/options directory
.vs/
# Uncomment if you have tasks that create the project's static files in wwwroot
#wwwroot/
# Visual Studio 2017 auto generated files
Generated\ Files/
# MSTest test Results
[Tt]est[Rr]esult*/
[Bb]uild[Ll]og.*
# NUnit
*.VisualState.xml
TestResult.xml
nunit-*.xml
# Build Results of an ATL Project
[Dd]ebugPS/
[Rr]eleasePS/
dlldata.c
# Benchmark Results
BenchmarkDotNet.Artifacts/
# .NET Core
project.lock.json
project.fragment.lock.json
artifacts/
# ASP.NET Scaffolding
ScaffoldingReadMe.txt
# StyleCop
StyleCopReport.xml
# Files built by Visual Studio
*_i.c
*_p.c
*_h.h
*.ilk
*.meta
*.obj
*.iobj
*.pch
*.pdb
*.ipdb
*.pgc
*.pgd
*.rsp
*.sbr
*.tlb
*.tli
*.tlh
*.tmp
*.tmp_proj
*_wpftmp.csproj
*.log
*.vspscc
*.vssscc
.builds
*.pidb
*.svclog
*.scc
# Chutzpah Test files
_Chutzpah*
# Visual C++ cache files
ipch/
*.aps
*.ncb
*.opendb
*.opensdf
*.sdf
*.cachefile
*.VC.db
*.VC.VC.opendb
# Visual Studio profiler
*.psess
*.vsp
*.vspx
*.sap
# Visual Studio Trace Files
*.e2e
# TFS 2012 Local Workspace
$tf/
# Guidance Automation Toolkit
*.gpState
# ReSharper is a .NET coding add-in
_ReSharper*/
*.[Rr]e[Ss]harper
*.DotSettings.user
# TeamCity is a build add-in
_TeamCity*
# DotCover is a Code Coverage Tool
*.dotCover
# AxoCover is a Code Coverage Tool
.axoCover/*
!.axoCover/settings.json
# Coverlet is a free, cross platform Code Coverage Tool
coverage*.json
coverage*.xml
coverage*.info
# Visual Studio code coverage results
*.coverage
*.coveragexml
# NCrunch
_NCrunch_*
.*crunch*.local.xml
nCrunchTemp_*
# MightyMoose
*.mm.*
AutoTest.Net/
# Web workbench (sass)
.sass-cache/
# Installshield output folder
[Ee]xpress/
# DocProject is a documentation generator add-in
DocProject/buildhelp/
DocProject/Help/*.HxT
DocProject/Help/*.HxC
DocProject/Help/*.hhc
DocProject/Help/*.hhk
DocProject/Help/*.hhp
DocProject/Help/Html2
DocProject/Help/html
# Click-Once directory
publish/
# Publish Web Output
*.[Pp]ublish.xml
*.azurePubxml
# Note: Comment the next line if you want to checkin your web deploy settings,
# but database connection strings (with potential passwords) will be unencrypted
*.pubxml
*.publishproj
# Microsoft Azure Web App publish settings. Comment the next line if you want to
# checkin your Azure Web App publish settings, but sensitive information contained
# in these scripts will be unencrypted
PublishScripts/
# NuGet Packages
*.nupkg
# NuGet Symbol Packages
*.snupkg
# The packages folder can be ignored because of Package Restore
**/[Pp]ackages/*
# except build/, which is used as an MSBuild target.
!**/[Pp]ackages/build/
# Uncomment if necessary however generally it will be regenerated when needed
#!**/[Pp]ackages/repositories.config
# NuGet v3's project.json files produces more ignorable files
*.nuget.props
*.nuget.targets
# Microsoft Azure Build Output
csx/
*.build.csdef
# Microsoft Azure Emulator
ecf/
rcf/
# Windows Store app package directories and files
AppPackages/
BundleArtifacts/
Package.StoreAssociation.xml
_pkginfo.txt
*.appx
*.appxbundle
*.appxupload
# Visual Studio cache files
# files ending in .cache can be ignored
*.[Cc]ache
# but keep track of directories ending in .cache
!?*.[Cc]ache/
# Others
ClientBin/
~$*
*~
*.dbmdl
*.dbproj.schemaview
*.jfm
*.pfx
*.publishsettings
orleans.codegen.cs
# Including strong name files can present a security risk
# (https://github.com/github/gitignore/pull/2483#issue-259490424)
#*.snk
# Since there are multiple workflows, uncomment next line to ignore bower_components
# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622)
#bower_components/
# RIA/Silverlight projects
Generated_Code/
# Backup & report files from converting an old project file
# to a newer Visual Studio version. Backup files are not needed,
# because we have git ;-)
_UpgradeReport_Files/
Backup*/
UpgradeLog*.XML
UpgradeLog*.htm
ServiceFabricBackup/
*.rptproj.bak
# SQL Server files
*.mdf
*.ldf
*.ndf
# Business Intelligence projects
*.rdl.data
*.bim.layout
*.bim_*.settings
*.rptproj.rsuser
*- [Bb]ackup.rdl
*- [Bb]ackup ([0-9]).rdl
*- [Bb]ackup ([0-9][0-9]).rdl
# Microsoft Fakes
FakesAssemblies/
# GhostDoc plugin setting file
*.GhostDoc.xml
# Node.js Tools for Visual Studio
.ntvs_analysis.dat
node_modules/
# Visual Studio 6 build log
*.plg
# Visual Studio 6 workspace options file
*.opt
# Visual Studio 6 auto-generated workspace file (contains which files were open etc.)
*.vbw
# Visual Studio LightSwitch build output
**/*.HTMLClient/GeneratedArtifacts
**/*.DesktopClient/GeneratedArtifacts
**/*.DesktopClient/ModelManifest.xml
**/*.Server/GeneratedArtifacts
**/*.Server/ModelManifest.xml
_Pvt_Extensions
# Paket dependency manager
.paket/paket.exe
paket-files/
# FAKE - F# Make
.fake/
# CodeRush personal settings
.cr/personal
# Python Tools for Visual Studio (PTVS)
__pycache__/
*.pyc
# Cake - Uncomment if you are using it
# tools/**
# !tools/packages.config
# Tabs Studio
*.tss
# Telerik's JustMock configuration file
*.jmconfig
# BizTalk build output
*.btp.cs
*.btm.cs
*.odx.cs
*.xsd.cs
# OpenCover UI analysis results
OpenCover/
# Azure Stream Analytics local run output
ASALocalRun/
# MSBuild Binary and Structured Log
*.binlog
# NVidia Nsight GPU debugger configuration file
*.nvuser
# MFractors (Xamarin productivity tool) working folder
.mfractor/
# Local History for Visual Studio
.localhistory/
# BeatPulse healthcheck temp database
healthchecksdb
# Backup folder for Package Reference Convert tool in Visual Studio 2017
MigrationBackup/
# Ionide (cross platform F# VS Code tools) working folder
.ionide/
# Fody - auto-generated XML schema
FodyWeavers.xsd
+37
View File
@@ -0,0 +1,37 @@
Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 17
VisualStudioVersion = 17.6.33815.320
MinimumVisualStudioVersion = 10.0.40219.1
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CarParkValidationAPI", "CarParkValidationAPI\CarParkValidationAPI.csproj", "{FCD8F53F-967F-4E66-B42C-DCD0C83B2670}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CommonAD", "CommonAD\CommonAD.csproj", "{1BDD9446-452B-4303-880C-6527161CB31D}"
EndProject
Project("{E53339B2-1760-4266-BCC7-CA923CBCF16C}") = "docker-compose", "docker-compose.dcproj", "{0F6F1F65-C99F-4C4B-B26C-B3FE044841DF}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{FCD8F53F-967F-4E66-B42C-DCD0C83B2670}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{FCD8F53F-967F-4E66-B42C-DCD0C83B2670}.Debug|Any CPU.Build.0 = Debug|Any CPU
{FCD8F53F-967F-4E66-B42C-DCD0C83B2670}.Release|Any CPU.ActiveCfg = Release|Any CPU
{FCD8F53F-967F-4E66-B42C-DCD0C83B2670}.Release|Any CPU.Build.0 = Release|Any CPU
{1BDD9446-452B-4303-880C-6527161CB31D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{1BDD9446-452B-4303-880C-6527161CB31D}.Debug|Any CPU.Build.0 = Debug|Any CPU
{1BDD9446-452B-4303-880C-6527161CB31D}.Release|Any CPU.ActiveCfg = Release|Any CPU
{1BDD9446-452B-4303-880C-6527161CB31D}.Release|Any CPU.Build.0 = Release|Any CPU
{0F6F1F65-C99F-4C4B-B26C-B3FE044841DF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{0F6F1F65-C99F-4C4B-B26C-B3FE044841DF}.Debug|Any CPU.Build.0 = Debug|Any CPU
{0F6F1F65-C99F-4C4B-B26C-B3FE044841DF}.Release|Any CPU.ActiveCfg = Release|Any CPU
{0F6F1F65-C99F-4C4B-B26C-B3FE044841DF}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {B6C27BFF-4D28-4CB3-954C-F3B6C100B5EC}
EndGlobalSection
EndGlobal
@@ -0,0 +1,12 @@
{
"version": 1,
"isRoot": true,
"tools": {
"dotnet-ef": {
"version": "5.0.9",
"commands": [
"dotnet-ef"
]
}
}
}
@@ -0,0 +1,8 @@
using System;
namespace CarParkValidationAPI.Authorization
{
[AttributeUsage(AttributeTargets.Method)]
public class AllowAnonymousAttribute : Attribute
{ }
}
@@ -0,0 +1,13 @@
using System.ComponentModel.DataAnnotations;
namespace CarParkValidationAPI.Models.Users
{
public class AuthenticateRequest
{
[Required]
public string Username { get; set; }
[Required]
public string Password { get; set; }
}
}
@@ -0,0 +1,25 @@
using CarParkValidationAPI.Entities;
public class AuthenticateResponse
{
public int Id { get; set; }
public string FirstName { get; set; }
public string LastName { get; set; }
public string Username { get; set; }
public int? Role { get; set; }
public int ValidationPointId { get; set; }
public string Token { get; set; }
public string Email { get; set; }
public AuthenticateResponse(User user, string token)
{
Id = user.Id;
FirstName = user.FirstName;
LastName = user.LastName;
Username = user.Username;
Email = user.Email;
Role = user.Role;
Token = token;
ValidationPointId = user.ValidationPointId;
}
}
@@ -0,0 +1,39 @@
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.Mvc.Filters;
using System;
using System.Collections.Generic;
using System.Linq;
using CarParkValidationAPI.Entities;
using CarParkValidationAPI.Models;
namespace CarParkValidationAPI.Authorization
{
[AttributeUsage(AttributeTargets.Class | AttributeTargets.Method)]
public class AuthorizeAttribute : Attribute, IAuthorizationFilter
{
private readonly IList<AdminRole> _roles;
public AuthorizeAttribute(params AdminRole[] roles)
{
_roles = roles ?? new AdminRole[] { };
}
public void OnAuthorization(AuthorizationFilterContext context)
{
// skip authorization if action is decorated with [AllowAnonymous] attribute
var allowAnonymous = context.ActionDescriptor.EndpointMetadata.OfType<AllowAnonymousAttribute>().Any();
if (allowAnonymous)
return;
// authorization
var user = (User)context.HttpContext.Items["User"];
if (user == null || (_roles.Any() && !_roles.Contains((AdminRole)user.Role)))
{
// not logged in or role not authorized
context.Result = new JsonResult(new { message = "Unauthorized" }) { StatusCode = StatusCodes.Status401Unauthorized };
}
}
}
}
@@ -0,0 +1,35 @@
using Microsoft.AspNetCore.Http;
using Microsoft.Extensions.Options;
using System.Linq;
using System.Threading.Tasks;
using CarParkValidationAPI.Models;
using CarParkValidationAPI.Interface;
namespace CarParkValidationAPI.Authorization
{
public class JwtMiddleware(RequestDelegate next, IOptions<AppSettings> appSettings)
{
private readonly AppSettings _appSettings = appSettings.Value;
public async Task Invoke(HttpContext context, IUserService userService, IJwtUtils jwtUtils)
{
string? token = context.Request.Headers.Authorization.FirstOrDefault()?.Split(" ").Last();
if (null == token)
context.Request.Cookies.TryGetValue("token", out token);
var user = jwtUtils.ValidateJwtToken(token);
if (user != null)
{
// attach user to context on successful jwt validation
//here to put in the real user
//TODO if you want to add information for User
context.Items["User"] = user;
}
await next(context);
}
}
}
@@ -0,0 +1,102 @@
using Microsoft.Extensions.Options;
using Microsoft.IdentityModel.Tokens;
using System;
using System.IdentityModel.Tokens.Jwt;
using System.Linq;
using System.Security.Claims;
using System.Text;
using CarParkValidationAPI.Entities;
using CarParkValidationAPI.Interface;
using CarParkValidationAPI.Models;
namespace CarParkValidationAPI.Authorization
{
public class JwtUtils : IJwtUtils
{
private readonly AppSettings _appSettings;
public JwtUtils(IOptions<AppSettings> appSettings)
{
_appSettings = appSettings.Value;
}
public string GenerateJwtToken(User user)
{
// generate token that is valid for 2 days
var tokenHandler = new JwtSecurityTokenHandler();
var key = Encoding.ASCII.GetBytes(_appSettings.Secret);
var tokenDescriptor = new SecurityTokenDescriptor
{
Subject = new ClaimsIdentity(new[] {
new Claim("id", user.Id.ToString()),
new Claim("subject", user.Username)
//add more if we need it
}
),
Expires = DateTime.UtcNow.AddDays(2),
SigningCredentials = new SigningCredentials(new SymmetricSecurityKey(key), SecurityAlgorithms.HmacSha256Signature)
};
var token = tokenHandler.CreateToken(tokenDescriptor);
return tokenHandler.WriteToken(token);
}
// get back id and username. in subject
public User? ValidateJwtToken(string token)
{
if (token == null)
return null;
var tokenHandler = new JwtSecurityTokenHandler();
var key = Encoding.ASCII.GetBytes(_appSettings.Secret);
try
{
tokenHandler.ValidateToken(token, new TokenValidationParameters
{
ValidateIssuerSigningKey = true,
IssuerSigningKey = new SymmetricSecurityKey(key),
ValidateIssuer = false,
ValidateAudience = false,
// set clockskew to zero so tokens expire exactly at token expiration time (instead of 5 minutes later)
ClockSkew = TimeSpan.Zero
}, out SecurityToken validatedToken);
var jwtToken = (JwtSecurityToken)validatedToken;
// var userId = int.Parse(jwtToken.Claims.First(x => x.Type == "id").Value); //old
int userId = 0;
string username = "";
Claim claim;
for (int i = 0; i< jwtToken.Claims.Count(); i++)
{
claim = jwtToken.Claims.ElementAt(i);
if (claim.Type == "id")
{
userId = int.Parse(claim.Value);
}
else if (claim.Type == "subject")
{
username = claim.Value;
}
if (!string.IsNullOrEmpty(username) && userId > 0)
{
break;
}
}
User user = new();
user.Id = userId;
user.Username = username;
// return user id from JWT token if validation successful
return user;
}
catch
{
// return null if validation fails
return null;
}
}
}
}
@@ -0,0 +1,36 @@
<Project Sdk="Microsoft.NET.Sdk.Web">
<PropertyGroup>
<TargetFramework>net10.0</TargetFramework>
<DockerDefaultTargetOS>Windows</DockerDefaultTargetOS>
<DockerComposeProjectPath>..\docker-compose.dcproj</DockerComposeProjectPath>
<LangVersion>14</LangVersion>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Azure.Core" Version="1.56.0" />
<PackageReference Include="Azure.Identity" Version="1.21.0" />
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="10.0.8" />
<PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="10.0.8" />
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="10.0.8" />
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="10.0.8" />
<PackageReference Include="Microsoft.IdentityModel.Tokens" Version="8.18.0" />
<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.23.0" />
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="10.0.1" />
<PackageReference Include="SpreadsheetLight" Version="3.5.0" />
<PackageReference Include="Swashbuckle.AspNetCore" Version="10.1.7" />
<PackageReference Include="System.Drawing.Common" Version="10.0.8" />
<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="8.18.0" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\CommonAD\CommonAD.csproj" />
</ItemGroup>
<ItemGroup>
<Content Update="appsettings.json">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
</ItemGroup>
</Project>
@@ -0,0 +1,62 @@
using Microsoft.AspNetCore.Mvc;
using CarParkValidationAPI.Authorization;
using CarParkValidationAPI.Entities;
using CarParkValidationAPI.Models;
using CarParkValidationAPI.Interface;
using System.Threading.Tasks;
namespace CarParkValidationAPI.Controllers
{
// [Authorize]
[ApiController]
[Route("api/v1/[controller]")]
public class AdminUserController : ControllerBase
{
private IAdminUser _adminUser;
public AdminUserController(IAdminUser adminUser)
{
_adminUser = adminUser;
}
[HttpPost]
public async Task<IActionResult> AdminUser([FromBody] AdminUserDto model)
{
var currentUser = (User)HttpContext.Items["User"];
if (null == currentUser)
return Unauthorized(new { message = "Unauthorized" });
_adminUser.SetCurrentUser(currentUser.Username);
var response = await _adminUser.SaveAdminUserAsync(model);
return Ok(response);
}
[HttpGet]
public async Task<IActionResult> AdminUser(bool onlyActive=true)
{
var retval = await _adminUser.LoadAdminUserAsync(onlyActive);
return Ok(retval);
}
[HttpGet("{id:int}")]
public async Task<IActionResult> AdminUser(int id)
{
/*
// only admins can access other user records
var currentUser = (User)HttpContext.Items["User"];
if (id != currentUser.Id && currentUser.Role != Role.Admin)
return Unauthorized(new { message = "Unauthorized" });
*/
var retval = await _adminUser.LoadAdminUserByIdAsync(id);
return Ok(retval);
}
[HttpDelete("{id:int}")]
public async Task<IActionResult> DeleteAdminUser(int id)
{
var currentUser = (User)HttpContext.Items["User"];
if (null == currentUser)
return Unauthorized(new { message = "Unauthorized" });
_adminUser.SetCurrentUser(currentUser.Username);
var retval = await _adminUser.DeleteAdminUserAsync(id);
return Ok(retval);
}
}
}
@@ -0,0 +1,68 @@
using Microsoft.AspNetCore.Mvc;
using CarParkValidationAPI.Authorization;
using CarParkValidationAPI.Entities;
using CarParkValidationAPI.Models;
using CarParkValidationAPI.Interface;
using System.Threading.Tasks;
namespace CarParkValidationAPI.Controllers
{
//[Authorize]
[ApiController]
[Route("api/v1/[controller]")]
public class ConcessionTypeController : ControllerBase
{
private IConcessionType _concessionType;
public ConcessionTypeController(IConcessionType concessionType)
{
_concessionType = concessionType;
}
[HttpPost]
public async Task<IActionResult> ConcessionType([FromBody] ConcessionTypeDto model)
{
var currentUser = (User)HttpContext.Items["User"];
if (null == currentUser)
return Unauthorized(new { message = "Unauthorized" });
_concessionType.SetCurrentUser(currentUser.Username);
if (!ModelState.IsValid)
return BadRequest(ModelState);
var response = await _concessionType.SaveConcessionTypeAsync(model);
return Ok(response);
}
[HttpGet]
public async Task<IActionResult> ConcessionType(bool onlyActive =true)
{
var retval = await _concessionType.LoadConcessionTypeAsync(onlyActive);
return Ok(retval);
}
[HttpGet("{id:int}")]
public async Task<IActionResult> ConcessionType(int id)
{
/*
// only admins can access other user records
var currentUser = (User)HttpContext.Items["User"];
if (id != currentUser.Id && currentUser.Role != Role.Admin)
return Unauthorized(new { message = "Unauthorized" });
*/
var retval = await _concessionType.LoadConcessionTypeByIdAsync(id);
return Ok(retval);
}
[HttpDelete("{id:int}")]
public async Task<IActionResult> DeleteConcessionType(int id)
{
/*
// only admins can access other user records
var currentUser = (User)HttpContext.Items["User"];
if (id != currentUser.Id && currentUser.Role != Role.Admin)
return Unauthorized(new { message = "Unauthorized" });
*/
var retval = await _concessionType.DeleteConcessionTypeAsync(id);
return Ok(retval);
}
}
}
@@ -0,0 +1,106 @@
using Microsoft.AspNetCore.Mvc;
using CarParkValidationAPI.Authorization;
using CarParkValidationAPI.Entities;
using CarParkValidationAPI.Models;
using CarParkValidationAPI.Interface;
using System.Threading.Tasks;
using System;
using Microsoft.AspNetCore.StaticFiles;
using CarParkValidationAPI.Repository;
namespace CarParkValidationAPI.Controllers
{
// [Authorize]
[ApiController]
[Route("api/v1/[controller]")]
public class ConcessionValidationController : ControllerBase
{
private ConcessionValidationReportRepository _concessionValidationReport;
private IConcessionValidation _concessionValidation;
private readonly FileExtensionContentTypeProvider _contentTypeProvider;
public ConcessionValidationController(IConcessionValidation concessionValidation,
ConcessionValidationReportRepository concesionReportReport)
{
_concessionValidationReport = concesionReportReport;
_concessionValidation = concessionValidation;
}
[HttpPost]
public async Task<IActionResult> ConcessionValidation([FromBody] ConcessionValidationDto model)
{
var currentUser = (User)HttpContext.Items["User"];
if (null == currentUser)
return Unauthorized(new { message = "Unauthorized" });
_concessionValidation.SetCurrentUser(currentUser.Username);
var response = await _concessionValidation.SaveConcessionValidationAsync(model);
return Ok(response);
}
[HttpGet]
public async Task<IActionResult> ConcessionValidation(bool onlyActive=true)
{
var retval = await _concessionValidation.LoadConcessionValidationAsync(onlyActive);
return Ok(retval);
}
[HttpGet("[action]")]
public async Task<IActionResult> ConcessionValidationByStaff(string staffLinkNo, DateTime fromDate, DateTime toDate)
{
var retval = await _concessionValidation.LoadConcessionValidationStaffLinkNoAsync(staffLinkNo, fromDate, toDate);
return Ok(retval);
}
[HttpGet("[action]")]
public async Task<IActionResult> CheckConcessionValidationByStaff(string staffLinkNo, string concessionCard, DateTime currentDate, int id)
{
var retval = await _concessionValidation.CheckConcessionValidationStaffLinkNoAsync(staffLinkNo, concessionCard, currentDate, id);
return Ok(retval);
}
[HttpGet("{id}")]
public async Task<IActionResult> ConcessionValidation(int id)
{
/*
// only admins can access other user records
var currentUser = (User)HttpContext.Items["User"];
if (id != currentUser.Id && currentUser.Role != Role.Admin)
return Unauthorized(new { message = "Unauthorized" });
*/
var retval = await _concessionValidation.LoadConcessionValidationByIdAsync(id);
return Ok(retval);
}
[HttpDelete("{id:int}")]
public async Task<IActionResult> DeleteConcessionValidation(int id)
{
// only admins can access other user records
var currentUser = (User)HttpContext.Items["User"];
if (null == currentUser)
return Unauthorized(new { message = "Unauthorized" });
_concessionValidation.SetCurrentUser(currentUser.Username);
var retval = await _concessionValidation.DeleteConcessionValidationAsync(id);
return Ok(retval);
}
/* download the excel file */
[HttpGet("[action]")]
public async Task<IActionResult> GetReportFile(DateTime fromDate , DateTime toDate)
{
// this.Response.Headers.Add("Access-Control-Expose-Headers", "Content-Disposition");
var result = await _concessionValidationReport.GetConcessionValidationReport(fromDate, toDate); // _concessionValidation.GetReport(fromDate, toDate);
string fileContentType = "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"; //Map(result.Data.FileName);
return File(result.Data.Content, fileContentType, result.Data.FileName);
}
[NonAction]
private string Map(string fileName)
{
if (!_contentTypeProvider.TryGetContentType(fileName, out string contentType))
{
contentType = "application/octet-stream";
}
return contentType;
}
}
}
@@ -0,0 +1,18 @@
using Microsoft.AspNetCore.Mvc;
using System;
using System.Collections.Generic;
using System.Linq;
using System.IO;
using System.Threading.Tasks;
namespace CarParkValidationAPI.Controllers
{
public class FallbackController : Controller
{
public IActionResult Index()
{
return PhysicalFile(Path.Combine(Directory.GetCurrentDirectory(),
"wwwroot", "index.html"), "text/HTML");
}
}
}
@@ -0,0 +1,37 @@
using Microsoft.AspNetCore.Mvc;
using CarParkValidationAPI.Authorization;
using CarParkValidationAPI.Entities;
using CarParkValidationAPI.Models;
using CarParkValidationAPI.Interface;
using System.Threading.Tasks;
namespace CarParkValidationAPI.Controllers
{
// [Authorize]
[ApiController]
[Route("api/v1/[controller]")]
public class LookupCodeController : ControllerBase
{
private readonly ILookupCode _lookupCodeService;
public LookupCodeController(ILookupCode lookupCode)
{
_lookupCodeService = lookupCode;
}
[HttpGet("[action]")]
public async Task<IActionResult> ConcessionTypes(bool onlyActive=true)
{
var retval = await _lookupCodeService.LoadConcessionTypeAsync(onlyActive);
return Ok(retval);
}
[HttpGet("[action]")]
public async Task<IActionResult> ValidationPoints(bool onlyActive= true)
{
var retval = await _lookupCodeService.LoadValidationPointAsync(onlyActive);
return Ok(retval);
}
}
}
@@ -0,0 +1,112 @@
using System;
using Microsoft.AspNetCore.Mvc;
using CarParkValidationAPI.Authorization;
using CarParkValidationAPI.Entities;
using CarParkValidationAPI.Models.Users;
using CarParkValidationAPI.Interface;
using System.Threading.Tasks;
using CarParkValidationAPI.Models;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Identity.Data;
namespace CarParkValidationAPI.Controllers
{
// [Authorize]
[ApiController]
[Route("api/v1/[controller]")]
public class UsersController : ControllerBase
{
private IUserService _userService;
public UsersController(IUserService userService)
{
_userService = userService;
}
[AllowAnonymous]
[HttpPost("[action]")]
public IActionResult Authenticate([FromBody] AuthenticateRequest model)
{
var response = _userService.Authenticate(model);
return Ok(response);
}
[AllowAnonymous]
[HttpPost("[action]")]
public async Task<IActionResult> LoginAD([FromBody] AuthenticateRequest model)
{
var response = await _userService.LoginAD(model);
// Configure cookie options
var cookieOptions = new CookieOptions
{
HttpOnly = true, // Blocks client-side JavaScript reading/theft
Secure = true, // Requires HTTPS connections
SameSite = SameSiteMode.Unspecified, // Prevents CSRF attacks
Expires = DateTimeOffset.UtcNow.AddDays(1), // Match your token lifespan
Path = "/" // Accessible across entire domain structure
};
var jwttoken = response.Data.Token;
// Write cookie into response headers
Response.Cookies.Append("token", jwttoken, cookieOptions);
return Ok(response);
}
[AllowAnonymous]
// 3. POST: api/auth/logout
[HttpPost("[action]")]
public IActionResult Logout()
{
// Erase cookie immediately by forcing an expired timestamp
Response.Cookies.Delete("token", new CookieOptions
{
HttpOnly = true,
Secure = true,
SameSite = SameSiteMode.Unspecified,
Path = "/"
});
return Ok(new { message = "Logged out successfully" });
}
[AllowAnonymous]
[HttpPost("[action]")]
public async Task<IActionResult> LoginApiAD([FromBody] AuthenticateRequest model)
{
var response = await _userService.LoginApiAD(model);
// Configure cookie options
var cookieOptions = new CookieOptions
{
HttpOnly = true, // Blocks client-side JavaScript reading/theft
Secure = true, // Requires HTTPS connections
SameSite = SameSiteMode.Unspecified, // Prevents CSRF attacks
Expires = DateTimeOffset.UtcNow.AddDays(1), // Match your token lifespan
Path = "/" // Accessible across entire domain structure
};
var jwttoken = response.Data.Token;
// Write cookie into response headers
Response.Cookies.Append("token", jwttoken, cookieOptions);
return Ok(response);
}
[AllowAnonymous]
[HttpGet("[action]")]
public async Task<IActionResult> SearchApiStaff(string stafflinkNo)
{
var user = await _userService.SearchApiStaff(stafflinkNo);
return Ok(user);
}
[AllowAnonymous]
[HttpGet("[action]")]
public async Task<ResultModel<User>> SearchADStaff(string stafflinkNo)
{
var user = await _userService.SearchADStaff(stafflinkNo);
return user;
}
}
}
@@ -0,0 +1,71 @@
using Microsoft.AspNetCore.Mvc;
using CarParkValidationAPI.Authorization;
using CarParkValidationAPI.Entities;
using CarParkValidationAPI.Models;
using CarParkValidationAPI.Interface;
using System.Threading.Tasks;
namespace CarParkValidationAPI.Controllers
{
/* [Authorize] */
[ApiController]
[Route("api/v1/[controller]")]
public class ValidationPointController : ControllerBase
{
private IValidationPoint _validationPoint;
public ValidationPointController(IValidationPoint validationPoint)
{
_validationPoint = validationPoint;
}
[HttpPost]
public async Task<IActionResult> ValidationPoint([FromBody] ValidationPointDto model)
{
// Look for the cookie by its string key
if (!Request.Cookies.TryGetValue("token", out string token))
{
return Unauthorized(new { message = "Not authenticated" });
}
var currentUser = (User)HttpContext.Items["User"];
if (null == currentUser)
return Unauthorized(new { message = "Unauthorized" });
_validationPoint.SetCurrentUser(currentUser.Username);
var response = await _validationPoint.SaveValidationPointAsync(model);
return Ok(response);
}
[HttpGet]
public async Task<IActionResult> ValidationPoint(bool onlyActive=true)
{
var retval = await _validationPoint.LoadValidationPointAsync(onlyActive);
return Ok(retval);
}
[HttpGet("{id:int}")]
public async Task<IActionResult> ValidationPoint(int id)
{
/*
// only admins can access other user records
var currentUser = (User)HttpContext.Items["User"];
if (id != currentUser.Id && currentUser.Role != Role.Admin)
return Unauthorized(new { message = "Unauthorized" });
*/
var retval = await _validationPoint.LoadValidationPointByIdAsync(id);
return Ok(retval);
}
[HttpDelete("{id:int}")]
public async Task<IActionResult> DeleteConcessionType(int id)
{
// only admins can access other user records
var currentUser = (User)HttpContext.Items["User"];
if (null == currentUser)
return Unauthorized(new { message = "Unauthorized" });
_validationPoint.SetCurrentUser(currentUser.Username);
var retval = await _validationPoint.DeleteValidationPointAsync(id);
return Ok(retval);
}
}
}
+255
View File
@@ -0,0 +1,255 @@
using Microsoft.EntityFrameworkCore;
using Microsoft.Extensions.Configuration;
using CarParkValidationAPI.Entities;
using CarParkValidationAPI.Models;
using Microsoft.Extensions.Options;
//using Microsoft.Data.SqlClient;
using System;
using System.Collections.Generic;
using System.Threading.Tasks;
using System.Data;
using System.Data.Common;
using System.Linq;
using Microsoft.OpenApi.Reader;
namespace CarParkValidationAPI.Datas;
public class DataContext : DbContext
{
// public DbSet<User> Users { get; set; }
public DbSet<AdminUser> AdminUsers { get; set; }
public DbSet<ValidationPoint> Validations { get; set; }
public DbSet<ConcessionValidation> ConcessionValidations { get; set; }
public DbSet<ConcessionType> ConcessionTypes { get; set; }
private readonly IConfiguration Configuration;
private IOptions<AppSettings> _appSettings;
public DataContext(IConfiguration configuration, IOptions<AppSettings> appSettings, DbContextOptions<DataContext> options): base(options)
{
Configuration = configuration;
_appSettings = appSettings;
}
protected override void OnModelCreating(ModelBuilder modelBuilder)
{
modelBuilder.Entity<ValidationPoint>().ToTable("ValidationPoint");
modelBuilder.Entity<ConcessionValidation>().ToTable("ConcessionValidation");
modelBuilder.Entity<ConcessionType>().ToTable("ConcessionType");
modelBuilder.Entity<AdminUser>().ToTable("AdminUser");
// Forces EF Core to map all DateTime properties to 'timestamp without time zone'
foreach (var entityType in modelBuilder.Model.GetEntityTypes())
{
var properties = entityType.GetProperties()
.Where(p => p.ClrType == typeof(DateTime) || p.ClrType == typeof(DateTime?));
foreach (var property in properties)
{
property.SetColumnType("timestamp without time zone");
}
}
}
// protected override void OnConfiguring(DbContextOptionsBuilder options)
//{
// in memory database used for simplicity, change to a real db for production applications
// options.UseInMemoryDatabase("TestDb");
// options.UseSqlServer(_appSettings.Value.SQLConnectionString);
// options.UseSqlServer(Configuration.GetValue<string>("AppSettings:SQLConnectionString"));
//}
private ConcessionValidationExtDto PopulateItem(IDataReader reader)
{
ConcessionValidationExtDto item = new ConcessionValidationExtDto();
object myobj;
myobj = reader["ValidationID"];
if (myobj != System.DBNull.Value)
item.Id = (int)myobj;
myobj = reader["ValidateDate"];
if (myobj != System.DBNull.Value)
item.ValidateDate = (DateTime)myobj;
myobj = reader["ConcessionCard"];
if (myobj != System.DBNull.Value)
item.ConcessionCard = (string)myobj;
myobj = reader["ConcessionHolder"];
if (myobj != System.DBNull.Value)
item.ConcessionHolder = (string)myobj;
myobj = reader["ConcessionExpiry"];
if (myobj != System.DBNull.Value)
item.ConcessionExpiry = (bool)myobj;
/*
myobj = reader["ConcessionTypeID"];
if (myobj != System.DBNull.Value)
item.ConcessionTypeId = (int)myobj;
*/
myobj = reader["StafflinkNo"];
if (myobj != System.DBNull.Value)
item.StafflinkNo = (string)myobj;
myobj = reader["ConcessionType"];
if (myobj != System.DBNull.Value)
item.ConcessionType = (string)myobj;
myobj = reader["ValidationPoint"];
if (myobj != System.DBNull.Value)
item.ValidationPoint = (string)myobj;
myobj = reader["StaffFirstName"];
if (myobj != System.DBNull.Value)
item.StaffFirstName = (string)myobj;
myobj = reader["StaffLastName"];
if (myobj != System.DBNull.Value)
item.StaffLastName = (string)myobj;
myobj = reader["StaffEmail"];
if (myobj != System.DBNull.Value)
item.StaffEmail = (string)myobj;
/*
myobj = reader["ValidationPointID"];
if (myobj != System.DBNull.Value)
item.ValidationPointId = (int)myobj;
*/
myobj = reader["Active"];
if (myobj != System.DBNull.Value)
item.Active = (bool)myobj;
return item;
}
public async Task<List<ConcessionValidationExtDto>> SelectConcessionValidationByStaffId(bool activeOnly,
string stafflinkNo, DateTime fromDate, DateTime toDate)
{
using (var command = this.Database.GetDbConnection().CreateCommand())
{
var pfromDate = command.CreateParameter();
pfromDate.ParameterName = "FromDate";
pfromDate.Value = fromDate.Date;
var pToDate = command.CreateParameter();
pToDate.ParameterName = "toDate";
pToDate.Value = toDate.Date;
var pStaffLink = command.CreateParameter();
pStaffLink.ParameterName = "StaffLinkNo";
pStaffLink.Value = stafflinkNo;
ConcessionValidationExtDto item;
List<ConcessionValidationExtDto> result = new List<ConcessionValidationExtDto>();
command.CommandType = CommandType.StoredProcedure;
command.CommandText = ("capv_ConValidation_Sel");
command.Parameters.Add(pfromDate);
command.Parameters.Add(pToDate);
command.Parameters.Add(pStaffLink);
this.Database.OpenConnection();
using (DbDataReader reader = await command.ExecuteReaderAsync())
{
while (await reader.ReadAsync())
{
item = PopulateItem(reader);
result.Add(item);
}
}
return result;
}
}
public async Task<List<int>> SelectCheckConcessionValidationAsync(DateTime fromDate, string concessionCard,
string staffLinkNo)
{
using (var command = this.Database.GetDbConnection().CreateCommand())
{
var pfromDate = command.CreateParameter();
pfromDate.ParameterName = "FromDate";
pfromDate.Value = fromDate.Date;
var pStaffLink = command.CreateParameter();
pStaffLink.ParameterName = "StaffLinkNo";
pStaffLink.Value = staffLinkNo;
var pConcessionCard = command.CreateParameter();
pConcessionCard.ParameterName = "ConcessionCard";
pConcessionCard.Value = concessionCard;
ConcessionValidationExtDto item;
List<int> result = new List<int>();
object myobj;
int id;
command.CommandType = CommandType.StoredProcedure;
command.CommandText = ("capv_CheckConValidation_Sel");
command.Parameters.Add(pfromDate);
command.Parameters.Add(pStaffLink);
command.Parameters.Add(pConcessionCard);
this.Database.OpenConnection();
using (DbDataReader reader = await command.ExecuteReaderAsync())
{
while (await reader.ReadAsync())
{
myobj = reader["ValidationID"];
if (myobj != System.DBNull.Value)
{
id = (int)myobj;
result.Add(id);
}
}
}
return result;
}
}
public async Task<List<ConcessionValidationExtDto>> SelectConcessionValidationByDate(bool activeOnly,
DateTime fromDate, DateTime toDate)
{
using (var command = this.Database.GetDbConnection().CreateCommand())
{
var pfromDate = command.CreateParameter();
pfromDate.ParameterName = "FromDate";
pfromDate.Value = fromDate.Date;
var pToDate = command.CreateParameter();
pToDate.ParameterName = "toDate";
pToDate.Value = toDate.Date;
ConcessionValidationExtDto item;
List<ConcessionValidationExtDto> result = new List<ConcessionValidationExtDto>();
command.CommandType = CommandType.StoredProcedure;
command.CommandText = ("capv_ConValidationDate_Sel");
command.Parameters.Add(pfromDate);
command.Parameters.Add(pToDate);
this.Database.OpenConnection();
using (DbDataReader reader = await command.ExecuteReaderAsync())
{
while (await reader.ReadAsync())
{
item = PopulateItem(reader);
result.Add(item);
}
}
result.Sort((x, y) => x.ValidateDate.Date.CompareTo(y.ValidateDate.Date));
return result;
}
}
}
+23
View File
@@ -0,0 +1,23 @@
#See https://aka.ms/customizecontainer to learn how to customize your debug container and how Visual Studio uses this Dockerfile to build your images for faster debugging.
#Depending on the operating system of the host machines(s) that will build or run the containers, the image specified in the FROM statement may need to be changed.
#For more information, please see https://aka.ms/containercompat
FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build
WORKDIR /src
COPY ["CarParkValidationAPI/CarParkValidationAPI.csproj", "CarParkValidationAPI/"]
COPY ["CommonAD/CommonAD.csproj", "CommonAD/"]
RUN dotnet restore "CarParkValidationAPI/CarParkValidationAPI.csproj"
COPY . .
WORKDIR "/src/CarParkValidationAPI"
RUN dotnet build "CarParkValidationAPI.csproj" -c Release -o /app/build
FROM build AS publish
RUN dotnet publish "CarParkValidationAPI.csproj" -c Release -o /app/publish /p:UseAppHost=false
FROM mcr.microsoft.com/dotnet/aspnet:8.0 AS base
WORKDIR /app
ENV ASPNETCORE_HTTP_PORTS=80
EXPOSE 80
COPY --from=publish /app/publish .
ENTRYPOINT ["dotnet", "CarParkValidationAPI.dll"]
@@ -0,0 +1,55 @@
using CarParkValidationAPI.Models;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text.Json.Serialization;
using System.Threading.Tasks;
namespace CarParkValidationAPI.Entities
{
public class AdminUserDto
{
#region public Member
public int Id { get; set; }
public string StafflinkNo { get; set; }
public string FirstName { get; set; }
public string? LastName { get; set; }
public string? Email { get; set; }
public string? AddedOn { get; set; }
public bool? Active { get; set; }
public int? RoleType { get; set; }
public int? ValidationPointId { get; set; }
#endregion
}
public class AdminUserViewDto
{
#region public Member
public int Id { get; set; }
public string StafflinkNo { get; set; }
public string FirstName { get; set; }
public string? LastName { get; set; }
public string? Email { get; set; }
public string? AddedOn { get; set; }
public bool? Active { get; set; }
public int? RoleType { get; set; }
public string ValidationPoint { get; set; }
public int ValidationPointId { get; set; }
[JsonIgnore]
public string PasswordHash { get; set; }
#endregion
}
}
@@ -0,0 +1,21 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
namespace CarParkValidationAPI.Entities
{
public class ApiException
{
public ApiException(int statusCode, string message = null, string details = null)
{
StatusCode = statusCode;
Message = message;
Details = details;
}
public int StatusCode { get; set; }
public string Message { get; set; }
public string Details { get; set; }
}
}
@@ -0,0 +1,20 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
namespace CarParkValidationAPI.Entities
{
public class ConcessionTypeDto
{
#region public Member
public int Id { get; set; }
public string Description { get; set; }
public string Display { get; set; }
public bool Active { get; set; }
#endregion
}
}
@@ -0,0 +1,41 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
namespace CarParkValidationAPI.Entities
{
public class ConcessionValidationExtDto: ConcessionValidationDto
{
public string ConcessionType { get; set; }
public string ValidationPoint { get; set; }
}
public partial class ConcessionValidationDto
{
#region public Member
public int Id { get; set; }
public DateTime ValidateDate { get; set; }
public string ConcessionCard { get; set; }
public string ConcessionHolder { get; set; }
public bool ConcessionExpiry { get; set; }
public int ConcessionTypeId { get; set; }
public string StafflinkNo { get; set; }
public int ValidationPointId { get; set; }
public bool Active { get; set; }
public string StaffFirstName { get; set; }
public string StaffLastName { get; set; }
public string StaffEmail { get; set; }
#endregion
}
}
@@ -0,0 +1,13 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
namespace CarParkValidationAPI.Entities
{
public class FileContent
{
public byte[] Content { get; set; }
public string FileName { get; set; }
}
}
@@ -0,0 +1,20 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
namespace CarParkValidationAPI.Entities
{
public class LookupCodeDto
{
public int Id
{
get; set;
}
public string Description
{
get; set;
}
}
}
@@ -0,0 +1,14 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
namespace CarParkValidationAPI.Models
{
public class ResultModel<T>
{
public T Data { get; set; }
public int StatusCode { get; set; }
public string Message { get; set; }
}
}
+8
View File
@@ -0,0 +1,8 @@
namespace CarParkValidationAPI.Entities
{
public enum Role
{
Admin,
User
}
}
+22
View File
@@ -0,0 +1,22 @@
using System.Text.Json.Serialization;
namespace CarParkValidationAPI.Entities;
public enum AdminRole
{
Normal = 1,
Admin = 2
}
public class User
{
public int Id { get; set; }
public string? FirstName { get; set; }
public string? LastName { get; set; }
public string Email { get; set; }
public string Username { get; set; }
public int? Role { get; set; }
public int ValidationPointId { get; set; }
[JsonIgnore]
public string PasswordHash { get; set; }
}
@@ -0,0 +1,24 @@
using System;
using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
using System.Linq;
using System.Threading.Tasks;
namespace CarParkValidationAPI.Entities
{
public class ValidationPointDto
{
#region public Member
public int Id { get; set; }
[Required]
public string Description { get; set; }
public string Display { get; set; }
public bool? Active { get; set; }
#endregion
}
}
@@ -0,0 +1,73 @@
using CarParkValidationAPI.Entities;
using Microsoft.AspNetCore.Http;
using Microsoft.Extensions.Hosting;
using Microsoft.Extensions.Logging;
using System;
using System.Collections.Generic;
using System.Net;
using System.Text.Json;
using System.Threading.Tasks;
namespace CarParkValidationAPI.Helpers
{
public class ErrorHandlerMiddleware
{
private readonly RequestDelegate _next;
private readonly ILogger<ErrorHandlerMiddleware> _logger;
private readonly IHostEnvironment _env;
public ErrorHandlerMiddleware(RequestDelegate next,
ILogger<ErrorHandlerMiddleware> logger, IHostEnvironment env)
{
_next = next;
_logger = logger;
_env = env;
}
public async Task Invoke(HttpContext context)
{
try
{
await _next(context);
}
catch (Exception ex)
{
var response = context.Response;
response.ContentType = "application/json";
_logger.LogError(ex, ex.Message);
/*
switch (ex)
{
// case Exception e:
// // custom application error
// response.StatusCode = (int)HttpStatusCode.BadRequest;
// break;
case KeyNotFoundException:
// not found error
response.StatusCode = (int)HttpStatusCode.NotFound;
break;
default:
// unhandled error
response.StatusCode = (int)HttpStatusCode.InternalServerError;
break;
} */
response.StatusCode = ex switch
{
// case Exception e:
// // custom application error
// response.StatusCode = (int)HttpStatusCode.BadRequest;
// break;
KeyNotFoundException => (int)HttpStatusCode.NotFound,// not found error
_ => (int)HttpStatusCode.InternalServerError,// unhandled error
};
//response.StatusCode = (int)HttpStatusCode.InternalServerError;
var res = _env.IsDevelopment() ?
new ApiException(response.StatusCode, ex.Message, ex.StackTrace?.ToString())
: new ApiException(response.StatusCode, "Internal Server Error");
var options = new JsonSerializerOptions { PropertyNamingPolicy = JsonNamingPolicy.CamelCase };
var json = JsonSerializer.Serialize(res, options);
await response.WriteAsync(json);
}
}
}
}
+25
View File
@@ -0,0 +1,25 @@
using System;
namespace CarParkValidationAPI.Helpers;
public class Helper
{
public static string DateToStr(DateTime? date)
{
string result = "";
if (date != null)
result = date?.ToString("yyyy-MM-dd");
return result;
}
public static DateTime StrToDate(string date)
{
DateTime result = DateTime.Today;
if (DateTime.TryParse(date, out var dt))
{
result = dt;
}
return result;
}
}
@@ -0,0 +1,20 @@
using CarParkValidationAPI.Models;
using CarParkValidationAPI.Entities;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
namespace CarParkValidationAPI.Interface
{
public interface IAdminUser
{
Task<ResultModel<List<AdminUserViewDto>>> LoadAdminUserAsync(bool OnlyActive);
Task<ResultModel<bool>> CheckAdminUserByStaffLinkNoAsync(string staffLinkNo);
Task<ResultModel<int>> SaveAdminUserAsync(AdminUserDto item);
Task<ResultModel<AdminUserDto>> LoadAdminUserByIdAsync(int id);
Task<ResultModel<bool>> DeleteAdminUserAsync(int id);
void SetCurrentUser(string username);
}
}
@@ -0,0 +1,19 @@
using CarParkValidationAPI.Models;
using CarParkValidationAPI.Entities;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
namespace CarParkValidationAPI.Interface
{
public interface IConcessionType
{
Task<ResultModel<List<ConcessionTypeDto>>> LoadConcessionTypeAsync(bool OnlyActive);
Task<ResultModel<int>> SaveConcessionTypeAsync(ConcessionTypeDto item);
Task<ResultModel<ConcessionTypeDto>> LoadConcessionTypeByIdAsync(int id);
Task<ResultModel<bool>> DeleteConcessionTypeAsync(int id);
void SetCurrentUser(string username);
}
}
@@ -0,0 +1,22 @@
using CarParkValidationAPI.Models;
using CarParkValidationAPI.Entities;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
namespace CarParkValidationAPI.Interface
{
public interface IConcessionValidation
{
Task<ResultModel<List<ConcessionValidationExtDto>>> LoadConcessionValidationAsync(bool OnlyActive);
Task<ResultModel<List<ConcessionValidationExtDto>>> LoadConcessionValidationStaffLinkNoAsync(string staffLinkNo, DateTime currentDate, DateTime toDate);
Task<ResultModel<int>> CheckConcessionValidationStaffLinkNoAsync(string staffLinkNo, string concessionCard, DateTime currentDate, int id);
Task<ResultModel<int>> SaveConcessionValidationAsync(ConcessionValidationDto item);
Task<ResultModel<ConcessionValidationDto>> LoadConcessionValidationByIdAsync(int id);
Task<ResultModel<bool>> DeleteConcessionValidationAsync(int id);
Task<ResultModel<FileContent>> GetReport(DateTime fromDate, DateTime toDate);
void SetCurrentUser(string username);
}
}
@@ -0,0 +1,16 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
using CarParkValidationAPI.Interface;
using CarParkValidationAPI.Entities;
namespace CarParkValidationAPI.Interface
{
public interface IJwtUtils
{
public string GenerateJwtToken(User user);
public User? ValidateJwtToken(string token);
}
}
@@ -0,0 +1,17 @@
using CarParkValidationAPI.Models;
using CarParkValidationAPI.Entities;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
namespace CarParkValidationAPI.Interface
{
public interface ILookupCode
{
Task<ResultModel<List<LookupCodeDto>>> LoadConcessionTypeAsync(bool OnlyActive);
Task<ResultModel<List<LookupCodeDto>>> LoadValidationPointAsync(bool OnlyActive);
}
}
@@ -0,0 +1,20 @@
using CarParkValidationAPI.Models.Users;
using CarParkValidationAPI.Entities;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
using CarParkValidationAPI.Models;
namespace CarParkValidationAPI.Interface
{
public interface IUserService
{
AuthenticateResponse Authenticate(AuthenticateRequest model);
Task<ResultModel<AuthenticateResponse>> LoginApiAD(AuthenticateRequest model);
Task<ResultModel<AuthenticateResponse>> LoginAD(AuthenticateRequest model);
Task<ResultModel<User>> SearchApiStaff(string staffLinkNo);
Task<ResultModel<User>> SearchADStaff(string staffLinkNo);
}
}
@@ -0,0 +1,19 @@
using CarParkValidationAPI.Models;
using CarParkValidationAPI.Entities;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
namespace CarParkValidationAPI.Interface
{
public interface IValidationPoint
{
Task<ResultModel<List<ValidationPointDto>>> LoadValidationPointAsync(bool OnlyActive);
Task<ResultModel<int>> SaveValidationPointAsync(ValidationPointDto item);
Task<ResultModel<ValidationPointDto>> LoadValidationPointByIdAsync(int id);
Task<ResultModel<bool>> DeleteValidationPointAsync(int id);
void SetCurrentUser(string username);
}
}
Binary file not shown.
+65
View File
@@ -0,0 +1,65 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.IO;
using System.Runtime.Serialization;
using System.ComponentModel.DataAnnotations.Schema;
using System.ComponentModel.DataAnnotations;
using System.Text.Json.Serialization;
namespace CarParkValidationAPI.Models
{
public partial class AdminUserCriteria
{
public AdminUserCriteria()
{
}
#region public Member
public int? Id { get; set; }
public int? StafflinkNo { get; set; }
public string Name { get; set; }
public string AddedBy { get; set; }
public bool? Active { get; set; }
public int? RoleType { get; set; }
#endregion
}
[Table("AdminUser")]
public partial class AdminUser
{
public AdminUser()
{
}
#region public Member
[Key]
public int Id { get; set; }
public string StafflinkNo { get; set; }
public string FirstName { get; set; }
public string? LastName { get; set; }
public string? Email { get; set; }
public DateTime? AddedOn { get; set; }
public bool? Active { get; set; }
public int? RoleType { get; set; }
public int? ValidationPointId { get; set; }
public DateTime? LastModified { get; set; }
public string? LastModifiedId { get; set; }
[JsonIgnore]
public string PasswordHash { get; set; }
#endregion
}
}
@@ -0,0 +1,28 @@
using System;
namespace CarParkValidationAPI.Models
{
public class AppSettings
{
public string Secret { get; set; }
public string SQLConnectionString { get; set; }
public string LDAPPath { get; set; }
public string LDAPUser { get; set; }
public string LDAPPassword { get; set; }
public string LoginWebAPI { get; set; }
/// <summary>
/// for convert to time. use GetADTimeOut
/// TimeSpan.FromSeconds(Convert.ToDouble(ConfigurationManager.AppSettings["ADTimeOut"]));
public string ADTimeOut { get; set; }
public TimeSpan GetADTimeOut()
{
if (!string.IsNullOrEmpty(ADTimeOut))
return TimeSpan.FromSeconds(Convert.ToDouble(ADTimeOut));
else
return TimeSpan.FromSeconds(0);
}
}
}
@@ -0,0 +1,28 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.IO;
using System.Runtime.Serialization;
using System.ComponentModel.DataAnnotations;
namespace CarParkValidationAPI.Models
{
public partial class ConcessionType
{
public ConcessionType()
{
}
#region public Member
[Key]
public int Id { get; set; }
public string ConcessionDesc { get; set; }
public string ConcessionDisplay { get; set; }
public bool Active { get; set; }
public DateTime? LastModified { get; set; }
public string? LastModifiedId { get; set; }
#endregion
}
}
@@ -0,0 +1,55 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.IO;
using System.Runtime.Serialization;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
namespace CarParkValidationAPI.Models
{
[NotMapped]
public class ConcessionValidationExt: ConcessionValidation
{
#region public Member
public string ConcessionType { get; set; }
public string ValidationPiont { get; set; }
#endregion
}
public partial class ConcessionValidation
{
public ConcessionValidation()
{
}
#region public Member
[Key]
public int Id { get; set; }
public DateTime ValidateDate { get; set; }
public string ConcessionCard { get; set; }
public string ConcessionHolder { get; set; }
public bool ConcessionExpiry { get; set; }
public int ConcessionTypeID { get; set; }
public string StafflinkNo { get; set; }
public int ValidationPointID { get; set; }
public bool Active { get; set; }
public string StaffFirstName { get; set; }
public string StaffLastName { get; set; }
public string StaffEmail { get; set; }
public DateTime? CreatedDate { get; set; }
public string? CreatedId { get; set; }
public DateTime? LastModified { get; set; }
public string? LastModifiedId{ get; set; }
#endregion
}
}
@@ -0,0 +1,26 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.IO;
using System.Runtime.Serialization;
using System.ComponentModel.DataAnnotations;
namespace CarParkValidationAPI.Models
{
public class ValidationPoint
{
[Key]
public int Id { get; set; }
public string Description { get; set; }
public string? DisplayName { get; set; }
public bool? Active { get; set; }
public DateTime? LastModified { get; set; }
public string? LastModifiedId { get; set; }
}
}
+244
View File
@@ -0,0 +1,244 @@
using Microsoft.AspNetCore.Hosting;
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.Hosting;
using Microsoft.Extensions.Logging;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading;
using System.Threading.Tasks;
using CarParkValidationAPI.Authorization;
using CarParkValidationAPI.Datas;
using CarParkValidationAPI.Interface;
using CarParkValidationAPI.Models;
using CarParkValidationAPI.Repository;
using Microsoft.AspNetCore.Authentication.JwtBearer;
using Microsoft.AspNetCore.Builder;
using Microsoft.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore.Infrastructure;
using Microsoft.EntityFrameworkCore.Storage;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.IdentityModel.Tokens;
// Define cross-origin sharing policy name
var myAllowSpecificOrigins = "_myAllowSpecificOrigins";
var builder = WebApplication.CreateBuilder(args);
// Add services to the container.
#region Services
var services = builder.Services;
services.AddCors();
/*
services.AddCors(options =>
{
options.AddPolicy(name: myAllowSpecificOrigins,
policy =>
{
policy.WithOrigins("http://localhost:3000") // 👈 Your React app location
.AllowAnyHeader()
.AllowAnyMethod()
.AllowCredentials(); // 👈 MANDATORY: Permits cookie exchange
});
});
*/
services.AddControllers();
// Learn more about configuring Swagger/OpenAPI at https://aka.ms/aspnetcore/swashbuckle
services.AddEndpointsApiExplorer();
services.AddSwaggerGen();
var appSettingsSection = builder.Configuration.GetSection("AppSettings");
services.Configure<AppSettings>(appSettingsSection);
var appSettings = appSettingsSection.Get<AppSettings>();
var key = Encoding.ASCII.GetBytes(appSettings.Secret);
services.AddAuthentication(x =>
{
x.DefaultAuthenticateScheme = JwtBearerDefaults.AuthenticationScheme;
x.DefaultChallengeScheme = JwtBearerDefaults.AuthenticationScheme;
})
.AddJwtBearer(x =>
{
x.RequireHttpsMetadata = false;
x.SaveToken = true;
x.TokenValidationParameters = new TokenValidationParameters
{
ValidateIssuerSigningKey = true,
IssuerSigningKey = new SymmetricSecurityKey(key),
ValidateIssuer = false,
ValidateAudience = false
};
});
services.AddHttpContextAccessor();
//services.AddScoped<ImportPersonRepository>();
services.AddDbContext<DataContext>(options =>
{
// options.LogTo(s => Console.WriteLine(s));
//options.UseNpgsql(appSettings.SQLConnectionString);
string? conn = builder.Configuration.GetValue<string>("AppSettings:SQLConnectionString");
// options.UseSqlServer(conn);
if (!string.IsNullOrEmpty(conn))
options.UseNpgsql(conn);
// options.LogTo(s => Console.WriteLine(s));
// if (conn != null)
// options.UseNpgsql(conn);
});
/*
services.AddGraphQLServer()
.AddFiltering()
.AddSorting()
.AddProjections()
// .RegisterDbContextFactory<FamilyTreeDBContext>()
//.AddQueryType<QueryFamilyTree>();
*/
services.AddHttpContextAccessor();
services.AddScoped<IJwtUtils, JwtUtils>();
services.AddScoped<IConcessionType, ConcessionTypeRepository>();
services.AddScoped<IValidationPoint, ValidationPointRepository>();
services.AddScoped<IAdminUser, AdminUserRepository>();
services.AddScoped<IUserService, UserServiceFakeRepository>();
services.AddScoped<IConcessionValidation, ConcessionValidationRepository>();
services.AddScoped<ILookupCode, LookupCodeRepository>();
services.AddScoped(typeof(ConcessionValidationReportRepository));
services.AddScoped<Seed>();
/*
// services.AddScoped<IUserService, UserRepository>();
/*
public FamilyTreeDBContext(DbContextOptions<FamilyTreeDBContext> options)
: base(options)
{
AppContext.SetSwitch("Npgsql.EnableLegacyTimestampBehavior", true);
}
services.AddScoped<IAdminUser, AdminUserRepository>();
services.AddScoped<IMotorVehicles, MotorVehiclesRepository>();
*/
#endregion
#region app
var app = builder.Build();
using (var scope = app.Services.CreateScope())
{
try
{
var context = scope.ServiceProvider.GetRequiredService<DataContext>();
var db = context.Database;
if (db != null)
{
/*
try
{
using var cts = new CancellationTokenSource();
CancellationToken cancellationToken = cts.Token;
await db.MigrateAsync(cancellationToken);
db.EnsureCreated();
}
catch
{
//continue
}
*/
var staff = scope.ServiceProvider.GetService<Seed>();
int id = staff.InsertOneUser();
if (id < 0)
{
var databaseCreator = (context.GetService<IDatabaseCreator>() as RelationalDatabaseCreator);
if (databaseCreator != null)
{
try
{
if (!databaseCreator.Exists())
databaseCreator.Create();
databaseCreator.CreateTables();
}
catch
{
//continue
}
}
id = staff.InsertOneUser();
}
}
}
catch (Exception e)
{
Console.WriteLine(e.ToString());
}
}
app.UseMiddleware<JwtMiddleware>();
// Configure the HTTP request pipeline.
//if (app.Environment.IsDevelopment())//
//{
app.UseSwagger();
app.UseSwaggerUI();
//}
// global cors policy
app.UseCors(x => x
.SetIsOriginAllowed(origin => true)
.AllowAnyMethod()
.AllowAnyHeader()
.WithExposedHeaders("Content-Disposition")
.AllowCredentials()); // 👈 MANDATORY: Permits cookie exchange
//app.UseCors(myAllowSpecificOrigins);
app.UseRouting();
app.UseAuthentication();
app.UseAuthorization();
app.MapControllers();
app.Run();
#endregion
/*
https://www.youtube.com/watch?v=WQFx2m5Ub9M
https://csharptotypescript.azurewebsites.net/
\ services.AddDbContext<BloggingContext>(options =>
options.UseNpgsql(Configuration.GetConnectionString("BloggingContext")));
dotnet ef dbcontext scaffold "host=postgresdb;port=5432;Database=carparkvalidationdb;Username=postgres;password=Positive~1" Npgsql.EntityFrameworkCore.PostgreSQL -Schemas schema1 --output-dir Models
PM> Scaffold-DbContext "Host=postgresdb;Port=5432;database=carparkvalidationdb;user id=postgres;Password=Positive~1" Npgsql.EntityFrameworkCore.PostgreSQL -OutputDir Models
*/
/*
graphql
https://www.youtube.com/watch?v=HnXA8RI7Tvc
query {
persons {
nodes{
id
firstName
sex
email
}
}
}
*/
@@ -0,0 +1,41 @@
{
"profiles": {
"IIS Express": {
"commandName": "IISExpress",
"launchBrowser": true,
"launchUrl": "swagger",
"environmentVariables": {
"ASPNETCORE_ENVIRONMENT": "Development"
}
},
"CarParkValidationAPI": {
"commandName": "Project",
"launchBrowser": true,
"launchUrl": "swagger",
"environmentVariables": {
"ASPNETCORE_ENVIRONMENT": "Development"
},
"dotnetRunMessages": "true",
"applicationUrl": "http://localhost:5100"
},
"Docker": {
"commandName": "Docker",
"launchBrowser": true,
"launchUrl": "{Scheme}://{ServiceHost}:{ServicePort}/swagger",
"publishAllPorts": true
}
},
"$schema": "http://json.schemastore.org/launchsettings.json",
"iisSettings": {
"windowsAuthentication": false,
"anonymousAuthentication": true,
"iis": {
"applicationUrl": "http://localhost/CarParkValidationAPI",
"sslPort": 0
},
"iisExpress": {
"applicationUrl": "http://localhost:61744",
"sslPort": 0
}
}
}
@@ -0,0 +1,276 @@
//using BCryptNet = BCrypt.Net.BCrypt;
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
using Microsoft.Extensions.Options;
using CarParkValidationAPI.Authorization;
using CarParkValidationAPI.Entities;
using CarParkValidationAPI.Helpers;
using CarParkValidationAPI.Models.Users;
using CarParkValidationAPI.Models;
using CarParkValidationAPI.Datas;
using CarParkValidationAPI.Interface;
using Microsoft.EntityFrameworkCore;
using System;
namespace CarParkValidationAPI.Repository
{
public class AdminUserRepository : IAdminUser
{
private DataContext _context;
private string _currentUser = "";
private readonly AppSettings _appSettings;
private Dictionary<int, string> _ValidationPointDic = null;
public AdminUserRepository(
DataContext context,
IOptions<AppSettings> appSettings)
{
_context = context;
_appSettings = appSettings.Value;
}
public void SetCurrentUser(string username)
{
_currentUser = username;
}
private string GetValidtionPointDesc(int id)
{
string result = "";
if (_ValidationPointDic != null && _ValidationPointDic.ContainsKey(id))
result = _ValidationPointDic[id];
return result;
}
private AdminUserViewDto FillAdminUserViewDto(AdminUser model)
{
AdminUserViewDto dto = new AdminUserViewDto();
dto.Id = model.Id;
dto.FirstName = model.FirstName;
dto.RoleType = (int) model.RoleType;
dto.StafflinkNo = model.StafflinkNo;
dto.Active = model.Active;
dto.LastName = model.LastName;
dto.AddedOn = Helper.DateToStr(model.AddedOn);
dto.ValidationPoint = GetValidtionPointDesc(model.ValidationPointId??0);
dto.ValidationPointId = model.ValidationPointId ?? 0;
return dto;
}
private AdminUserDto FillAdminUserDto(AdminUser model)
{
AdminUserDto dto = new AdminUserDto();
dto.Id = model.Id;
dto.FirstName = model.FirstName;
dto.RoleType = model.RoleType;
dto.StafflinkNo = model.StafflinkNo;
dto.Active = model.Active;
dto.LastName = model.LastName;
dto.AddedOn = Helper.DateToStr(model.AddedOn);
dto.ValidationPointId = model.ValidationPointId ?? 0;
return dto;
}
private AdminUser FillAdminUser(AdminUserDto dto, AdminUser model)
{
if (dto.Id > 0)
model.Id = dto.Id;
model.FirstName = dto.FirstName;
model.RoleType = (int) dto.RoleType;
model.StafflinkNo = dto.StafflinkNo;
model.Active = dto.Active ?? false;
model.LastName = dto.LastName;
model.AddedOn = Helper.StrToDate(dto.AddedOn);
model.ValidationPointId = dto.ValidationPointId;
return model;
}
public async Task<ResultModel<List<AdminUserViewDto>>> LoadAdminUserAsync(bool onlyActive)
{
List<AdminUserViewDto> resultList = new List<AdminUserViewDto>();
int statuscode = 0;
string error = "";
try
{
_ValidationPointDic = await _context.Validations.Where(x => x.Active == true).ToDictionaryAsync((x) => x.Id, y => y.Description);
//var list = await _context.AdminUsers.Where(x => x.Active == onlyActive).ToListAsync();
var list = await _context.AdminUsers.AsQueryable().ToListAsync();
AdminUserViewDto dto;
AdminUser user;
for (int i = 0; i < list.Count; i++)
{
user = list[i];
dto = FillAdminUserViewDto(user);
resultList.Add(dto);
}
statuscode = 1;
}
catch (Exception ex)
{
error = ex.ToString();
statuscode = -1;
}
return new ResultModel<List<AdminUserViewDto>>()
{
Data = resultList,
StatusCode = statuscode,
Message = error
};
}
public async Task<ResultModel<bool>> CheckAdminUserByStaffLinkNoAsync(string staffLinkNo)
{
bool result = false;
int statuscode = 0;
string error = "";
try
{
if (!string.IsNullOrEmpty(staffLinkNo))
{
var list = await _context.AdminUsers.Where( x=> x.StafflinkNo == staffLinkNo).ToListAsync();
if (list.Count > 0)
{
result = true;
statuscode = 1;
}
}
}
catch (Exception ex)
{
error = ex.ToString();
statuscode = -1;
}
return new ResultModel<bool>()
{
Data = result,
StatusCode = statuscode,
Message = error
};
}
public async Task<ResultModel<AdminUserDto>> LoadAdminUserByIdAsync(int id)
{
AdminUserDto result = null;
int statuscode = -1;
string error = "";
try
{
if (id > 0)
{
AdminUser model = await _context.AdminUsers.FindAsync(id);
result = FillAdminUserDto(model);
statuscode = 1;
}
}
catch (Exception ex)
{
error = ex.ToString();
statuscode = -1;
}
return new ResultModel<AdminUserDto>()
{
Data = result,
StatusCode = statuscode,
Message = error
};
}
public async Task<ResultModel<int>> SaveAdminUserAsync(AdminUserDto item)
{
int result = default(int);
int statuscode = 0;
string error = "";
try
{
AdminUser model;
if (item.Id > 0)
{
model = await _context.AdminUsers.FindAsync(item.Id);
model = FillAdminUser(item, model);
model.LastModified = DateTime.Now;
model.LastModifiedId = _currentUser;
await _context.SaveChangesAsync();
result = model.Id;
statuscode = 1;
}
else
{
ResultModel<bool> found = await CheckAdminUserByStaffLinkNoAsync(item.StafflinkNo);
if (!found.Data)
{
model = new AdminUser();
model = FillAdminUser(item, model);
_context.AdminUsers.Add(model);
await _context.SaveChangesAsync();
result = model.Id;
statuscode = 1;
}
else
{
error = "staff link No '" + item.StafflinkNo + "' already in admin user";
statuscode = 0;
result = 0;
}
}
}
catch (Exception ex)
{
result = -1;
error = ex.ToString();
statuscode = -1;
}
return new ResultModel<int>()
{
Data = result,
StatusCode = statuscode,
Message = error
};
}
public async Task<ResultModel<bool>> DeleteAdminUserAsync(int id)
{
bool result = true;
int statuscode = 0;
string error = "";
try
{
if (id > 0)
{
AdminUser model = await _context.AdminUsers.FindAsync(id);
model.Active = false;
model.LastModified = DateTime.Now;
model.LastModifiedId = _currentUser;
await _context.SaveChangesAsync();
statuscode = 1;
}
}
catch (Exception ex)
{
error = ex.ToString();
statuscode = -1;
result = false;
}
return new ResultModel<bool>()
{
Data = result,
StatusCode = statuscode,
Message = error
};
}
}
}
@@ -0,0 +1,198 @@
//using BCryptNet = BCrypt.Net.BCrypt;
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
using Microsoft.Extensions.Options;
using CarParkValidationAPI.Authorization;
using CarParkValidationAPI.Entities;
using CarParkValidationAPI.Helpers;
using CarParkValidationAPI.Models.Users;
using CarParkValidationAPI.Models;
using CarParkValidationAPI.Datas;
using CarParkValidationAPI.Interface;
using Microsoft.EntityFrameworkCore;
using System;
namespace CarParkValidationAPI.Repository
{
public class ConcessionTypeRepository : IConcessionType
{
private DataContext _context;
private string _currentUser = "";
private readonly AppSettings _appSettings;
public ConcessionTypeRepository(
DataContext context,
IOptions<AppSettings> appSettings)
{
_context = context;
_appSettings = appSettings.Value;
}
public void SetCurrentUser(string username)
{
_currentUser = username;
}
private ConcessionTypeDto FillConcessionTypeDto(ConcessionType model)
{
ConcessionTypeDto dto = new ConcessionTypeDto();
dto.Active = model.Active;
dto.Description = model.ConcessionDesc;
dto.Display = model.ConcessionDisplay;
dto.Id = model.Id;
return dto;
}
private ConcessionType FillConcessionType(ConcessionTypeDto dto, ConcessionType model)
{
model.Active = dto.Active;
model.ConcessionDesc = dto.Description.Trim();
if (!string.IsNullOrEmpty(dto.Display))
model.ConcessionDisplay = dto.Display.Trim();
return model;
}
public async Task<ResultModel<List<ConcessionTypeDto>>> LoadConcessionTypeAsync(bool onlyActive)
{
List<ConcessionTypeDto> result = null;
int statuscode = 0;
string error = "";
try
{
result = await _context.ConcessionTypes.Select(
x => new ConcessionTypeDto()
{
Id = x.Id,
Description = x.ConcessionDesc,
Display = x.ConcessionDisplay,
Active = x.Active
}).ToListAsync();
statuscode = 1;
result.Sort((x, y) => x.Description.CompareTo(y.Description));
}
catch (Exception ex)
{
error = ex.ToString();
statuscode = -1;
}
return new ResultModel<List<ConcessionTypeDto>>()
{
Data = result,
StatusCode = statuscode,
Message = error
};
}
public async Task<ResultModel<ConcessionTypeDto>> LoadConcessionTypeByIdAsync(int id)
{
ConcessionType? result;
int statuscode = 0;
string error = "";
ConcessionTypeDto dto =new();
try
{
result = await _context.ConcessionTypes.FindAsync(id);
if (result != null)
{
dto = FillConcessionTypeDto(result);
statuscode = 1;
}
}
catch (Exception ex)
{
error = ex.ToString();
statuscode = -1;
}
return new ResultModel<ConcessionTypeDto>()
{
Data = dto,
StatusCode = statuscode,
Message = error
};
}
public async Task<ResultModel<int>> SaveConcessionTypeAsync(ConcessionTypeDto item)
{
int result = default(int);
int statuscode = 0;
string error = "";
try
{
ConcessionType model;
if (item.Id > 0)
{
model = await _context.ConcessionTypes.FindAsync(item.Id);
model = FillConcessionType(item, model);
model.LastModified = DateTime.Now;
model.LastModifiedId = _currentUser;
await _context.SaveChangesAsync();
result = item.Id;
}
else //new record
{
model = new ConcessionType();
model = FillConcessionType(item, model);
model.LastModified = DateTime.Now;
model.LastModifiedId = _currentUser;
_context.ConcessionTypes.Add(model);
var id = await _context.SaveChangesAsync();
result = model.Id;
}
statuscode = 1;
}
catch (Exception ex)
{
error = ex.ToString();
statuscode = -1;
}
//var dto = await Task.Run(() => result);
return new ResultModel<int>()
{
Data = result,
StatusCode = statuscode,
Message = error
};
}
public async Task<ResultModel<bool>> DeleteConcessionTypeAsync(int id)
{
bool result = true;
int statuscode = 0;
string error = "";
try
{
ConcessionType model;
if (id > 0)
{
model = await _context.ConcessionTypes.FindAsync(id);
model.Active = false;
//_context.ConcessionTypes.Remove(model);
await _context.SaveChangesAsync();
statuscode = 1;
}
}
catch (Exception ex)
{
error = ex.ToString();
statuscode = -1;
}
//var dto = await Task.Run(() => result);
return new ResultModel<bool>()
{
Data = result,
StatusCode = statuscode,
Message = error
};
}
}
}
@@ -0,0 +1,139 @@
using CarParkValidationAPI.Datas;
using CarParkValidationAPI.Models;
using Microsoft.Extensions.Options;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
using SpreadsheetLight;
using CarParkValidationAPI.Entities;
using System.IO;
namespace CarParkValidationAPI.Repository
{
public class ConcessionValidationReportRepository
{
private readonly DataContext _context;
private readonly IOptions<AppSettings> _appSettings;
const string DateFormat = "dd-MM-yyyy HH:mm";
const string dateFormat = "dd-MM-yyyyy";
public ConcessionValidationReportRepository(
DataContext context, IOptions<AppSettings> appSettings)
{
_context = context;
_appSettings = appSettings;
}
public async Task<ResultModel<FileContent>> GetConcessionValidationReport(DateTime fromDate, DateTime toDate)
{
//excel SLDocument sl = new SLDocument();
int statusCode = 1;
ConcessionValidationExtDto item;
int col = 1;
int row = 1;
SLDocument sl = new SLDocument();
//first sheetName
sl.RenameWorksheet(SLDocument.DefaultFirstSheetName, "ConcessionValidation");
SLStyle style = sl.CreateStyle();
style.SetFontUnderline(DocumentFormat.OpenXml.Spreadsheet.UnderlineValues.Single);
style.SetFontBold(true);
style.SetFont("Arial Black", 16);
sl.SetCellStyle(1, 5, style);
sl.SetRowHeight(1, 1, 25);
sl.SetCellValue(row++, 5, "The Concession Validation Report");
sl.SetCellValue(row, 3, "Date Range: " + fromDate.ToString(dateFormat) + " - " + toDate.ToString(dateFormat) );
sl.SetCellValue(1, 6, " " + DateTime.Now.ToString("ddd dd/MM/yyyy HH:mm"));
int startTitleRow = 3;
row = startTitleRow;
//make the title bold
style = sl.CreateStyle();
style.Font.Bold = true;
sl.SetRowStyle(startTitleRow, style);
//set it height
sl.SetRowHeight(startTitleRow, startTitleRow, 25);
// add the title first
sl.SetCellValue(row, col++, "Date");
sl.SetCellValue(row, col++, "Concession Card Number");
sl.SetCellValue(row, col++, "Concession Holder Name");
sl.SetCellValue(row, col++, "Expiry date checked");
sl.SetCellValue(row, col++, "ConcessionType");
sl.SetCellValue(row, col++, "Validation Piont");
// sl.SetCellValue(row, col++, "StaffLink No");
sl.SetCellValue(row, col++, "Enter by");
// sl.SetCellValue(row, col++, "Staff Last name");
// sl.SetCellValue(row, col++, "Staff Email");
sl.FreezePanes(row, col - 1); //frozen the row.
//wrap text on is concession Expiry
style = sl.CreateStyle();
style.SetWrapText(true);
sl.SetColumnStyle(4, style);
//format date
style = sl.CreateStyle();
style.FormatCode = "dd/MM/yyyy HH:MM";
sl.SetColumnStyle(1, style);
//make column width
sl.SetColumnWidth(1, 20);
sl.SetColumnWidth(2, 18);
sl.SetColumnWidth(3, 25);
sl.SetColumnWidth(4, 20);
sl.SetColumnWidth(5, 50);
sl.SetColumnWidth(6, 40);
sl.SetColumnWidth(7, 40);
// sl.SetColumnWidth(8, 20);
// sl.SetColumnWidth(9, 20);
// sl.SetColumnWidth(10, 20);
int startRowFrom = startTitleRow+1;
var list = await _context.SelectConcessionValidationByDate(true, fromDate.ToLocalTime(), toDate.ToLocalTime());
for (int i = 0; i < list.Count; i++)
{
col = 1;
item = list[i];
row = i + startRowFrom;
sl.SetCellValue(row, col++, item.ValidateDate);
sl.SetCellValue(row, col++, item.ConcessionCard);
sl.SetCellValue(row, col++, item.ConcessionHolder);
sl.SetCellValue(row, col++, item.ConcessionExpiry ? "Yes": "No");
sl.SetCellValue(row, col++, item.ConcessionType);
sl.SetCellValue(row, col++, item.ValidationPoint);
// sl.SetCellValue(row, col++, item.StafflinkNo);
sl.SetCellValue(row, col++, item.StaffFirstName + " " + item.StaffLastName);
// sl.SetCellValue(row, col++, item.StaffLastName);
// sl.SetCellValue(row, col++, item.StaffEmail);
}
byte[] array;
// sl.SaveAs("C:\\Temp\\Report\\ConcessionValidationDate" + DateTime.Now.ToString("yyyyMMddHHmm") + ".xlsx");
using (MemoryStream ws = new MemoryStream())
{
sl.SaveAs(ws);
array = ws.ToArray();
/*
using (FileStream fs = new FileStream("c:\\temp\\Report\\conReport.xlsx",FileMode.Create,FileAccess.Write))
{
ws.WriteTo(fs);
fs.Close();
}
*/
ws.Close();
}
var result = new FileContent
{
Content = array,
FileName = "ConcessionValidation" + DateTime.Now.ToString("yyyy_MM_dd_HH_mm")+ ".xlsx",
};
return new ResultModel<FileContent>
{
Data = result,
StatusCode = statusCode
};
}
}
}
@@ -0,0 +1,371 @@
//using BCryptNet = BCrypt.Net.BCrypt;
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
using Microsoft.Extensions.Options;
using CarParkValidationAPI.Authorization;
using CarParkValidationAPI.Entities;
using CarParkValidationAPI.Helpers;
using CarParkValidationAPI.Models.Users;
using CarParkValidationAPI.Models;
using CarParkValidationAPI.Datas;
using CarParkValidationAPI.Interface;
using Microsoft.EntityFrameworkCore;
using System;
namespace CarParkValidationAPI.Repository
{
public class ConcessionValidationRepository : IConcessionValidation
{
private DataContext _context;
private string _currentUser = "";
private readonly AppSettings _appSettings;
public ConcessionValidationRepository(
DataContext context,
IOptions<AppSettings> appSettings)
{
_context = context;
_appSettings = appSettings.Value;
}
public void SetCurrentUser(string username)
{
_currentUser = username;
}
private ConcessionValidationDto FillConcessionValidationDto(ConcessionValidation model)
{
ConcessionValidationDto dto = new ConcessionValidationDto();
dto.Active = model.Active;
dto.ConcessionCard = model.ConcessionCard;
dto.ConcessionExpiry = model.ConcessionExpiry;
dto.ConcessionHolder = model.ConcessionHolder;
dto.ConcessionTypeId = model.ConcessionTypeID;
dto.Id = model.Id;
dto.StafflinkNo = model.StafflinkNo;
dto.ValidateDate = model.ValidateDate;
dto.ValidationPointId = model.ValidationPointID;
dto.StaffFirstName = model.StaffFirstName;
dto.StaffLastName = model.StaffLastName;
dto.StaffEmail = model.StaffEmail;
return dto;
}
private ConcessionValidationExtDto FillConcessionValidationExtDto(ConcessionValidation model)
{
ConcessionValidationExtDto dto = new ConcessionValidationExtDto();
dto.Active = model.Active;
dto.ConcessionCard = model.ConcessionCard;
dto.ConcessionExpiry = model.ConcessionExpiry;
dto.ConcessionHolder = model.ConcessionHolder;
dto.ConcessionTypeId = model.ConcessionTypeID;
dto.Id = model.Id;
dto.StaffFirstName = model.StaffFirstName;
dto.StaffLastName = model.StaffLastName;
dto.StaffEmail = model.StaffEmail;
dto.ValidateDate = model.ValidateDate;
dto.ValidationPointId = model.ValidationPointID;
return dto;
}
private ConcessionValidation FillConcessionValidation(ConcessionValidationDto dto, ConcessionValidation model)
{
model.Active = dto.Active;
model.ConcessionCard = dto.ConcessionCard.Trim();
model.ConcessionExpiry = dto.ConcessionExpiry;
model.ConcessionHolder = dto.ConcessionHolder.Trim();
model.ConcessionTypeID = dto.ConcessionTypeId;
model.StafflinkNo = dto.StafflinkNo;
model.StaffFirstName = dto.StaffFirstName.Trim();
model.StaffLastName = dto.StaffLastName.Trim();
model.StaffEmail = dto.StaffEmail.Trim();
model.ValidateDate = dto.ValidateDate.ToLocalTime();
model.ValidationPointID = dto.ValidationPointId;
return model;
}
public async Task<ResultModel<List<ConcessionValidationExtDto>>> LoadConcessionValidationAsync(bool onlyActive)
{
int statuscode = 0;
string error = "";
List<ConcessionValidationExtDto> result = new List<ConcessionValidationExtDto>();
ConcessionValidationExtDto dto;
ConcessionValidation model;
try
{
List<ConcessionValidation> clist = await _context.ConcessionValidations.Where(x => x.Active == true).ToListAsync();
for (int i = 0; i < clist.Count; i++)
{
model = clist[i];
dto = FillConcessionValidationExtDto(model);
result.Add(dto);
}
statuscode = 1;
}
catch (Exception ex)
{
statuscode = -1;
error = ex.ToString();
}
return new ResultModel<List<ConcessionValidationExtDto>>()
{
Data = result,
StatusCode = statuscode,
Message = error
};
}
public async Task<ResultModel<List<ConcessionValidationExtDto>>> LoadConcessionValidationStaffLinkNoAsync(string staffLinkNo, DateTime fromDate, DateTime toDate)
{
List<ConcessionValidationExtDto> result = new List<ConcessionValidationExtDto>();
// ConcessionValidationExtDto dto;
// ConcessionValidation model;
int statuscode = 0;
string error = "";
try
{
//List<ConcessionValidation> clist = await _context.ConcessionValidations.Where(x =>
// x.Active == true
// && x.StafflinkNo == staffLinkNo
// && x.ValidateDate.Date == currentDate.Date
//).ToListAsync();
result = await _context.SelectConcessionValidationByStaffId(true, staffLinkNo, fromDate, toDate);
/*
//var clist = await _context.SPSelectValidation(true, staffLinkNo, currentDate);
for (int i = 0; i < clist.Count; i++)
{
model = clist[i];
dto = FillConcessionValidationExtDto(model);
result.Add(dto);
}
*/
statuscode = 1;
result.Sort((x, y) => x.ValidateDate.CompareTo(y.ValidateDate));
}
catch (Exception ex)
{
statuscode = -1;
error = ex.ToString();
}
return new ResultModel<List<ConcessionValidationExtDto>>()
{
Data = result,
StatusCode = statuscode,
Message = error
};
}
public async Task<ResultModel<int>> CheckConcessionValidationStaffLinkNoAsync(string staffLinkNo, string concessionCard, DateTime currentDate, int id)
{
int statuscode = 1;
int result = 1;
int number = id < 1 ? 0 : 1; // if insert check > 0 . if modify > 1
string message = "warning you already add concession card on this date!";
try
{
var anyRecord = await _context.SelectCheckConcessionValidationAsync(currentDate.ToLocalTime().Date, concessionCard.Trim(), staffLinkNo.Trim());
if (anyRecord.Count > number)
{
result = -1;
}
else
{
result = 1; //test
message = "test OK just one time";
}
statuscode = 1;
}
catch (Exception ex)
{
message = "Error " + ex.ToString();
statuscode = -1;
result = 0;
}
return new ResultModel<int>()
{
Data = result,
StatusCode = statuscode,
Message = message,
};
}
public async Task<ResultModel<int>> CheckConcessionValidationStaffLinkNoAsync_old(string staffLinkNo, string concessionCard, DateTime currentDate)
{
int statuscode = 1;
int result = 1;
string concard = concessionCard.Trim();
string message = "warning you already add concession card on this date!";
try
{
var anyRecord = await _context.ConcessionValidations.Where(x =>
x.StafflinkNo == staffLinkNo
&& x.ConcessionCard == concard
&& x.Active == true
&& x.ValidateDate.Date == currentDate.ToLocalTime().Date
).ToListAsync();
if (anyRecord.Count > 0)
{
result = -1;
}
else
{
result = 1; //test
message = "test OK just one time";
}
statuscode = 1;
}
catch (Exception ex)
{
message = "Error " + ex.ToString();
statuscode = -1;
result = 0;
}
return new ResultModel<int>()
{
Data = result,
StatusCode = statuscode,
Message = message,
};
}
public async Task<ResultModel<ConcessionValidationDto>> LoadConcessionValidationByIdAsync(int id)
{
ConcessionValidationDto result = null;
int statuscode = 0;
string error = "";
try
{
if (id > 0)
{
ConcessionValidation model = await _context.ConcessionValidations.FindAsync(id);
result = FillConcessionValidationDto(model);
statuscode = 1;
}
}
catch (Exception ex)
{
statuscode = -1;
error = ex.ToString();
}
return new ResultModel<ConcessionValidationDto>()
{
Data = result,
StatusCode = statuscode,
Message = error
};
}
public async Task<ResultModel<int>> SaveConcessionValidationAsync(ConcessionValidationDto item)
{
int result = default(int);
int statuscode = 0;
string error = "";
//_currentUser = item.StafflinkNo;
try
{
ConcessionValidation model;
if (item.Id > 0)
{
model = await _context.ConcessionValidations.FindAsync(item.Id);
model = FillConcessionValidation(item, model);
model.LastModified = DateTime.Now;
model.LastModifiedId = _currentUser;
result = await _context.SaveChangesAsync();
}
else
{
model = new ConcessionValidation();
model = FillConcessionValidation(item, model);
model.LastModified = DateTime.Now;
model.LastModifiedId = _currentUser;
model.CreatedDate = DateTime.Now;
model.CreatedId = _currentUser;
_context.ConcessionValidations.Add(model);
result = await _context.SaveChangesAsync();
result = model.Id;
}
statuscode = 1;
}
catch (Exception ex)
{
statuscode = -1;
error = ex.ToString();
}
return new ResultModel<int>()
{
Data = result,
StatusCode = statuscode,
Message = error
};
}
public async Task<ResultModel<bool>> DeleteConcessionValidationAsync(int id)
{
bool result = true;
int statuscode = 0;
string error = "";
try
{
if (id > 0)
{
ConcessionValidation model = await _context.ConcessionValidations.FindAsync(id);
model.Active = false;
model.LastModified = DateTime.Now;
model.LastModifiedId = _currentUser;
//_context.ConcessionValidations.Remove(model);
await _context.SaveChangesAsync();
statuscode = 1;
}
}
catch (Exception ex)
{
result = false;
statuscode = -1;
error = ex.ToString();
}
return new ResultModel<bool>()
{
Data = result,
StatusCode = statuscode,
Message = error
};
}
public async Task<ResultModel<FileContent>> GetReport(DateTime fromDate, DateTime toDate)
{
int statusCode = 1;
string fileContext = "filecontain as string this is file contain in string format";
//await this._concessionValidationReport.GetConcessionValidationReport(DateTime.Today.AddDays(-30), DateTime.Today.AddDays(30));
var result = new FileContent
{
Content = Convert.FromBase64String(fileContext),
FileName = "excel extension"
};
var task = await Task.Run(() => 1);
return new ResultModel<FileContent>
{
Data = result,
StatusCode = statusCode
};
}
}
}
@@ -0,0 +1,94 @@
//using BCryptNet = BCrypt.Net.BCrypt;
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
using Microsoft.Extensions.Options;
using CarParkValidationAPI.Authorization;
using CarParkValidationAPI.Entities;
using CarParkValidationAPI.Helpers;
using CarParkValidationAPI.Models.Users;
using CarParkValidationAPI.Models;
using CarParkValidationAPI.Datas;
using CarParkValidationAPI.Interface;
using Microsoft.EntityFrameworkCore;
using System;
namespace CarParkValidationAPI.Repository;
public class LookupCodeRepository: ILookupCode
{
private DataContext _context;
private readonly AppSettings _appSettings;
public LookupCodeRepository(
DataContext context,
IOptions<AppSettings> appSettings)
{
_context = context;
_appSettings = appSettings.Value;
}
public async Task<ResultModel<List<LookupCodeDto>>> LoadConcessionTypeAsync(bool onlyActive)
{
List<LookupCodeDto> result = null;
int statuscode = 0;
string error = "";
try
{
result = await _context.ConcessionTypes.Where(x => x.Active == onlyActive).Select(
x => new LookupCodeDto()
{
Id = x.Id,
Description = x.ConcessionDesc,
}).ToListAsync();
statuscode = 1;
result.Sort((x,y) => x.Description.CompareTo(y.Description));
}
catch (Exception ex)
{
statuscode = -1;
error = ex.ToString();
}
return new ResultModel<List<LookupCodeDto>>()
{
Data = result,
StatusCode = statuscode,
Message = error
};
}
public async Task<ResultModel<List<LookupCodeDto>>> LoadValidationPointAsync(bool onlyActive)
{
List<LookupCodeDto> result = null;
int statuscode = 0;
string error = "";
try
{
result = await _context.Validations.Where(x => x.Active == onlyActive).Select(
x => new LookupCodeDto()
{
Id = x.Id,
Description = x.Description
}).ToListAsync();
result.Sort((x, y) => x.Description.CompareTo(y.Description));
statuscode = 1;
}
catch (Exception ex)
{
statuscode = -1;
error = ex.ToString();
}
return new ResultModel<List<LookupCodeDto>>()
{
Data = result,
StatusCode = statuscode,
Message = error
};
}
}
+79
View File
@@ -0,0 +1,79 @@
using System.Linq;
using CarParkValidationAPI.Datas;
using Microsoft.EntityFrameworkCore;
using System;
namespace CarParkValidationAPI.Repository;
public class Seed
{
private readonly DataContext _context;
public Seed(DataContext context)
{
_context = context;
}
public int InsertOneUser()
{
int id = -1;
//password = password
string txt = " INSERT INTO \"AdminUser\" ( " +
" \"StafflinkNo\", \"FirstName\",\"LastName\", \"Email\", \"AddedOn\", \"RoleType\",\"Active\") " +
"VALUES" +
" ( '60249360','kham', 'vilaythong', 'kham.vilaythong@gmail.com','2025-09-01', 1, TRUE), " +
" ( '60249362', 'Sy', 'vilaythong','sy.vilaythong@gmail.com','2025-09-01', 1, TRUE), " +
" ( '60249363', 'Hung', 'Nguyen', 'hung.nguyen@gmail.com', '2025-09-01', 1, TRUE); ";
string validationPoint = "INSERT INTO \"ValidationPoint\" (" +
"\"DisplayName\", \"Description\",\"Active\" )" +
"VALUES" +
"('Y', 'MAIN Gate', TRUE), " +
"('Y', 'NORTH Gate', TRUE), " +
"('Y', 'SOUTH Gate', TRUE) ";
string concessType = "INSERT INTO \"ConcessionType\" (" +
"\"ConcessionDesc\", \"ConcessionDisplay\", \"Active\")" +
"VALUES ('Senior Card', 'Y', TRUE)," +
"('Student Card', 'Y', TRUE)," +
"('Pensioners Card', 'Y', TRUE)," +
"('Yunior Card', 'Y', TRUE)";
try
{
int count = _context.AdminUsers.Count();
if (count < 1)
{
var conn = _context.Database.GetDbConnection();
try
{
conn.Open();
var command = conn.CreateCommand();
command.CommandText = txt;
command.CommandType = System.Data.CommandType.Text;
command.ExecuteNonQuery();
command.CommandText = validationPoint;
command.CommandType = System.Data.CommandType.Text;
command.ExecuteNonQuery();
command.CommandText = concessType;
command.CommandType = System.Data.CommandType.Text;
command.ExecuteNonQuery();
id = 9;
}
catch (Exception ex)
{
Console.WriteLine(ex.Message);
id = -1;
}
finally
{
conn.Close();
}
}
else
id = 1;
}
catch (Exception ex)
{
id = -10;
}
return id;
}
}
@@ -0,0 +1,261 @@
//using BCryptNet = BCrypt.Net.BCrypt;
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
using Microsoft.Extensions.Options;
using CarParkValidationAPI.Authorization;
using CarParkValidationAPI.Entities;
using CarParkValidationAPI.Helpers;
using CarParkValidationAPI.Models.Users;
using CarParkValidationAPI.Models;
using CarParkValidationAPI.Datas;
using CarParkValidationAPI.Interface;
using Microsoft.EntityFrameworkCore;
using CommonAD.Models;
using CommonAD;
namespace CarParkValidationAPI.Repository
{
public class UserServiceFakeRepository : IUserService
{
private DataContext _context;
private IJwtUtils _jwtUtils;
private readonly AppSettings _appSettings;
public UserServiceFakeRepository(
DataContext context,
IJwtUtils jwtUtils,
IOptions<AppSettings> appSettings)
{
_context = context;
_jwtUtils = jwtUtils;
_appSettings = appSettings.Value;
}
public AuthenticateResponse Authenticate(AuthenticateRequest model)
{
int statuscode = -1;
User myUser = new User();
//now check the adminuser table
var user = _context.AdminUsers.
SingleOrDefault(x => x.StafflinkNo == model.Username
&& x.Active == true);
if (user != null)
{
myUser.Role = (int) user.RoleType;
myUser.Id = user.Id;
myUser.ValidationPointId = user.ValidationPointId??0;
statuscode = 1;
}
else //not allow
{
statuscode = 0;
myUser.Role = (int) AdminRole.Normal;
}
// authentication successful so generate jwt token
var jwtToken = _jwtUtils.GenerateJwtToken(myUser);
return new AuthenticateResponse(myUser, jwtToken);
}
public async Task<ResultModel<AuthenticateResponse>> LoginApiAD(AuthenticateRequest model)
{
User user = new User();
int statusCode = 1;
if (model.Username.ToLower() == "admin")
{
user.FirstName = model.Username;
user.LastName = "LS Test";
user.Role = (int)AdminRole.Admin;
user.Username = model.Username;
user.Email = "admin@mail.com";
user.ValidationPointId = 1;
}
else
{
var userdb = _context.AdminUsers.SingleOrDefault(x => x.StafflinkNo == model.Username);
if (userdb != null)
{
user.Username = model.Username;
user.FirstName = userdb.FirstName;
user.LastName = " LS Normal";
user.Email = userdb.Email;
user.Role = userdb.RoleType;
user.ValidationPointId = userdb.ValidationPointId ?? 1;
}
}
// authentication successful so generate jwt token
var jwtToken = _jwtUtils.GenerateJwtToken(user);
var retval = await Task.Run(() => new AuthenticateResponse(user, jwtToken));
return new ResultModel<AuthenticateResponse>()
{
Data = retval,
StatusCode = statusCode
};
}
public async Task<ResultModel<AuthenticateResponse>> NLoginApiAD(AuthenticateRequest model)
{
User myUser = null;
AuthenticateResponse retval = null;
int statuscode = 0;
string webAPIUrl = _appSettings.LoginWebAPI;
var loginInfo = await CommonAD.WebAPIUtil.GetLoginADAsync(webAPIUrl, "CheckADCredentials", 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;
//now check the adminuser table
var user = _context.AdminUsers.SingleOrDefault(x => x.StafflinkNo == model.Username);
if (user != null)
{
myUser.Role = user.RoleType;
myUser.Id = user.Id;
}
else
myUser.Role = (int) AdminRole.Normal;
// validate
// if (user == null || !BCryptNet.Verify(model.Password, user.PasswordHash))
// authentication successful so generate jwt token
var jwtToken = _jwtUtils.GenerateJwtToken(myUser);
statuscode = 1;
retval = new AuthenticateResponse(myUser, jwtToken);
}
return new ResultModel<AuthenticateResponse>()
{
Data = retval,
StatusCode = statuscode
};
}
public async Task<ResultModel<AuthenticateResponse>> LoginAD(AuthenticateRequest model)
{
User myUser = null;
AuthenticateResponse retval = null;
int statuscode = 0;
ADConfig adConfig = new ADConfig()
{
LDAPPassword = _appSettings.LDAPPassword,
LDAPPath = _appSettings.LDAPPath,
LDAPUser = _appSettings.LDAPUser,
ADTimeOutStr = _appSettings.ADTimeOut
};
myUser = await Task.Run(() => LoginADStaff(adConfig,model.Username, model.Password));
if (!string.IsNullOrEmpty(myUser.Username))
{
statuscode = 1;
// authentication successful so generate jwt token
var jwtToken = _jwtUtils.GenerateJwtToken(myUser);
retval = new AuthenticateResponse(myUser, jwtToken);
}
return new ResultModel<AuthenticateResponse>()
{
Data = retval,
StatusCode = statuscode
};
}
public async Task<ResultModel<User>> SearchApiStaff(string staffLinkNo)
{
User myUser = null;
int statuscode = 0;
myUser = new User();
myUser.Email = "Facky";
myUser.FirstName = "";
myUser.LastName = "";
myUser.Username = staffLinkNo;
statuscode = 0;
/*
string webAPIUrl = _appSettings.LoginWebAPI;
var loginInfo = await CommonAD.WebAPIUtil.SearchStaffAsync(webAPIUrl, "SearchStaff", staffLinkNo);
if (loginInfo != null && loginInfo.result)
{
myUser = new User();
myUser.Email = loginInfo.email;
myUser.FirstName = loginInfo.firstName;
myUser.LastName = loginInfo.lastName;
myUser.Username = loginInfo.stafflinkNo;
statuscode = 1;
}*/
return new ResultModel<User>()
{
Data = myUser,
StatusCode = statuscode
};
// return myUser;
}
public async Task<ResultModel<User>> SearchADStaff(string staffLinkNo)
{
int statuscode = 0;
ADConfig adConfig = new ADConfig()
{
LDAPPassword = _appSettings.LDAPPassword,
LDAPPath = _appSettings.LDAPPath,
LDAPUser = _appSettings.LDAPUser,
ADTimeOutStr = _appSettings.ADTimeOut
};
User myUser = await Task.Run(() => SearchADStaff(adConfig, staffLinkNo));
if (!string.IsNullOrEmpty(myUser.Username))
statuscode = 1;
return new ResultModel<User>()
{
Data = myUser,
StatusCode = statuscode
};
}
private User SearchADStaff(ADConfig adConfig, string username)
{
MyADObject myADObj = new() ;
User user = new()
{
Username = myADObj.stafflinkNo,
Email = myADObj.email,
FirstName = myADObj.firstName,
LastName = myADObj.lastName
};
// myADObj.JobTitle;
return user;
// return null;
}
private User LoginADStaff(ADConfig adConfig, string username, string password)
{
MyADObject myADObj = new();
User user = new()
{
Username = username,
Email = "email",
FirstName = username,
LastName = "Fake"
};
// myADObj.JobTitle;
return user;
// return null;
}
}
}
@@ -0,0 +1,258 @@
//using BCryptNet = BCrypt.Net.BCrypt;
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
using Microsoft.Extensions.Options;
using CarParkValidationAPI.Authorization;
using CarParkValidationAPI.Entities;
using CarParkValidationAPI.Helpers;
using CarParkValidationAPI.Models.Users;
using CarParkValidationAPI.Models;
using CarParkValidationAPI.Datas;
using CarParkValidationAPI.Interface;
using Microsoft.EntityFrameworkCore;
using CommonAD.Models;
using CommonAD;
namespace CarParkValidationAPI.Repository;
public class UserServiceRepository : IUserService
{
private DataContext _context;
private IJwtUtils _jwtUtils;
private readonly AppSettings _appSettings;
public UserServiceRepository(
DataContext context,
IJwtUtils jwtUtils,
IOptions<AppSettings> appSettings)
{
_context = context;
_jwtUtils = jwtUtils;
_appSettings = appSettings.Value;
}
public AuthenticateResponse Authenticate(AuthenticateRequest model)
{
User myUser = new();
var adminUser = _context.AdminUsers.SingleOrDefault(x => x.StafflinkNo == model.Username);
if (adminUser != null)
{
myUser.Id = adminUser.Id;
myUser.Email = adminUser.Email;
myUser.FirstName = adminUser.FirstName;
myUser.LastName = adminUser.LastName;
myUser.Role = adminUser.RoleType;
}
// validate
// if (user == null || !BCryptNet.Verify(model.Password, user.PasswordHash))
// if (adminUser == null || (model.Password != adminUser.PasswordHash))
// throw new System.Exception("Username or password is incorrect");
// authentication successful so generate jwt token
var jwtToken = _jwtUtils.GenerateJwtToken(myUser);
return new AuthenticateResponse(myUser, jwtToken);
}
public async Task<ResultModel<AuthenticateResponse>> LoginApiAD(AuthenticateRequest model)
{
User myUser = null;
AuthenticateResponse retval = null;
int statuscode = 0;
string webAPIUrl = _appSettings.LoginWebAPI;
myUser = new User();
//now check the adminuser table
var user = _context.AdminUsers.
SingleOrDefault(x => x.StafflinkNo == model.Username
&& x.Active == true);
if (user != null)
{
myUser.Role = (int) user.RoleType;
myUser.Id = user.Id;
myUser.ValidationPointId = user.ValidationPointId??0;
statuscode = 1;
}
else //not allow
{
statuscode = 0;
myUser.Role = (int) AdminRole.Normal;
}
// validate
// if (user == null || !BCryptNet.Verify(model.Password, user.PasswordHash))
// authentication successful so generate jwt token
var jwtToken = _jwtUtils.GenerateJwtToken(myUser);
//statuscode = 1;
retval = new AuthenticateResponse(myUser, jwtToken);
return new ResultModel<AuthenticateResponse>()
{
Data = retval,
StatusCode = statuscode
};
}
public async Task<ResultModel<AuthenticateResponse>> LoginApiAD_old(AuthenticateRequest model)
{
User myUser = null;
AuthenticateResponse retval = null;
int statuscode = 0;
string webAPIUrl = _appSettings.LoginWebAPI;
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;
//now check the adminuser table
var user = _context.AdminUsers.
SingleOrDefault(x => x.StafflinkNo == model.Username
&& x.Active == true);
if (user != null)
{
myUser.Role = (int) user.RoleType;
myUser.Id = user.Id;
myUser.ValidationPointId = user.ValidationPointId ?? 0;
statuscode = 1;
}
else //not allow
{
statuscode = 0;
myUser.Role = (int) AdminRole.Normal;
}
// validate
// if (user == null || !BCryptNet.Verify(model.Password, user.PasswordHash))
// authentication successful so generate jwt token
var jwtToken = _jwtUtils.GenerateJwtToken(myUser);
//statuscode = 1;
retval = new AuthenticateResponse(myUser, jwtToken);
}
return new ResultModel<AuthenticateResponse>()
{
Data = retval,
StatusCode = statuscode
};
}
public async Task<ResultModel<AuthenticateResponse>> LoginAD(AuthenticateRequest model)
{
User myUser = null;
AuthenticateResponse retval = null;
int statuscode = 0;
ADConfig adConfig = new ADConfig()
{
LDAPPassword = _appSettings.LDAPPassword,
LDAPPath = _appSettings.LDAPPath,
LDAPUser = _appSettings.LDAPUser,
ADTimeOutStr = _appSettings.ADTimeOut
};
myUser = await Task.Run(() => LoginADStaff(adConfig,model.Username, model.Password));
if (!string.IsNullOrEmpty(myUser.Username))
{
statuscode = 1;
// authentication successful so generate jwt token
var jwtToken = _jwtUtils.GenerateJwtToken(myUser);
retval = new AuthenticateResponse(myUser, jwtToken);
}
return new ResultModel<AuthenticateResponse>()
{
Data = retval,
StatusCode = statuscode
};
}
public async Task<ResultModel<User>> SearchApiStaff(string staffLinkNo)
{
User myUser = null;
int statuscode = 0;
string webAPIUrl = _appSettings.LoginWebAPI;
var loginInfo = await CommonAD.WebAPIUtil.SearchStaffAsync(webAPIUrl, "SearchStaff", staffLinkNo);
if (loginInfo != null && loginInfo.result)
{
myUser = new User();
myUser.Email = loginInfo.email;
myUser.FirstName = loginInfo.firstName;
myUser.LastName = loginInfo.lastName;
myUser.Username = loginInfo.stafflinkNo;
statuscode = 1;
}
return new ResultModel<User>()
{
Data = myUser,
StatusCode = statuscode
};
// return myUser;
}
public async Task<ResultModel<User>> SearchADStaff(string staffLinkNo)
{
int statuscode = 0;
ADConfig adConfig = new ADConfig()
{
LDAPPassword = _appSettings.LDAPPassword,
LDAPPath = _appSettings.LDAPPath,
LDAPUser = _appSettings.LDAPUser,
ADTimeOutStr = _appSettings.ADTimeOut
};
User myUser = await Task.Run(() => SearchADStaff(adConfig, staffLinkNo));
if (!string.IsNullOrEmpty(myUser.Username))
statuscode = 1;
return new ResultModel<User>()
{
Data = myUser,
StatusCode = statuscode
};
}
private User SearchADStaff(ADConfig adConfig, string username)
{
MyADObject myADObj = new();
User user = new()
{
Username = myADObj.stafflinkNo,
Email = myADObj.email,
FirstName = myADObj.firstName,
LastName = myADObj.lastName
};
// myADObj.JobTitle;
return user;
// return null;
}
private User LoginADStaff(ADConfig adConfig, string username, string password)
{
MyADObject myADObj = new();
User user = new()
{
Username = myADObj.stafflinkNo,
Email = myADObj.email,
FirstName = myADObj.firstName,
LastName = myADObj.lastName
};
// myADObj.JobTitle;
return user;
// return null;
}
}
@@ -0,0 +1,187 @@
using CarParkValidationAPI.Datas;
using CarParkValidationAPI.Entities;
using CarParkValidationAPI.Interface;
using CarParkValidationAPI.Models;
using Microsoft.EntityFrameworkCore;
using Microsoft.Extensions.Options;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
namespace CarParkValidationAPI.Repository
{
public class ValidationPointRepository : IValidationPoint
{
private DataContext _context;
private readonly AppSettings _appSettings;
private string _currentUser = "";
private List<ValidationPointDto> _list = new List<ValidationPointDto>();
public ValidationPointRepository(
DataContext context,
IOptions<AppSettings> appSettings)
{
_context = context;
_appSettings = appSettings.Value;
}
public void SetCurrentUser(string username)
{
_currentUser = username;
}
private ValidationPointDto FillValidationDto(ValidationPoint item)
{
ValidationPointDto dto = new ValidationPointDto();
dto.Active = item.Active;
dto.Description = item.Description;
dto.Display = item.DisplayName;
dto.Id = item.Id;
return dto;
}
private ValidationPoint FillValidationModel(ValidationPointDto item, ValidationPoint model) {
model.Active = item.Active;
model.Description = item.Description.Trim();
if (!string.IsNullOrEmpty(item.Display))
model.DisplayName = item.Display.Trim();
return model;
}
public async Task<ResultModel<List<ValidationPointDto>>> LoadValidationPointAsync(bool onlyActive)
{
int statuscode = 0;
string error = "";
try
{
var it = await _context.Validations.ToListAsync();
ValidationPointDto dto;
for (int i = 0; i < it.Count; i++)
{
dto = FillValidationDto(it[i]);
_list.Add(dto);
}
_list.Sort((x, y) => x.Description.CompareTo(y.Description));
statuscode = 1;
}
catch (Exception ex)
{
error = ex.ToString();
statuscode = -1;
}
return new ResultModel<List<ValidationPointDto>>()
{
Data = _list,
StatusCode = statuscode,
Message = error
};
}
public async Task<ResultModel<ValidationPointDto>> LoadValidationPointByIdAsync(int id)
{
ValidationPoint result = null;
int statuscode = 0;
string error = "";
ValidationPointDto dto = null;
try
{
result = await _context.Validations.FindAsync(id);
dto = FillValidationDto(result);
//result = _list.Find(x => x.Id == id);
//var dto = await Task.Run(() => result);
statuscode = 1;
}
catch (Exception ex)
{
error = ex.ToString();
statuscode = -1;
}
return new ResultModel<ValidationPointDto>()
{
Data = dto,
StatusCode = statuscode,
Message = error
};
}
public async Task<ResultModel<int>> SaveValidationPointAsync(ValidationPointDto item)
{
int result = default(int);
int statuscode = 0;
string error = "";
try
{
ValidationPoint model;
if (item.Id > 0)
{
model = await _context.Validations.FindAsync(item.Id);
model = FillValidationModel(item, model);
model.LastModified = DateTime.Now;
model.LastModifiedId = _currentUser;
await _context.SaveChangesAsync();
result = item.Id;
}
else //new record
{
model = new ValidationPoint();
model.LastModified = DateTime.Now;
model.LastModifiedId = _currentUser;
model = FillValidationModel(item, model);
_context.Validations.Add(model);
var id = await _context.SaveChangesAsync();
result = model.Id;
}
statuscode = 1;
}
catch (Exception ex)
{
error = ex.ToString();
statuscode = -1;
}
//var dto = await Task.Run(() => result);
return new ResultModel<int>()
{
Data = result,
StatusCode = statuscode,
Message = error
};
}
public async Task<ResultModel<bool>> DeleteValidationPointAsync(int id)
{
bool result = true;
int statuscode = 0;
string error = "";
try
{
ValidationPoint model;
if (id > 0)
{
model = await _context.Validations.FindAsync(id);
model.Active = false;
//_context.Validations.Remove(model);
await _context.SaveChangesAsync();
statuscode = 1;
}
}
catch (Exception ex)
{
error = ex.ToString();
statuscode = -1;
}
//var dto = await Task.Run(() => result);
return new ResultModel<bool>()
{
Data = result,
StatusCode = statuscode,
Message = error
};
}
}
}
@@ -0,0 +1,16 @@
{
"Logging": {
"LogLevel": {
"Default": "Information",
"Microsoft": "Warning",
"Microsoft.Hosting.Lifetime": "Information"
}
},
"AllowedHosts": "*"
}
/*
"SQLConnectionString": "Server=NEPHICT-040931L;Initial Catalog=CarParkValidation;Persist Security Info=False;User ID=bids_admin;Password=Password4BI;MultipleActiveResultSets=False;Encrypt=True;TrustServerCertificate=True;Connection Timeout=30;",
user id=bids_admin;password=Password4BI;
Server=tcp:10.60.207.82,1433;
*/
+23
View File
@@ -0,0 +1,23 @@
{
"AppSettings": {
"Secret": "Nepean Blue Mountain Super Secret SIGN AND VERIFY JWT TOKENS, BEARER TOKEN USE WHEN CALLING THIS API.",
"SQLConnectionString_SQL": "Server=127.0.0.1,1433;Initial Catalog=CarParkValidation;User Id=sa;Password=Positive@2022;Encrypt=True;TrustServerCertificate=True;Connection Timeout=30;",
"SQLConnectionString": "host=localhost;port=5432;database=CarParkValidation;username=postgres;password=Positive~1;",
"LDAPPath": "",
"LDAPUser": "S",
"LDAPPassword": "",
"ADTimeOut": "30",
"LoginWebAPI": "http://NEPHMDB-SQL007/CommonWebApiAD/api/AD"
},
"Logging": {
"LogLevel": {
"Default": "Information",
"Microsoft": "Warning",
"Microsoft.Hosting.Lifetime": "Information"
}
},
"AllowedHosts": "*"
}
Binary file not shown.
+16
View File
@@ -0,0 +1,16 @@
services:
sqlserver:
image: mcr.microsoft.com/mssql/server:2022-latest
container_name: sqlserver
hostname: mydocker-sqlserver
environment:
- ACCEPT_EULA=Y
- MSSQL_SA_PASSWORD=YourStrong!Passw0rdd
- MSSQL_PID=Express
ports:
- "1433:1433"
volumes:
- mssql_data:/var/opt/mssql/data
volumes:
mssql_data:
+15
View File
@@ -0,0 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<location path="." inheritInChildApplications="false">
<system.webServer>
<handlers>
<add name="aspNetCore" path="*" verb="*" modules="AspNetCoreModuleV2" resourceType="Unspecified" />
</handlers>
<aspNetCore processPath="bin\Debug\net5.0\CarParkValidationAPI.exe" arguments="" stdoutLogEnabled="false" hostingModel="InProcess">
<environmentVariables>
<environmentVariable name="ASPNETCORE_ENVIRONMENT" value="Development" />
</environmentVariables>
</aspNetCore>
</system.webServer>
</location>
</configuration>
+44
View File
@@ -0,0 +1,44 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Web;
using System.Configuration;
namespace CommonAD.Models
{
public class ADConfig
{
public string LDAPPath = "";
public string LDAPUser = "";
public string LDAPPassword = "";
private TimeSpan _ADTimeOut = TimeSpan.FromSeconds(0);
public TimeSpan ADTimeOut
{
get
{
return _ADTimeOut;
}
}
public string ADTimeOutStr
{
set
{
if (!string.IsNullOrEmpty(value))
_ADTimeOut = TimeSpan.FromSeconds(Convert.ToDouble(value));
}
}
/*
public static void Init()
{
LDAPPath = ConfigurationManager.AppSettings["LDAPPath"];
LDAPUser = ConfigurationManager.AppSettings["LDAPUser"];
LDAPPassword = ConfigurationManager.AppSettings["LDAPPassword"];
ADTimeOut = TimeSpan.FromSeconds(Convert.ToDouble(ConfigurationManager.AppSettings["ADTimeOut"]));
}
*/
}
}
+373
View File
@@ -0,0 +1,373 @@
using CommonAD.Models;
using System;
using System.Collections.Generic;
using System.DirectoryServices;
namespace CommonAD
{
public class ADStaffLink
{
private ADConfig _adConfig;
public ADStaffLink (ADConfig adConfig)
{
_adConfig = adConfig;
}
public MyADObject SearchStaff(string FirstName = "", string LastName = "")
{
MyADObject ADObj = new MyADObject();
using (var DE = new System.DirectoryServices.DirectoryEntry(_adConfig.LDAPPath, _adConfig.LDAPUser, _adConfig.LDAPPassword))
{
try
{
DirectorySearcher adsSearcher = new DirectorySearcher(DE);
adsSearcher.ClientTimeout = _adConfig.ADTimeOut;
adsSearcher.ServerTimeLimit = _adConfig.ADTimeOut;
adsSearcher.ServerPageTimeLimit = _adConfig.ADTimeOut;
adsSearcher.Filter = string.Format("(&(objectCategory=person)(objectClass=user)(givenname={0})(sn={1}))", FirstName, LastName);
try
{
SearchResult sr = adsSearcher.FindOne();
if (sr != null)
{
ADObj.result = true;
//LoginResult.Login = GetUserPropertyValue(sr, "sAMAccountName", 0);
ADObj.StafflinkNo = GetUserPropertyValue(sr, "sAMAccountName", 0);
ADObj.FirstName = GetUserPropertyValue(sr, "givenname", 0);
ADObj.LastName = GetUserPropertyValue(sr, "sn", 0);
ADObj.Email = GetUserPropertyValue(sr, "mail", 0);
ADObj.Company = GetUserPropertyValue(sr, "company", 0);
ADObj.Location = GetUserPropertyValue(sr, "physicalDeliveryOfficeName", 0);
ADObj.Department = GetUserPropertyValue(sr, "department", 0);
ADObj.BadPwdCount = GetUserPropertyValue(sr, "badPwdCount", 0);
ADObj.Phone = GetUserPropertyValue(sr, "telephonenumber", 0);
ADObj.DisplayName = GetUserPropertyValue(sr, "displayName", 0);
ADObj.Manager = GetUserPropertyValue(sr, "manager", 0);
ADObj.ReportsTo = GetUserPropertyValue(sr, "directReports", 0);
ADObj.StaffList = GetUserPropertyValue(sr, "staffList", 0);
}
}
catch
{
// Failed to authenticate. Most likely it is caused by unknown user
// id or bad strPassword.
ADObj.result = false;
}
}
catch
{
ADObj.result = false;
}
}
//LoginResult.Success = res;
//string token = "";
//long tickTock = DateTime.Now.Ticks;
//if (res)
//{
// string tokenPT = app + "|" + user + "|" + "|" + tickTock + "|" + "NBM";
// token = CommonCrypt.EncryptString(tokenPT, "bagmas2011+", "a1b2c3d4");
// token = CommonEncoding.Base64Encode(token);
//}
//LoginResult.Login = user;
//LoginResult.Token = token;
//LoginResult.Time = tickTock;
return ADObj;
}
public MyADObject SearchStaff(string StaffLinkNo)
{
MyADObject ADObj = new MyADObject();
using (var DE = new System.DirectoryServices.DirectoryEntry(_adConfig.LDAPPath, _adConfig.LDAPUser, _adConfig.LDAPPassword))
{
try
{
DirectorySearcher adsSearcher = new DirectorySearcher(DE);
adsSearcher.ClientTimeout = _adConfig.ADTimeOut;
adsSearcher.ServerTimeLimit = _adConfig.ADTimeOut;
adsSearcher.ServerPageTimeLimit = _adConfig.ADTimeOut;
adsSearcher.Filter = "(SAMAccountName=" + StaffLinkNo + ")";
try
{
SearchResult sr = adsSearcher.FindOne();
if (sr != null)
{
ADObj.result = true;
// LoginResult.Login = GetUserPropertyValue(sr, "sAMAccountName", 0); ;
ADObj.StafflinkNo = GetUserPropertyValue(sr, "SAMAccountName", 0);
ADObj.FirstName = GetUserPropertyValue(sr, "givenname", 0);
ADObj.LastName = GetUserPropertyValue(sr, "sn", 0);
ADObj.Email = GetUserPropertyValue(sr, "mail", 0);
ADObj.Company = GetUserPropertyValue(sr, "company", 0);
ADObj.Location = GetUserPropertyValue(sr, "physicalDeliveryOfficeName", 0);
ADObj.Department = GetUserPropertyValue(sr, "department", 0);
ADObj.JobTitle = GetUserPropertyValue(sr, "title", 0);
ADObj.BadPwdCount = GetUserPropertyValue(sr, "badPwdCount", 0);
ADObj.Phone = GetUserPropertyValue(sr, "telephonenumber", 0);
ADObj.DisplayName = GetUserPropertyValue(sr, "displayName", 0);
ADObj.Manager = GetUserPropertyValue(sr, "manager", 0);
ADObj.ReportsTo = GetUserPropertyValue(sr, "directReports", 0);
ADObj.StaffList = GetUserPropertyValue(sr, "staffList", 0);
}
}
catch (Exception ex)
{
// Failed to authenticate. Most likely it is caused by unknown user
// id or bad strPassword.
ADObj.result = false;
}
}
catch
{
ADObj.result = false;
}
}
//LoginResult.Success = res;
//string token = "";
//long tickTock = DateTime.Now.Ticks;
//if (res)
//{
// string tokenPT = app + "|" + user + "|" + "|" + tickTock + "|" + "NBM";
// token = CommonCrypt.EncryptString(tokenPT, "bagmas2011+", "a1b2c3d4");
// token = CommonEncoding.Base64Encode(token);
//}
//LoginResult.Login = user;
//LoginResult.Token = token;
//LoginResult.Time = tickTock;
return ADObj;
}
public MyADObject CheckADCredentials(string user, string pass)
{
//dynamic LoginResult = new JObject() as dynamic;
bool res = true;
MyADObject ADObj = new MyADObject();
using (var DE = new System.DirectoryServices.DirectoryEntry(_adConfig.LDAPPath, user, pass))
{
try
{
//DE.RefreshCache(); // This will force credentials validation
DirectorySearcher adsSearcher = new DirectorySearcher(DE);
adsSearcher.ClientTimeout = _adConfig.ADTimeOut;
adsSearcher.ServerTimeLimit = _adConfig.ADTimeOut;
adsSearcher.ServerPageTimeLimit = _adConfig.ADTimeOut;
//adsSearcher.Filter = "(&(objectClass=user)(objectCategory=person))";
adsSearcher.Filter = "(sAMAccountName=" + user + ")";
try
{
SearchResult sr = adsSearcher.FindOne();
if (sr != null)
{
ADObj.StafflinkNo = GetUserPropertyValue(sr, "sAMAccountName", 0); ;
ADObj.FirstName = GetUserPropertyValue(sr, "givenname", 0);
ADObj.LastName = GetUserPropertyValue(sr, "sn", 0);
ADObj.Email = GetUserPropertyValue(sr, "mail", 0);
ADObj.Company = GetUserPropertyValue(sr, "company", 0);
ADObj.Location = GetUserPropertyValue(sr, "physicalDeliveryOfficeName", 0);
ADObj.Department = GetUserPropertyValue(sr, "department", 0);
ADObj.BadPwdCount = GetUserPropertyValue(sr, "badPwdCount", 0);
ADObj.Phone = GetUserPropertyValue(sr, "telephonenumber", 0);
ADObj.DisplayName = GetUserPropertyValue(sr, "displayName", 0);
ADObj.Manager = GetUserPropertyValue(sr, "manager", 0);
// we will retrieve the count of staff in DirectReports as a flag to determine if this user is a manager
// we will assume if no staff then requests lodged by this user will need signoff by their manager
//LoginResult.StaffListCount = sr.Properties["DirectReports"].Count;
//LoginResult.PWD = ADConfig.LDAPPassword;
//LoginResult.User = ADConfig.LDAPUser;
/* // we do not think we need actual staff IDs at this point - a count of staff will be enough for this application
// but leave here in case we need to re-use this in another app.
List<string> StaffList = new List<string>();
foreach (string objProperty in sr.Properties["DirectReports"])
{
string emp = objProperty.ToString().Split(',')[0];
emp = emp.Replace("CN=", "");
StaffList.Add(emp);
//emps.Add(emp);
//user.StaffList += '|';
//user.StaffList += emp;
//
}
LoginResult.StaffList = JsonConvert.SerializeObject(StaffList);
*/
try
{
if (ADObj.Manager != String.Empty)
{
String managerInfo = Convert.ToString(ADObj.Manager);
String managerID = managerInfo.Split(',')[0].Split('=')[1];
String managerOU = managerInfo.Split(',')[1].Split('=')[1];
List<MyADObject> managerDetails = Search(managerID, managerOU);
// JToken managerDetails = Search(managerID);
ADObj.ManagerDetails = managerDetails[0].ToString();
}
}
catch (Exception ex)
{
ADObj.ManagerDetails = "Not available: " + ex.Message;
}
}
}
catch (Exception ex2)
{
// Failed to authenticate. Most likely it is caused by unknown user
// id or bad strPassword.
res = false;
}
}
catch
{
res = false;
}
}
ADObj.result = res;
// string token = "";
// long tickTock = DateTime.Now.Ticks;
// if (res)
// {
//string tokenPT = app + "|" + user + "|" + pass + "|" + tickTock + "|" + "NBM";
//token = CommonCrypt.EncryptString(tokenPT, "bagmas2011+", "a1b2c3d4");
//token = CommonEncoding.Base64Encode(token);
//}
//LoginResult.Token = token;
//LoginResult.Time = tickTock;
//return LoginResult;
return ADObj;
}
public List<MyADObject> Search(string q, string ou)
{
//ou = "Nepean Blue Mountains";
MyADObject ADObj = new Models.MyADObject();
//ADConfig.Init();
List<MyADObject> lstLDAPUser = new List<MyADObject>();
if (string.IsNullOrEmpty(q))
q = "______"; //defualt not found
System.DirectoryServices.DirectoryEntry dirEntry = new System.DirectoryServices.DirectoryEntry(_adConfig.LDAPPath, _adConfig.LDAPUser, _adConfig.LDAPPassword);
DirectorySearcher dirSearch = new DirectorySearcher(dirEntry);
dirSearch.ClientTimeout = _adConfig.ADTimeOut;
dirSearch.ServerTimeLimit = _adConfig.ADTimeOut;
dirSearch.ServerPageTimeLimit = _adConfig.ADTimeOut;
dirSearch.Filter = "(&(objectClass=user)(|(cn=" + q + "*)))";
dirSearch.SearchRoot = dirEntry;
dirSearch.SearchScope = SearchScope.Subtree;
dirSearch.PageSize = 100;
dirSearch.Sort = new SortOption("displayName", SortDirection.Ascending);
using (SearchResultCollection src = dirSearch.FindAll())
{
int i = 0;
foreach (SearchResult sr in src)
{
i++;
if (i > 100)
break;
bool bLogindisabled = true;
string sTmp = GetUserPropertyValue(sr, "logindisabled", 0);
bLogindisabled = (sTmp == string.Empty ? false : Convert.ToBoolean(sTmp));
if (!bLogindisabled)
{
sTmp = GetUserPropertyValue(sr, "passwordexpirationtime", 0);
if (sTmp != "")
{
try
{
if (DateTime.Now > Convert.ToDateTime(sTmp))
{
bLogindisabled = true;
}
}
catch { }
}
}
if (!bLogindisabled)
{
MyADObject user = new MyADObject();
// user.Login = GetUserPropertyValue(sr, "sAMAccountName", 0);
user.StafflinkNo = GetUserPropertyValue(sr, "sAMAccountName", 0);
user.FirstName = GetUserPropertyValue(sr, "givenname", 0);
user.LastName = GetUserPropertyValue(sr, "sn", 0);
user.Email = GetUserPropertyValue(sr, "mail", 0);
user.Company = GetUserPropertyValue(sr, "company", 0);
user.Location = GetUserPropertyValue(sr, "physicalDeliveryOfficeName", 0);
user.Department = GetUserPropertyValue(sr, "department", 0);
user.BadPwdCount = GetUserPropertyValue(sr, "badPwdCount", 0);
//user.company = GetUserPropertyValue(sr, "company", 0);
user.Phone = GetUserPropertyValue(sr, "telephonenumber", 0);
user.DisplayName = GetUserPropertyValue(sr, "displayName", 0);
//user.distinguishedName = GetUserPropertyValue(sr, "distinguishedName", 0);
user.DisplayName = GetUserPropertyValue(sr, "displayName", 0);
lstLDAPUser.Add(user);
}
}
}
if (dirSearch != null)
dirSearch.Dispose();
if (dirEntry != null)
dirEntry.Dispose();
return lstLDAPUser;
}//end method
private string GetUserPropertyValue(SearchResult res, string sPropertyName, int lIndex)
{
try
{
if (res.Properties[sPropertyName].Count > lIndex)
{
string s;
object v = res.Properties[sPropertyName][lIndex];
if (v.GetType() == typeof(byte[]))
{
s = System.Text.ASCIIEncoding.ASCII.GetString((byte[])v);
}
else if (v.GetType() == typeof(DateTime))
{
s = ((DateTime)v).ToLocalTime().ToString("yyyy/MM/dd HH:mm:ss");
}
else
{
s = v.ToString();
}
return (s);
}
else
{
return ("");
}
}
catch
{
return ("");
}
}
}
}
+17
View File
@@ -0,0 +1,17 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net8.0;net10.0</TargetFrameworks>
<LangVersion>14</LangVersion>
</PropertyGroup>
<ItemGroup>
<Compile Remove="ADStaffLink.cs" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="System.DirectoryServices" Version="10.0.8" />
<PackageReference Include="System.Net.Http.Json" Version="10.0.8" />
</ItemGroup>
</Project>
+33
View File
@@ -0,0 +1,33 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Web;
using System.Configuration;
namespace CommonAD.Models
{
public class MyADObject
{
public string stafflinkNo { get; set; }
public string firstName { get; set; }
public string lastName { get; set; }
public string email { get; set; }
public string company { get; set; }
public string location { get; set; }
public string department { get; set; }
public string jobTitle { get; set; }
public string badPwdCount { get; set; }
public string phone { get; set; }
public string displayName { get; set; }
public string manager { get; set; }
public string reportsTo { get; set; }
public string staffList { get; set; }
public string managerDetails { get; set; }
public bool result { get; set; }
}
}
+316
View File
@@ -0,0 +1,316 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Net;
using System.Net.Http;
using System.Net.Http.Headers;
using System.Text;
using System.Threading.Tasks;
using CommonAD.Models;
using System.Net.Http.Json;
namespace CommonAD
{
public class WebAPIUtil
{
/// <summary>
/// SearchStaff
/// </summary>
/// <param name="webAPIUri">"http://virtapp-mdb048/CommonAPI/api/AD/"</param>
/// <param name="actionEntry"> "SearchStaff"</param>
/// <param name="username"></param>
/// <param name="error"></param>
/// <returns></returns>
public static MyADObject SearchStaff(string webAPIUri, string actionEntry, string username)
{
MyADObject result = null;
if (!webAPIUri.EndsWith("/"))
webAPIUri += "/";
System.Net.ServicePointManager.SecurityProtocol = SecurityProtocolType.Tls12 | SecurityProtocolType.Tls11 | SecurityProtocolType.Tls;
using (var client = new HttpClient())
{
client.BaseAddress = new Uri(webAPIUri);
// We want the response to be JSON.
// client.DefaultRequestHeaders.Accept.Clear();
// client.DefaultRequestHeaders.Accept.Add(new MediaTypeWithQualityHeaderValue("application/json"));
// Build up the data to POST.
// List<KeyValuePair<string, string>> postData = new List<KeyValuePair<string, string>>();
// postData.Add(new KeyValuePair<string, string>("StaffLinkNo", username));
// postData.Add(new KeyValuePair<string, string>("pass", password));
//postData.Add(new KeyValuePair<string, string>("client_secret", clientSecret));
//var form = new Dictionary<string, string>
//{
// {"grant_type", "client_credentials"},
//};
//client.DefaultRequestHeaders.Authorization = new System.Net.Http.Headers.AuthenticationHeaderValue("Bearer", token);
//client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Basic", Convert.ToBase64String(System.Text.ASCIIEncoding.ASCII.GetBytes(username + ":" + password)));
// HttpContent content = new StringContent(json, Encoding.UTF8);
// actionEntry = webAPIUri + actionEntry;
// FormUrlEncodedContent content = new FormUrlEncodedContent(postData);
//FormUrlEncodedContent content = new FormUrlEncodedContent(form);
// Post to the Server and parse the response.
//HttpResponseMessage response = await client.PostAsync("Token", content);
// string jsonString = await response.Content.ReadAsStringAsync();
//HttpResponseMessage response = client.PostAsync(actionEntry, content).GetAwaiter().GetResult();
actionEntry = actionEntry + "?StaffLinkNo=" + username;
try
{
var myado = client.GetFromJsonAsync<MyADObject>(actionEntry).GetAwaiter().GetResult();
if (myado != null)
result = myado;
}
catch(Exception ex)
{
throw ex;
}
}
return result;
}
/// <summary>
/// SearchStaff Async version
/// </summary>
/// <param name="webAPIUri">"http://virtapp-mdb048/CommonAPI/api/AD/"</param>
/// <param name="actionEntry"> "SearchStaff"</param>
/// <param name="username"></param>
/// <returns></returns>
public static async Task<MyADObject> SearchStaffAsync(string webAPIUri, string actionEntry, string username)
{
MyADObject result = null;
string error = "";
if (!webAPIUri.EndsWith("/"))
webAPIUri += "/";
System.Net.ServicePointManager.SecurityProtocol = SecurityProtocolType.Tls12 | SecurityProtocolType.Tls11 | SecurityProtocolType.Tls;
using (var client = new HttpClient())
{
client.BaseAddress = new Uri(webAPIUri);
// We want the response to be JSON.
// client.DefaultRequestHeaders.Accept.Clear();
// client.DefaultRequestHeaders.Accept.Add(new MediaTypeWithQualityHeaderValue("application/json"));
// Build up the data to POST.
// List<KeyValuePair<string, string>> postData = new List<KeyValuePair<string, string>>();
// postData.Add(new KeyValuePair<string, string>("StaffLinkNo", username));
// postData.Add(new KeyValuePair<string, string>("pass", password));
//postData.Add(new KeyValuePair<string, string>("client_secret", clientSecret));
//var form = new Dictionary<string, string>
//{
// {"grant_type", "client_credentials"},
//};
//client.DefaultRequestHeaders.Authorization = new System.Net.Http.Headers.AuthenticationHeaderValue("Bearer", token);
//client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Basic", Convert.ToBase64String(System.Text.ASCIIEncoding.ASCII.GetBytes(username + ":" + password)));
// HttpContent content = new StringContent(json, Encoding.UTF8);
// actionEntry = webAPIUri + actionEntry;
//FormUrlEncodedContent content = new FormUrlEncodedContent(postData);
//FormUrlEncodedContent content = new FormUrlEncodedContent(form);
// Post to the Server and parse the response.
//HttpResponseMessage response = await client.PostAsync("Token", content);
// string jsonString = await response.Content.ReadAsStringAsync();
//HttpResponseMessage response = client.PostAsync(actionEntry, content).GetAwaiter().GetResult();
actionEntry = actionEntry + "?StaffLinkNo=" + username;
try
{
result = await client.GetFromJsonAsync<MyADObject>(actionEntry);
}
catch (Exception ex)
{
error = ex.ToString();
result = null;
}
}
return result;
}
/// <summary>
/// GetLoginAD webAPIUri "http://virtapp-mdb048/CommonAPI/api/AD/";
/// </summary>
/// <param name="webAPIUri"> "http://virtapp-mdb048/CommonAPI/api/AD/"</param>
/// <param name="actionEntry">"CheckADCredentials"</param>
/// <param name="username"></param>
/// <param name="password"></param>
/// <param name="error"></param>
/// <returns></returns>
public static string GetLoginAD(string webAPIUri, string actionEntry, string username, string password, out string error)
{
string result = "";
// string tokenstr = "";
if (!webAPIUri.EndsWith("/"))
webAPIUri += "/";
string mytoken = "";
error = "";
System.Net.ServicePointManager.SecurityProtocol = SecurityProtocolType.Tls12 | SecurityProtocolType.Tls11 | SecurityProtocolType.Tls;
using (var client = new HttpClient())
{
client.BaseAddress = new Uri(webAPIUri);
// We want the response to be JSON.
// client.DefaultRequestHeaders.Accept.Clear();
// client.DefaultRequestHeaders.Accept.Add(new MediaTypeWithQualityHeaderValue("application/json"));
// Build up the data to POST.
// List<KeyValuePair<string, string>> postData = new List<KeyValuePair<string, string>>();
// postData.Add(new KeyValuePair<string, string>("user", username));
// postData.Add(new KeyValuePair<string, string>("pass", password));
//postData.Add(new KeyValuePair<string, string>("client_secret", clientSecret));
//var form = new Dictionary<string, string>
//{
// {"grant_type", "client_credentials"},
//};
//client.DefaultRequestHeaders.Authorization = new System.Net.Http.Headers.AuthenticationHeaderValue("Bearer", token);
//client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Basic", Convert.ToBase64String(System.Text.ASCIIEncoding.ASCII.GetBytes(username + ":" + password)));
// HttpContent content = new StringContent(json, Encoding.UTF8);
// actionEntry = webAPIUri + actionEntry;
// FormUrlEncodedContent content = new FormUrlEncodedContent(postData);
//FormUrlEncodedContent content = new FormUrlEncodedContent(form);
// Post to the Server and parse the response.
//HttpResponseMessage response = await client.PostAsync("Token", content);
// string jsonString = await response.Content.ReadAsStringAsync();
//HttpResponseMessage response = client.PostAsync(actionEntry, content).GetAwaiter().GetResult();
actionEntry = actionEntry + "?user=" + username + "&pass=" + password;
//client.GetFromJsonAsync<MyADObject>(actionEntry);
HttpResponseMessage response = client.GetAsync(actionEntry).GetAwaiter().GetResult();
if (response.StatusCode == HttpStatusCode.OK)
{
mytoken = (response.Content.ReadAsStringAsync().GetAwaiter().GetResult());
result = mytoken;
}
else
{
result = response.ReasonPhrase.ToString();
error = result;
result = "";
}
}
return result;
}
/// <summary>
/// GetLoginAD Async version
/// </summary>
/// <param name="webAPIUri"> "http://virtapp-mdb048/CommonAPI/api/AD/"</param>
/// <param name="actionEntry">"CheckADCredentials"</param>
/// <param name="username"></param>
/// <param name="password"></param>
/// <returns></returns>
public static async Task<MyADObject> GetLoginADAsync(string webAPIUri, string actionEntry, string username, string password)
{
MyADObject result = null;
if (!webAPIUri.EndsWith("/"))
webAPIUri += "/";
string error = "";
System.Net.ServicePointManager.SecurityProtocol = SecurityProtocolType.Tls12 | SecurityProtocolType.Tls11 | SecurityProtocolType.Tls;
using (var client = new HttpClient())
{
client.BaseAddress = new Uri(webAPIUri);
// We want the response to be JSON.
// client.DefaultRequestHeaders.Accept.Clear();
// client.DefaultRequestHeaders.Accept.Add(new MediaTypeWithQualityHeaderValue("application/json"));
// Build up the data to POST.
// List<KeyValuePair<string, string>> postData = new List<KeyValuePair<string, string>>();
// postData.Add(new KeyValuePair<string, string>("user", username));
// postData.Add(new KeyValuePair<string, string>("pass", password));
//postData.Add(new KeyValuePair<string, string>("client_secret", clientSecret));
//var form = new Dictionary<string, string>
//{
// {"grant_type", "client_credentials"},
//};
//client.DefaultRequestHeaders.Authorization = new System.Net.Http.Headers.AuthenticationHeaderValue("Bearer", token);
//client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Basic", Convert.ToBase64String(System.Text.ASCIIEncoding.ASCII.GetBytes(username + ":" + password)));
// HttpContent content = new StringContent(json, Encoding.UTF8);
// actionEntry = webAPIUri + actionEntry;
// FormUrlEncodedContent content = new FormUrlEncodedContent(postData);
//FormUrlEncodedContent content = new FormUrlEncodedContent(form);
// Post to the Server and parse the response.
//HttpResponseMessage response = await client.PostAsync("Token", content);
// string jsonString = await response.Content.ReadAsStringAsync();
//HttpResponseMessage response = client.PostAsync(actionEntry, content).GetAwaiter().GetResult();
actionEntry = actionEntry + "?user=" + username + "&pass=" + password;
try
{
result = await client.GetFromJsonAsync<MyADObject>(actionEntry);
}
catch (Exception ex)
{
error = ex.ToString();
result = null;
}
}
return result;
}
public static async Task<MyADObject> PostLoginADAsync(string webAPIUri, string actionEntry, string username, string password)
{
MyADObject result = null;
if (!webAPIUri.EndsWith("/"))
webAPIUri += "/";
string error = "";
System.Net.ServicePointManager.SecurityProtocol = SecurityProtocolType.Tls12 | SecurityProtocolType.Tls11 | SecurityProtocolType.Tls;
using (var client = new HttpClient())
{
client.BaseAddress = new Uri(webAPIUri + actionEntry);
string json = "{\"userName\":\"" + username + "\", \"password\":\"" + password + "\"}";
//var form = new Dictionary<string, string>
//{
// {"grant_type", "client_credentials"},
//};
//client.DefaultRequestHeaders.Authorization = new System.Net.Http.Headers.AuthenticationHeaderValue("Bearer", token);
//client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Basic", Convert.ToBase64String(System.Text.ASCIIEncoding.ASCII.GetBytes(username + ":" + password)));
HttpContent content = new StringContent(json, Encoding.UTF8, "application/json");
// actionEntry = webAPIUri + actionEntry;
// FormUrlEncodedContent content = new FormUrlEncodedContent(postData);
//FormUrlEncodedContent content = new FormUrlEncodedContent(form);
// Post to the Server and parse the response.
//HttpResponseMessage response = await client.PostAsync("Token", content);
// string jsonString = await response.Content.ReadAsStringAsync();
//HttpResponseMessage response = client.PostAsync(actionEntry, content).GetAwaiter().GetResult();
// actionEntry = actionEntry + "?user=" + username + "&pass=" + password;
try
{
var response = client.PostAsync("",content);
string myreturn = await response.Result.Content.ReadAsStringAsync();
result = System.Text.Json.JsonSerializer.Deserialize<MyADObject>(myreturn);
}
catch (Exception ex)
{
error = ex.ToString();
result = null;
}
}
return result;
}
}
}
+44
View File
@@ -0,0 +1,44 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Web;
using System.Configuration;
namespace CommonApi.Models
{
public class ADConfig
{
public string LDAPPath = "";
public string LDAPUser = "";
public string LDAPPassword = "";
private TimeSpan _ADTimeOut = TimeSpan.FromSeconds(0);
public TimeSpan ADTimeOut
{
get
{
return _ADTimeOut;
}
}
public string ADTimeOutStr
{
set
{
if (!string.IsNullOrEmpty(value))
_ADTimeOut = TimeSpan.FromSeconds(Convert.ToDouble(value));
}
}
/*
public static void Init()
{
LDAPPath = ConfigurationManager.AppSettings["LDAPPath"];
LDAPUser = ConfigurationManager.AppSettings["LDAPUser"];
LDAPPassword = ConfigurationManager.AppSettings["LDAPPassword"];
ADTimeOut = TimeSpan.FromSeconds(Convert.ToDouble(ConfigurationManager.AppSettings["ADTimeOut"]));
}
*/
}
}
+374
View File
@@ -0,0 +1,374 @@
using CommonApi.Models;
using CommonAuth.Models;
using System;
using System.Collections.Generic;
using System.DirectoryServices;
namespace CommonAuth
{
public class ADStaffLink
{
private ADConfig _adConfig;
public ADStaffLink (ADConfig adConfig)
{
_adConfig = adConfig;
}
public MyADObject SearchStaff(string FirstName = "", string LastName = "")
{
MyADObject ADObj = new MyADObject();
using (var DE = new System.DirectoryServices.DirectoryEntry(_adConfig.LDAPPath, _adConfig.LDAPUser, _adConfig.LDAPPassword))
{
try
{
DirectorySearcher adsSearcher = new DirectorySearcher(DE);
adsSearcher.ClientTimeout = _adConfig.ADTimeOut;
adsSearcher.ServerTimeLimit = _adConfig.ADTimeOut;
adsSearcher.ServerPageTimeLimit = _adConfig.ADTimeOut;
adsSearcher.Filter = string.Format("(&(objectCategory=person)(objectClass=user)(givenname={0})(sn={1}))", FirstName, LastName);
try
{
SearchResult sr = adsSearcher.FindOne();
if (sr != null)
{
ADObj.result = true;
//LoginResult.Login = GetUserPropertyValue(sr, "sAMAccountName", 0);
ADObj.StafflinkNo = GetUserPropertyValue(sr, "sAMAccountName", 0);
ADObj.FirstName = GetUserPropertyValue(sr, "givenname", 0);
ADObj.LastName = GetUserPropertyValue(sr, "sn", 0);
ADObj.Email = GetUserPropertyValue(sr, "mail", 0);
ADObj.Company = GetUserPropertyValue(sr, "company", 0);
ADObj.Location = GetUserPropertyValue(sr, "physicalDeliveryOfficeName", 0);
ADObj.Department = GetUserPropertyValue(sr, "department", 0);
ADObj.BadPwdCount = GetUserPropertyValue(sr, "badPwdCount", 0);
ADObj.Phone = GetUserPropertyValue(sr, "telephonenumber", 0);
ADObj.DisplayName = GetUserPropertyValue(sr, "displayName", 0);
ADObj.Manager = GetUserPropertyValue(sr, "manager", 0);
ADObj.ReportsTo = GetUserPropertyValue(sr, "directReports", 0);
ADObj.StaffList = GetUserPropertyValue(sr, "staffList", 0);
}
}
catch
{
// Failed to authenticate. Most likely it is caused by unknown user
// id or bad strPassword.
ADObj.result = false;
}
}
catch
{
ADObj.result = false;
}
}
//LoginResult.Success = res;
//string token = "";
//long tickTock = DateTime.Now.Ticks;
//if (res)
//{
// string tokenPT = app + "|" + user + "|" + "|" + tickTock + "|" + "NBM";
// token = CommonCrypt.EncryptString(tokenPT, "bagmas2011+", "a1b2c3d4");
// token = CommonEncoding.Base64Encode(token);
//}
//LoginResult.Login = user;
//LoginResult.Token = token;
//LoginResult.Time = tickTock;
return ADObj;
}
public MyADObject SearchStaff(string StaffLinkNo)
{
MyADObject ADObj = new MyADObject();
using (var DE = new System.DirectoryServices.DirectoryEntry(_adConfig.LDAPPath, _adConfig.LDAPUser, _adConfig.LDAPPassword))
{
try
{
DirectorySearcher adsSearcher = new DirectorySearcher(DE);
adsSearcher.ClientTimeout = _adConfig.ADTimeOut;
adsSearcher.ServerTimeLimit = _adConfig.ADTimeOut;
adsSearcher.ServerPageTimeLimit = _adConfig.ADTimeOut;
adsSearcher.Filter = "(SAMAccountName=" + StaffLinkNo + ")";
try
{
SearchResult sr = adsSearcher.FindOne();
if (sr != null)
{
ADObj.result = true;
// LoginResult.Login = GetUserPropertyValue(sr, "sAMAccountName", 0); ;
ADObj.StafflinkNo = GetUserPropertyValue(sr, "SAMAccountName", 0);
ADObj.FirstName = GetUserPropertyValue(sr, "givenname", 0);
ADObj.LastName = GetUserPropertyValue(sr, "sn", 0);
ADObj.Email = GetUserPropertyValue(sr, "mail", 0);
ADObj.Company = GetUserPropertyValue(sr, "company", 0);
ADObj.Location = GetUserPropertyValue(sr, "physicalDeliveryOfficeName", 0);
ADObj.Department = GetUserPropertyValue(sr, "department", 0);
ADObj.JobTitle = GetUserPropertyValue(sr, "title", 0);
ADObj.BadPwdCount = GetUserPropertyValue(sr, "badPwdCount", 0);
ADObj.Phone = GetUserPropertyValue(sr, "telephonenumber", 0);
ADObj.DisplayName = GetUserPropertyValue(sr, "displayName", 0);
ADObj.Manager = GetUserPropertyValue(sr, "manager", 0);
ADObj.ReportsTo = GetUserPropertyValue(sr, "directReports", 0);
ADObj.StaffList = GetUserPropertyValue(sr, "staffList", 0);
}
}
catch (Exception ex)
{
// Failed to authenticate. Most likely it is caused by unknown user
// id or bad strPassword.
ADObj.result = false;
}
}
catch
{
ADObj.result = false;
}
}
//LoginResult.Success = res;
//string token = "";
//long tickTock = DateTime.Now.Ticks;
//if (res)
//{
// string tokenPT = app + "|" + user + "|" + "|" + tickTock + "|" + "NBM";
// token = CommonCrypt.EncryptString(tokenPT, "bagmas2011+", "a1b2c3d4");
// token = CommonEncoding.Base64Encode(token);
//}
//LoginResult.Login = user;
//LoginResult.Token = token;
//LoginResult.Time = tickTock;
return ADObj;
}
public MyADObject CheckADCredentials(string user, string pass)
{
//dynamic LoginResult = new JObject() as dynamic;
bool res = true;
MyADObject ADObj = new MyADObject();
using (var DE = new System.DirectoryServices.DirectoryEntry(_adConfig.LDAPPath, user, pass))
{
try
{
//DE.RefreshCache(); // This will force credentials validation
DirectorySearcher adsSearcher = new DirectorySearcher(DE);
adsSearcher.ClientTimeout = _adConfig.ADTimeOut;
adsSearcher.ServerTimeLimit = _adConfig.ADTimeOut;
adsSearcher.ServerPageTimeLimit = _adConfig.ADTimeOut;
//adsSearcher.Filter = "(&(objectClass=user)(objectCategory=person))";
adsSearcher.Filter = "(sAMAccountName=" + user + ")";
try
{
SearchResult sr = adsSearcher.FindOne();
if (sr != null)
{
ADObj.StafflinkNo = GetUserPropertyValue(sr, "sAMAccountName", 0); ;
ADObj.FirstName = GetUserPropertyValue(sr, "givenname", 0);
ADObj.LastName = GetUserPropertyValue(sr, "sn", 0);
ADObj.Email = GetUserPropertyValue(sr, "mail", 0);
ADObj.Company = GetUserPropertyValue(sr, "company", 0);
ADObj.Location = GetUserPropertyValue(sr, "physicalDeliveryOfficeName", 0);
ADObj.Department = GetUserPropertyValue(sr, "department", 0);
ADObj.BadPwdCount = GetUserPropertyValue(sr, "badPwdCount", 0);
ADObj.Phone = GetUserPropertyValue(sr, "telephonenumber", 0);
ADObj.DisplayName = GetUserPropertyValue(sr, "displayName", 0);
ADObj.Manager = GetUserPropertyValue(sr, "manager", 0);
// we will retrieve the count of staff in DirectReports as a flag to determine if this user is a manager
// we will assume if no staff then requests lodged by this user will need signoff by their manager
//LoginResult.StaffListCount = sr.Properties["DirectReports"].Count;
//LoginResult.PWD = ADConfig.LDAPPassword;
//LoginResult.User = ADConfig.LDAPUser;
/* // we do not think we need actual staff IDs at this point - a count of staff will be enough for this application
// but leave here in case we need to re-use this in another app.
List<string> StaffList = new List<string>();
foreach (string objProperty in sr.Properties["DirectReports"])
{
string emp = objProperty.ToString().Split(',')[0];
emp = emp.Replace("CN=", "");
StaffList.Add(emp);
//emps.Add(emp);
//user.StaffList += '|';
//user.StaffList += emp;
//
}
LoginResult.StaffList = JsonConvert.SerializeObject(StaffList);
*/
try
{
if (ADObj.Manager != String.Empty)
{
String managerInfo = Convert.ToString(ADObj.Manager);
String managerID = managerInfo.Split(',')[0].Split('=')[1];
String managerOU = managerInfo.Split(',')[1].Split('=')[1];
List<MyADObject> managerDetails = Search(managerID, managerOU);
// JToken managerDetails = Search(managerID);
ADObj.ManagerDetails = managerDetails[0].ToString();
}
}
catch (Exception ex)
{
ADObj.ManagerDetails = "Not available: " + ex.Message;
}
}
}
catch (Exception ex2)
{
// Failed to authenticate. Most likely it is caused by unknown user
// id or bad strPassword.
res = false;
}
}
catch
{
res = false;
}
}
ADObj.result = res;
// string token = "";
// long tickTock = DateTime.Now.Ticks;
// if (res)
// {
//string tokenPT = app + "|" + user + "|" + pass + "|" + tickTock + "|" + "NBM";
//token = CommonCrypt.EncryptString(tokenPT, "bagmas2011+", "a1b2c3d4");
//token = CommonEncoding.Base64Encode(token);
//}
//LoginResult.Token = token;
//LoginResult.Time = tickTock;
//return LoginResult;
return ADObj;
}
public List<MyADObject> Search(string q, string ou)
{
//ou = "Nepean Blue Mountains";
MyADObject ADObj = new Models.MyADObject();
//ADConfig.Init();
List<MyADObject> lstLDAPUser = new List<MyADObject>();
if (string.IsNullOrEmpty(q))
q = "______"; //defualt not found
System.DirectoryServices.DirectoryEntry dirEntry = new System.DirectoryServices.DirectoryEntry(_adConfig.LDAPPath, _adConfig.LDAPUser, _adConfig.LDAPPassword);
DirectorySearcher dirSearch = new DirectorySearcher(dirEntry);
dirSearch.ClientTimeout = _adConfig.ADTimeOut;
dirSearch.ServerTimeLimit = _adConfig.ADTimeOut;
dirSearch.ServerPageTimeLimit = _adConfig.ADTimeOut;
dirSearch.Filter = "(&(objectClass=user)(|(cn=" + q + "*)))";
dirSearch.SearchRoot = dirEntry;
dirSearch.SearchScope = SearchScope.Subtree;
dirSearch.PageSize = 100;
dirSearch.Sort = new SortOption("displayName", SortDirection.Ascending);
using (SearchResultCollection src = dirSearch.FindAll())
{
int i = 0;
foreach (SearchResult sr in src)
{
i++;
if (i > 100)
break;
bool bLogindisabled = true;
string sTmp = GetUserPropertyValue(sr, "logindisabled", 0);
bLogindisabled = (sTmp == string.Empty ? false : Convert.ToBoolean(sTmp));
if (!bLogindisabled)
{
sTmp = GetUserPropertyValue(sr, "passwordexpirationtime", 0);
if (sTmp != "")
{
try
{
if (DateTime.Now > Convert.ToDateTime(sTmp))
{
bLogindisabled = true;
}
}
catch { }
}
}
if (!bLogindisabled)
{
MyADObject user = new MyADObject();
// user.Login = GetUserPropertyValue(sr, "sAMAccountName", 0);
user.StafflinkNo = GetUserPropertyValue(sr, "sAMAccountName", 0);
user.FirstName = GetUserPropertyValue(sr, "givenname", 0);
user.LastName = GetUserPropertyValue(sr, "sn", 0);
user.Email = GetUserPropertyValue(sr, "mail", 0);
user.Company = GetUserPropertyValue(sr, "company", 0);
user.Location = GetUserPropertyValue(sr, "physicalDeliveryOfficeName", 0);
user.Department = GetUserPropertyValue(sr, "department", 0);
user.BadPwdCount = GetUserPropertyValue(sr, "badPwdCount", 0);
//user.company = GetUserPropertyValue(sr, "company", 0);
user.Phone = GetUserPropertyValue(sr, "telephonenumber", 0);
user.DisplayName = GetUserPropertyValue(sr, "displayName", 0);
//user.distinguishedName = GetUserPropertyValue(sr, "distinguishedName", 0);
user.DisplayName = GetUserPropertyValue(sr, "displayName", 0);
lstLDAPUser.Add(user);
}
}
}
if (dirSearch != null)
dirSearch.Dispose();
if (dirEntry != null)
dirEntry.Dispose();
return lstLDAPUser;
}//end method
private string GetUserPropertyValue(SearchResult res, string sPropertyName, int lIndex)
{
try
{
if (res.Properties[sPropertyName].Count > lIndex)
{
string s;
object v = res.Properties[sPropertyName][lIndex];
if (v.GetType() == typeof(byte[]))
{
s = System.Text.ASCIIEncoding.ASCII.GetString((byte[])v);
}
else if (v.GetType() == typeof(DateTime))
{
s = ((DateTime)v).ToLocalTime().ToString("yyyy/MM/dd HH:mm:ss");
}
else
{
s = v.ToString();
}
return (s);
}
else
{
return ("");
}
}
catch
{
return ("");
}
}
}
}
+12
View File
@@ -0,0 +1,12 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="System.DirectoryServices" Version="5.0.0" />
<PackageReference Include="System.DirectoryServices.Protocols" Version="5.0.0" />
</ItemGroup>
</Project>
+33
View File
@@ -0,0 +1,33 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Web;
using System.Configuration;
namespace CommonAuth.Models
{
public class MyADObject
{
public string StafflinkNo { get; set; }
public string FirstName { get; set; }
public string LastName { get; set; }
public string Email { get; set; }
public string Company { get; set; }
public string Location { get; set; }
public string Department { get; set; }
public string JobTitle { get; set; }
public string BadPwdCount { get; set; }
public string Phone { get; set; }
public string DisplayName { get; set; }
public string Manager { get; set; }
public string ReportsTo { get; set; }
public string StaffList { get; set; }
public string ManagerDetails { get; set; }
public bool result { get; set; }
}
}
+17
View File
@@ -0,0 +1,17 @@
# Dockerfile
# https://hub.docker.com/_/microsoft-mssql-server
FROM mcr.microsoft.com/mssql/server-2022-latest
EXPOSE 1433
WORKDIR /app
COPY ./entrypoint.sh ./
COPY ./init-db.sql ./
# https://dbafromthecold.com/2019/11/18/using-volumes-in-sql-server-2019-non-root-containers/
USER root
RUN mkdir /var/opt/mssql
RUN chmod +x ./entrypoint.sh
RUN mkdir -p /var/opt/mssql/data && chown -R mssql /var/opt/mssql/data && chgrp -R mssql /var/opt/mssql/data && chmod -R 750 mssql /var/opt/mssql/data
RUN mkdir -p /var/opt/mssql/log && chown mssql /var/opt/mssql/log
RUN mkdir -p /var/opt/mssql/backup && chown mssql /var/opt/mssql/backup
USER mssql
CMD /opt/mssql/bin/sqlservr
#ENTRYPOINT ["./entrypoint.sh"]
+75
View File
@@ -0,0 +1,75 @@
# React + TypeScript + Vite
This template provides a minimal setup to get React working in Vite with HMR and some ESLint rules.
Currently, two official plugins are available:
- [@vitejs/plugin-react](https://github.com/vitejs/vite-plugin-react/blob/main/packages/plugin-react) uses [Oxc](https://oxc.rs)
- [@vitejs/plugin-react-swc](https://github.com/vitejs/vite-plugin-react/blob/main/packages/plugin-react-swc) uses [SWC](https://swc.rs/)
## React Compiler
The React Compiler is enabled on this template. See [this documentation](https://react.dev/learn/react-compiler) for more information.
Note: This will impact Vite dev & build performances.
## Expanding the ESLint configuration
If you are developing a production application, we recommend updating the configuration to enable type-aware lint rules:
```js
export default defineConfig([
globalIgnores(['dist']),
{
files: ['**/*.{ts,tsx}'],
extends: [
// Other configs...
// Remove tseslint.configs.recommended and replace with this
tseslint.configs.recommendedTypeChecked,
// Alternatively, use this for stricter rules
tseslint.configs.strictTypeChecked,
// Optionally, add this for stylistic rules
tseslint.configs.stylisticTypeChecked,
// Other configs...
],
languageOptions: {
parserOptions: {
project: ['./tsconfig.node.json', './tsconfig.app.json'],
tsconfigRootDir: import.meta.dirname,
},
// other options...
},
},
])
```
You can also install [eslint-plugin-react-x](https://github.com/Rel1cx/eslint-react/tree/main/packages/plugins/eslint-plugin-react-x) and [eslint-plugin-react-dom](https://github.com/Rel1cx/eslint-react/tree/main/packages/plugins/eslint-plugin-react-dom) for React-specific lint rules:
```js
// eslint.config.js
import reactX from 'eslint-plugin-react-x'
import reactDom from 'eslint-plugin-react-dom'
export default defineConfig([
globalIgnores(['dist']),
{
files: ['**/*.{ts,tsx}'],
extends: [
// Other configs...
// Enable lint rules for React
reactX.configs['recommended-typescript'],
// Enable lint rules for React DOM
reactDom.configs.recommended,
],
languageOptions: {
parserOptions: {
project: ['./tsconfig.node.json', './tsconfig.app.json'],
tsconfigRootDir: import.meta.dirname,
},
// other options...
},
},
])
```
+22
View File
@@ -0,0 +1,22 @@
import js from '@eslint/js'
import globals from 'globals'
import reactHooks from 'eslint-plugin-react-hooks'
import reactRefresh from 'eslint-plugin-react-refresh'
import tseslint from 'typescript-eslint'
import { defineConfig, globalIgnores } from 'eslint/config'
export default defineConfig([
globalIgnores(['dist']),
{
files: ['**/*.{ts,tsx}'],
extends: [
js.configs.recommended,
tseslint.configs.recommended,
reactHooks.configs.flat.recommended,
reactRefresh.configs.vite,
],
languageOptions: {
globals: globals.browser,
},
},
])
+13
View File
@@ -0,0 +1,13 @@
<!doctype html>
<html lang="en">
<head>
<meta charset="UTF-8" />
<link rel="icon" type="image/svg+xml" href="/favicon.svg" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>carvalidationi ui</title>
</head>
<body>
<div id="root"></div>
<script type="module" src="/src/main.tsx"></script>
</body>
</html>
+3544
View File
File diff suppressed because it is too large Load Diff
+48
View File
@@ -0,0 +1,48 @@
{
"name": "carvalidationui",
"private": true,
"version": "0.0.0",
"type": "module",
"scripts": {
"dev": "vite",
"build": "tsc -b && vite build",
"lint": "eslint .",
"preview": "vite preview"
},
"dependencies": {
"@redux-devtools/extension": "^4.0.0",
"@reduxjs/toolkit": "^2.12.0",
"@tailwindcss/vite": "^4.3.0",
"formik": "^2.4.9",
"moment": "^2.30.1",
"primeicons": "^7.0.0",
"primereact": "^10.9.8",
"react": "^19.2.6",
"react-dom": "^19.2.6",
"react-redux": "^9.3.0",
"react-router-dom": "^7.15.1",
"redux-thunk": "^3.1.0",
"tailwindcss": "^4.3.0",
"yup": "^1.7.1"
},
"devDependencies": {
"@babel/core": "^7.29.0",
"@eslint/js": "^10.0.1",
"@rolldown/plugin-babel": "^0.2.3",
"@types/babel__core": "^7.20.5",
"@types/node": "^24.12.3",
"@types/react": "^19.2.14",
"@types/react-dom": "^19.2.3",
"@types/react-redux": "^7.1.34",
"@types/yup": "^0.29.14",
"@vitejs/plugin-react": "^6.0.1",
"babel-plugin-react-compiler": "^1.0.0",
"eslint": "^10.3.0",
"eslint-plugin-react-hooks": "^7.1.1",
"eslint-plugin-react-refresh": "^0.5.2",
"globals": "^17.6.0",
"typescript": "~6.0.2",
"typescript-eslint": "^8.59.2",
"vite": "^8.0.12"
}
}
+3
View File
@@ -0,0 +1,3 @@
{
"API_URL": "http://localhost:5100/api/v1"
}
File diff suppressed because one or more lines are too long

After

Width:  |  Height:  |  Size: 9.3 KiB

+24
View File
@@ -0,0 +1,24 @@
<svg xmlns="http://www.w3.org/2000/svg">
<symbol id="bluesky-icon" viewBox="0 0 16 17">
<g clip-path="url(#bluesky-clip)"><path fill="#08060d" d="M7.75 7.735c-.693-1.348-2.58-3.86-4.334-5.097-1.68-1.187-2.32-.981-2.74-.79C.188 2.065.1 2.812.1 3.251s.241 3.602.398 4.13c.52 1.744 2.367 2.333 4.07 2.145-2.495.37-4.71 1.278-1.805 4.512 3.196 3.309 4.38-.71 4.987-2.746.608 2.036 1.307 5.91 4.93 2.746 2.72-2.746.747-4.143-1.747-4.512 1.702.189 3.55-.4 4.07-2.145.156-.528.397-3.691.397-4.13s-.088-1.186-.575-1.406c-.42-.19-1.06-.395-2.741.79-1.755 1.24-3.64 3.752-4.334 5.099"/></g>
<defs><clipPath id="bluesky-clip"><path fill="#fff" d="M.1.85h15.3v15.3H.1z"/></clipPath></defs>
</symbol>
<symbol id="discord-icon" viewBox="0 0 20 19">
<path fill="#08060d" d="M16.224 3.768a14.5 14.5 0 0 0-3.67-1.153c-.158.286-.343.67-.47.976a13.5 13.5 0 0 0-4.067 0c-.128-.306-.317-.69-.476-.976A14.4 14.4 0 0 0 3.868 3.77C1.546 7.28.916 10.703 1.231 14.077a14.7 14.7 0 0 0 4.5 2.306q.545-.748.965-1.587a9.5 9.5 0 0 1-1.518-.74q.191-.14.372-.293c2.927 1.369 6.107 1.369 8.999 0q.183.152.372.294-.723.437-1.52.74.418.838.963 1.588a14.6 14.6 0 0 0 4.504-2.308c.37-3.911-.63-7.302-2.644-10.309m-9.13 8.234c-.878 0-1.599-.82-1.599-1.82 0-.998.705-1.82 1.6-1.82.894 0 1.614.82 1.599 1.82.001 1-.705 1.82-1.6 1.82m5.91 0c-.878 0-1.599-.82-1.599-1.82 0-.998.705-1.82 1.6-1.82.893 0 1.614.82 1.599 1.82 0 1-.706 1.82-1.6 1.82"/>
</symbol>
<symbol id="documentation-icon" viewBox="0 0 21 20">
<path fill="none" stroke="#aa3bff" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.35" d="m15.5 13.333 1.533 1.322c.645.555.967.833.967 1.178s-.322.623-.967 1.179L15.5 18.333m-3.333-5-1.534 1.322c-.644.555-.966.833-.966 1.178s.322.623.966 1.179l1.534 1.321"/>
<path fill="none" stroke="#aa3bff" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.35" d="M17.167 10.836v-4.32c0-1.41 0-2.117-.224-2.68-.359-.906-1.118-1.621-2.08-1.96-.599-.21-1.349-.21-2.848-.21-2.623 0-3.935 0-4.983.369-1.684.591-3.013 1.842-3.641 3.428C3 6.449 3 7.684 3 10.154v2.122c0 2.558 0 3.838.706 4.726q.306.383.713.671c.76.536 1.79.64 3.581.66"/>
<path fill="none" stroke="#aa3bff" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.35" d="M3 10a2.78 2.78 0 0 1 2.778-2.778c.555 0 1.209.097 1.748-.047.48-.129.854-.503.982-.982.145-.54.048-1.194.048-1.749a2.78 2.78 0 0 1 2.777-2.777"/>
</symbol>
<symbol id="github-icon" viewBox="0 0 19 19">
<path fill="#08060d" fill-rule="evenodd" d="M9.356 1.85C5.05 1.85 1.57 5.356 1.57 9.694a7.84 7.84 0 0 0 5.324 7.44c.387.079.528-.168.528-.376 0-.182-.013-.805-.013-1.454-2.165.467-2.616-.935-2.616-.935-.349-.91-.864-1.143-.864-1.143-.71-.48.051-.48.051-.48.787.051 1.2.805 1.2.805.695 1.194 1.817.857 2.268.649.064-.507.27-.857.49-1.052-1.728-.182-3.545-.857-3.545-3.87 0-.857.31-1.558.8-2.104-.078-.195-.349-1 .077-2.078 0 0 .657-.208 2.14.805a7.5 7.5 0 0 1 1.946-.26c.657 0 1.328.092 1.946.26 1.483-1.013 2.14-.805 2.14-.805.426 1.078.155 1.883.078 2.078.502.546.799 1.247.799 2.104 0 3.013-1.818 3.675-3.558 3.87.284.247.528.714.528 1.454 0 1.052-.012 1.896-.012 2.156 0 .208.142.455.528.377a7.84 7.84 0 0 0 5.324-7.441c.013-4.338-3.48-7.844-7.773-7.844" clip-rule="evenodd"/>
</symbol>
<symbol id="social-icon" viewBox="0 0 20 20">
<path fill="none" stroke="#aa3bff" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.35" d="M12.5 6.667a4.167 4.167 0 1 0-8.334 0 4.167 4.167 0 0 0 8.334 0"/>
<path fill="none" stroke="#aa3bff" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.35" d="M2.5 16.667a5.833 5.833 0 0 1 8.75-5.053m3.837.474.513 1.035c.07.144.257.282.414.309l.93.155c.596.1.736.536.307.965l-.723.73a.64.64 0 0 0-.152.531l.207.903c.164.715-.213.991-.84.618l-.872-.52a.63.63 0 0 0-.577 0l-.872.52c-.624.373-1.003.094-.84-.618l.207-.903a.64.64 0 0 0-.152-.532l-.723-.729c-.426-.43-.289-.864.306-.964l.93-.156a.64.64 0 0 0 .412-.31l.513-1.034c.28-.562.735-.562 1.012 0"/>
</symbol>
<symbol id="x-icon" viewBox="0 0 19 19">
<path fill="#08060d" fill-rule="evenodd" d="M1.893 1.98c.052.072 1.245 1.769 2.653 3.77l2.892 4.114c.183.261.333.48.333.486s-.068.089-.152.183l-.522.593-.765.867-3.597 4.087c-.375.426-.734.834-.798.905a1 1 0 0 0-.118.148c0 .01.236.017.664.017h.663l.729-.83c.4-.457.796-.906.879-.999a692 692 0 0 0 1.794-2.038c.034-.037.301-.34.594-.675l.551-.624.345-.392a7 7 0 0 1 .34-.374c.006 0 .93 1.306 2.052 2.903l2.084 2.965.045.063h2.275c1.87 0 2.273-.003 2.266-.021-.008-.02-1.098-1.572-3.894-5.547-2.013-2.862-2.28-3.246-2.273-3.266.008-.019.282-.332 2.085-2.38l2-2.274 1.567-1.782c.022-.028-.016-.03-.65-.03h-.674l-.3.342a871 871 0 0 1-1.782 2.025c-.067.075-.405.458-.75.852a100 100 0 0 1-.803.91c-.148.172-.299.344-.99 1.127-.304.343-.32.358-.345.327-.015-.019-.904-1.282-1.976-2.808L6.365 1.85H1.8zm1.782.91 8.078 11.294c.772 1.08 1.413 1.973 1.425 1.984.016.017.241.02 1.05.017l1.03-.004-2.694-3.766L7.796 5.75 5.722 2.852l-1.039-.004-1.039-.004z" clip-rule="evenodd"/>
</symbol>
</svg>

After

Width:  |  Height:  |  Size: 4.9 KiB

+184
View File
@@ -0,0 +1,184 @@
.counter {
font-size: 16px;
padding: 5px 10px;
border-radius: 5px;
color: var(--accent);
background: var(--accent-bg);
border: 2px solid transparent;
transition: border-color 0.3s;
margin-bottom: 24px;
&:hover {
border-color: var(--accent-border);
}
&:focus-visible {
outline: 2px solid var(--accent);
outline-offset: 2px;
}
}
.hero {
position: relative;
.base,
.framework,
.vite {
inset-inline: 0;
margin: 0 auto;
}
.base {
width: 170px;
position: relative;
z-index: 0;
}
.framework,
.vite {
position: absolute;
}
.framework {
z-index: 1;
top: 34px;
height: 28px;
transform: perspective(2000px) rotateZ(300deg) rotateX(44deg) rotateY(39deg)
scale(1.4);
}
.vite {
z-index: 0;
top: 107px;
height: 26px;
width: auto;
transform: perspective(2000px) rotateZ(300deg) rotateX(40deg) rotateY(39deg)
scale(0.8);
}
}
#center {
display: flex;
flex-direction: column;
gap: 25px;
place-content: center;
place-items: center;
flex-grow: 1;
@media (max-width: 1024px) {
padding: 32px 20px 24px;
gap: 18px;
}
}
#next-steps {
display: flex;
border-top: 1px solid var(--border);
text-align: left;
& > div {
flex: 1 1 0;
padding: 32px;
@media (max-width: 1024px) {
padding: 24px 20px;
}
}
.icon {
margin-bottom: 16px;
width: 22px;
height: 22px;
}
@media (max-width: 1024px) {
flex-direction: column;
text-align: center;
}
}
#docs {
border-right: 1px solid var(--border);
@media (max-width: 1024px) {
border-right: none;
border-bottom: 1px solid var(--border);
}
}
#next-steps ul {
list-style: none;
padding: 0;
display: flex;
gap: 8px;
margin: 32px 0 0;
.logo {
height: 18px;
}
a {
color: var(--text-h);
font-size: 16px;
border-radius: 6px;
background: var(--social-bg);
display: flex;
padding: 6px 12px;
align-items: center;
gap: 8px;
text-decoration: none;
transition: box-shadow 0.3s;
&:hover {
box-shadow: var(--shadow);
}
.button-icon {
height: 18px;
width: 18px;
}
}
@media (max-width: 1024px) {
margin-top: 20px;
flex-wrap: wrap;
justify-content: center;
li {
flex: 1 1 calc(50% - 8px);
}
a {
width: 100%;
justify-content: center;
box-sizing: border-box;
}
}
}
#spacer {
height: 88px;
border-top: 1px solid var(--border);
@media (max-width: 1024px) {
height: 48px;
}
}
.ticks {
position: relative;
width: 100%;
&::before,
&::after {
content: '';
position: absolute;
top: -4.5px;
border: 5px solid transparent;
}
&::before {
left: 0;
border-left-color: var(--border);
}
&::after {
right: 0;
border-right-color: var(--border);
}
}
+63
View File
@@ -0,0 +1,63 @@
import './App.css';
import { BrowserRouter, Routes, Route, Navigate } from 'react-router-dom';
import Login from './login/login';
import Home from './home/home';
import { AuthProvider } from './share/authcontext';
import { ProtectedRoute, PublicRoute } from './share/routeprotest';
import { MainLayout } from './layouts/MainLayout';
import 'primereact/resources/themes/tailwind-light/theme.css';
import AdminUserApp from './adminuser/adminuser';
import ValidationPointApp from './validationpoint/validationpoint';
import ConcessionTypeApp from './concessionType/concessionType';
import EditConcessionTypeApp from './concessionType/editconcesstype';
import ConcessionValidationApp from './concessionvalidation/concessionvalidation';
import EditConcessionValidationApp from './concessionvalidation/editconcessvalidation';
function App() {
return (
<AuthProvider>
<BrowserRouter>
<Routes>
{/* Public-only Routes (Redirects to dashboard if already logged in) */}
<Route element={<PublicRoute />}>
<Route path="/login" element={<Login />} />
</Route>
{/* Protected Routes (Redirects to login if not logged in) */}
<Route element={<ProtectedRoute />}>
<Route element={<MainLayout />}>
<Route path="/home" element={<Home />} />
<Route path="/validationpoint" element={<ValidationPointApp />} />
<Route path="/adminuser" element={<AdminUserApp />} />
<Route path="/concessiontype" element={<ConcessionTypeApp/>} />
<Route path="/concessiontype/:id" element={<EditConcessionTypeApp />} />
<Route path="/concessionvalidation" element={<ConcessionValidationApp/>} />
<Route path="/concessionvalidation/:id" element={<EditConcessionValidationApp/>} />
</Route>
</Route>
{/* Catch-all fallback */}
<Route path="*" element={<Navigate to="/login" replace />} />
</Routes>
</BrowserRouter>
</AuthProvider>
);
}
export default App;
/*
// Parent Route
<Route path="/users" element={<UserLayout />}>
// Child Route with ID parameter
<Route path=":id" element={<UserProfile />} />
</Route>
*/
/*
npm run build
npx vite build
vite build
vite build --base=/myWebsite/
*/
+192
View File
@@ -0,0 +1,192 @@
import { useState, useEffect , type ChangeEvent } from 'react';
import {type AdminUserDto,type Lookup,type ValidationPointDto,AdminRole} from '../models';
// const API_URL = 'https://typicode.com';
import { adminUserService ,validationpointService} from '../services';
export default function AdminUserApp() {
// Example array typed as an array of ValidationPoints
const roleList: Lookup[] = [
{ id: AdminRole.Normal, description: "Normal" },
{ id: AdminRole.Admin, description: "Admin" }
];
const empty: AdminUserDto =
{
id: -1,stafflinkNo: '',firstName: '', lastName: '',
addedOn: '',active: false,
roleType: AdminRole.Normal,validationPointId: 0
};
const [adminUsers, setAdminUsers] = useState<AdminUserDto[]>([]);
const [form, setForm] = useState<AdminUserDto>(empty);
const [isEditing, setIsEditing] = useState(false);
const [valdationPoints, setValidateionPoints] = useState<ValidationPointDto[]>([]);
// READ: Fetch all customers
useEffect(() => {
fetchAdminUsers();
fecthValidationPoint();
}, []);
const fecthValidationPoint = async () => {
try{
const vpres = await validationpointService.get();
if (vpres.statusCode == 1)
setValidateionPoints(vpres.data);
}
catch (error) {
console.error('error loading Validation Point', error);
}
};
const fetchAdminUsers = async () => {
try {
const response = await adminUserService.get();
//const data = await response.json();
if (response.statusCode == 1)
setAdminUsers(response.data.slice(0, 5)); // Limiting to 5 for preview
} catch (error) {
console.error('Error fetching data:', error);
}
};
// INPUT HANDLER
const handleInputChange = (e: { target: { name: any; value: any; }; }) => {
const { name, value } = e.target;
setForm({ ...form, [name]: value });
};
// 3. Type the event as ChangeEvent<HTMLSelectElement>
const handleSelectInputChange = (e: ChangeEvent<HTMLSelectElement>): void => {
const { name, value } = e.target;
const id = Number(value);
console.log("handle select name, value and id", name, value, id);
setForm((prevData) => ({
...prevData,
[name]: id
}));
};
// CREATE & UPDATE: Submit handler
const handleSubmit = async (e: { preventDefault: () => void; }) => {
e.preventDefault();
if (!form.firstName || !form.stafflinkNo) return alert('Please fill in all fields');
console.log("what is data to save", form);
// SAVE (create/update)
try {
const oid = form.id;
const nid = await adminUserService.save(form);
form.id = nid.data;
if (oid < 0)
{
const olist = adminUsers;
olist.push(form);
setAdminUsers(olist);
}
else
{
setAdminUsers(adminUsers.map(c => c.id === form.id ? form : c));
}
clearForm();
} catch (error) {
console.error('Error updating customer:', error);
}
};
// DELETE
const handleDelete = async (id: number) => {
try {
const respose = await adminUserService.delete(id);
if (respose.data > 0)
setAdminUsers(adminUsers.filter(c => c.id !== id));
else
console.error('something is wrong', respose);
} catch (error) {
console.error('Error deleting customer:', error);
}
};
// UTILITIES
const handleEditClick = (adminUser:AdminUserDto) => {
setForm(adminUser);
setIsEditing(true);
};
const clearForm = () => {
setForm(empty);
setIsEditing(false);
};
return (
<div className='p-5'>
<h2>AdminUser Management (CRUD)</h2>
{/* FORM COMPONENT */}
<form onSubmit={handleSubmit} >
<div className='m-2 grid grid-cols-3 gap-4'>
<input
type="text" name="firstName" placeholder="First Name"
value={form.firstName} onChange={handleInputChange}
/>
<input
type="text" name="lastName" placeholder="Last Name"
value={form.lastName} onChange={handleInputChange}
/>
<input
type="text" name="stafflinkNo" placeholder="stafflinkNo"
value={form.stafflinkNo} onChange={handleInputChange}
/>
<select name="validationPointId" id="validationPointId"
value={form.validationPointId} // <-- 1. Bind to model state
onChange={handleSelectInputChange}
>
<option value="">-- Please choose validation point --</option>
{/* 4. Map over the array to generate options dynamically */}
{valdationPoints.map((val) => (
<option key={val.id} value={val.id}>
{val.description}
</option>
))}
</select>
<select name="roleType" id="roleType"
value={form.roleType} // <-- 1. Bind to model state
onChange={handleSelectInputChange}
>
<option value="">-- Please choose role type --</option>
{/* 4. Map over the array to generate options dynamically */}
{roleList.map((val) => (
<option key={val.id} value={val.id}>
{val.description}
</option>
))}
</select>
</div>
<div className='flex justify-end'>
<button type="submit" className="text-white mr-2 bg-green-600 box-border border border-transparent hover:bg-green-800 focus:ring-4 focus:ring-success-medium shadow-xs font-medium leading-5 rounded-base text-sm px-4 py-2.5 focus:outline-none">
{isEditing ? 'Update' : 'Add'}</button>
{/*
<button type="submit">{isEditing ? 'Update' : 'Add'}</button>
*/}
{isEditing && <button type="button" onClick={clearForm}>Cancel</button>}
</div>
</form>
<hr className="h-1 mx-auto my-2 bg-gray-200 border-0 rounded-sm md:my-4"></hr>
<div className='mt-2'>
{/* LIST COMPONENT */}
<ul style={{ listStyle: 'none', padding: 0 }}>
{adminUsers.map(item => (
<li key={item.id} style={
{ padding: '10px', borderBottom: '1px solid #ccc',
display: 'flex', justifyContent: 'space-between' }}>
<div>
<strong>{item.firstName} {item.lastName}</strong> ({item.stafflinkNo})
</div>
<div>
<button onClick={() => handleEditClick(item)} className='text-white hover:bg-green-800 bg-green-600 mr-2'>Edit</button>
<button onClick={() => handleDelete(item.id)} className='hover:bg-red-500 hover:text-white'>Delete</button>
</div>
</li>
))}
</ul>
</div>
</div>
);
}
+46
View File
@@ -0,0 +1,46 @@
import React, { useState } from 'react';
import { useDispatch, useSelector } from 'react-redux';
import { RootState, AppDispatch } from './store';
import { addItem, deleteItemById } from './todoSlice';
export const TodoList: React.FC = () => {
const [inputText, setInputText] = useState('');
// Strongly type dispatch and select the state
const dispatch = useDispatch<AppDispatch>();
const items = useSelector((state: RootState) => state.todos.items);
const handleAdd = () => {
if (!inputText.trim()) return;
dispatch(
addItem({
id: crypto.randomUUID(), // Generates a unique string ID
text: inputText,
})
);
setInputText('');
};
return (
<div>
<input
value={inputText}
onChange={(e) => setInputText(e.target.value)}
placeholder="Enter item..."
/>
<button onClick={handleAdd}>Add Item</button>
<ul>
{items.map((item) => (
<li key={item.id}>
{item.text}
<button onClick={() => dispatch(deleteItemById(item.id))}>
Delete
</button>
</li>
))}
</ul>
</div>
);
};
Binary file not shown.

After

Width:  |  Height:  |  Size: 13 KiB

+1
View File
@@ -0,0 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" aria-hidden="true" role="img" class="iconify iconify--logos" width="35.93" height="32" preserveAspectRatio="xMidYMid meet" viewBox="0 0 256 228"><path fill="#00D8FF" d="M210.483 73.824a171.49 171.49 0 0 0-8.24-2.597c.465-1.9.893-3.777 1.273-5.621c6.238-30.281 2.16-54.676-11.769-62.708c-13.355-7.7-35.196.329-57.254 19.526a171.23 171.23 0 0 0-6.375 5.848a155.866 155.866 0 0 0-4.241-3.917C100.759 3.829 77.587-4.822 63.673 3.233C50.33 10.957 46.379 33.89 51.995 62.588a170.974 170.974 0 0 0 1.892 8.48c-3.28.932-6.445 1.924-9.474 2.98C17.309 83.498 0 98.307 0 113.668c0 15.865 18.582 31.778 46.812 41.427a145.52 145.52 0 0 0 6.921 2.165a167.467 167.467 0 0 0-2.01 9.138c-5.354 28.2-1.173 50.591 12.134 58.266c13.744 7.926 36.812-.22 59.273-19.855a145.567 145.567 0 0 0 5.342-4.923a168.064 168.064 0 0 0 6.92 6.314c21.758 18.722 43.246 26.282 56.54 18.586c13.731-7.949 18.194-32.003 12.4-61.268a145.016 145.016 0 0 0-1.535-6.842c1.62-.48 3.21-.974 4.76-1.488c29.348-9.723 48.443-25.443 48.443-41.52c0-15.417-17.868-30.326-45.517-39.844Zm-6.365 70.984c-1.4.463-2.836.91-4.3 1.345c-3.24-10.257-7.612-21.163-12.963-32.432c5.106-11 9.31-21.767 12.459-31.957c2.619.758 5.16 1.557 7.61 2.4c23.69 8.156 38.14 20.213 38.14 29.504c0 9.896-15.606 22.743-40.946 31.14Zm-10.514 20.834c2.562 12.94 2.927 24.64 1.23 33.787c-1.524 8.219-4.59 13.698-8.382 15.893c-8.067 4.67-25.32-1.4-43.927-17.412a156.726 156.726 0 0 1-6.437-5.87c7.214-7.889 14.423-17.06 21.459-27.246c12.376-1.098 24.068-2.894 34.671-5.345a134.17 134.17 0 0 1 1.386 6.193ZM87.276 214.515c-7.882 2.783-14.16 2.863-17.955.675c-8.075-4.657-11.432-22.636-6.853-46.752a156.923 156.923 0 0 1 1.869-8.499c10.486 2.32 22.093 3.988 34.498 4.994c7.084 9.967 14.501 19.128 21.976 27.15a134.668 134.668 0 0 1-4.877 4.492c-9.933 8.682-19.886 14.842-28.658 17.94ZM50.35 144.747c-12.483-4.267-22.792-9.812-29.858-15.863c-6.35-5.437-9.555-10.836-9.555-15.216c0-9.322 13.897-21.212 37.076-29.293c2.813-.98 5.757-1.905 8.812-2.773c3.204 10.42 7.406 21.315 12.477 32.332c-5.137 11.18-9.399 22.249-12.634 32.792a134.718 134.718 0 0 1-6.318-1.979Zm12.378-84.26c-4.811-24.587-1.616-43.134 6.425-47.789c8.564-4.958 27.502 2.111 47.463 19.835a144.318 144.318 0 0 1 3.841 3.545c-7.438 7.987-14.787 17.08-21.808 26.988c-12.04 1.116-23.565 2.908-34.161 5.309a160.342 160.342 0 0 1-1.76-7.887Zm110.427 27.268a347.8 347.8 0 0 0-7.785-12.803c8.168 1.033 15.994 2.404 23.343 4.08c-2.206 7.072-4.956 14.465-8.193 22.045a381.151 381.151 0 0 0-7.365-13.322Zm-45.032-43.861c5.044 5.465 10.096 11.566 15.065 18.186a322.04 322.04 0 0 0-30.257-.006c4.974-6.559 10.069-12.652 15.192-18.18ZM82.802 87.83a323.167 323.167 0 0 0-7.227 13.238c-3.184-7.553-5.909-14.98-8.134-22.152c7.304-1.634 15.093-2.97 23.209-3.984a321.524 321.524 0 0 0-7.848 12.897Zm8.081 65.352c-8.385-.936-16.291-2.203-23.593-3.793c2.26-7.3 5.045-14.885 8.298-22.6a321.187 321.187 0 0 0 7.257 13.246c2.594 4.48 5.28 8.868 8.038 13.147Zm37.542 31.03c-5.184-5.592-10.354-11.779-15.403-18.433c4.902.192 9.899.29 14.978.29c5.218 0 10.376-.117 15.453-.343c-4.985 6.774-10.018 12.97-15.028 18.486Zm52.198-57.817c3.422 7.8 6.306 15.345 8.596 22.52c-7.422 1.694-15.436 3.058-23.88 4.071a382.417 382.417 0 0 0 7.859-13.026a347.403 347.403 0 0 0 7.425-13.565Zm-16.898 8.101a358.557 358.557 0 0 1-12.281 19.815a329.4 329.4 0 0 1-23.444.823c-7.967 0-15.716-.248-23.178-.732a310.202 310.202 0 0 1-12.513-19.846h.001a307.41 307.41 0 0 1-10.923-20.627a310.278 310.278 0 0 1 10.89-20.637l-.001.001a307.318 307.318 0 0 1 12.413-19.761c7.613-.576 15.42-.876 23.31-.876H128c7.926 0 15.743.303 23.354.883a329.357 329.357 0 0 1 12.335 19.695a358.489 358.489 0 0 1 11.036 20.54a329.472 329.472 0 0 1-11 20.722Zm22.56-122.124c8.572 4.944 11.906 24.881 6.52 51.026c-.344 1.668-.73 3.367-1.15 5.09c-10.622-2.452-22.155-4.275-34.23-5.408c-7.034-10.017-14.323-19.124-21.64-27.008a160.789 160.789 0 0 1 5.888-5.4c18.9-16.447 36.564-22.941 44.612-18.3ZM128 90.808c12.625 0 22.86 10.235 22.86 22.86s-10.235 22.86-22.86 22.86s-22.86-10.235-22.86-22.86s10.235-22.86 22.86-22.86Z"></path></svg>

After

Width:  |  Height:  |  Size: 4.0 KiB

File diff suppressed because one or more lines are too long

After

Width:  |  Height:  |  Size: 8.5 KiB

+42
View File
@@ -0,0 +1,42 @@
.app-header {
display: flex;
justify-content: space-between;
align-items: center;
padding: 1rem 2rem;
background-color: #ffffff;
box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1);
}
.header-nav {
display: flex;
gap: 1.5rem;
}
.header-nav a {
text-decoration: none;
color: #333;
font-weight: 500;
}
.header-nav a:hover {
color: #007bff;
}
.header-actions button {
padding: 0.5rem 1rem;
border: none;
border-radius: 4px;
cursor: pointer;
font-weight: 600;
}
.login-btn {
background-color: #007bff;
color: white;
}
.logout-btn {
background-color: #f8f9fa;
border: 1px solid #ccc;
color: #333;
}
+34
View File
@@ -0,0 +1,34 @@
import React from 'react';
import './Header.css';
// Define the types for the props
interface HeaderProps {
title: string;
onLogout?: () => void; // Optional function for a logout button
}
export const Header: React.FC<HeaderProps> = ({ title, onLogout }) => {
return (
<header className="app-header">
<div className="header-logo">
<h1>{title}</h1>
</div>
<nav className="header-nav">
<a href="/home">Home</a>
<a href="/adminuser">Admin User</a>
<a href="/validationpoint">Validation Point</a>
</nav>
<div className="header-actions">
{onLogout ? (
<button onClick={onLogout} className="logout-btn">
Log Out
</button>
) : (
<button className="login-btn">Log In</button>
)}
</div>
</header>
);
};
@@ -0,0 +1,151 @@
import { useState, useEffect } from 'react';
import {type ConcessionType } from '../models';
import { concessionTypeService} from '../services';
import { useNavigate } from 'react-router-dom';
export default function ConcessionTypeApp() {
const navigate = useNavigate();
const empty: ConcessionType =
{
id: -1,
description: '',
display: '',
active: false
};
const [list, setList] = useState<ConcessionType[]>([]);
const [form, setForm] = useState(empty);
const [isEditing, setIsEditing] = useState(false);
// READ: Fetch all list
useEffect(() => {
fecthValidationPoint();
}, []);
const fecthValidationPoint = async () => {
try{
const vpres = await concessionTypeService.get();
if (vpres.statusCode == 1)
setList(vpres.data);
}
catch (error) {
console.error('error loading Validation Point', error);
}
};
// INPUT HANDLER
const handleInputChange = (e: { target: { name: any; value: any; }; }) => {
const { name, value } = e.target;
setForm({ ...form, [name]: value });
setIsEditing(true);
};
// INPUT HANDLER
const handleCheckChange = (e: { target: { name: any; checked:any }; }) => {
const { name, checked } = e.target;
setForm({ ...form, [name]: checked });
setIsEditing(true);
};
// CREATE & UPDATE: Submit handler
const handleSubmit = async (e: { preventDefault: () => void; }) => {
console.log("on submit handle", isEditing,form);
e.preventDefault();
if (!form.description ) return alert('Please fill in all fields');
if (isEditing) {
// SAVE (create/update)
try {
const oid = form.id;
const nid = await concessionTypeService.save(form);
if (nid.statusCode == 1) {
form.id = nid.data;
if (oid < 1)
{
const nlist = list;
nlist.push(form);
setList(nlist);
}
else
setList(list.map(c => c.id === form.id ? form : c));
clearForm();
}
} catch (error) {
console.error('Error updating customer:', error);
}
}
};
// DELETE
const handleDelete = async (id: number) => {
try {
const respose = await concessionTypeService.delete(id);
if (respose.data > 0)
setList(list.filter(c => c.id !== id));
else
console.error('something is wrong', respose);
} catch (error) {
console.error('Error deleting customer:', error);
}
};
// UTILITIES
const handleNavClick = (item:ConcessionType) => {
// setForm(item);
// setIsEditing(true);
navigate(`/concessiontype/${item.id}`);
};
// UTILITIES
const handleEditClick = (item:ConcessionType) => {
setForm(item);
setIsEditing(true);
};
const clearForm = () => {
setForm(empty);
setIsEditing(false);
};
return (
<div className='p-5'>
<h2>ConcessionType Management (CRUD)</h2>
{/* FORM COMPONENT */}
<form onSubmit={handleSubmit} style={{ marginBottom: '20px', display: 'flex', gap: '10px' }}>
<input
type="text" name="description" placeholder="description"
value={form.description} onChange={handleInputChange}
/>
<input
type="text" name="display" placeholder="display"
value={form.display} onChange={handleInputChange}
/>
<input
type="checkbox" name="active" placeholder="Active"
checked={form.active} onChange={handleCheckChange}
/>
<button type="submit">{isEditing ? 'Update' : 'Add'}</button>
{isEditing && <button type="button" onClick={clearForm}>Cancel</button>}
</form>
{/* LIST COMPONENT */}
<ul style={{ listStyle: 'none', padding: 0 }}>
{list.map(item => (
<li key={item.id} style={
{ padding: '10px', borderBottom: '1px solid #ccc',
display: 'flex', justifyContent: 'space-between' }}>
<div>
<strong>{item.description}</strong> ({item.display}) - {item.active ? "True": "False"}
</div>
<div>
<button onClick={() => handleNavClick(item)} style={{ marginRight: '5px' }}>Navigate</button>
<button onClick={() => handleEditClick(item)} style={{ marginRight: '5px' }}>Edit</button>
<button onClick={() => handleDelete(item.id)}>Delete</button>
</div>
</li>
))}
</ul>
</div>
);
}
@@ -0,0 +1,150 @@
// components/UserProfile.tsx
import { useParams } from 'react-router-dom';
import { useFormik } from 'formik';
import * as Yup from 'yup';
import type { ConcessionType } from '../models';
import { useEffect, useState } from 'react';
import { concessionTypeService } from '../services';
import { useNavigate } from 'react-router-dom';
type RouteParams = {
id: string;
};
// 1. Set the initial form states based on the interface
export default function EditConcessionTypeApp() {
console.log(" 1 edit concession type ");
// useParams returns a partial object, so explicitly cast or type it
const navigate = useNavigate();
/*
const handleFormSave = async (e: React.FormEvent) => {
e.preventDefault();
if (!id) return;
const result = await dispatch(updateCustomerApi({ id, name, email, purchaseHistory: history }));
if (updateCustomerApi.fulfilled.match(result)) {
alert('Records successfully committed.');
navigate('/customers');
}
};
*/
const initialValues: ConcessionType =
{
id: 0,
description: '',
display: '',
active: false
};
const [initialFormValues, setInitialFormValues] = useState<ConcessionType>(initialValues);
const [isLoading, setIsLoading] = useState<boolean>(true);
const { id } = useParams<RouteParams>();
// 3. Fetch existing record data on mount or when the ID changes
useEffect(() => {
const fetchExistingRecord = async () => {
try {
setIsLoading(true);
const iid = parseInt(id ?? '0');
if (iid > 0) {
// Replace this with your actual Axios, Fetch, or SDK call
const response = await concessionTypeService.getById(iid);
if (response.statusCode == 1)
// Update state with the fetched record
setInitialFormValues(response.data);
}
else {
initialFormValues.id = -1;
}
} catch (error) {
console.error('Failed to fetch the record data:', error);
} finally {
setIsLoading(false);
}
};
fetchExistingRecord();
}, [id]);
const formik = useFormik<ConcessionType>({
initialValues: initialFormValues,
enableReinitialize: true, // Ensures form updates when state fills
validationSchema: Yup.object({
description: Yup.string().required('description field cannot be blank'),
}),
onSubmit: async (data) => {
// alert(values.description);
const res = await concessionTypeService.save(data);
if (res.statusCode == 1)
alert('save success');
navigate(-1);
},
});
if (isLoading) {
return <div>Loading your record info...</div>;
}
// return <h1>Edit Concession Type from React Router: {id}</h1>;
return (
<form onSubmit={formik.handleSubmit} >
<label>Edit Concession Type</label>
<div className='grid grid-cols-2 gap-2'>
<input
id="description"
name="description"
type="text"
onChange={formik.handleChange}
onBlur={formik.handleBlur}
value={formik.values.description}
/>
{formik.touched.description && formik.errors.description ? (
<div>{formik.errors.description}</div>
) : null}
<input
id="display"
name="display"
type="text"
onChange={formik.handleChange}
onBlur={formik.handleBlur}
value={formik.values.display}
/>
</div>
<div className='ml-2 mt-2'>
<input
id="active"
name="active"
type="checkbox"
onChange={formik.handleChange}
onBlur={formik.handleBlur}
checked={formik.values.active}
/>
<label htmlFor="active" className='ml-2'>Active</label>
</div>
<button className='flex ml-auto' type="submit">Submit</button>
</form>
);
};
/* navigate to edit page
import { useNavigate } from 'react-router-dom';
interface UserButtonProps {
id: string | number;
}
export default function UserButton({ id }: UserButtonProps) {
const navigate = useNavigate();
const handleClick = () => {
// Navigates to /users/42 using template literals
navigate(`/users/${id}`);
};
return <button onClick={handleClick}>View Profile</button>;
*/
@@ -0,0 +1,176 @@
import React,{ useState, useEffect } from 'react';
import { type ConcessionValidationDto } from '../models';
import { concessionvalidationService as concessService} from '../services';
import { DataTable } from 'primereact/datatable';
import { Button } from 'primereact/button';
import { Column } from 'primereact/column';
import { ConfirmDialog, confirmDialog } from 'primereact/confirmdialog';
import { useNavigate } from 'react-router-dom';
import moment from 'moment';
export default function ConcessionValidationApp() {
const navigate = useNavigate();
const empty: ConcessionValidationDto =
{
id: 0,
validateDate: '',
concessionCard: '',
concessionHolder: '',
concessionExpiry: false,
concessionTypeId: 0,
stafflinkNo: '',
validationPointId: 0,
active: false,
staffFirstName: '',
staffLastName: '',
staffEmail: '',
iDate: new Date()
};
const [list, setList] = useState<ConcessionValidationDto[]>([]);
const [form, setForm] = useState(empty);
const [isEditing, setIsEditing] = useState(false);
// READ: Fetch all list
useEffect(() => {
fecthValidationPoint();
}, []);
const fecthValidationPoint = async () => {
try{
const vpres = await concessService.get();
if (vpres.statusCode == 1)
setList(vpres.data);
}
catch (error) {
console.error('error loading Validation Point', error);
}
};
// CREATE & UPDATE: Submit handler
const handleSubmit = async (e: { preventDefault: () => void; }) => {
console.log("on submit handle", isEditing,form);
e.preventDefault();
if (!form.concessionHolder ) return alert('Please fill in all fields');
if (isEditing) {
// SAVE (create/update)
try {
const nid = await concessService.save(form);
form.id = nid.data;
setList(list.map(c => c.id === form.id ? form : c));
clearForm();
} catch (error) {
console.error('Error updating customer:', error);
}
}
};
// DELETE
const handleDelete = async (id: number) => {
try {
const respose = await concessService.delete(id);
if (respose.data > 0)
setList(list.filter(c => c.id !== id));
else
console.error('something is wrong', respose);
} catch (error) {
console.error('Error deleting customer:', error);
}
};
const formatDate = (value:string) => {
return moment(value).format('DD-MM-YYYY');
};
const dateBodyTemplate = (rowData:ConcessionValidationDto) => {
return formatDate(rowData.validateDate);
};
const handleEditClick = (item:ConcessionValidationDto) => {
// setForm(item);
// setIsEditing(true);
handleNavClick(item.id);
};
const confirmDelete = (item: ConcessionValidationDto) => {
confirmDialog({
message: 'Do you want to delete this record?',
header: 'Delete Confirmation',
icon: 'pi pi-info-circle',
defaultFocus: 'reject',
acceptClassName: 'p-button-danger',
accept() {
handleDelete(item.id);
},
});
// setForm(product);
// setDeleteProductDialog(true);
};
const handleNavClick = (id: number) => {
// setForm(item);
// setIsEditing(true);
navigate(`/concessionvalidation/${id}`);
};
const clearForm = () => {
setForm(empty);
setIsEditing(false);
};
const actionBodyTemplate = (rowData: ConcessionValidationDto) => {
return (
<React.Fragment>
<div className='flex gap-2'>
<Button icon="pi pi-pencil" rounded outlined className='flex mr-2'
onClick={() => handleEditClick(rowData)} />
<Button icon="pi pi-trash" rounded outlined severity="danger" onClick={() => confirmDelete(rowData)} />
</div>
</React.Fragment>
);
};
return (
<div className='m-4 grid gap-2'>
<ConfirmDialog />
<h2>Concession Validation Management (CRUD)</h2>
{/* FORM COMPONENT
<form onSubmit={handleSubmit} style={{ marginBottom: '20px', display: 'flex', gap: '10px' }}>
<input
type="text" name="concessionCard" placeholder="concessionCard"
value={form.concessionCard} onChange={handleInputChange}
/>
<input
type="text" name="concessionHolder" placeholder="concessionHolder"
value={form.concessionHolder} onChange={handleInputChange}
/>
<input
type="text" name="concessionCard" placeholder="concessionCard"
value={form.concessionCard} onChange={handleInputChange}
/>
<input
type="checkbox" name="concessionExpiry" placeholder="concessionExpiry"
checked={form.concessionExpiry} onChange={handleCheckChange}
/>
<button type="submit">{isEditing ? 'Update' : 'Add'}</button>
{isEditing && <button type="button" onClick={clearForm}>Cancel</button>}
</form>
*/}
<div className='flex justify-end'>
<button onClick={() => handleNavClick(-1)}>Add New</button>
</div>
{/* LIST COMPONENT */}
<DataTable value={list} tableStyle={{ minWidth: '50rem' }}>
<Column field="concessionCard" header="Concession Card"></Column>
<Column field="concessionHolder" header="Concession Holder"></Column>
<Column field="validateDate" body={dateBodyTemplate} header="Validation Date"></Column>
<Column field="concessionExpiry" header="Expiry"></Column>
<Column body={actionBodyTemplate} exportable={false} style={{ minWidth: '12rem' }}></Column>
</DataTable>
</div>
);
}
@@ -0,0 +1,242 @@
// components/UserProfile.tsx
import { useParams } from 'react-router-dom';
import { useFormik } from 'formik';
import * as Yup from 'yup';
import { Dropdown } from 'primereact/dropdown';
import { Calendar } from 'primereact/calendar';
import type { ConcessionType, ConcessionValidationDto } from '../models';
import { useEffect, useState } from 'react';
import { concessionvalidationService as concessService } from '../services';
import { useNavigate } from 'react-router-dom';
import { Utils } from '../share';
//import { concessionTypeService } from '../services';
import moment from 'moment';
import { useAppSelector, useAppDispatch } from '../store/hook';
//import { type RootState } from '../store/store';
import { funThunkLoadConcessionType, funThunkLoadValidationPoint } from '../store/slice';
type RouteParams = {
id: string;
};
// 1. Set the initial form states based on the interface
export default function EditConcessionValidationApp() {
// useParams returns a partial object, so explicitly cast or type it
const { id } = useParams<RouteParams>();
const navigate = useNavigate();
const dispatch = useAppDispatch();
const conTypeList = useAppSelector(state => state.concessionTypeRE.concessionTypes);
const validationPointList = useAppSelector(state => state.concessionTypeRE.validationPoints);
console.log(" 1 get login ");
const loginUser = Utils.getLogin();
console.log(" 2 get login ");
// const dispatch = useAppDispatch();
// State elements are automatically typed based on the store schema
//const { concessionTypes } = useAppSelector((state: RootState) => state.convalidation);
const initialValues: ConcessionValidationDto =
{
id: -1,
validateDate: '',
iDate: new Date(),
concessionCard: '',
concessionHolder: '',
concessionExpiry: false,
concessionTypeId: 0,
active: true,
/*
stafflinkNo: "",
validationPointId: 0,
staffFirstName: "",
staffLastName: "",
staffEmail: "",
*/
stafflinkNo: loginUser.username ?? "",
validationPointId: loginUser.validationPointId ?? 0,
staffFirstName: loginUser.firstName,
staffLastName: loginUser.lastName,
staffEmail: loginUser.email,
};
const iid = parseInt(id ?? '0');
const [isLoading, setIsLoading] = useState<boolean>(true);
const [initialFormValues, setInitialFormValues] = useState<ConcessionValidationDto>(initialValues);
//const [conTypeList, setconTypeList] = useState<ConcessionType[]>([]);
const fetchExistingRecord = async () => {
try {
setIsLoading(true);
if (iid > 0) {
// Replace this with your actual Axios, Fetch, or SDK call
const response = await concessService.getById(iid);
if (response.statusCode == 1)
// Update state with the fetched record
setInitialFormValues(response.data);
}
} catch (error) {
console.error('Failed to fetch the record data:', error);
} finally {
setIsLoading(false);
}
};
useEffect(() => {
fetchExistingRecord();
if (conTypeList.length < 1)
dispatch(funThunkLoadValidationPoint());
if (validationPointList.length < 1)
dispatch(funThunkLoadConcessionType());
return () => {
// isMounted = false;
// dispatch(clearConcessionType());
};
}, [iid, dispatch]);
//if (concessionTypes != null)
// setconTypeList(concessionTypes);
/*
const fecthConcessionType = async () => {
try {
const vpres = await concessionTypeService.get();
if (vpres.statusCode == 1)
setconTypeList(vpres.data);
}
catch (error) {
console.error('error loading Validation Point', error);
}
};
*/
const formik = useFormik<ConcessionValidationDto>({
initialValues: initialFormValues,
enableReinitialize: true, // Ensures form updates when state fills
validationSchema: Yup.object({
concessionCard: Yup.string().required('concessionCard field cannot be blank'),
}),
onSubmit: async (data) => {
/* using redux thunk *****
***********************************************************
// 1. Dispatch and wait for the thunk to complete
const resultAction = await dispatch(updateCustomerApi({ name, email, purchaseHistory }));
// 2. Unwrap the action payload safely
if (updateCustomerApi.fulfilled.match(resultAction)) {
// The fresh server response is inside the action payload directly!
const myNewId = resultAction.payload.id;
console.log("Got the new ID immediately:", myNewId);
*************************************************************
option two
// 1. Keep your selector at the top-level of the component
const myNewId = useAppSelector((state) => state.customer.activeItem?.id);
// 2. Submit handler only triggers the mutation
const handleSubmit = (e: React.FormEvent) => {
e.preventDefault();
dispatch(triggerIdGenerationAction());
};
// 3. Effect listens for the variable to change on subsequent renders
useEffect(() => {
if (myNewId) {
console.log("State updated! Moving to next screen with ID:", myNewId);
navigate(`/receipt/${myNewId}`);
}
}, [myNewId, navigate]); // Fires automatically when myNewId changes
***************************************************************************
*/
// alert(values.description);
console.log('on submit', data);
data.validateDate = moment(data.iDate).format('YYYY-MM-DD');
const res = await concessService.save(data);
if (res.statusCode == 1)
alert('save success');
navigate(-1);
},
});
if (isLoading) {
return <div>Loading your record info...</div>;
}
// return <h1>Edit Concession Type from React Router: {id}</h1>;
return (
<form onSubmit={formik.handleSubmit} >
<label>Edit Concession Validation</label>
<div className='grid grid-cols-2 gap-2'>
<input
id="concessionCard"
name="concessionCard"
type="text"
onChange={formik.handleChange}
onBlur={formik.handleBlur}
placeholder='Card'
value={formik.values.concessionCard}
/>
{formik.touched.concessionCard && formik.errors.concessionCard ? (
<div>{formik.errors.concessionCard}</div>
) : null}
<input
id="concessionHolder"
name="concessionHolder"
type="text"
placeholder='Card Holder'
onChange={formik.handleChange}
onBlur={formik.handleBlur}
value={formik.values.concessionHolder}
/>
<Calendar value={formik.values.iDate} onChange={(e) => formik.setFieldValue('iDate', e.value)} dateFormat="dd/mm/yy" />
</div>
<div className='ml-2 mt-2'>
<input
id="concessionExpiry"
name="concessionExpiry"
type="checkbox"
onChange={formik.handleChange}
onBlur={formik.handleBlur}
checked={formik.values.concessionExpiry}
/>
<label htmlFor="concessionExpiry" className='ml-2'>Expiry</label>
<Dropdown value={formik.values.concessionTypeId} onChange={(e) => formik.setFieldValue('concessionTypeId', e.value)}
options={conTypeList} optionLabel="description" optionValue="id"
placeholder="Select a concession Type" className="w-full md:w-14rem" />
<Dropdown value={formik.values.validationPointId} onChange={(e) => formik.setFieldValue('validationPointId', e.value)}
options={validationPointList} optionLabel="description" optionValue="id"
placeholder="Select a concession Type" className="w-full md:w-14rem" />
</div>
<button className='flex ml-auto mt-2' type="submit">Submit</button>
</form>
);
};
/* navigate to edit page
import { useNavigate } from 'react-router-dom';
interface UserButtonProps {
id: string | number;
}
export default function UserButton({ id }: UserButtonProps) {
const navigate = useNavigate();
const handleClick = () => {
// Navigates to /users/42 using template literals
navigate(`/users/${id}`);
};
return <button onClick={handleClick}>View Profile</button>;
*/
+9
View File
@@ -0,0 +1,9 @@
export {};
declare global {
interface Window {
APP_CONFIG?: {
API_URL?: string;
};
}
}
+25
View File
@@ -0,0 +1,25 @@
import { useNavigate } from "react-router-dom";
export default function Home() {
const navigate = useNavigate();
return (
<>
<h2>Home Page</h2>
<div className='grid grid-cols-4 gap-2 mt-4'>
<button className='mt-2 rounded-xl border-2 bg-blue-500 cursor-pointer'
onClick={() => navigate("/concessiontype")}
type="button">Concession Typed</button>
<button className='mt-2 rounded-xl border-2 bg-blue-500 cursor-pointer'
onClick={() => navigate("/concessionvalidation")}
type="button">Concession Validation</button>
<button className='mt-2 rounded-xl border-2 bg-blue-500 cursor-pointer'
onClick={() => navigate("/validationpoint")}
type="button">Validation Point</button>
<button className='mt-2 rounded-xl border-2 bg-blue-500 cursor-pointer'
onClick={() => navigate("/adminuser")}
type="button">Admin User</button>
</div>
</>
);
}
+1
View File
@@ -0,0 +1 @@
export * from "./home";
+22
View File
@@ -0,0 +1,22 @@
@import "tailwindcss";
@import 'primeicons/primeicons.css';
/* Add this to your global CSS file */
input {
border: 1px solid #ccc;
border-radius: 4px;
padding: 8px;
}
select {
border: 1px solid #ccc;
border-radius: 4px;
}
button {
border: 1px solid #007bff;
/*
background-color: #007bff;
color: white;
*/
border-radius: 4px;
padding: 8px 16px;
cursor: pointer;
}
+23
View File
@@ -0,0 +1,23 @@
import React from 'react';
import { Outlet } from 'react-router-dom';
import { Header } from '../components/Header';
import { useAuth } from '../share';
export const MainLayout: React.FC = () => {
const { logout } = useAuth();
const handleLogout = () => {
// Add your AuthProvider logout logic here
logout();
console.log('Logging out...');
};
return (
<div className="app-container">
<Header title="Car Park Validation" onLogout={handleLogout} />
<main className="main-content" style={{ padding: '2rem' }}>
{/* This renders the actual page component (Home, Admin, etc.) */}
<Outlet />
</main>
</div>
);
};
+76
View File
@@ -0,0 +1,76 @@
import React, { useState } from 'react';
import { useNavigate, useLocation } from 'react-router-dom';
import { InputText } from 'primereact/inputtext';
import { useAuth } from '../share';
import { Button } from 'primereact/button';
import { adminUserService } from '../services';
export default function Login() {
let loggingIn = false;
const empty =
{
username: '',
password: ''
};
const [form, setForm] = useState(empty);
const { login,isAuthenticated} = useAuth();
const navigate = useNavigate();
const location = useLocation();
const [submitted, setSubmitted] = useState(false);
// Retrieve the original destination path, defaulting to the dashboard
const from = location.state?.from?.pathname || '/home';
// INPUT HANDLER
const handleInputChange = (e: { target: { name: any; value: any; }; }) => {
const { name, value } = e.target;
setForm({ ...form, [name]: value });
};
const handleFormSubmit = async (e: React.ChangeEvent) => {
e.preventDefault();
try {
// Replace this section with your actual API fetch request
const loginUser = await adminUserService.login(form.username,form.password);
if (loginUser.statusCode == 1)
{
// Saves to state and localStorage
login(loginUser.data);
// Redirects user back to their intended protected page
navigate(from, { replace: true });
}
} catch (error) {
console.error('Login failed', error);
}
};
return (
<div className="flex justify-center">
<div className='shadow-2 rounded p-2'>
<h2>Login</h2>
<form name="form" onSubmit={handleFormSubmit}>
<div className={'field' + (submitted && !isAuthenticated ? ' has-error' : '')}>
<label htmlFor="username">Username</label>
<InputText id="username" type="text" className="p-inputtext-sm inputfield w-full border-round"
name="username" value={form.username} onChange={handleInputChange} />
{submitted && !isAuthenticated &&
<div className="help-block">Username is required</div>
}
</div>
<div className={'field' + (submitted && !form.password ? ' has-error' : '')}>
<label htmlFor="password">Password</label>
<InputText id="password" type="password" className="p-inputtext-sm inputfield w-full border-round"
name="password" value={form.password} onChange={handleInputChange} />
{submitted && !form.password &&
<div className="help-block">Password is required</div>
}
</div>
<div className="flex justify-end mt-2">
<Button className="p-button-sm p-button-rounded" type="submit" label="Login" loading={loggingIn} style={{height: "30px"}} />
</div>
</form>
</div>
</div>
);
}
+31
View File
@@ -0,0 +1,31 @@
//import { StrictMode } from 'react'
import { createRoot } from 'react-dom/client'
import './index.css'
import App from './App.tsx'
import { PrimeReactProvider } from 'primereact/api';
import { Provider } from 'react-redux';
import { store } from './store';
// Fetch config from the public folder at runtime
fetch('/config.json')
.then((response) => response.json())
.then((config) => {
// Store it globally on the window object
//(window as any).APP_CONFIG = 'abc';
window.APP_CONFIG = config;
createRoot(document.getElementById('root')!).render(
//<StrictMode>
<Provider store={store}>
<PrimeReactProvider>
<App />
</PrimeReactProvider>
</Provider>
//</StrictMode>,
)
})
.catch((error) => {
console.error('Failed to load runtime configuration:', error);
});

Some files were not shown because too many files have changed in this diff Show More