JCL-469: Add support for scope, state and nonce values in the OpenIdProvider (#1376)

Author: acoburn

openid/src/main/java/com/inrupt/client/openid/OpenIdProvider.java

@@ -54,8 +54,16 @@
  */
 public class OpenIdProvider {
 
+    // OAuth 2 and OpenID request parameters
     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 = "&";
 
@@ -155,11 +163,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();

openid/src/test/java/com/inrupt/client/openid/OpenIdProviderTest.java

@@ -83,6 +83,8 @@ void unknownMetadata() {
     @Test
     void authorizeAsyncTest() {
         final AuthorizationRequest authReq = AuthorizationRequest.newBuilder()
+            .scope("openid")
+            .scope("webid")
             .codeChallenge("myCodeChallenge")
             .codeChallengeMethod("method")
             .build(
@@ -91,7 +93,27 @@ void authorizeAsyncTest() {
             );
         assertEquals(
             "http://example.test/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(
+            "http://example.test/auth?client_id=myClientId&redirect_uri=myRedirectUri&" +
+            "response_type=code&scope=openid%20webid&state=" + state + "&nonce=" + nonce,
             openIdProvider.authorize(authReq).toCompletableFuture().join().toString()
         );
     }