Fix login problem

2 years ago · dd1f7aa743
1 changed files with 7 additions and 0 deletions
--- a/src/EventHub.Web.Theme/Themes/EventHub/Components/MainNavbar/Default.cshtml
+++ b/src/EventHub.Web.Theme/Themes/EventHub/Components/MainNavbar/Default.cshtml
@ -14,10 +14,17 @@

@{
    var returnUrl = WebUtility.UrlEncode(Context.Request.GetEncodedPathAndQuery());
+    
+    if(Context.Request.Path.Equals("/Account/Login", StringComparison.OrdinalIgnoreCase))
+    {
+        returnUrl = WebUtility.UrlEncode(Context.Request.Query["returnUrl"]);
+    }
+    
    if (returnUrl.IsNullOrWhiteSpace())
    {
        returnUrl = "/";
    }
+    
 }
 <nav class="navbar navbar-expand-lg navbar-light bg-light static-top">
    <div class="container">