Skip to content
This repository was archived by the owner on Sep 26, 2024. It is now read-only.

Add an explicit check for OctopusID when deciding auth code flow vs hybrid flow #70

Merged
N-lson merged 1 commit into from
Apr 28, 2022
Merged

Add an explicit check for OctopusID when deciding auth code flow vs hybrid flow #70

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 4 additions & 1 deletion source/Server.OpenIDConnect.Common/Issuer/AuthorizationEndpointUrlBuilder.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,10 @@ protected AuthorizationEndpointUrlBuilder(TStore configurationStore, IUrlEncoder
this.urlEncoder = urlEncoder;
}

protected virtual string ResponseType => ConfigurationStore.HasClientSecret ? OpenIDConnectConfiguration.AuthCodeResponseType : OpenIDConnectConfiguration.HybridResponseType;
// TODO: Remove the explicit check for OctopusID once OctopusID supports auth code flow
protected virtual string ResponseType => ConfigurationStore.HasClientSecret && ConfigurationStore.ConfigurationSettingsName != "OctopusID"
? OpenIDConnectConfiguration.AuthCodeResponseType
: OpenIDConnectConfiguration.HybridResponseType;
protected virtual string ResponseMode => OpenIDConnectConfiguration.DefaultResponseMode;

public virtual string Build(string requestDirectoryPath, IssuerConfiguration issuerConfiguration, string? nonce = null, string? state = null, string? codeChallenge = null)
Expand Down
3 changes: 2 additions & 1 deletion source/Server.OpenIDConnect.Common/Web/UserAuthenticationAction.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,8 @@ public async Task<IOctoResponseProvider> ExecuteAsync(IOctoRequest request)
var issuer = ConfigurationStore.GetIssuer() ?? string.Empty;
var issuerConfig = await identityProviderConfigDiscoverer.GetConfigurationAsync(issuer);

var response = ConfigurationStore.HasClientSecret
// TODO: Remove the explicit check for OctopusID once OctopusID supports auth code flow
var response = ConfigurationStore.HasClientSecret && ConfigurationStore.ConfigurationSettingsName != "OctopusID"
? await BuildAuthorizationCodePkceResponse(model, new LoginStateWithRequestId(state.RedirectAfterLoginTo, state.UsingSecureConnection, Guid.NewGuid()), issuerConfig)
: BuildHybridResponse(model, state, issuerConfig);

Expand Down