More Code Refactoring

Author: mckaragoz

samples/UAuthHub/CodeBeam.UltimateAuth.Sample.UAuthHub/Components/App.razor

@@ -6,11 +6,9 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <base href="/" />
     <ResourcePreloader />
-    @* <link rel="stylesheet" href="@Assets["lib/bootstrap/dist/css/bootstrap.min.css"]" /> *@
     <link rel="stylesheet" href="@Assets["app.css"]" />
-    <link rel="stylesheet" href="@Assets["UltimateAuth.Sample.UAuthHub.styles.css"]" />
     <ImportMap />
-    <link rel="icon" type="image/png" href="~/UltimateAuth-Logo.png" />
+    <link rel="icon" type="image/png" href="UltimateAuth-Logo.png" />
 
     <link href="https://fonts.googleapis.com/css?family=Roboto:300,400,500,700&display=swap" rel="stylesheet" />
     <link href="_content/MudBlazor/MudBlazor.min.css" rel="stylesheet" />

samples/UAuthHub/CodeBeam.UltimateAuth.Sample.UAuthHub/Components/Pages/Home.razor

@@ -1,7 +1,7 @@
 @page "/"
 @page "/login"
 @attribute [UAuthLoginPage]
-@inherits UAuthFlowPageBase
+@inherits UAuthHubPageBase
 
 @implements IDisposable
 @using CodeBeam.UltimateAuth.Client.Infrastructure
@@ -16,7 +16,6 @@
 @inject IAuthStore AuthStore
 @inject IHubFlowService HubFlowService
 @inject IPkceService PkceService
-@inject IHubFlowReader HubFlowReader
 @inject IHubCredentialResolver HubCredentialResolver
 @inject IClientStorage BrowserStorage
 @inject ISnackbar Snackbar
@@ -25,7 +24,7 @@
 @inject IDialogService DialogService
 @inject IOptions<UAuthClientOptions> Options
 
-@if (_state == null || !_state.IsActive)
+@if (!IsHubAuthorized)
 {
     <MudPage Class="d-flex align-center justify-center" FullScreen="FullScreen.FullWithoutAppbar" Column="1" Row="1">
         <MudPaper Class="pa-8" Elevation="4" Style="max-width: 520px; width: 100%;">
@@ -115,11 +114,12 @@
                         <MudText Style="color: var(--mud-palette-text-secondary)" Typo="Typo.subtitle2" Align="Align.Center">Login programmatically as admin/admin.</MudText>
                     </MudStack>
 
-                    <MudDivider Class="my-2" />
+                    @* <MudDivider Class="my-2" /> *@
 
                     <MudStack>
+                        @* TODO: Enhance sample *@
                         @* <MudText Align="Align.Center" Typo="Typo.subtitle2"><MudLink Class="cursor-pointer" OnClick="OpenResetDialog">Forgot Password</MudLink></MudText> *@
-                        <MudText Align="Align.Center" Typo="Typo.subtitle2">Don't have an account? <MudLink Class="cursor-pointer" Href="/register">SignUp</MudLink></MudText>
+                        @* <MudText Align="Align.Center" Typo="Typo.subtitle2">Don't have an account? <MudLink Class="cursor-pointer" Href="/register">SignUp</MudLink></MudText> *@
                     </MudStack>
                 </MudPaper>
             </MudItem>

samples/UAuthHub/CodeBeam.UltimateAuth.Sample.UAuthHub/Components/Pages/Home.razor.cs

@@ -4,21 +4,15 @@
 using CodeBeam.UltimateAuth.Core.Contracts;
 using CodeBeam.UltimateAuth.Core.Domain;
 using CodeBeam.UltimateAuth.Server.Stores;
-using Microsoft.AspNetCore.Components;
 using MudBlazor;
 
 namespace CodeBeam.UltimateAuth.Sample.UAuthHub.Components.Pages;
 
 public partial class Home
 {
-    [SupplyParameterFromQuery(Name = "hub")]
-    public string? HubKey { get; set; }
-
     private string? _username;
     private string? _password;
 
-    private HubFlowState? _state;
-
     private UAuthClientProductInfo? _productInfo;
     private UAuthLoginForm _loginForm = null!;
 
@@ -38,51 +32,35 @@ protected override async Task OnInitializedAsync()
         _productInfo = ClientProductInfoProvider.Get();
     }
 
-    protected override async Task OnParametersSetAsync()
-    {
-        if (string.IsNullOrWhiteSpace(HubKey))
-        {
-            _state = null;
-            return;
-        }
-
-        if (HubSessionId.TryParse(HubKey, out var hubSessionId))
-            _state = await HubFlowReader.GetStateAsync(hubSessionId);
-    }
-
     protected override async Task OnAfterRenderAsync(bool firstRender)
     {
         if (string.IsNullOrWhiteSpace(HubKey))
             return;
 
-        if (_state is null || !_state.Exists)
+        if (HubState is null || !HubState.Exists)
         {
             await StartNewPkceAsync();
             return;
         }
 
-        if (_state.IsExpired)
+        if (HubState.IsExpired)
         {
             await StartNewPkceAsync();
             return;
         }
 
-        if (_state.Error != null && !_errorHandled)
+        if (HubState.Error != null && !_errorHandled)
         {
             _errorHandled = true;
-
-            Snackbar.Add(ResolveErrorMessage(_state.Error), Severity.Error);
-            //_state = _state.ClearError();
-
-            //await Task.Delay(200);
+            Snackbar.Add(ResolveErrorMessage(HubState.Error), Severity.Error);
             await ContinuePkceAsync();
 
             if (HubSessionId.TryParse(HubKey, out var hubSessionId))
             {
-                _state = await HubFlowReader.GetStateAsync(hubSessionId);
+                await ReloadState();
             }
 
-            await _loginForm.RefreshAsync();
+            await _loginForm.ReloadAsync();
 
             StateHasChanged();
         }
@@ -91,7 +69,7 @@ protected override async Task OnAfterRenderAsync(bool firstRender)
     // For testing & debugging
     private async Task ProgrammaticPkceLogin()
     {
-        var hub = _state;
+        var hub = HubState;
 
         if (hub is null)
             return;
@@ -107,8 +85,8 @@ private async Task ProgrammaticPkceLogin()
             Secret = "admin",
             AuthorizationCode = credentials?.AuthorizationCode ?? string.Empty,
             CodeVerifier = credentials?.CodeVerifier ?? string.Empty,
-            ReturnUrl = _state?.ReturnUrl ?? string.Empty,
-            HubSessionId = _state?.HubSessionId.Value ?? hubSessionId.Value,
+            ReturnUrl = HubState?.ReturnUrl ?? string.Empty,
+            HubSessionId = HubState?.HubSessionId.Value ?? hubSessionId.Value,
         };
 
         await UAuthClient.Flows.TryCompletePkceLoginAsync(request, UAuthSubmitMode.TryAndCommit);
@@ -159,7 +137,7 @@ private async Task StartNewPkceAsync()
 
     private async Task<string> ResolveReturnUrlAsync()
     {
-        var fromContext = _state?.ReturnUrl;
+        var fromContext = HubState?.ReturnUrl;
         if (!string.IsNullOrWhiteSpace(fromContext))
             return fromContext;
 
@@ -275,11 +253,11 @@ AuthFailureReason.InvalidCredentials when remainingAttempts is > 0
         Snackbar.Add(message, Severity.Error);
     }
 
-    private string ResolveErrorMessage(string? errorKey)
+    private string ResolveErrorMessage(HubErrorCode? errorCode)
     {
-        if (errorKey == "invalid")
+        if (errorCode == HubErrorCode.InvalidCredentials)
         {
-            return "Login failed.";
+            return "Invalid credentials.";
         }
 
         return "Failed attempt.";

samples/UAuthHub/CodeBeam.UltimateAuth.Sample.UAuthHub/Program.cs

@@ -12,7 +12,6 @@
 
 var builder = WebApplication.CreateBuilder(args);
 
-// Add services to the container.
 builder.Services.AddRazorComponents()
     .AddInteractiveServerComponents()
     .AddCircuitOptions(options =>
@@ -27,7 +26,6 @@
 
 builder.Services.AddScoped<DarkModeManager>();
 
-
 builder.Services.AddUltimateAuthServer(o => {
     o.Diagnostics.EnableRefreshDetails = true;
     //o.Session.MaxLifetime = TimeSpan.FromSeconds(32);
@@ -41,33 +39,19 @@
     o.Identifiers.AllowMultipleUsernames = true;
 })
     .AddUltimateAuthInMemory()
-    .AddUAuthHub(o => o.AllowedClientOrigins.Add("https://localhost:6130"));
+    .AddUAuthHub(o => o.AllowedClientOrigins.Add("https://localhost:6130")); // Client sample's URL
 
 builder.Services.AddUltimateAuthClientBlazor(o =>
 {
     //o.Refresh.Interval = TimeSpan.FromSeconds(5);
     o.Reauth.Behavior = ReauthBehavior.RaiseEvent;
 });
 
-//builder.Services.AddCors(options =>
-//{
-//    options.AddPolicy("UAuthHub", policy =>
-//    {
-//        policy
-//            .WithOrigins("https://localhost:6130")
-//            .AllowAnyHeader()
-//            .AllowAnyMethod()
-//            .AllowCredentials()
-//            .WithExposedHeaders("X-UAuth-Refresh"); // TODO: Add exposed headers globally
-//    });
-//});
-
 var app = builder.Build();
 
 if (!app.Environment.IsDevelopment())
 {
     app.UseExceptionHandler("/Error", createScopeForErrors: true);
-    // The default HSTS value is 30 days. You may want to change this for production scenarios, see https://aka.ms/aspnetcore-hsts.
     app.UseHsts();
 }
 else
@@ -81,7 +65,6 @@
 }
 
 app.UseHttpsRedirection();
-app.UseCors("UAuthHub");
 
 app.UseUltimateAuthWithAspNetCore();
 app.UseAntiforgery();
@@ -94,13 +77,4 @@
     .AddInteractiveServerRenderMode()
     .AddUltimateAuthRoutes(UAuthAssemblies.BlazorClient());
 
-app.MapGet("/health", () =>
-{
-    return Results.Ok(new
-    {
-        service = "UAuthHub",
-        status = "ok"
-    });
-});
-
 app.Run();

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

@@ -73,7 +73,7 @@
 
             <MudItem Class="order-0 order-sm-1" xs="12" sm="6">
                 <MudPaper Class="uauth-login-paper pa-8" Elevation="3">
-                    <UAuthLoginForm Identifier="@_username" Secret="@_password" SubmitMode="UAuthSubmitMode.TryAndCommit" OnTryResult="@HandleTry" ReturnUrl="@(ReturnUrl ?? "/home")">
+                    <UAuthLoginForm Identifier="@_username" Secret="@_password" OnTryResult="@HandleTry" ReturnUrl="@(ReturnUrl ?? "/home")">
                         <MudStack Class="mud-width-full">
                             <MudStack Row="true" AlignItems="AlignItems.Center">
                                 <UAuthLogo Size="48" ShieldColor="var(--mud-palette-primary)" KeyColor="white" />

samples/blazor-standalone-wasm/CodeBeam.UltimateAuth.Sample.BlazorStandaloneWasm/Pages/Login.razor

@@ -86,7 +86,7 @@
                             Instead of use PKCE flow.
                             This section only demonstrates that direct login flow is working, but not suggested.
                         </MudAlert>
-                        <UAuthLoginForm Identifier="@_username" Secret="@_password" ReturnUrl="@(ReturnUrl ?? "/home")">
+                        <UAuthLoginForm Identifier="@_username" Secret="@_password" ReturnUrl="@(ReturnUrl ?? "/home")" OnTryResult="HandleLoginResult">
                             <MudStack Class="mud-width-full">
                                 <MudTextField @ref="@_usernameField" @bind-Value="@_username" Variant="Variant.Outlined" Label="Username" Required="true" Immediate="true" HelperText="@(_remainingAttempts != null ? $"Remaining Attempts: {_remainingAttempts}" : null)" />
                                 <MudPasswordField @bind-Value="@_password" Variant="Variant.Outlined" Label="Password" Required="true" Immediate="true" />

samples/blazor-standalone-wasm/CodeBeam.UltimateAuth.Sample.BlazorStandaloneWasm/Pages/Login.razor.cs

@@ -99,6 +99,21 @@ private async Task ProgrammaticLogin()
         await UAuthClient.Flows.LoginAsync(request, ReturnUrl ?? "/home");
     }
 
+    private async Task HandleLoginResult(IUAuthTryResult result)
+    {
+        if (!result.Success)
+        {
+            if (result.Reason == AuthFailureReason.LockedOut && result.LockoutUntilUtc is { } until)
+            {
+                _lockoutUntil = until;
+                StartCountdown();
+            }
+
+            _remainingAttempts = result.RemainingAttempts;
+            ShowLoginError(result.Reason, result.RemainingAttempts);
+        }
+    }
+
     private async void StartCountdown()
     {
         if (_lockoutUntil is null)

src/CodeBeam.UltimateAuth.Core/Domain/Hub/HubErrorCode.cs

@@ -0,0 +1,10 @@
+namespace CodeBeam.UltimateAuth.Core.Domain;
+
+public enum HubErrorCode
+{
+    None = 0,
+    InvalidCredentials,
+    LockedOut,
+    RequiresMfa,
+    Unknown
+}

src/CodeBeam.UltimateAuth.Core/Domain/Hub/HubFlowArtifact.cs

@@ -14,7 +14,7 @@ public sealed class HubFlowArtifact : AuthArtifact
 
     public HubFlowPayload Payload { get; }
 
-    public string? Error { get; private set; }
+    public HubErrorCode? Error { get; private set; }
 
     public HubFlowArtifact(
         HubSessionId hubSessionId,
@@ -34,7 +34,7 @@ public HubFlowArtifact(
         Payload = payload;
     }
 
-    public void SetError(string error)
+    public void SetError(HubErrorCode error)
     {
         Error = error;
         RegisterAttempt();

src/CodeBeam.UltimateAuth.Core/Domain/Hub/HubFlowState.cs

@@ -8,7 +8,7 @@ public sealed class HubFlowState
     public HubFlowType FlowType { get; init; }
     public UAuthClientProfile ClientProfile { get; init; }
     public string? ReturnUrl { get; init; }
-    public string? Error { get; init; }
+    public HubErrorCode? Error { get; init; }
     public int AttemptCount { get; init; }
 
     public bool IsActive { get; init; }