Fix Programmatic Login and AuthenticationStateProvider for Blazor Server

Author: mckaragoz

samples/blazor-server/CodeBeam.UltimateAuth.Sample.BlazorServer/Components/Pages/Home.razor

@@ -1,6 +1,7 @@
 @page "/"
 @page "/login"
 @using CodeBeam.UltimateAuth.Client
+@using CodeBeam.UltimateAuth.Client.Authentication
 @using CodeBeam.UltimateAuth.Client.Diagnostics
 @using CodeBeam.UltimateAuth.Core.Abstractions
 @using CodeBeam.UltimateAuth.Core.Runtime

samples/blazor-server/CodeBeam.UltimateAuth.Sample.BlazorServer/Components/Pages/UAuthAuthenticationStateProvider.cs

@@ -1,7 +1,9 @@
+using CodeBeam.UltimateAuth.Client.Authentication;
 using CodeBeam.UltimateAuth.Client.Extensions;
 using CodeBeam.UltimateAuth.Core.Domain;
 using CodeBeam.UltimateAuth.Core.Extensions;
 using CodeBeam.UltimateAuth.Credentials.InMemory;
+using CodeBeam.UltimateAuth.Sample.BlazorServer.Components;
 using CodeBeam.UltimateAuth.Security.Argon2;
 using CodeBeam.UltimateAuth.Server.Authentication;
 using CodeBeam.UltimateAuth.Server.Extensions;
@@ -10,7 +12,6 @@
 using Microsoft.AspNetCore.Components;
 using MudBlazor.Services;
 using MudExtensions.Services;
-using CodeBeam.UltimateAuth.Sample.BlazorServer.Components;
 
 var builder = WebApplication.CreateBuilder(args);
 
@@ -38,6 +39,12 @@
 
 builder.Services.AddHttpContextAccessor();
 
+builder.Services.AddScoped<IUAuthAuthenticationStateSource, ServerAuthStateSource>();
+//builder.Services.AddScoped<UAuthBlazorServerAuthenticationStateProvider>();
+
+//builder.Services.AddScoped<AuthenticationStateProvider>(sp =>
+//    sp.GetRequiredService<UAuthBlazorServerAuthenticationStateProvider>());
+
 builder.Services.AddUltimateAuth();
 
 builder.Services.AddUltimateAuthServer(o => {
@@ -57,8 +64,6 @@
     o.Reauth.Behavior = ReauthBehavior.RaiseEvent;
 });
 
-
-
 builder.Services.AddScoped(sp =>
 {
     var navigation = sp.GetRequiredService<NavigationManager>();

samples/blazor-server/CodeBeam.UltimateAuth.Sample.BlazorServer/Program.cs

@@ -1,11 +1,12 @@
+using CodeBeam.UltimateAuth.Client.Authentication;
 using CodeBeam.UltimateAuth.Client.Extensions;
 using CodeBeam.UltimateAuth.Core.Extensions;
+using CodeBeam.UltimateAuth.Sample.BlazorStandaloneWasm;
+using Microsoft.AspNetCore.Components.Authorization;
 using Microsoft.AspNetCore.Components.Web;
 using Microsoft.AspNetCore.Components.WebAssembly.Hosting;
-using CodeBeam.UltimateAuth.Sample.BlazorStandaloneWasm;
 using MudBlazor.Services;
 using MudExtensions.Services;
-using Microsoft.AspNetCore.Components.Authorization;
 
 var builder = WebAssemblyHostBuilder.CreateDefault(args);
 builder.RootComponents.Add<App>("#app");
@@ -18,6 +19,10 @@
 {
     o.Endpoints.Authority = "https://localhost:6110";
 });
+
+builder.Services.AddScoped<AuthenticationStateProvider, UAuthAuthenticationStateProvider>();
+builder.Services.AddScoped<IUAuthAuthenticationStateSource, ClientAuthStateSource>();
+
 builder.Services.AddAuthorizationCore();
 
 builder.Services.AddMudServices();

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

@@ -0,0 +1,24 @@
+using Microsoft.AspNetCore.Components.Authorization;
+
+namespace CodeBeam.UltimateAuth.Client.Authentication
+{
+    public sealed class ClientAuthStateSource : IUAuthAuthenticationStateSource
+    {
+        private readonly IUAuthClient _client;
+
+        public event Action? StateChanged;
+
+        public ClientAuthStateSource(IUAuthClient client)
+        {
+            _client = client;
+        }
+
+        public async Task<AuthenticationState> GetStateAsync()
+        {
+            var principal = await _client.GetCurrentPrincipalAsync();
+            return new AuthenticationState(principal);
+        }
+
+        public void NotifyChanged() => StateChanged?.Invoke();
+    }
+}

src/CodeBeam.UltimateAuth.Client/Authentication/ClientAuthStateSource.cs

@@ -0,0 +1,10 @@
+using Microsoft.AspNetCore.Components.Authorization;
+
+namespace CodeBeam.UltimateAuth.Client.Authentication
+{
+    public interface IUAuthAuthenticationStateSource
+    {
+        Task<AuthenticationState> GetStateAsync();
+        event Action? StateChanged;
+    }
+}

src/CodeBeam.UltimateAuth.Client/Authentication/IUAuthAuthenticationStateSource.cs

@@ -0,0 +1,20 @@
+using Microsoft.AspNetCore.Components.Authorization;
+
+namespace CodeBeam.UltimateAuth.Client.Authentication
+{
+    public sealed class ServerAuthStateSource : IUAuthAuthenticationStateSource
+    {
+        private readonly AuthenticationStateProvider _provider;
+
+        public event Action? StateChanged;
+
+        public ServerAuthStateSource(AuthenticationStateProvider provider)
+        {
+            _provider = provider;
+            _provider.AuthenticationStateChanged += _ => StateChanged?.Invoke();
+        }
+
+        public Task<AuthenticationState> GetStateAsync()
+            => _provider.GetAuthenticationStateAsync();
+    }
+}

src/CodeBeam.UltimateAuth.Client/Authentication/ServerAuthStateSource.cs

@@ -4,22 +4,14 @@ namespace CodeBeam.UltimateAuth.Client.Authentication
 {
     public sealed class UAuthAuthenticationStateProvider : AuthenticationStateProvider
     {
-        private readonly IUAuthClient _client;
+        private readonly IUAuthAuthenticationStateSource _source;
 
-        public UAuthAuthenticationStateProvider(IUAuthClient client)
+        public UAuthAuthenticationStateProvider(IUAuthAuthenticationStateSource source)
         {
-            _client = client;
+            _source = source;
+            _source.StateChanged += () => NotifyAuthenticationStateChanged(GetAuthenticationStateAsync());
         }
 
-        public override async Task<AuthenticationState> GetAuthenticationStateAsync()
-        {
-            var principal = await _client.GetCurrentPrincipalAsync();
-            return new AuthenticationState(principal);
-        }
-
-        public void NotifyStateChanged()
-        {
-            NotifyAuthenticationStateChanged(GetAuthenticationStateAsync());
-        }
+        public override Task<AuthenticationState> GetAuthenticationStateAsync() => _source.GetStateAsync();
     }
 }

src/CodeBeam.UltimateAuth.Client/Authentication/UAuthAuthenticationStateProvider.cs

@@ -71,15 +71,17 @@ private static IServiceCollection AddUltimateAuthClientInternal(this IServiceCol
             // services.AddSingleton<IValidateOptions<UAuthClientOptions>, ...>();
 
             services.AddSingleton<IClientProfileDetector, UAuthClientProfileDetector>();
-            services.PostConfigure<UAuthOptions>(o =>
-            {
-                if (!o.AutoDetectClientProfile || o.ClientProfile != UAuthClientProfile.NotSpecified)
-                    return;
+            services.AddSingleton<IPostConfigureOptions<UAuthOptions>, UAuthOptionsPostConfigure>();
 
-                using var sp = services.BuildServiceProvider();
-                var detector = sp.GetRequiredService<IClientProfileDetector>();
-                o.ClientProfile = detector.Detect(sp);
-            });
+            //services.PostConfigure<UAuthOptions>(o =>
+            //{
+            //    if (!o.AutoDetectClientProfile || o.ClientProfile != UAuthClientProfile.NotSpecified)
+            //        return;
+
+            //    using var sp = services.BuildServiceProvider();
+            //    var detector = sp.GetRequiredService<IClientProfileDetector>();
+            //    o.ClientProfile = detector.Detect(sp);
+            //});
 
             services.PostConfigure<UAuthClientOptions>(o =>
             {
@@ -88,12 +90,11 @@ private static IServiceCollection AddUltimateAuthClientInternal(this IServiceCol
 
             services.AddScoped<IBrowserPostClient, BrowserPostClient>();
             services.AddScoped<IUAuthClient, UAuthClient>();
+            services.AddScoped<IClientAuthState, ClientAuthState>();
 
             services.AddScoped<ISessionCoordinator>(sp =>
             {
-                var core = sp
-                    .GetRequiredService<IOptions<UAuthOptions>>()
-                    .Value;
+                var core = sp.GetRequiredService<IOptions<UAuthOptions>>().Value;
 
                 return core.ClientProfile == UAuthClientProfile.BlazorServer
                     ? sp.GetRequiredService<BlazorServerSessionCoordinator>()
@@ -102,13 +103,13 @@ private static IServiceCollection AddUltimateAuthClientInternal(this IServiceCol
 
             services.AddScoped<UAuthAuthenticationStateProvider>();
 
-            services.AddScoped<AuthenticationStateProvider>(sp =>
-                sp.GetRequiredService<UAuthAuthenticationStateProvider>());
+            // Uncomment causes blazor server to circular DI
+            //services.AddScoped<AuthenticationStateProvider>(sp =>
+            //    sp.GetRequiredService<UAuthAuthenticationStateProvider>());
 
             services.AddScoped<BlazorServerSessionCoordinator>();
             services.AddScoped<NoOpSessionCoordinator>();
             services.AddScoped<UAuthClientDiagnostics>();
-            services.AddScoped<IClientAuthState, ClientAuthState>();
 
             return services;
         }

src/CodeBeam.UltimateAuth.Client/Extensions/UltimateAuthClientServiceCollectionExtensions.cs

@@ -0,0 +1,28 @@
+using CodeBeam.UltimateAuth.Core.Options;
+using Microsoft.Extensions.Options;
+
+namespace CodeBeam.UltimateAuth.Client.Infrastructure
+{
+    internal sealed class UAuthOptionsPostConfigure : IPostConfigureOptions<UAuthOptions>
+    {
+        private readonly IClientProfileDetector _detector;
+        private readonly IServiceProvider _services;
+
+        public UAuthOptionsPostConfigure(IClientProfileDetector detector, IServiceProvider services)
+        {
+            _detector = detector;
+            _services = services;
+        }
+
+        public void PostConfigure(string? name, UAuthOptions options)
+        {
+            if (!options.AutoDetectClientProfile)
+                return;
+
+            if (options.ClientProfile != UAuthClientProfile.NotSpecified)
+                return;
+
+            options.ClientProfile = _detector.Detect(_services);
+        }
+    }
+}