From 01ee9650ff1d0d6cb47097c2a16ee894838056ed Mon Sep 17 00:00:00 2001 From: sbwalker Date: Fri, 31 Oct 2025 12:09:37 -0400 Subject: [PATCH] fix #5735 - logout redirect on action components --- Oqtane.Client/Themes/Controls/Theme/LoginBase.cs | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/Oqtane.Client/Themes/Controls/Theme/LoginBase.cs b/Oqtane.Client/Themes/Controls/Theme/LoginBase.cs index 846cbcb7..f36f680d 100644 --- a/Oqtane.Client/Themes/Controls/Theme/LoginBase.cs +++ b/Oqtane.Client/Themes/Controls/Theme/LoginBase.cs @@ -1,4 +1,5 @@ using System; +using System.Linq; using System.Net; using System.Threading.Tasks; using Microsoft.AspNetCore.Components; @@ -62,7 +63,14 @@ namespace Oqtane.Themes.Controls // verify anonymous users can access current page if (UserSecurity.IsAuthorized(null, PermissionNames.View, PageState.Page.PermissionList) && Utilities.IsEffectiveAndNotExpired(PageState.Page.EffectiveDate, PageState.Page.ExpiryDate)) { - returnurl = PageState.Route.PathAndQuery; + if (PageState.Route.Action != Constants.DefaultAction && PageState.Modules.Any() && PageState.Modules.First().SecurityAccessLevel > SecurityAccessLevel.View) + { + returnurl = PageState.Route.PagePath; + } + else + { + returnurl = PageState.Route.PathAndQuery; + } } else {