Merge pull request #3540 from leigh-pointer/LoginURL

Fix #3539 for Multiple click on login button
This commit is contained in:
Shaun Walker
2023-12-12 13:16:16 -05:00
committed by GitHub

View File

@ -28,16 +28,21 @@ namespace Oqtane.Themes.Controls
var returnurl = WebUtility.UrlEncode(PageState.Route.PathAndQuery); var returnurl = WebUtility.UrlEncode(PageState.Route.PathAndQuery);
if (allowexternallogin && !allowsitelogin) // Check if not already actioned Login
if(!NavigationManager.Uri.ToString().Contains("login?returnurl=%2F"))
{ {
// external login if (allowexternallogin && !allowsitelogin)
NavigationManager.NavigateTo(Utilities.TenantUrl(PageState.Alias, "/pages/external?returnurl=" + returnurl), true); {
} // external login
else NavigationManager.NavigateTo(Utilities.TenantUrl(PageState.Alias, "/pages/external?returnurl=" + returnurl), true);
{ }
// local login else
NavigationManager.NavigateTo(NavigateUrl("login", "?returnurl=" + returnurl)); {
// local login
NavigationManager.NavigateTo(NavigateUrl("login", "?returnurl=" + returnurl));
}
} }
} }
protected async Task LogoutUser() protected async Task LogoutUser()