Skip to content

Fix OAuth2 issues: Restore 'none' token endpoint auth method. Do not add default openid scope if non-empty. #926

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
maximthomas merged 3 commits into from
Sep 23, 2025
Merged

Fix OAuth2 issues: Restore 'none' token endpoint auth method. Do not add default openid scope if non-empty. #926

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8747ea2
Restore 'none' token endpoint auth method.
maximthomas Sep 22, 2025
c2376b2
Do not add default openid scope if non-empty
maximthomas Sep 22, 2025
5c0d0f8
Update copyright
maximthomas Sep 22, 2025
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: 3 additions & 2 deletions openam-oauth2/src/main/java/org/forgerock/openidconnect/Client.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
*
* Copyright 2014-2016 ForgeRock AS.
* Portions Copyrighted 2015 Nomura Research Institute, Ltd.
* Portions Copyrighted 2025 3A Systems LLC.
*/

package org.forgerock.openidconnect;
Expand Down Expand Up @@ -217,9 +218,9 @@ public enum TokenEndpointAuthMethod {
/** Client secret post type. */
// CLIENT_SECRET_JWT("client_secret_jwt"), todo uncomment as we add suppot
/** Client secret basic type. */
PRIVATE_KEY_JWT("private_key_jwt");
PRIVATE_KEY_JWT("private_key_jwt"),
/** None type. */
// NONE("none");
NONE("none");

private String type;

Expand Down
6 changes: 3 additions & 3 deletions ...th2/src/main/java/org/forgerock/openidconnect/OpenIdConnectClientRegistrationService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -271,13 +271,13 @@ public JsonValue createRegistration(String accessToken, String deploymentUrl, OA
throw new InvalidClientMetadata("Invalid scopes requested");
}
} else { //if nothing requested, fall back to provider defaults
scopes = new ArrayList<String>();
scopes = new ArrayList<>();
scopes.addAll(providerSettings.getDefaultScopes());
}

//regardless, we add openid
if (!scopes.contains(OPENID)) {
scopes = new ArrayList<String>(scopes);
if (scopes.isEmpty()) {
scopes = new ArrayList<>();
scopes.add(OPENID);
}

Expand Down
4 changes: 3 additions & 1 deletion openam-server-only/src/main/resources/services/AgentService.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@

Portions Copyrighted 2011-2016 ForgeRock AS.
Portions Copyrighted 2015 Nomura Research Institute, Ltd.
Portions Copyrighted 2025 3A Systems LLC.
-->

<!DOCTYPE ServicesConfiguration
Expand All @@ -36,7 +37,7 @@

<ServicesConfiguration>
<Service name="AgentService" version="1.0">
<Schema i18nFileName="agentService" revisionNumber="10">
<Schema i18nFileName="agentService" revisionNumber="11">
<Organization>
<SubSchema name="OAuth2Client" inheritance="multiple" i18nKey="a7001" hideConfigUI="yes">
<AttributeSchema
Expand Down Expand Up @@ -181,6 +182,7 @@
<ChoiceValue i18nKey="a741">client_secret_basic</ChoiceValue>
<!-- <ChoiceValue i18nKey="a742">client_secret_jwt</ChoiceValue> -->
<ChoiceValue i18nKey="a743">private_key_jwt</ChoiceValue>
<ChoiceValue>none</ChoiceValue>
</ChoiceValues>
<DefaultValues>
<Value>client_secret_basic</Value>
Expand Down
Loading