From d0158f936eb7e097452b8ac9810fd623682d50a8 Mon Sep 17 00:00:00 2001
From: liangshiwei <deawback@hotmail.com>
Date: Mon, 3 Feb 2025 11:57:53 +0800
Subject: [PATCH] Fix returnUrl problem

---
 .../Themes/EventHub/Components/MainNavbar/Default.cshtml   | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/src/EventHub.Web.Theme/Themes/EventHub/Components/MainNavbar/Default.cshtml b/src/EventHub.Web.Theme/Themes/EventHub/Components/MainNavbar/Default.cshtml
index 268d49f..46dd030 100644
--- a/src/EventHub.Web.Theme/Themes/EventHub/Components/MainNavbar/Default.cshtml
+++ b/src/EventHub.Web.Theme/Themes/EventHub/Components/MainNavbar/Default.cshtml
@@ -13,12 +13,7 @@
 @inject IOptions<EventHubUrlOptions> UrlOptions
 
 @{
-    var returnUrl = WebUtility.UrlEncode(Context.Request.GetEncodedPathAndQuery());
-    
-    if(Context.Request.Path.Equals("/Account/Login", StringComparison.OrdinalIgnoreCase))
-    {
-        returnUrl = WebUtility.UrlEncode(Context.Request.Query["returnUrl"]);
-    }
+    var returnUrl = WebUtility.UrlEncode(Context.Request.Query.ContainsKey("returnUrl") ? Context.Request.Query["returnUrl"] : Context.Request.GetEncodedPathAndQuery());
     
     if (returnUrl.IsNullOrWhiteSpace())
     {