From 9d42dac7d95ace3793f64fef8e90dca63b20b234 Mon Sep 17 00:00:00 2001 From: Ben Date: Fri, 16 Jan 2026 10:26:49 +0800 Subject: [PATCH 1/2] Fix #5959: set OnRedirectToIdentityProvider events without overwrite previous settings. --- .../OqtaneSiteAuthenticationBuilderExtensions.cs | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/Oqtane.Server/Extensions/OqtaneSiteAuthenticationBuilderExtensions.cs b/Oqtane.Server/Extensions/OqtaneSiteAuthenticationBuilderExtensions.cs index 26a041ee..0ca17f9f 100644 --- a/Oqtane.Server/Extensions/OqtaneSiteAuthenticationBuilderExtensions.cs +++ b/Oqtane.Server/Extensions/OqtaneSiteAuthenticationBuilderExtensions.cs @@ -84,16 +84,13 @@ namespace Oqtane.Extensions options.Events.OnRemoteFailure = OnRemoteFailure; if (sitesettings.GetValue("ExternalLogin:Parameters", "") != "") { - options.Events = new OpenIdConnectEvents + options.Events.OnRedirectToIdentityProvider = context => { - OnRedirectToIdentityProvider = context => + foreach (var parameter in sitesettings.GetValue("ExternalLogin:Parameters", "").Split(",")) { - foreach (var parameter in sitesettings.GetValue("ExternalLogin:Parameters", "").Split(",")) - { - context.ProtocolMessage.SetParameter(parameter.Split("=")[0], parameter.Split("=")[1]); - } - return Task.FromResult(0); + context.ProtocolMessage.SetParameter(parameter.Split("=")[0], parameter.Split("=")[1]); } + return Task.FromResult(0); }; } } From 8ba480f168d93ed56645115119f1759ba976b954 Mon Sep 17 00:00:00 2001 From: Ben Date: Fri, 16 Jan 2026 10:28:59 +0800 Subject: [PATCH 2/2] Fix #5959: set OnRedirectToIdentityProvider events without overwrite previous settings. --- .../OqtaneSiteAuthenticationBuilderExtensions.cs | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/Oqtane.Server/Extensions/OqtaneSiteAuthenticationBuilderExtensions.cs b/Oqtane.Server/Extensions/OqtaneSiteAuthenticationBuilderExtensions.cs index 0ca17f9f..ecb4bde9 100644 --- a/Oqtane.Server/Extensions/OqtaneSiteAuthenticationBuilderExtensions.cs +++ b/Oqtane.Server/Extensions/OqtaneSiteAuthenticationBuilderExtensions.cs @@ -129,18 +129,15 @@ namespace Oqtane.Extensions options.Events.OnRemoteFailure = OnRemoteFailure; if (sitesettings.GetValue("ExternalLogin:Parameters", "") != "") { - options.Events = new OAuthEvents + options.Events.OnRedirectToAuthorizationEndpoint = context => { - OnRedirectToAuthorizationEndpoint = context => + var url = context.RedirectUri; + foreach (var parameter in sitesettings.GetValue("ExternalLogin:Parameters", "").Split(",")) { - var url = context.RedirectUri; - foreach (var parameter in sitesettings.GetValue("ExternalLogin:Parameters", "").Split(",")) - { - url += (!url.Contains("?")) ? "?" + parameter : "&" + parameter; - } - context.Response.Redirect(url); - return Task.FromResult(0); + url += (!url.Contains("?")) ? "?" + parameter : "&" + parameter; } + context.Response.Redirect(url); + return Task.FromResult(0); }; } }