From 118e43f0c2aa9bc7018ec69868fdb540ab474e1b Mon Sep 17 00:00:00 2001
From: Samuele Locatelli <samuele@steamware.net>
Date: Mon, 4 Mar 2024 11:07:54 +0100
Subject: [PATCH] Fix base URL

---
 Resources/ChangeLog.html                                    | 2 +-
 Resources/VersNum.txt                                       | 2 +-
 Resources/manifest.xml                                      | 2 +-
 .../Areas/Identity/Pages/Account/LogOut.cshtml              | 6 ++++--
 .../Areas/Identity/Pages/Account/Manage/_ManageNav.cshtml   | 5 ++++-
 WebDoorCreator.UI/WebDoorCreator.UI.csproj                  | 2 +-
 6 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/Resources/ChangeLog.html b/Resources/ChangeLog.html
index 5361f59..fc0496c 100644
--- a/Resources/ChangeLog.html
+++ b/Resources/ChangeLog.html
@@ -1,6 +1,6 @@
 <body>
     <i>WebDoorCreator - Egalware</i>
-    <h4>Version: 0.9.2403.0410</h4>
+    <h4>Version: 0.9.2403.0411</h4>
     <br /> Release note:
     <ul>
         <li>
diff --git a/Resources/VersNum.txt b/Resources/VersNum.txt
index 0d4a670..d70aaa2 100644
--- a/Resources/VersNum.txt
+++ b/Resources/VersNum.txt
@@ -1 +1 @@
-0.9.2403.0410
+0.9.2403.0411
diff --git a/Resources/manifest.xml b/Resources/manifest.xml
index 28b361a..7fd56c7 100644
--- a/Resources/manifest.xml
+++ b/Resources/manifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <item>
-  <version>0.9.2403.0410</version>
+  <version>0.9.2403.0411</version>
   <url>http://nexus.steamware.net/repository/SWS/WDC/stable/WDC.UI.zip</url>
   <changelog>http://nexus.steamware.net/repository/SWS/WDC/stable/ChangeLog.html</changelog>
   <mandatory>false</mandatory>
diff --git a/WebDoorCreator.UI/Areas/Identity/Pages/Account/LogOut.cshtml b/WebDoorCreator.UI/Areas/Identity/Pages/Account/LogOut.cshtml
index 21b7fe2..9881622 100644
--- a/WebDoorCreator.UI/Areas/Identity/Pages/Account/LogOut.cshtml
+++ b/WebDoorCreator.UI/Areas/Identity/Pages/Account/LogOut.cshtml
@@ -3,13 +3,15 @@
 @attribute [IgnoreAntiforgeryToken]
 @inject SignInManager<IdentityUser> SignInManager
 @functions {
-    public async Task<IActionResult> OnPost()
+    public async Task<IActionResult> OnPost(string returnUrl = null)
     {
+        returnUrl ??= Url.Content("~/");
         if (SignInManager.IsSignedIn(User))
         {
             await SignInManager.SignOutAsync();
         }
 
-        return Redirect("~/");
+        return Redirect(returnUrl);
+        // return Redirect("~/");
     }
 }
diff --git a/WebDoorCreator.UI/Areas/Identity/Pages/Account/Manage/_ManageNav.cshtml b/WebDoorCreator.UI/Areas/Identity/Pages/Account/Manage/_ManageNav.cshtml
index 7d68f22..51ba53b 100644
--- a/WebDoorCreator.UI/Areas/Identity/Pages/Account/Manage/_ManageNav.cshtml
+++ b/WebDoorCreator.UI/Areas/Identity/Pages/Account/Manage/_ManageNav.cshtml
@@ -12,5 +12,8 @@
     }
     <li class="nav-item"><a class="nav-link @ManageNavPages.TwoFactorAuthenticationNavClass(ViewContext)" id="two-factor" asp-page="./TwoFactorAuthentication">Two-factor authentication</a></li>
     <li class="nav-item"><a class="nav-link @ManageNavPages.PersonalDataNavClass(ViewContext)" id="personal-data" asp-page="./PersonalData">Personal data</a></li>
-    <li class="nav-item bg-dark rounded p-2"><a class="text-light text-decoration-none" id="personal-data" href="~/"><i class="fa-solid fa-arrow-left-long"></i>  &nbsp; Back to Main page</a></li>
+    @{
+        string baseUrl = Url.Content("~/");
+        <li class="nav-item bg-dark rounded p-2"><a class="text-light text-decoration-none" id="personal-data" href="@baseUrl"><i class="fa-solid fa-arrow-left-long"></i>  &nbsp; Back to Main page</a></li>
+    }
 </ul>
diff --git a/WebDoorCreator.UI/WebDoorCreator.UI.csproj b/WebDoorCreator.UI/WebDoorCreator.UI.csproj
index 4a0df79..3d619b6 100644
--- a/WebDoorCreator.UI/WebDoorCreator.UI.csproj
+++ b/WebDoorCreator.UI/WebDoorCreator.UI.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
     <Nullable>enable</Nullable>
-        <Version>0.9.2403.0410</Version>
+        <Version>0.9.2403.0411</Version>
     <ImplicitUsings>enable</ImplicitUsings>
     <UserSecretsId>aspnet-WebDoorCreator.UI-dfe95fed-1398-4144-bd43-8b3a765d6608</UserSecretsId>
   </PropertyGroup>
