Remove ClientAuthService

Author: hhvrc

Common/Authentication/AuthenticationHandlers/ApiTokenAuthentication.cs

@@ -15,7 +15,6 @@ namespace OpenShock.Common.Authentication.AuthenticationHandlers;
 
 public sealed class ApiTokenAuthentication : AuthenticationHandler<AuthenticationSchemeOptions>
 {
-    private readonly IClientAuthService<User> _authService;
     private readonly IUserReferenceService _userReferenceService;
     private readonly IBatchUpdateService _batchUpdateService;
     private readonly OpenShockContext _db;
@@ -25,14 +24,12 @@ public ApiTokenAuthentication(
         IOptionsMonitor<AuthenticationSchemeOptions> options,
         ILoggerFactory logger,
         UrlEncoder encoder,
-        IClientAuthService<User> clientAuth,
         IUserReferenceService userReferenceService,
         OpenShockContext db,
         IBatchUpdateService batchUpdateService
         )
         : base(options, logger, encoder)
     {
-        _authService = clientAuth;
         _userReferenceService = userReferenceService;
         _db = db;
         _batchUpdateService = batchUpdateService;
@@ -58,7 +55,7 @@ protected override async Task<AuthenticateResult> HandleAuthenticateAsync()
         }
 
         _batchUpdateService.UpdateApiTokenLastUsed(tokenDto.Id);
-        _authService.CurrentClient = tokenDto.User;
+        Context.Items["User"] = tokenDto.User;
         _userReferenceService.AuthReference = tokenDto;
 
         var claims = new List<Claim>(3 + tokenDto.Permissions.Count)

Common/Authentication/AuthenticationHandlers/UserSessionAuthentication.cs

@@ -16,7 +16,6 @@ namespace OpenShock.Common.Authentication.AuthenticationHandlers;
 
 public sealed class UserSessionAuthentication : AuthenticationHandler<AuthenticationSchemeOptions>
 {
-    private readonly IClientAuthService<User> _authService;
     private readonly IUserReferenceService _userReferenceService;
     private readonly IBatchUpdateService _batchUpdateService;
     private readonly OpenShockContext _db;
@@ -27,15 +26,13 @@ public UserSessionAuthentication(
         IOptionsMonitor<AuthenticationSchemeOptions> options,
         ILoggerFactory logger,
         UrlEncoder encoder,
-        IClientAuthService<User> clientAuth,
         IUserReferenceService userReferenceService,
         OpenShockContext db,
         ISessionService sessionService,
         IBatchUpdateService batchUpdateService
         )
         : base(options, logger, encoder)
     {
-        _authService = clientAuth;
         _userReferenceService = userReferenceService;
         _db = db;
         _sessionService = sessionService;
@@ -60,29 +57,29 @@ protected override async Task<AuthenticateResult> HandleAuthenticateAsync()
 
         _batchUpdateService.UpdateSessionLastUsed(sessionToken, DateTimeOffset.UtcNow);
 
-        var retrievedUser = await _db.Users.Include(u => u.UserDeactivation).FirstOrDefaultAsync(user => user.Id == session.UserId);
-        if (retrievedUser == null) return Fail(AuthResultError.SessionInvalid);
-        if (retrievedUser.ActivatedAt is null)
+        var user = await _db.Users.Include(u => u.UserDeactivation).FirstOrDefaultAsync(user => user.Id == session.UserId);
+        if (user == null) return Fail(AuthResultError.SessionInvalid);
+        if (user.ActivatedAt is null)
         {
             await _sessionService.DeleteSessionAsync(session);
             return Fail(AuthResultError.AccountNotActivated);
         }
-        if (retrievedUser.UserDeactivation is not null)
+        if (user.UserDeactivation is not null)
         {
             await _sessionService.DeleteSessionAsync(session);
             return Fail(AuthResultError.AccountDeactivated);
         }
 
-        _authService.CurrentClient = retrievedUser;
+        Context.Items["User"] = user;
         _userReferenceService.AuthReference = session;
 
-        var claims = new List<Claim>(2 + retrievedUser.Roles.Count)
+        var claims = new List<Claim>(2 + user.Roles.Count)
         {
             new(ClaimTypes.AuthenticationMethod, OpenShockAuthSchemes.UserSessionCookie),
-            new(ClaimTypes.NameIdentifier, retrievedUser.Id.ToString()),
+            new(ClaimTypes.NameIdentifier, user.Id.ToString()),
         };
 
-        foreach (var roletype in retrievedUser.Roles)
+        foreach (var roletype in user.Roles)
         {
             claims.Add(new Claim(ClaimTypes.Role, roletype.ToString()));
         }

Common/Authentication/ControllerBase/AuthenticatedSessionControllerBase.cs

@@ -13,7 +13,7 @@ public class AuthenticatedSessionControllerBase : OpenShockControllerBase, IActi
     [NonAction]
     public void OnActionExecuting(ActionExecutingContext context)
     {
-        CurrentUser = ControllerContext.HttpContext.RequestServices.GetRequiredService<IClientAuthService<User>>().CurrentClient;
+        CurrentUser = HttpContext.Items["User"] as User ?? throw new Exception("User not found");
     }
 
     [NonAction]

Common/Authentication/Services/ClientAuthService.cs

@@ -108,7 +108,6 @@ public static IServiceCollection AddOpenShockServices(this IServiceCollection se
             };
         });
 
-        services.AddScoped<IClientAuthService<User>, ClientAuthService<User>>();
         services.AddScoped<IUserReferenceService, UserReferenceService>();
 
         var authBuilder = services

Common/OpenShockServiceHelper.cs

@@ -218,8 +218,7 @@ public async Task UpdatePermissions(OpenShockContext db)
     [NonAction]
     public void OnActionExecuting(ActionExecutingContext context)
     {
-        _currentUser = ControllerContext.HttpContext.RequestServices.GetRequiredService<IClientAuthService<User>>()
-            .CurrentClient;
+        _currentUser = HttpContext.Items["User"] as User ?? throw new Exception("User not found");
     }
 
     /// <summary>