Fix admin api service resolution stuff
2 files changed, 4 insertions, 2 deletions
diff --git a/extra/admin-api/Spacebar.AdminApi/Middleware/AuthenticationMiddleware.cs b/extra/admin-api/Spacebar.AdminApi/Middleware/AuthenticationMiddleware.cs
index 2ee476f6d..525cf6ade 100644
--- a/extra/admin-api/Spacebar.AdminApi/Middleware/AuthenticationMiddleware.cs
+++ b/extra/admin-api/Spacebar.AdminApi/Middleware/AuthenticationMiddleware.cs
@@ -7,7 +7,6 @@ namespace Spacebar.AdminApi.Middleware;
public class AuthenticationMiddleware(
ILogger<AuthenticationMiddleware> logger,
- SpacebarAspNetAuthenticationService authService,
SpacebarAuthenticationConfiguration config,
RequestDelegate next) {
public async Task InvokeAsync(HttpContext context, IServiceProvider sp) {
@@ -16,6 +15,9 @@ public class AuthenticationMiddleware(
return;
}
+ await using var spScope = sp.CreateAsyncScope();
+ var authService = spScope.ServiceProvider.GetRequiredService<SpacebarAspNetAuthenticationService>();
+
TokenValidationResult? res = null;
try {
await authService.ValidateTokenAsync(context.Request);
diff --git a/extra/admin-api/Spacebar.AdminApi/Program.cs b/extra/admin-api/Spacebar.AdminApi/Program.cs
index 3b3a9ef1d..f4c0379d5 100644
--- a/extra/admin-api/Spacebar.AdminApi/Program.cs
+++ b/extra/admin-api/Spacebar.AdminApi/Program.cs
@@ -30,7 +30,7 @@ builder.Services.AddDbContextPool<SpacebarDbContext>(options => {
.UseNpgsql(builder.Configuration.GetConnectionString("Spacebar"))
.EnableDetailedErrors();
});
-builder.Services.AddScoped<SpacebarAuthenticationConfiguration>();
+builder.Services.AddSingleton<SpacebarAuthenticationConfiguration>();
builder.Services.AddScoped<SpacebarAuthenticationService>();
builder.Services.AddScoped<SpacebarAspNetAuthenticationService>();
// builder.Services.AddSingleton<RabbitMQConfiguration>();
|