diff --git a/src/Umbraco.Core/Configuration/Models/SecuritySettings.cs b/src/Umbraco.Core/Configuration/Models/SecuritySettings.cs index 118481b3381d..2a57a0a74c7c 100644 --- a/src/Umbraco.Core/Configuration/Models/SecuritySettings.cs +++ b/src/Umbraco.Core/Configuration/Models/SecuritySettings.cs @@ -25,7 +25,7 @@ public class SecuritySettings internal const int StaticMemberDefaultLockoutTimeInMinutes = 30 * 24 * 60; internal const int StaticUserDefaultLockoutTimeInMinutes = 30 * 24 * 60; - internal const string StaticAuthorizeCallbackPathName = "/umbraco"; + internal const string StaticAuthorizeCallbackPathName = "/umbraco/oauth_complete"; internal const string StaticAuthorizeCallbackLogoutPathName = "/umbraco/logout"; internal const string StaticAuthorizeCallbackErrorPathName = "/umbraco/error"; diff --git a/src/Umbraco.Web.Common/Helpers/OAuthOptionsHelper.cs b/src/Umbraco.Web.Common/Helpers/OAuthOptionsHelper.cs index 4179819f73dd..803ee92b1379 100644 --- a/src/Umbraco.Web.Common/Helpers/OAuthOptionsHelper.cs +++ b/src/Umbraco.Web.Common/Helpers/OAuthOptionsHelper.cs @@ -65,19 +65,4 @@ public T SetUmbracoRedirectWithFilteredParams(T context, string providerFrien context.Response.Redirect(callbackPath); return context; } - - /// - /// Sets the callbackPath for the RemoteAuthenticationOptions based on the configured Umbraco path and the path supplied. - /// By default this will result in "/umbraco/your-supplied-path". - /// - /// The options object to set the path on. - /// The path that should go after the umbraco path, will add a leading slash if it's missing. - /// - public RemoteAuthenticationOptions SetUmbracoBasedCallbackPath(RemoteAuthenticationOptions options, string path) - { - var umbracoCallbackPath = _securitySettings.Value.AuthorizeCallbackPathName; - - options.CallbackPath = umbracoCallbackPath + path.EnsureStartsWith("/"); - return options; - } }