From 2e4a55f15484b3f70fa7c23db1e40fd61d65cbaa Mon Sep 17 00:00:00 2001 From: john Date: Tue, 20 May 2025 11:58:18 +0200 Subject: [PATCH] inject logger --- Femto.Api/Auth/SessionAuthenticationHandler.cs | 5 ++--- Femto.Api/Controllers/Auth/AuthController.cs | 7 ++++--- Femto.Api/Sessions/HttpContextSessionExtensions.cs | 5 +---- 3 files changed, 7 insertions(+), 10 deletions(-) diff --git a/Femto.Api/Auth/SessionAuthenticationHandler.cs b/Femto.Api/Auth/SessionAuthenticationHandler.cs index d019808..e71481d 100644 --- a/Femto.Api/Auth/SessionAuthenticationHandler.cs +++ b/Femto.Api/Auth/SessionAuthenticationHandler.cs @@ -16,8 +16,7 @@ internal class SessionAuthenticationHandler( ILoggerFactory logger, UrlEncoder encoder, IAuthModule authModule, - CurrentUserContext currentUserContext, - IOptions cookieOptions + CurrentUserContext currentUserContext ) : AuthenticationHandler(options, logger, encoder) { protected override async Task HandleAuthenticateAsync() @@ -44,7 +43,7 @@ internal class SessionAuthenticationHandler( var identity = new ClaimsIdentity(claims, this.Scheme.Name); var principal = new ClaimsPrincipal(identity); - this.Context.SetSession(result.Session, result.User); + this.Context.SetSession(result.Session, result.User, Logger); currentUserContext.CurrentUser = new CurrentUser( result.User.Id, result.User.Username, diff --git a/Femto.Api/Controllers/Auth/AuthController.cs b/Femto.Api/Controllers/Auth/AuthController.cs index cf17500..b567d1d 100644 --- a/Femto.Api/Controllers/Auth/AuthController.cs +++ b/Femto.Api/Controllers/Auth/AuthController.cs @@ -20,7 +20,8 @@ namespace Femto.Api.Controllers.Auth; public class AuthController( IAuthModule authModule, IOptions cookieSettings, - ICurrentUserContext currentUserContext + ICurrentUserContext currentUserContext, + ILogger logger ) : ControllerBase { [HttpPost("login")] @@ -28,7 +29,7 @@ public class AuthController( { var result = await authModule.Command(new LoginCommand(request.Username, request.Password)); - HttpContext.SetSession(result.Session, result.User); + HttpContext.SetSession(result.Session, result.User, logger); return new LoginResponse( result.User.Id, @@ -44,7 +45,7 @@ public class AuthController( new RegisterCommand(request.Username, request.Password, request.SignupCode) ); - HttpContext.SetSession(result.Session, result.User); + HttpContext.SetSession(result.Session, result.User, logger); return new RegisterResponse( result.User.Id, diff --git a/Femto.Api/Sessions/HttpContextSessionExtensions.cs b/Femto.Api/Sessions/HttpContextSessionExtensions.cs index ae6d6f0..fb7c3af 100644 --- a/Femto.Api/Sessions/HttpContextSessionExtensions.cs +++ b/Femto.Api/Sessions/HttpContextSessionExtensions.cs @@ -8,11 +8,8 @@ namespace Femto.Api.Sessions; internal static class HttpContextSessionExtensions { - public static void SetSession(this HttpContext httpContext, Session session, UserInfo user) + public static void SetSession(this HttpContext httpContext, Session session, UserInfo user, ILogger logger) { - var loggerFactory = httpContext.RequestServices.GetRequiredService(); - var logger = loggerFactory.CreateLogger("Femto"); - var cookieSettings = httpContext.RequestServices.GetService>(); var secure = cookieSettings?.Value.Secure ?? true;