Merge pull request #631 from bcgov/yj

chore: aps auth

Author: ychung-mot

server/StrDss.Api/Authentication/ApsJwtBearerEvents.cs

@@ -25,20 +25,22 @@ public ApsJwtBearerEvents(ICurrentUser currentUser, IUserService userService, IR
             _memoryCache = memoryCache;
         }
 
-        public override async Task AuthenticationFailed(AuthenticationFailedContext context)
-        {
-            var clientId = context.HttpContext.User?.FindFirst(StrDssClaimTypes.ClientId)?.Value ?? "Unknown";
-            var ipAddress = context.HttpContext.Connection?.RemoteIpAddress?.ToString() ?? "Unknown IP";
+        //public override async Task AuthenticationFailed(AuthenticationFailedContext context)
+        //{
+        //    var clientId = context.HttpContext.User?.FindFirst(StrDssClaimTypes.ClientId)?.Value ?? "Unknown";
+        //    var ipAddress = context.HttpContext.Connection?.RemoteIpAddress?.ToString() ?? "Unknown IP";
 
-            clientId = clientId == "" ? "" : clientId;
+        //    clientId = clientId == "" ? "" : clientId;
 
-            _logger.LogWarning($"[AUTH] Aps Authentication failed for user '{clientId}' from IP address '{ipAddress}'.");
+        //    _logger.LogWarning($"[AUTH] Aps Authentication failed for user '{clientId}' from IP address '{ipAddress}'.");
 
-            await base.AuthenticationFailed(context);
-        }
+        //    await base.AuthenticationFailed(context);
+        //}
 
         public override async Task TokenValidated(TokenValidatedContext context)
         {
+            _logger.LogDebug($"[AUTH] Token Validated with APS JWT");
+
             _currentUser.LoadApsSession(context!.Principal!);
 
             var (user, permissions) = await _userService.GetUserByGuidAsync(_currentUser.UserGuid);

server/StrDss.Api/Authentication/KcJwtBearerEvents.cs

@@ -4,6 +4,7 @@
 using StrDss.Model.UserDtos;
 using StrDss.Service;
 using StrDss.Service.Bceid;
+using System.Net;
 
 namespace StrDss.Api.Authentication
 {
@@ -22,32 +23,34 @@ public KcJwtBearerEvents(ICurrentUser currentUser, IUserService userService, IBc
             _logger = logger;
         }
 
-        public override async Task AuthenticationFailed(AuthenticationFailedContext context)
-        {
-            try
-            {
-                var username = context.HttpContext.User?.Identity?.Name ?? "Unknown";
-                var ipAddress = context.HttpContext.Connection?.RemoteIpAddress?.ToString() ?? "Unknown IP";
+        //public override async Task AuthenticationFailed(AuthenticationFailedContext context)
+        //{
+        //    try
+        //    {
+        //        var username = context.HttpContext.User?.Identity?.Name ?? "Unknown";
+        //        var ipAddress = context.HttpContext.Connection?.RemoteIpAddress?.ToString() ?? "Unknown IP";
 
-                if (!context.HttpContext.Request.Headers.ContainsKey("Authorization"))
-                {
-                    _logger.LogWarning($"[AUTH] KC Authentication failed for user '{username}' from IP address '{ipAddress}'. Authorization header is missing.");
-                }
-                else
-                {
-                    _logger.LogDebug($"[AUTH] Authorization header present. Proceeding with Aps authentication for user '{username}' from IP address '{ipAddress}'.");
-                }
-            }
-            catch (Exception ex)
-            {
-                _logger.LogError(ex, "An error occurred while processing the authentication failure.");
-            }
+        //        if (!context.HttpContext.Request.Headers.ContainsKey("Authorization"))
+        //        {
+        //            _logger.LogWarning($"[AUTH] KC Authentication failed for user '{username}' from IP address '{ipAddress}'. Authorization header is missing.");
+        //        }
+        //        else
+        //        {
+        //            _logger.LogDebug($"[AUTH] Authorization header present. Proceeding with Aps authentication for user '{username}' from IP address '{ipAddress}'.");
+        //        }
+        //    }
+        //    catch (Exception ex)
+        //    {
+        //        _logger.LogError(ex, "An error occurred while processing the authentication failure.");
+        //    }
 
-            await base.AuthenticationFailed(context);
-        }
+        //    await base.AuthenticationFailed(context);
+        //}
 
         public override async Task TokenValidated(TokenValidatedContext context)
         {
+            _logger.LogDebug($"[AUTH] Token Validated with KC JWT");
+
             _currentUser.LoadUserSession(context!.Principal!);
 
             var (user, permissions) = await _userService.GetUserByGuidAsync(_currentUser.UserGuid);