-
Notifications
You must be signed in to change notification settings - Fork 337
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.
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
Infer sign out scheme when using external identity providers and asp.net identity #1265
Merged
Merged
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,40 @@ | ||
using Duende.IdentityServer.Configuration; | ||
using Microsoft.AspNetCore.Identity; | ||
using Microsoft.Extensions.Options; | ||
|
||
namespace Duende.IdentityServer.AspNetIdentity; | ||
|
||
/// <summary> | ||
/// Identity server options configuration | ||
/// </summary> | ||
public class UseAspNetIdentityCookieScheme : IPostConfigureOptions<IdentityServerOptions> | ||
{ | ||
private readonly IOptions<Microsoft.AspNetCore.Authentication.AuthenticationOptions> _authOptions; | ||
|
||
/// <summary> | ||
/// ctor | ||
/// </summary> | ||
/// <param name="authOptions"></param> | ||
public UseAspNetIdentityCookieScheme(IOptions<Microsoft.AspNetCore.Authentication.AuthenticationOptions> authOptions) | ||
{ | ||
_authOptions = authOptions; | ||
} | ||
|
||
/// <inheritdoc/> | ||
public void PostConfigure(string name, IdentityServerOptions options) | ||
{ | ||
// If we are using ASP.NET Identity and the dynamic providers don't have a | ||
// sign out scheme set, then we need the dynamic providers to use ASP.NET | ||
// Identity's cookie at sign out time. If the sign out scheme is explicitly | ||
// set, then we don't override that though. | ||
|
||
if (DefaultAuthSchemeIsAspNetIdentity() && | ||
!options.DynamicProviders.SignOutSchemeSetExplicitly) | ||
{ | ||
options.DynamicProviders.SignOutScheme = IdentityConstants.ApplicationScheme; | ||
} | ||
|
||
bool DefaultAuthSchemeIsAspNetIdentity() => | ||
_authOptions.Value.DefaultAuthenticateScheme == IdentityConstants.ApplicationScheme; | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -31,7 +31,24 @@ public class DynamicProviderOptions | |
/// <summary> | ||
/// Scheme for signout. Defaults to the constant IdentityServerConstants.DefaultCookieAuthenticationScheme. | ||
/// </summary> | ||
public string SignOutScheme { get; set; } = IdentityServerConstants.DefaultCookieAuthenticationScheme; | ||
public string SignOutScheme | ||
{ | ||
get | ||
{ | ||
return _signOutScheme ?? IdentityServerConstants.DefaultCookieAuthenticationScheme; | ||
} | ||
set | ||
{ | ||
_signOutScheme = value; | ||
} | ||
} | ||
|
||
private string? _signOutScheme; | ||
|
||
/// <summary> | ||
/// Gets a value indicating if the SignOutScheme was set explicitly, either by application logic or by options binding. | ||
/// </summary> | ||
public bool SignOutSchemeSetExplicitly { get => _signOutScheme != null; } | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. The options class now understands if the sign out scheme has actually been set. We use that in our configuration so that we don't override a user who is trying to set the scheme explicitly. |
||
|
||
/// <summary> | ||
/// Registers a provider configuration model and authentication handler for the protocol type being used. | ||
|
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This logic has been refactored a bit to make the intentions clearer