From 09248b28986922073b6adf727022559411983332 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marek=20Jasi=C5=84ski?= <jasins.marek@gmail.com>
Date: Wed, 27 May 2026 12:24:01 +0200
Subject: [PATCH] feat(auth): fix post-login redirection ArgumentException and
 introduce premium client-side hydration preloader

---
 .../Layout/MainHubLayout.razor                | 19 +++++++++++++++++++
 src/NexusReader.Web/Program.cs                |  4 ++--
 2 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/src/NexusReader.UI.Shared/Layout/MainHubLayout.razor b/src/NexusReader.UI.Shared/Layout/MainHubLayout.razor
index d64c15e..14574f3 100644
--- a/src/NexusReader.UI.Shared/Layout/MainHubLayout.razor
+++ b/src/NexusReader.UI.Shared/Layout/MainHubLayout.razor
@@ -4,6 +4,14 @@
 @using NexusReader.Application.Abstractions.Services
 @using NexusReader.UI.Shared.Services
 
+@if (!_isFullyLoaded)
+{
+    <div class="app-preloader" style="backdrop-filter: blur(15px); background: rgba(18, 18, 18, 0.95); z-index: 100000;">
+        <div class="preloader-spinner"></div>
+        <div class="preloader-text">Synchronizing Secure Session...</div>
+    </div>
+}
+
 <div class="hub-container @(_isMobileMenuOpen ? "mobile-menu-open" : "")">
     <AuthorizeView>
         <Authorized>
@@ -80,6 +88,7 @@
                         </div>
                         <span class="nav-text">Concenters</span>
                     </NavLink>
+
                 </nav>
 
                 <div class="sidebar-footer">
@@ -113,6 +122,7 @@
 
     private bool _isSyncing = false;
     private bool _isMobileMenuOpen = false;
+    private bool _isFullyLoaded = false;
 
     protected override async Task OnInitializedAsync()
     {
@@ -127,6 +137,15 @@
         }
     }
 
+    protected override void OnAfterRender(bool firstRender)
+    {
+        if (firstRender)
+        {
+            _isFullyLoaded = true;
+            StateHasChanged();
+        }
+    }
+
     private void ToggleMobileMenu()
     {
         _isMobileMenuOpen = !_isMobileMenuOpen;
diff --git a/src/NexusReader.Web/Program.cs b/src/NexusReader.Web/Program.cs
index 8f5f5c6..5a31328 100644
--- a/src/NexusReader.Web/Program.cs
+++ b/src/NexusReader.Web/Program.cs
@@ -518,7 +518,7 @@ app.MapGet("/identity/login/google", (string? returnUrl) =>
     var properties = new AuthenticationProperties
     {
         RedirectUri = "/identity/callback/google",
-        Items = { { "returnUrl", returnUrl ?? "/" } }
+        Items = { { "returnUrl", string.IsNullOrEmpty(returnUrl) ? "/" : returnUrl } }
     };
     return Results.Challenge(properties, new[] { "Google" });
 });
@@ -598,7 +598,7 @@ app.MapPost("/account/login-form", async (
     if (result.Succeeded)
     {
         logger.LogInformation("User logged in: {Email}", email);
-        return Results.Redirect(returnUrl ?? "/");
+        return Results.Redirect(string.IsNullOrEmpty(returnUrl) ? "/" : returnUrl);
     }
     
     var error = result.IsLockedOut ? "LockedOut" : "InvalidCredentials";