From 35e776b15020f1158fe694f999fbef19db7d015d Mon Sep 17 00:00:00 2001
From: Pavel Vesely <pavel@vesely.dev>
Date: Mon, 7 Dec 2020 21:27:00 +0100
Subject: [PATCH] Fix - return to url during login fail when returnurl contains
 "/"

---
 Oqtane.Client/Themes/Controls/LoginBase.cs | 2 +-
 Oqtane.Client/UI/SiteRouter.razor          | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Oqtane.Client/Themes/Controls/LoginBase.cs b/Oqtane.Client/Themes/Controls/LoginBase.cs
index ed9eb289..27f43497 100644
--- a/Oqtane.Client/Themes/Controls/LoginBase.cs
+++ b/Oqtane.Client/Themes/Controls/LoginBase.cs
@@ -22,7 +22,7 @@ namespace Oqtane.Themes.Controls
             {
                 returnurl += "/" + PageState.Page.Path;
             }
-            NavigationManager.NavigateTo(NavigateUrl("login", "returnurl=" + returnurl));
+            NavigationManager.NavigateTo(NavigateUrl("login", "?returnurl=" + returnurl));
         }
 
         protected async Task LogoutUser()
diff --git a/Oqtane.Client/UI/SiteRouter.razor b/Oqtane.Client/UI/SiteRouter.razor
index 667816ab..469a0a7b 100644
--- a/Oqtane.Client/UI/SiteRouter.razor
+++ b/Oqtane.Client/UI/SiteRouter.razor
@@ -300,7 +300,7 @@
                 if (user == null)
                 {
                     // redirect to login page
-                    NavigationManager.NavigateTo(Utilities.NavigateUrl(alias.Path, "login", "returnurl=" + path));
+                    NavigationManager.NavigateTo(Utilities.NavigateUrl(alias.Path, "login", "?returnurl=" + path));
                 }
                 else
                 {
@@ -565,4 +565,4 @@
 => RuntimeInformation.IsOSPlatform(OSPlatform.Create("BROWSER"))
         ? Oqtane.Shared.Runtime.WebAssembly
         : Oqtane.Shared.Runtime.Server;
-}
\ No newline at end of file
+}