Fix public home routing and add home smoke test

2026-07-08 01:22:05 +09:00
parent d38275e9c7
commit 5813130443
3 changed files with 31 additions and 4 deletions
@@ -6,7 +6,31 @@
        if (!firstRender)
            return;

-        var returnUrl = Uri.EscapeDataString(Navigation.ToBaseRelativePath(Navigation.Uri));
+        var returnUrl = Uri.EscapeDataString(GetSafeReturnUrl());
        Navigation.NavigateTo($"/taxbaik/admin/login?returnUrl={returnUrl}", replace: true);
    }
+
+    private string GetSafeReturnUrl()
+    {
+        try
+        {
+            var current = new Uri(Navigation.Uri);
+            var baseUri = new Uri(Navigation.BaseUri);
+
+            if (current.IsAbsoluteUri &&
+                string.Equals(current.Scheme, baseUri.Scheme, StringComparison.OrdinalIgnoreCase) &&
+                string.Equals(current.Authority, baseUri.Authority, StringComparison.OrdinalIgnoreCase) &&
+                current.AbsolutePath.StartsWith(baseUri.AbsolutePath, StringComparison.OrdinalIgnoreCase))
+            {
+                var relative = current.AbsolutePath[baseUri.AbsolutePath.Length..] + current.Query + current.Fragment;
+                return string.IsNullOrWhiteSpace(relative) ? "dashboard" : relative.TrimStart('/');
+            }
+        }
+        catch
+        {
+            // Fall through to a safe default.
+        }
+
+        return "dashboard";
+    }
 }