Reduce filecount

Author: hhvrc

API/Services/OAuth/IOAuthBuilder.cs

@@ -5,7 +5,6 @@ namespace OpenShock.API.Services.OAuth;
 public interface IOAuthHandlerRegistry
 {
     string[] ListProviderKeys();
-    bool TryGet(string key, out IOAuthHandler handler);
     Task<OneOf<Uri, OAuthErrorResult, OAuthProviderNotSupported>> StartAuthorizeAsync(HttpContext http, string provider, OAuthFlow flow, string returnTo);
     Task<OneOf<OAuthCallbackResult, OAuthErrorResult, OAuthProviderNotSupported>> HandleCallbackAsync(HttpContext http, string provider, IQueryCollection query);
 }

API/Services/OAuth/IOAuthHandlerRegistry.cs

@@ -19,19 +19,14 @@ public string[] ListProviderKeys()
         return _handlers.Keys.ToArray();
     }
 
-    public bool TryGet(string key, out IOAuthHandler handler)
-    {
-        return _handlers.TryGetValue(key, out handler!);
-    }
-
     private Uri GetCallbackUri(string provider)
     {
         return new Uri($"https://api.openshock.app/1/oauth/{provider}/callback");
     }
 
     public async Task<OneOf<Uri, OAuthErrorResult, OAuthProviderNotSupported>> StartAuthorizeAsync(HttpContext http, string provider, OAuthFlow flow, string returnTo)
     {
-        if (!TryGet(provider, out var handler))
+        if (!_handlers.TryGetValue(provider, out var handler))
             return new OAuthProviderNotSupported();
 
         // Generate state and persist in Redis (+ double-submit cookie inside store)
@@ -53,7 +48,7 @@ public async Task<OneOf<Uri, OAuthErrorResult, OAuthProviderNotSupported>> Start
 
     public async Task<OneOf<OAuthCallbackResult, OAuthErrorResult, OAuthProviderNotSupported>> HandleCallbackAsync(HttpContext http, string provider, IQueryCollection query)
     {
-        if (!TryGet(provider, out var handler))
+        if (!_handlers.TryGetValue(provider, out var handler))
             return new OAuthProviderNotSupported();
 
         var result = await handler.HandleCallbackAsync(http, query, GetCallbackUri(provider));

API/Services/OAuth/OAuthBuilder.cs

@@ -0,0 +1,45 @@
+using Microsoft.Extensions.DependencyInjection.Extensions;
+
+namespace OpenShock.API.Services.OAuth;
+
+public interface IOAuthBuilder
+{
+    IOAuthBuilder AddHandler<THandler, TOptions>(IConfiguration configuration)
+        where THandler : class, IOAuthHandler
+        where TOptions : class;
+}
+
+internal sealed class OAuthBuilder : IOAuthBuilder
+{
+    private readonly IServiceCollection _services;
+    internal OAuthBuilder(IServiceCollection services) => _services = services;
+
+    public IOAuthBuilder AddHandler<THandler, TOptions>(IConfiguration configuration)
+        where THandler : class, IOAuthHandler
+        where TOptions : class
+    {
+        _services.Configure<TOptions>(configuration);
+
+        // Typed HttpClient per handler (unique type = unique client)
+        _services.AddHttpClient<THandler>();
+
+        // Register handler as IOAuthHandler
+        _services.AddSingleton<IOAuthHandler, THandler>();
+
+        return this;
+    }
+}
+
+public static class ServiceCollectionHelpers
+{
+    public static IOAuthBuilder AddOAuth(this IServiceCollection services)
+    {
+        // Default state store if none registered
+        services.TryAddSingleton<IOAuthStateStore, RedisOAuthStateStore>();
+
+        // Registry built from IEnumerable<IOAuthHandler>
+        services.TryAddSingleton<IOAuthHandlerRegistry, OAuthHandlerRegistry>();
+        
+        return new OAuthBuilder(services);
+    }
+}