Simplify infrastructure services and move all recurring jobs to Hangfire

backend/Hosts/Musify.Api/Authentication/JwtBearerEventsHandler.cs

@@ -4,6 +4,7 @@ using System.Text.Json.Serialization;
 using Mediator;
 using Microsoft.AspNetCore.Authentication.JwtBearer;
 using Microsoft.Extensions.Caching.Memory;
+using Microsoft.IdentityModel.Protocols.OpenIdConnect;
 using Musify.Application.Users;
 
 namespace Musify.Api.Authentication;
@@ -87,15 +88,15 @@ public sealed class JwtBearerEventsHandler(
 
         try
         {
+            var userInfoEndpoint = await ResolveUserInfoEndpointAsync(tokenValidatedContext, cancellationToken);
+
             var client = httpClientFactory.CreateClient();
-            var request = new HttpRequestMessage(
-                HttpMethod.Get,
-                $"{authenticationConfiguration.IssuerAddress.TrimEnd('/')}/oidc/v1/userinfo")
+            using var request = new HttpRequestMessage(HttpMethod.Get, userInfoEndpoint)
             {
                 Headers = { Authorization = new AuthenticationHeaderValue("Bearer", accessToken) }
             };
 
-            var response = await client.SendAsync(request, cancellationToken);
+            using var response = await client.SendAsync(request, cancellationToken);
             if (!response.IsSuccessStatusCode)
             {
                 logger.LogDebug("Userinfo request returned {StatusCode}", response.StatusCode);
@@ -111,6 +112,20 @@ public sealed class JwtBearerEventsHandler(
         }
     }
 
+    private async Task<string> ResolveUserInfoEndpointAsync(
+        TokenValidatedContext tokenValidatedContext, CancellationToken cancellationToken)
+    {
+        var configurationManager = tokenValidatedContext.Options.ConfigurationManager;
+        if (configurationManager != null)
+        {
+            var configuration = await configurationManager.GetConfigurationAsync(cancellationToken);
+            if (configuration is OpenIdConnectConfiguration { UserInfoEndpoint: { Length: > 0 } endpoint })
+                return endpoint;
+        }
+
+        return $"{authenticationConfiguration.IssuerAddress.TrimEnd('/')}/oidc/v1/userinfo";
+    }
+
     public override Task AuthenticationFailed(AuthenticationFailedContext context)
     {
         logger.LogWarning(context.Exception, "JWT authentication failed");

backend/Hosts/Musify.Worker/Program.cs

@@ -1,6 +1,4 @@
-using Hangfire;
 using Musify.Application.Configuration;
-using Musify.Infrastructure.Jobs;
 using Musify.Infrastructure.MassTransit;
 using Musify.Infrastructure.Persistence;
 using Musify.Infrastructure.Services;
@@ -26,25 +24,10 @@ services.AddAudioTranscoder(configuration);
 services.AddPictureService();
 services.AddDatabase(configuration);
 services.AddMassTransitConsumers(configuration);
-services.AddUploadIntentJobs(configuration);
+services.AddUploadIntentConfiguration(configuration);
 services.AddMediator();
-services.AddDailyMixGenerationJob(configuration);
+services.AddJobs();
 
 var host = builder.Build();
 
-using (var scope = host.Services.CreateScope())
-{
-    var recurringJobManager = scope.ServiceProvider.GetRequiredService<IRecurringJobManager>();
-    recurringJobManager.AddOrUpdate<DailyMixGenerationJob>(
-        "daily-mix-generation",
-        job => job.RunAsync(CancellationToken.None),
-        Cron.Daily(),
-        new RecurringJobOptions { TimeZone = TimeZoneInfo.Utc });
-    recurringJobManager.AddOrUpdate<ListeningHistoryCleanupJob>(
-        "listening-history-cleanup",
-        job => job.RunAsync(CancellationToken.None),
-        Cron.Daily(3),
-        new RecurringJobOptions { TimeZone = TimeZoneInfo.Utc });
-}
-
 host.Run();