Skip to content

JCL-469: Add support for scope, state and nonce values in OpenIdProvider::authorize #1375

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
acoburn merged 1 commit into from
Jun 26, 2024
Merged

JCL-469: Add support for scope, state and nonce values in OpenIdProvider::authorize #1375

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
23 changes: 20 additions & 3 deletions openid/src/main/java/com/inrupt/client/openid/OpenIdProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,10 +54,18 @@
*/
public class OpenIdProvider {

// OAuth 2 and OpenID request parameters
private static final String CLIENT_SECRET_BASIC = "client_secret_basic";
private static final String CLIENT_SECRET_POST = "client_secret_post";
private static final String CLIENT_ID = "client_id";
private static final String CODE_CHALLENGE = "code_challenge";
private static final String CODE_CHALLENGE_METHOD = "code_challenge_method";
private static final String NONCE = "nonce";
private static final String REDIRECT_URI = "redirect_uri";
private static final String RESPONSE_TYPE = "response_type";
private static final String SCOPE = "scope";
private static final String STATE = "state";

private static final String EQUALS = "=";
private static final String ETC = "&";

Expand Down Expand Up @@ -157,11 +165,20 @@ private URI authorize(final URI authorizationEndpoint, final AuthorizationReques
final URIBuilder builder = URIBuilder.newBuilder(authorizationEndpoint)
.queryParam(CLIENT_ID, request.getClientId())
.queryParam(REDIRECT_URI, request.getRedirectUri().toString())
.queryParam("response_type", request.getResponseType());
.queryParam(RESPONSE_TYPE, request.getResponseType())
.queryParam(SCOPE, request.getScope());

if (request.getState() != null) {
builder.queryParam(STATE, request.getState());
}

if (request.getNonce() != null) {
builder.queryParam(NONCE, request.getNonce());
}

if (request.getCodeChallenge() != null && request.getCodeChallengeMethod() != null) {
builder.queryParam("code_challenge", request.getCodeChallenge());
builder.queryParam("code_challenge_method", request.getCodeChallengeMethod());
builder.queryParam(CODE_CHALLENGE, request.getCodeChallenge());
builder.queryParam(CODE_CHALLENGE_METHOD, request.getCodeChallengeMethod());
}

return builder.build();
Expand Down
24 changes: 23 additions & 1 deletion openid/src/test/java/com/inrupt/client/openid/OpenIdProviderTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,8 @@ void unknownMetadata() {
@Test
void authorizeAsyncTest() {
final AuthorizationRequest authReq = AuthorizationRequest.newBuilder()
.scope("openid")
.scope("webid")
.codeChallenge("myCodeChallenge")
.codeChallengeMethod("method")
.build(
Expand All @@ -91,7 +93,27 @@ void authorizeAsyncTest() {
);
assertEquals(
issuer + "/auth?client_id=myClientId&redirect_uri=myRedirectUri&" +
"response_type=code&code_challenge=myCodeChallenge&code_challenge_method=method",
"response_type=code&scope=openid%20webid&code_challenge=myCodeChallenge&code_challenge_method=method",
openIdProvider.authorize(authReq).toCompletableFuture().join().toString()
);
}

@Test
void authorizeAsyncStateNonceTest() {
final String state = UUID.randomUUID().toString();
final String nonce = UUID.randomUUID().toString();
final AuthorizationRequest authReq = AuthorizationRequest.newBuilder()
.scope("openid")
.scope("webid")
.state(state)
.nonce(nonce)
.build(
"myClientId",
URI.create("myRedirectUri")
);
assertEquals(
issuer + "/auth?client_id=myClientId&redirect_uri=myRedirectUri&" +
"response_type=code&scope=openid%20webid&state=" + state + "&nonce=" + nonce,
openIdProvider.authorize(authReq).toCompletableFuture().join().toString()
);
}
Expand Down