Adding returnurl to logoff (#13010)

OrchardCMS · Dec 29, 2022 · 0514eed · 0514eed
1 parent eefbfdb
commit 0514eed
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/src/OrchardCore.Modules/OrchardCore.Users/Controllers/AccountController.cs b/src/OrchardCore.Modules/OrchardCore.Users/Controllers/AccountController.cs
@@ -243,12 +243,12 @@ public async Task<IActionResult> Login(LoginViewModel model, string returnUrl =
 
         [HttpPost]
         [ValidateAntiForgeryToken]
-        public async Task<IActionResult> LogOff()
+        public async Task<IActionResult> LogOff(string returnUrl = null)
         {
             await _signInManager.SignOutAsync();
             _logger.LogInformation(4, "User logged out.");
 
-            return Redirect("~/");
+            return RedirectToLocal(returnUrl);
         }
 
         [HttpGet]
@@ -300,7 +300,7 @@ private IActionResult RedirectToLocal(string returnUrl)
         {
             if (Url.IsLocalUrl(returnUrl))
             {
-                return Redirect(returnUrl);
+                return Redirect(returnUrl.ToUriComponents());
             }
             else
             {
@@ -322,7 +322,7 @@ await workflowManager.TriggerEventAsync(nameof(Workflows.Activities.UserLoggedIn
                     input: input, correlationId: ((User)user).UserId);
             }
 
-            return RedirectToLocal(returnUrl.ToUriComponents());
+            return RedirectToLocal(returnUrl);
         }
 
         [HttpPost]