From ec4c9d96890eb4e8092b580787b20b7f0888b517 Mon Sep 17 00:00:00 2001 From: Khwezi Mngoma Date: Sat, 13 Jun 2026 23:20:02 +0200 Subject: [PATCH] Fixed login and logout redirect issue --- MidrandBookshop/Components/Pages/Checkout.razor.cs | 4 ++-- MidrandBookshop/Components/RedirectToLogin.razor.cs | 5 +++-- MidrandBookshop/MidrandBookshop.csproj | 4 ++-- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/MidrandBookshop/Components/Pages/Checkout.razor.cs b/MidrandBookshop/Components/Pages/Checkout.razor.cs index 824661e..1316149 100644 --- a/MidrandBookshop/Components/Pages/Checkout.razor.cs +++ b/MidrandBookshop/Components/Pages/Checkout.razor.cs @@ -126,8 +126,8 @@ public partial class Checkout() var addItemsResult = await OrderService.AddItemsToOrderAsync(order.Value, [.. orderItems]); - // 4. Generate the signed Payfast form payload using your backend service - var hostAddress = "https://localhost:7021"; + // 4. Generate the signed Payfast form payload using your backend service + var hostAddress = Navigation.BaseUri.TrimEnd('/'); CheckoutPayload = new Dictionary { diff --git a/MidrandBookshop/Components/RedirectToLogin.razor.cs b/MidrandBookshop/Components/RedirectToLogin.razor.cs index 5598726..1f091b5 100644 --- a/MidrandBookshop/Components/RedirectToLogin.razor.cs +++ b/MidrandBookshop/Components/RedirectToLogin.razor.cs @@ -4,8 +4,9 @@ public partial class RedirectToLogin { protected override void OnInitialized() { - var returnUrl = Navigation.ToBaseRelativePath(Navigation.Uri); + var relativePath = Navigation.ToBaseRelativePath(Navigation.Uri); + var sanitizedRedirectPath = relativePath.StartsWith('/') ? relativePath : $"/{relativePath}"; - Navigation.NavigateTo($"/login?returnUrl={Uri.EscapeDataString(returnUrl)}", forceLoad: true); + Navigation.NavigateTo($"/login?redirectUri={Uri.EscapeDataString(sanitizedRedirectPath)}", forceLoad: true); } } diff --git a/MidrandBookshop/MidrandBookshop.csproj b/MidrandBookshop/MidrandBookshop.csproj index 16e98d4..c0253fb 100644 --- a/MidrandBookshop/MidrandBookshop.csproj +++ b/MidrandBookshop/MidrandBookshop.csproj @@ -18,13 +18,13 @@ - + - +