Memory chache to store jwt tiken and home area added in web app.

HasanJaved-Developer · HasanJaved-Developer · commit 46aee684758d · 2025-09-06T16:54:28.000+05:00
diff --git a/ApiIntegrationMvc/ApiIntegrationMvc.csproj b/ApiIntegrationMvc/ApiIntegrationMvc.csproj
@@ -10,4 +10,8 @@
     <ProjectReference Include="..\UserManagement.Sdk\UserManagement.Sdk.csproj" />
   </ItemGroup>
 
+  <ItemGroup>
+    <Folder Include="Areas\Home\Models\" />
+  </ItemGroup>
+
 </Project>
diff --git a/ApiIntegrationMvc/Areas/Account/Controllers/LoginController.cs b/ApiIntegrationMvc/Areas/Account/Controllers/LoginController.cs
@@ -1,5 +1,6 @@
 ﻿using ApiIntegrationMvc.Areas.Account.Models;
 using Microsoft.AspNetCore.Mvc;
+using System.Text.Json;
 using UserManagement.Contracts.Auth;
 using UserManagement.Sdk.Abstractions;
 
@@ -9,7 +10,8 @@ namespace ApiIntegrationMvc.Areas.Account.Controllers
     public class LoginController : Controller
     {
         private readonly IUserManagementClient _users;
-        public LoginController(IUserManagementClient users) => _users = users;
+        private readonly IAccessTokenProvider _cache;
+        public LoginController(IUserManagementClient users, IAccessTokenProvider cache) => (_users, _cache) = (users, cache);
 
         [HttpGet]
         [ResponseCache(NoStore = true, Location = ResponseCacheLocation.None)]
@@ -23,22 +25,44 @@ public IActionResult Index()
         [ValidateAntiForgeryToken]
         public async Task<IActionResult> Index(LoginViewModel model, CancellationToken ct)
         {
-            if (!ModelState.IsValid)
+            try
             {
-                return View(model);
-            }
+                if (!ModelState.IsValid)
+                {
+                    return View(model);
+                }
+
+                var req = new LoginRequest(model.Username, model.Password);
+                var result = await _users.LoginAsync(req, ct);
 
-            var req = new LoginRequest(model.Username, model.Password);
-            var result = await _users.LoginAsync(req, ct);
+                if (result == null || string.IsNullOrWhiteSpace(result.Token))
+                {
+                    TempData["Error"] = "Invalid username or password.";
+                    return RedirectToAction(nameof(Index));   // ← PRG on failure
+                }
 
-            if (result == null || string.IsNullOrWhiteSpace(result.AccessToken))
+                
+                _cache.SetAccessToken(result.Token, result.UserId, result.ExpiresAtUtc);
+
+                return RedirectToAction("Index", "Home", new { area = "Home" });
+            }
+            catch (HttpRequestException hx)
             {
-                TempData["Error"] = "Invalid username or password.";
-                return RedirectToAction(nameof(Index));   // ← PRG on failure
+                TempData["Error"] = hx.Message;
+                return RedirectToAction(nameof(Index));   // ← PRG on failure             
+            }
+            catch (JsonException jx)
+            {                
+                TempData["Error"] = jx.Message;
+                return RedirectToAction(nameof(Index));   // ← PRG on failure             
+            }
+            catch(Exception ex)
+            {
+                TempData["Error"] = "Internal Error. Please contact administrator.";
+                return RedirectToAction(nameof(Index));   // ← PRG on failure             
             }
-            
-            return RedirectToAction("Index", "Home");     // PRG on success too                                   
-            
         }
+
+        
     }
 }
diff --git a/ApiIntegrationMvc/Areas/Home/Controllers/HomeController.cs b/ApiIntegrationMvc/Areas/Home/Controllers/HomeController.cs
@@ -0,0 +1,30 @@
+using ApiIntegrationMvc.Areas.Account.Models;
+using Microsoft.AspNetCore.Mvc;
+using System.Text.Json;
+using UserManagement.Contracts.Auth;
+using UserManagement.Sdk.Abstractions;
+
+namespace ApiIntegrationMvc.Areas.Home.Controllers
+{
+    [Area("Home")]
+    public class HomeController : Controller
+    {
+        private readonly ILogger<HomeController> _logger;
+
+        public HomeController(ILogger<HomeController> logger)
+        {
+            _logger = logger;
+        }
+
+        public IActionResult Index()
+        {
+            return View();
+        }
+
+        public IActionResult Privacy()
+        {
+            return View();
+        }
+
+    }
+}
diff --git a/ApiIntegrationMvc/Areas/Home/Views/Home/Index.cshtml b/ApiIntegrationMvc/Areas/Home/Views/Home/Index.cshtml
@@ -0,0 +1,8 @@
+﻿@{
+    ViewData["Title"] = "Home Page";
+}
+
+<div class="text-center">
+    <h1 class="display-4">Welcome</h1>
+    <p>Learn about <a href="https://learn.microsoft.com/aspnet/core">building Web apps with ASP.NET Core</a>.</p>
+</div>
diff --git a/ApiIntegrationMvc/Areas/Home/Views/Home/_ViewImports.cshtml b/ApiIntegrationMvc/Areas/Home/Views/Home/_ViewImports.cshtml
@@ -0,0 +1,4 @@
+﻿@using ApiIntegrationMvc
+@using ApiIntegrationMvc.Models
+@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
+@using ApiIntegrationMvc.Areas.Account.Models
diff --git a/ApiIntegrationMvc/Areas/Home/Views/Home/_ViewStart.cshtml b/ApiIntegrationMvc/Areas/Home/Views/Home/_ViewStart.cshtml
@@ -0,0 +1,3 @@
+﻿@{
+    Layout = "~/Views/Shared/_Layout.cshtml"; // or area-specific layout if you want
+}
diff --git a/ApiIntegrationMvc/Program.cs b/ApiIntegrationMvc/Program.cs
@@ -7,11 +7,10 @@
 
 // Add MemoryCache globally
 builder.Services.AddMemoryCache();
+builder.Services.AddHttpContextAccessor(); // required for the above
 
 builder.Services.AddUserManagementSdk();
 
-// Register the token provider (memory-based)
-builder.Services.AddScoped<IAccessTokenProvider, MemoryCacheAccessTokenProvider>();
 
 
 // Add services to the container.
diff --git a/ApiIntegrationMvc/Views/Shared/_Layout.cshtml b/ApiIntegrationMvc/Views/Shared/_Layout.cshtml
@@ -15,7 +15,7 @@
     <header>
         <nav class="navbar navbar-expand-sm navbar-toggleable-sm navbar-light bg-white border-bottom box-shadow mb-3">
             <div class="container-fluid">
-                <a class="navbar-brand" asp-area="" asp-controller="Home" asp-action="Index">ApiIntegrationMvc</a>
+                <a class="navbar-brand" asp-area="" asp-controller="Home" asp-action="Index">Integration Portal</a>
                 <button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target=".navbar-collapse" aria-controls="navbarSupportedContent"
                         aria-expanded="false" aria-label="Toggle navigation">
                     <span class="navbar-toggler-icon"></span>
diff --git a/UserManagement.Contracts/Auth/AuthResult.cs b/UserManagement.Contracts/Auth/AuthResult.cs
@@ -5,9 +5,11 @@
 using System.Threading.Tasks;
 
 namespace UserManagement.Contracts.Auth
-{
-    public sealed record AuthResult(
-    string AccessToken,
-    int ExpiresInSeconds,
-    string? TokenType = "Bearer");
+{    
+    public record AuthResponse(
+      int UserId,
+      string UserName,
+      string Token,
+      DateTime ExpiresAtUtc 
+  );
 }
diff --git a/UserManagement.Sdk/Abstractions/IAccessTokenProvider.cs b/UserManagement.Sdk/Abstractions/IAccessTokenProvider.cs
@@ -9,5 +9,6 @@ namespace UserManagement.Sdk.Abstractions
     public interface IAccessTokenProvider
     {
         Task<string?> GetAccessTokenAsync(CancellationToken ct = default);
+        void SetAccessToken(string token, int userId, DateTime expiresAtUtc);
     }
 }
diff --git a/UserManagement.Sdk/Abstractions/IUserManagementClient.cs b/UserManagement.Sdk/Abstractions/IUserManagementClient.cs
@@ -9,6 +9,6 @@ namespace UserManagement.Sdk.Abstractions
 {
     public interface IUserManagementClient
     {
-        Task<AuthResult?> LoginAsync(LoginRequest request, CancellationToken ct = default);
+        Task<AuthResponse> LoginAsync(LoginRequest request, CancellationToken ct = default);
     }
 }
diff --git a/UserManagement.Sdk/Extensions/ServiceCollectionExtensions.cs b/UserManagement.Sdk/Extensions/ServiceCollectionExtensions.cs
@@ -29,6 +29,10 @@ public static IServiceCollection AddUserManagementSdk(
             // Delegating handler MUST be transient
             services.AddTransient<BearerTokenHandler>();
 
+            // Register the token provider (memory-based)
+            services.AddScoped<IAccessTokenProvider, MemoryCacheAccessTokenProvider>();
+
+
             // The Typed client
             services.AddHttpClient<IUserManagementClient, UserManagementClient>((sp, http) =>
             {
diff --git a/UserManagement.Sdk/MemoryCacheAccessTokenProvider.cs b/UserManagement.Sdk/MemoryCacheAccessTokenProvider.cs
@@ -1,32 +1,54 @@
-﻿using Microsoft.Extensions.Caching.Memory;
+﻿using Microsoft.AspNetCore.Http;
+using Microsoft.Extensions.Caching.Memory;
+using System.Security.Claims;
 using UserManagement.Sdk.Abstractions;
 
 namespace UserManagement.Sdk
 {
     public sealed class MemoryCacheAccessTokenProvider : IAccessTokenProvider
     {
         private readonly IMemoryCache _cache;
+        private readonly IHttpContextAccessor _http;        
 
-        public MemoryCacheAccessTokenProvider(IMemoryCache cache)
+        public MemoryCacheAccessTokenProvider(IMemoryCache cache, IHttpContextAccessor http)
         {
             _cache = cache;
+            _http = http;
         }
 
         public Task<string?> GetAccessTokenAsync(CancellationToken ct = default)
         {
-            // Try to fetch from cache
-            if (_cache.TryGetValue("AccessToken", out string? token))
-            {
-                return Task.FromResult(token);
-            }
+            var user = _http.HttpContext?.User;
+            var uid =
+                user?.FindFirst("sub")?.Value
+             ?? user?.FindFirst(ClaimTypes.NameIdentifier)?.Value;
 
-            return Task.FromResult<string?>(null);
+            if (string.IsNullOrEmpty(uid)) return Task.FromResult<string?>(null);
+
+            var key = $"token:{uid}";
+            _cache.TryGetValue(key, out string? token);
+            return Task.FromResult(token);
         }
 
         // Optional helper method to set the token into cache
-        public void SetAccessToken(string token, TimeSpan expiresIn)
+        public void SetAccessToken(string token, int userId, DateTime expiresAtUtc)
+        {            
+            var ttl = ToTtl(expiresAtUtc);            
+            _cache.Set($"token:{userId}", token, ttl);
+        }
+
+        public static TimeSpan ToTtl(DateTime expiresAtUtc, TimeSpan? safety = null)
         {
-            _cache.Set("AccessToken", token, expiresIn);
+            // ensure it's treated as UTC
+            if (expiresAtUtc.Kind != DateTimeKind.Utc)
+                expiresAtUtc = DateTime.SpecifyKind(expiresAtUtc, DateTimeKind.Utc);
+
+            var ttl = expiresAtUtc - DateTime.UtcNow;
+
+            // subtract a small safety margin to avoid edge expiries
+            ttl -= safety ?? TimeSpan.FromSeconds(15);
+
+            return ttl > TimeSpan.Zero ? ttl : TimeSpan.Zero;
         }
     }
 }
diff --git a/UserManagement.Sdk/UserManagement.Sdk.csproj b/UserManagement.Sdk/UserManagement.Sdk.csproj
@@ -11,6 +11,7 @@
   </ItemGroup>
 
   <ItemGroup>
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.Core" Version="2.3.0" />
     <PackageReference Include="Microsoft.Extensions.Caching.Abstractions" Version="9.0.8" />
     <PackageReference Include="Microsoft.Extensions.Http" Version="9.0.8" />
     <PackageReference Include="Microsoft.Extensions.Http.Polly" Version="9.0.8" />
diff --git a/UserManagement.Sdk/UserManagementClient.cs b/UserManagement.Sdk/UserManagementClient.cs
@@ -1,4 +1,6 @@
-﻿using System.Net.Http.Json;
+﻿using Microsoft.AspNetCore.Mvc;
+using System.Net.Http.Json;
+using System.Text.Json;
 using UserManagement.Contracts.Auth;
 using UserManagement.Sdk.Abstractions;
 
@@ -10,8 +12,31 @@ internal sealed class UserManagementClient : IUserManagementClient
 
         public UserManagementClient(HttpClient http) => _http = http;
 
-        public async Task<AuthResult?> LoginAsync(LoginRequest request, CancellationToken ct = default)
-            => await _http.PostAsJsonAsync("api/users/authenticate", request, ct)
-                          .Result.Content.ReadFromJsonAsync<AuthResult>(cancellationToken: ct);        
+        public async Task<AuthResponse> LoginAsync(LoginRequest request, CancellationToken ct = default)
+        {
+            var resp = await _http.PostAsJsonAsync("api/users/authenticate", request, ct);
+            var contentType = resp.Content.Headers.ContentType?.MediaType ?? "";
+
+            var body = await resp.Content.ReadAsStringAsync(ct);
+
+            if (!resp.IsSuccessStatusCode)
+            {
+                // Try to parse ProblemDetails for a better message
+                ProblemDetails? prob = null;
+                if (contentType.Contains("json", StringComparison.OrdinalIgnoreCase))
+                {
+                    try { prob = JsonSerializer.Deserialize<ProblemDetails>(body); } catch { /* ignore */ }
+                }
+                var msg = prob?.Detail ?? prob?.Title ?? $"HTTP {(int)resp.StatusCode} {resp.ReasonPhrase}";
+                throw new HttpRequestException(msg);
+            }
+
+            // Success → parse AuthResponse
+            if (!contentType.Contains("json", StringComparison.OrdinalIgnoreCase))
+                throw new InvalidOperationException($"Expected JSON but got '{contentType}'. Body: {body[..Math.Min(120, body.Length)]}");
+
+            var auth = JsonSerializer.Deserialize<AuthResponse>(body, new JsonSerializerOptions { PropertyNameCaseInsensitive = true });
+            return auth;
+        }
     }
 }
diff --git a/UserManagementApi/Controllers/UsersController.cs b/UserManagementApi/Controllers/UsersController.cs
@@ -1,12 +1,12 @@
 ﻿using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Identity.Data;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Options;
 using Microsoft.IdentityModel.Tokens;
 using System.IdentityModel.Tokens.Jwt;
 using System.Security.Claims;
 using System.Text;
+using UserManagement.Contracts.Auth;
 using UserManagementApi.Data;
 using UserManagementApi.DTO;
 using UserManagementApi.DTO.Auth;
@@ -29,21 +29,42 @@ public UsersController(AppDbContext db, IOptions<JwtOptions> jwtOptions)
         }
         // --------- NEW: POST /api/users/authenticate ----------
         [HttpPost("authenticate")]
+        [ProducesResponseType(typeof(AuthResponse), StatusCodes.Status200OK)]
+        [ProducesResponseType(typeof(ProblemDetails), StatusCodes.Status400BadRequest)]
+        [ProducesResponseType(typeof(ProblemDetails), StatusCodes.Status401Unauthorized)]
+
         public async Task<ActionResult<AuthResponse>> Authenticate([FromBody] DTO.LoginRequest req)
         {
             if (string.IsNullOrWhiteSpace(req.UserName) || string.IsNullOrWhiteSpace(req.Password))
-                return BadRequest("Username and password are required.");
+            {
+                return ValidationProblem(new ValidationProblemDetails
+                {
+                    Title = "Validation error",
+                    Detail = "Username and password are required.",
+                    Status = StatusCodes.Status400BadRequest,
+                    Errors = new Dictionary<string, string[]>
+                    {
+                        ["userName"] = new[] { "Required" },
+                        ["password"] = new[] { "Required" }
+                    }
+                });
+            }
 
             var user = await _db.Users
                 .Include(u => u.UserRoles)
                     .ThenInclude(ur => ur.Role)
                 .FirstOrDefaultAsync(u => u.UserName == req.UserName);
 
             if (user == null || !BCrypt.Net.BCrypt.Verify(req.Password, user.Password))
-            {
-                return Unauthorized("Invalid credentials.");
+            {                
+                return Unauthorized(new ProblemDetails
+                {
+                    Title = "Invalid credentials",
+                    Detail = "Username or password is incorrect.",
+                    Status = StatusCodes.Status401Unauthorized
+                });
             }
-
+        
    
             var dto = await BuildPermissionsForUser(user.Id);
                         
@@ -52,7 +73,7 @@ public async Task<ActionResult<AuthResponse>> Authenticate([FromBody] DTO.LoginR
             // Get the same permissions tree you already expose
             var permissions = await BuildPermissionsForUser(user.Id);
 
-            return Ok(new AuthResponse(user.Id, user.UserName, token, expiresAtUtc, permissions));
+            return Ok(new AuthResponse(user.Id, user.UserName, token, expiresAtUtc));
         }
 
         // --------- (Existing) GET /api/users/{userId}/permissions ----------
diff --git a/UserManagementApi/DTO/PermissionDtos.cs b/UserManagementApi/DTO/PermissionDtos.cs
@@ -1,15 +1,7 @@
 ﻿namespace UserManagementApi.DTO
 {
     public record LoginRequest(string UserName, string Password);
-
-    public record AuthResponse(
-        int UserId,
-        string UserName,
-        string Token,
-        DateTime ExpiresAtUtc,
-        UserPermissionsDto Permissions // reuse your existing permissions dto
-    );
-
+    
     public record FunctionDto(int Id, string Code, string DisplayName);
     public record ModuleDto(int Id, string Name, string Area, string Controller, string Action, List<FunctionDto> Functions);
     public record CategoryDto(int Id, string Name, List<ModuleDto> Modules);
diff --git a/UserManagementApi/UserManagementApi.csproj b/UserManagementApi/UserManagementApi.csproj

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+@{`
	`2`	`+ Layout = "~/Views/Shared/_Layout.cshtml"; // or area-specific layout if you want`
	`3`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -9,5 +9,6 @@ namespace UserManagement.Sdk.Abstractions`
`9`	`9`	`public interface IAccessTokenProvider`
`10`	`10`	`{`
`11`	`11`	`Task<string?> GetAccessTokenAsync(CancellationToken ct = default);`
	`12`	`+ void SetAccessToken(string token, int userId, DateTime expiresAtUtc);`
`12`	`13`	`}`
`13`	`14`	`}`