Cleanup Not Needed ResourceApi Definitions

Author: mckaragoz

samples/blazor-standalone-wasm/CodeBeam.UltimateAuth.Sample.BlazorStandaloneWasm/ResourceApi/ProductApiService.cs

@@ -12,11 +12,22 @@ public ProductApiService(HttpClient http)
         _http = http;
     }
 
-    public async Task<List<Product>> GetAllAsync()
+    private HttpRequestMessage CreateRequest(HttpMethod method, string url, object? body = null)
     {
-        var request = new HttpRequestMessage(HttpMethod.Get, "/api/products");
+        var request = new HttpRequestMessage(method, url);
         request.SetBrowserRequestCredentials(BrowserRequestCredentials.Include);
 
+        if (body is not null)
+        {
+            request.Content = JsonContent.Create(body);
+        }
+
+        return request;
+    }
+
+    public async Task<List<Product>> GetAllAsync()
+    {
+        var request = CreateRequest(HttpMethod.Get, "/api/products");
         var response = await _http.SendAsync(request);
 
         if (!response.IsSuccessStatusCode)
@@ -27,7 +38,8 @@ public async Task<List<Product>> GetAllAsync()
 
     public async Task<Product?> GetAsync(int id)
     {
-        var response = await _http.GetAsync($"/api/products/{id}");
+        var request = CreateRequest(HttpMethod.Get, $"/api/products/{id}");
+        var response = await _http.SendAsync(request);
 
         if (!response.IsSuccessStatusCode)
             return null;
@@ -37,17 +49,30 @@ public async Task<List<Product>> GetAllAsync()
 
     public async Task<Product?> CreateAsync(Product product)
     {
-        var response = await _http.PostAsJsonAsync("/api/products", product);
+        var request = CreateRequest(HttpMethod.Post, "/api/products", product);
+        var response = await _http.SendAsync(request);
 
         if (!response.IsSuccessStatusCode)
             throw new Exception($"Create failed: {response.StatusCode}");
 
         return await response.Content.ReadFromJsonAsync<Product>();
     }
 
+    public async Task<Product?> UpdateAsync(int id, Product product)
+    {
+        var request = CreateRequest(HttpMethod.Put, $"/api/products/{id}", product);
+        var response = await _http.SendAsync(request);
+
+        if (!response.IsSuccessStatusCode)
+            throw new Exception($"Update failed: {response.StatusCode}");
+
+        return await response.Content.ReadFromJsonAsync<Product>();
+    }
+
     public async Task DeleteAsync(int id)
     {
-        var response = await _http.DeleteAsync($"/api/products/{id}");
+        var request = CreateRequest(HttpMethod.Delete, $"/api/products/{id}");
+        var response = await _http.SendAsync(request);
 
         if (!response.IsSuccessStatusCode)
             throw new Exception($"Delete failed: {response.StatusCode}");

samples/resource-api/CodeBeam.UltimateAuth.Sample.ResourceApi/Program.cs

@@ -10,7 +10,7 @@
 // Learn more about configuring OpenAPI at https://aka.ms/aspnet/openapi
 builder.Services.AddOpenApi();
 
-builder.Services.AddUltimateAuthResourceApi();
+builder.Services.AddUltimateAuthResourceApi(o => o.UAuthHubBaseUrl = "https://localhost:6110");
 
 builder.Services.AddCors(options =>
 {

src/CodeBeam.UltimateAuth.Server/Extensions/ServiceCollectionExtensions.cs

@@ -67,26 +67,17 @@ public static IServiceCollection AddUltimateAuthServer(this IServiceCollection s
         return services;
     }
 
-    public static IServiceCollection AddUltimateAuthResourceApi(this IServiceCollection services, Action<UAuthServerOptions>? configure = null)
+    public static IServiceCollection AddUltimateAuthResourceApi(this IServiceCollection services, Action<UAuthResourceApiOptions>? configure = null)
     {
         ArgumentNullException.ThrowIfNull(services);
         services.AddUltimateAuth();
 
-        //AddUsersInternal(services);
-        //AddCredentialsInternal(services);
-        //AddAuthorizationInternal(services);
-        //AddUltimateAuthPolicies(services);
-
-        services.AddOptions<UAuthServerOptions>()
+        services.AddOptions<UAuthResourceApiOptions>()
             .Configure(options =>
             {
                 configure?.Invoke(options);
             })
-            .BindConfiguration("UltimateAuth:Server")
-            .PostConfigure(options =>
-            {
-                options.Endpoints.Authentication = false;
-            });
+            .BindConfiguration("UltimateAuth:ResourceApi");
 
         services.AddUltimateAuthResourceInternal();
 
@@ -126,7 +117,7 @@ private static IServiceCollection AddUltimateAuthServerInternal(this IServiceCol
         services.TryAddEnumerable(ServiceDescriptor.Singleton<IAuthorityInvariant, InvalidOrRevokedSessionInvariant>());
         services.TryAddEnumerable(ServiceDescriptor.Singleton<IAuthorityInvariant, TenantResolvedInvariant>());
 
-        // EVENTS
+        // Events
         services.AddSingleton(sp =>
         {
             var options = sp.GetRequiredService<IOptions<UAuthServerOptions>>().Value;
@@ -247,9 +238,7 @@ private static IServiceCollection AddUltimateAuthServerInternal(this IServiceCol
 
         services.TryAddScoped<IHubCapabilities, HubCapabilities>();
 
-        // -----------------------------
-        // ENDPOINTS
-        // -----------------------------
+        // Endpoints
         services.TryAddScoped<AuthFlowEndpointFilter>();
         services.TryAddSingleton<IAuthEndpointRegistrar, UAuthEndpointRegistrar>();
 
@@ -260,9 +249,7 @@ private static IServiceCollection AddUltimateAuthServerInternal(this IServiceCol
         services.TryAddScoped<IRefreshEndpointHandler, RefreshEndpointHandler>();
         services.TryAddScoped<IPkceEndpointHandler, PkceEndpointHandler>();
 
-        // ------------------------------
-        // ASP.NET CORE INTEGRATION
-        // ------------------------------
+        // ASP.NET Core Integration
         services.AddAuthentication();
 
         services.PostConfigureAll<AuthenticationOptions>(options =>
@@ -389,17 +376,16 @@ public static IServiceCollection AddUAuthHub(this IServiceCollection services, A
         return services;
     }
 
-    // TODO: This is not true, need to build true pipeline for ResourceApi.
     private static IServiceCollection AddUltimateAuthResourceInternal(this IServiceCollection services)
     {
+        // Resource API Specific
         services.AddSingleton<IUAuthRuntimeMarker, ResourceRuntimeMarker>();
 
         services.AddScoped<ISessionValidator, RemoteSessionValidator>();
         services.AddScoped<IUserAccessor<UserKey>, ResourceUserAccessor<UserKey>>();
         services.AddScoped<IAuthContextFactory, ResourceAuthContextFactory>();
-
-        services.TryAddScoped<IRefreshTokenValidator, UAuthRefreshTokenValidator>();
 
+        // Server & Resource API Shared
         services.TryAddScoped<IUserAccessor, UserAccessorBridge>();
         services.TryAddScoped<ISessionContextAccessor, SessionContextAccessor>();
         services.TryAddScoped<ICurrentUser, HttpContextCurrentUser>();
@@ -413,14 +399,12 @@ private static IServiceCollection AddUltimateAuthResourceInternal(this IServiceC
 
         services.TryAddScoped<ITransportCredentialResolver, TransportCredentialResolver>();
         services.TryAddScoped<IDeviceContextFactory, DeviceContextFactory>();
-        services.TryAddScoped<IAuthStateSnapshotFactory, AuthStateSnapshotFactory>();
         services.TryAddScoped<IPrimaryCredentialResolver, PrimaryCredentialResolver>();
         services.TryAddScoped<IDeviceResolver, DeviceResolver>();
 
         services.TryAddSingleton<IClock, CodeBeam.UltimateAuth.Server.Infrastructure.SystemClock>();
 
-        services.AddHttpContextAccessor();
-        services.AddAuthentication();
+       
 
         services.TryAddScoped<ITenantResolver, UAuthTenantResolver>();
         services.TryAddSingleton<ITenantIdResolver>(sp =>
@@ -446,37 +430,24 @@ private static IServiceCollection AddUltimateAuthResourceInternal(this IServiceC
             };
         });
 
-        services.AddAuthentication();
-
-        services.PostConfigureAll<AuthenticationOptions>(options =>
+        // ASP.NET Core Integration
+        services.AddHttpContextAccessor();
+        services.AddAuthentication(options =>
         {
-            options.DefaultAuthenticateScheme ??= UAuthConstants.SchemeDefaults.GlobalScheme;
-            options.DefaultSignInScheme ??= UAuthConstants.SchemeDefaults.GlobalScheme;
-            options.DefaultChallengeScheme ??= UAuthConstants.SchemeDefaults.GlobalScheme;
-        });
-
-        services.AddAuthentication().AddUAuthResourceApi();
+            options.DefaultAuthenticateScheme = UAuthConstants.SchemeDefaults.GlobalScheme;
+            options.DefaultChallengeScheme = UAuthConstants.SchemeDefaults.GlobalScheme;
+        })
+            .AddUAuthResourceApi();
         services.AddAuthorization();
 
-        services.TryAddSingleton<IRefreshTokenStoreFactory, NotSupportedRefreshTokenStoreFactory>();
-        services.TryAddSingleton<IUserRoleStoreFactory, NotSupportedUserRoleStoreFactory>();
-        services.TryAddSingleton<IUAuthPasswordHasher, NotSupportedPasswordHasher>();
-        services.TryAddSingleton<IIdentifierValidator, NoOpIdentifierValidator>();
-        services.TryAddSingleton<IAccessPolicyProvider, AllowAllAccessPolicyProvider>();
-        services.TryAddScoped<IUserClaimsProvider, NoOpUserClaimsProvider>();
-        services.TryAddSingleton<ITokenHasher, NoOpTokenHasher>();
-        services.TryAddScoped<IPrimaryUserIdentifierProvider, NoOpPrimaryUserIdentifierProvider>();
-        services.TryAddScoped<IUserProfileSnapshotProvider, NoOpUserProfileSnapshotProvider>();
-        services.TryAddScoped<IUserLifecycleSnapshotProvider, NoOpUserLifecycleSnapshotProvider>();
-
-        //services.PostConfigureAll<AuthenticationOptions>(options =>
-        //{
-        //    options.DefaultAuthenticateScheme ??= UAuthConstants.SchemeDefaults.GlobalScheme;
-        //});
-
-        services.AddHttpClient<ISessionValidator, RemoteSessionValidator>(client =>
+        services.AddHttpClient<ISessionValidator, RemoteSessionValidator>((sp, client) =>
         {
-            client.BaseAddress = new Uri("https://localhost:6110"); // Auth Server
+            var opts = sp.GetRequiredService<IOptions<UAuthResourceApiOptions>>().Value;
+
+            if (string.IsNullOrWhiteSpace(opts.UAuthHubBaseUrl))
+                throw new InvalidOperationException("UAuthHubBaseUrl is not configured. Add it via UAuthResourceApiOptions.");
+
+            client.BaseAddress = new Uri(opts.UAuthHubBaseUrl);
         });
 
         return services;

src/CodeBeam.UltimateAuth.Server/Options/UAuthResourceApiOptions.cs

@@ -0,0 +1,6 @@
+namespace CodeBeam.UltimateAuth.Server.Options;
+
+public class UAuthResourceApiOptions
+{
+    public string UAuthHubBaseUrl { get; set; } = default!;
+}