Skip to content

V14: Unique OAuth callback route #16194

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
iOvergaard merged 2 commits into from
May 2, 2024
Merged

V14: Unique OAuth callback route #16194

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
034b022
set the default for `AuthorizeCallbackPathName` to "/umbraco/oauth_co…
iOvergaard Apr 30, 2024
9317e74
remove redundant method
iOvergaard May 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/Umbraco.Core/Configuration/Models/SecuritySettings.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";

Expand Down
15 changes: 0 additions & 15 deletions src/Umbraco.Web.Common/Helpers/OAuthOptionsHelper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,19 +65,4 @@ public T SetUmbracoRedirectWithFilteredParams<T>(T context, string providerFrien
context.Response.Redirect(callbackPath);
return context;
}

/// <summary>
/// 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".
/// </summary>
/// <param name="options">The options object to set the path on.</param>
/// <param name="path">The path that should go after the umbraco path, will add a leading slash if it's missing.</param>
/// <returns></returns>
public RemoteAuthenticationOptions SetUmbracoBasedCallbackPath(RemoteAuthenticationOptions options, string path)
{
var umbracoCallbackPath = _securitySettings.Value.AuthorizeCallbackPathName;

options.CallbackPath = umbracoCallbackPath + path.EnsureStartsWith("/");
return options;
}
}