Merge pull request #256 from DiyorMarket/CheckPoint-Details-PopUp

Check point details pop up

Author: Boburm1rzo

CheckDrive.Web/CheckDrive.Web/CheckDrive.Web.csproj

@@ -13,7 +13,6 @@
     <None Remove="Controllers\**" />
     <Content Remove="wwwroot\css\LogOutButtun.css" />
     <_ContentIncludedByDefault Remove="appsettings.Production.json" />
-    <Compile Include="Controllers\AuthController.cs" />
     <Compile Include="Controllers\CarsController.cs" />
     <Compile Include="Controllers\CheckPointController.cs" />
     <Compile Include="Controllers\DebtsController.cs" />

CheckDrive.Web/CheckDrive.Web/Controllers/AuthController.cs

@@ -1,20 +1,21 @@
 using CheckDrive.Web.Stores.CheckPoint;
 using Microsoft.AspNetCore.Mvc;
 
-namespace CheckDrive.Web.Controllers
+namespace CheckDrive.Web.Controllers;
+
+public class CheckPointController(ICheckPointStore checkPointStore) : Controller
 {
-    public class CheckPointController : Controller
+    public async Task<ActionResult> Index(int id)
+    {
+        var checkPoint = await checkPointStore.GetByIdAsync(id);
+
+        return View(checkPoint);
+    }
+
+    public async Task<ActionResult> Details(int id)
     {
-        private readonly ICheckPointStore _checkPointStore;
-        public CheckPointController(ICheckPointStore checkPointStore)
-        {
-            _checkPointStore = checkPointStore ?? throw new ArgumentNullException(nameof(checkPointStore));
-        }
-        public async Task<ActionResult> Index(int id)
-        {
-            var checkPoint = await _checkPointStore.GetCheckPointByIdAsync(id);
+        var checkPoint = await checkPointStore.GetByIdAsync(id);
 
-            return View(checkPoint);
-        }
+        return View(checkPoint);
     }
 }

CheckDrive.Web/CheckDrive.Web/Controllers/CheckPointController.cs

@@ -10,12 +10,12 @@ public IActionResult Index()
         return View();
     }
 
-    [Route("Error/{statusCode:int}")]
+    [Route("{statusCode:int}")]
     public IActionResult ErrorPage(int statusCode)
     {
         return statusCode switch
         {
-            401 => View(nameof(Unauthorized)),
+            401 => RedirectToAction("Login", "Home"),
             403 => View(nameof(Forbidden)),
             404 => View(nameof(NotFound)),
             409 => RedirectToAction(nameof(Error409)),

CheckDrive.Web/CheckDrive.Web/Controllers/ErrorController.cs

@@ -1,21 +1,40 @@
-using CheckDrive.Web.Stores.Dashboard;
+using CheckDrive.Web.Requests.Auth;
+using CheckDrive.Web.Stores.Auth;
+using CheckDrive.Web.Stores.Dashboard;
 using Microsoft.AspNetCore.Mvc;
 
 namespace CheckDrive.Web.Controllers;
 
-public class HomeController : Controller
+public class HomeController(IAuthStore authStore, IDashboardStore dashboardStore) : Controller
 {
-    private readonly IDashboardStore _dashboardStore;
+    public async Task<IActionResult> Index()
+    {
+        var result = await dashboardStore.GetDashboardAsync();
+
+        return View(result);
+    }
 
-    public HomeController(IDashboardStore dashboardStore)
+    [HttpGet, Route("login")]
+    public IActionResult Login() => View();
+
+    [HttpPost, Route("login")]
+    public async Task<IActionResult> Login(LoginRequest request)
     {
-        _dashboardStore = dashboardStore ?? throw new ArgumentNullException(nameof(dashboardStore));
+        if (!ModelState.IsValid)
+        {
+            return View(request);
+        }
+
+        await authStore.LoginAsync(request);
+
+        return RedirectToAction("Index", "Home");
     }
 
-    public async Task<IActionResult> Index()
+    [HttpGet, Route("logout")]
+    public IActionResult Logout()
     {
-        var result = await _dashboardStore.GetDashboardAsync();
+        authStore.Logout();
 
-        return View(result);
+        return RedirectToAction(nameof(Login));
     }
 }

CheckDrive.Web/CheckDrive.Web/Controllers/HomeController.cs

@@ -8,9 +8,9 @@
 namespace CheckDrive.Web.Helpers;
 
 // Initializes CookieHandler & AuthStore via ServiceProvider due to circular dependency
-// AuthorizationHandler -> AuthStore -> CheckDriveApi -> HttpClient -> AuthorizationHandler,
+// AuthorizationHandler -> AuthStore -> ApiClient -> HttpClient -> AuthorizationHandler,
 // which means before initialization of AuthorizationHandler we cannot resolve AuthStore.
-// Resolving CookieHandler via ServiceProvider as well to keep it consistent and easier to follow.
+// Resolving CookieHandler via ServiceProvider as well, to keep it consistent and easier to follow.
 internal sealed class AuthorizationHandler(IServiceProvider serviceProvider) : DelegatingHandler
 {
     protected override async Task<HttpResponseMessage> SendAsync(HttpRequestMessage request, CancellationToken cancellationToken)
@@ -20,33 +20,31 @@ protected override async Task<HttpResponseMessage> SendAsync(HttpRequestMessage
             return await base.SendAsync(request, cancellationToken);
         }
 
-        await AddAuthorizationHeaders(request);
+        await TryAddAuthorizationHeadersAsync(request);
 
         return await base.SendAsync(request, cancellationToken);
     }
 
-    private async Task AddAuthorizationHeaders(HttpRequestMessage request)
-    {
-        var accessToken = await GetAccessToken();
-
-        request.Headers.Authorization = new AuthenticationHeaderValue(HeaderConstants.AuthenticationSchema, accessToken);
-    }
-
-    private async Task<string> GetAccessToken()
+    private async Task TryAddAuthorizationHeadersAsync(HttpRequestMessage request)
     {
         using var scope = serviceProvider.CreateScope();
         var cookieHandler = scope.ServiceProvider.GetRequiredService<ICookieHandler>();
         var authStore = scope.ServiceProvider.GetRequiredService<IAuthStore>();
 
         var (accessToken, refreshToken) = cookieHandler.GetTokens();
 
-        if (!JwtHelper.IsTokenValid(accessToken) && !string.IsNullOrWhiteSpace(refreshToken))
+        if (JwtHelper.IsValid(accessToken))
         {
-            var response = await authStore.RefreshTokenAsync(new RefreshTokenRequest(refreshToken));
+            request.Headers.Authorization = new AuthenticationHeaderValue(HeaderConstants.AuthenticationSchema, accessToken);
 
-            return response.AccessToken;
+            return;
         }
 
-        return accessToken ?? string.Empty;
+        if (!string.IsNullOrWhiteSpace(refreshToken))
+        {
+            var response = await authStore.RefreshTokenAsync(new RefreshTokenRequest(refreshToken));
+
+            request.Headers.Authorization = new AuthenticationHeaderValue(HeaderConstants.AuthenticationSchema, response.AccessToken);
+        }
     }
 }

CheckDrive.Web/CheckDrive.Web/Helpers/AuthorizationHandler.cs

@@ -1,12 +1,13 @@
-using Microsoft.IdentityModel.Tokens;
+using System.Diagnostics.CodeAnalysis;
 using System.IdentityModel.Tokens.Jwt;
 using System.Security.Claims;
+using Microsoft.IdentityModel.Tokens;
 
 namespace CheckDrive.Web.Helpers;
 
 internal static class JwtHelper
 {
-    public static bool IsTokenValid(string? token)
+    public static bool IsValid([NotNullWhen(true)] string? token)
     {
         if (string.IsNullOrEmpty(token))
         {

CheckDrive.Web/CheckDrive.Web/Helpers/JwtHelper.cs

@@ -24,4 +24,6 @@ public async Task<TokenResponse> RefreshTokenAsync(RefreshTokenRequest request)
 
         return response;
     }
+
+    public void Logout() => cookieHandler.ClearTokens();
 }

CheckDrive.Web/CheckDrive.Web/Stores/Auth/AuthStore.cs

@@ -7,4 +7,5 @@ public interface IAuthStore
 {
     Task<TokenResponse> LoginAsync(LoginRequest request);
     Task<TokenResponse> RefreshTokenAsync(RefreshTokenRequest request);
+    void Logout();
 }

CheckDrive.Web/CheckDrive.Web/Stores/Auth/IAuthStore.cs

@@ -12,13 +12,11 @@ internal sealed class CheckPointStore(CheckDriveApi apiClient) : ICheckPointStor
     public Task<List<CheckPointViewModel>> GetAllAsync()
         => apiClient.GetAsync<List<CheckPointViewModel>>(_resourceUrl);
 
-    public async Task<CheckPointViewModel> GetCheckPointByIdAsync(int id)
+    public async Task<CheckPointViewModel> GetByIdAsync(int id)
     {
-        var checkPoints = await apiClient.GetAsync<List<CheckPointViewModel>>(_resourceUrl);
+        var checkPoint = await apiClient.GetAsync<CheckPointViewModel>($"{_resourceUrl}/{id}");
 
-        var result = checkPoints.FirstOrDefault(x => x.Id == id);
-
-        return result;
+        return checkPoint;
     }
 
     public List<SelectListItem> GetEnumValues<TEnum>() where TEnum : Enum

CheckDrive.Web/CheckDrive.Web/Stores/CheckPoint/CheckPointStore.cs

@@ -6,6 +6,6 @@ namespace CheckDrive.Web.Stores.CheckPoint;
 public interface ICheckPointStore
 {
     Task<List<CheckPointViewModel>> GetAllAsync();
-    Task<CheckPointViewModel> GetCheckPointByIdAsync(int id);
+    Task<CheckPointViewModel> GetByIdAsync(int id);
     List<SelectListItem> GetEnumValues<TEnum>() where TEnum : Enum;
 }

CheckDrive.Web/CheckDrive.Web/Stores/CheckPoint/ICheckPointStore.cs

@@ -9,17 +9,25 @@ public class CheckPointViewModel
     public string Driver { get; set; }
     public string CarModel { get; set; }
     public decimal CurrentMileage { get; set; }
+    public string FormattedCurrentMileage => CurrentMileage.ToString("N1");
     public decimal CurrentFuelAmount { get; set; }
+    public string FormattedCurrentFuelAmount => CurrentFuelAmount.ToString("N1");
     public string Mechanic { get; set; }
     public decimal InitialMillage { get; set; }
+    public string FormattedInitialMillage => InitialMillage.ToString("N1");
     public decimal FinalMileage { get; set; }
+    public string FormattedFinalMileage => FinalMileage.ToString("N1");
     public string Operator { get; set; }
     public decimal InitialOilAmount { get; set; }
+    public string FormattedInitialOilAmount => InitialOilAmount.ToString("N1");
     public decimal OilRefillAmount { get; set; }
+    public string FormattedOilRefillAmount => OilRefillAmount.ToString("N1");
     public string Oil { get; set; }
     public string Dispatcher { get; set; }
     public decimal FuelConsumptionAdjustment { get; set; }
+    public string FormattedFuelConsumptionAdjustment => FuelConsumptionAdjustment.ToString("N1");
     public decimal DebtAmount { get; set; }
+    public string FormattedDebtAmount => DebtAmount.ToString("N1");
     public CheckPointStage Stage { get; set; }
     public CheckPointStatus Status { get; set; }
 }