Fix returnUrl problem

2 years ago · d0158f936e
1 changed files with 1 additions and 6 deletions
--- 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())
    {