Fix OidcClient duplicating the client_id for the public client

quarkusio · Jul 10, 2022 · 8a00cfe · 8a00cfe
1 parent 60fd34f
commit 8a00cfe
Show file tree

Hide file tree

Showing 5 changed files with 33 additions and 1 deletion.
diff --git a/...ions/oidc-client/runtime/src/main/java/io/quarkus/oidc/client/runtime/OidcClientImpl.java b/...ions/oidc-client/runtime/src/main/java/io/quarkus/oidc/client/runtime/OidcClientImpl.java
@@ -109,7 +109,7 @@ public Uni<Tokens> get() {
                         body.add(OidcConstants.CLIENT_ASSERTION, jwt);
                     }
                 } else if (!OidcCommonUtils.isClientSecretPostAuthRequired(oidcConfig.credentials)) {
-                    body.add(OidcConstants.CLIENT_ID, oidcConfig.clientId.get());
+                    body = copyMultiMap(body).set(OidcConstants.CLIENT_ID, oidcConfig.clientId.get());
                 }
                 if (!additionalGrantParameters.isEmpty()) {
                     body = copyMultiMap(body);

diff --git a/...ion-tests/oidc-client-wiremock/src/main/java/io/quarkus/it/keycloak/FrontendResource.java b/...ion-tests/oidc-client-wiremock/src/main/java/io/quarkus/it/keycloak/FrontendResource.java
@@ -63,4 +63,11 @@ public Uni<String> echoRefreshTokenOnly(@QueryParam("refreshToken") String refre
         return clients.getClient("refresh").refreshTokens(refreshToken)
                 .onItem().transform(t -> t.getAccessToken());
     }
+
+    @GET
+    @Path("password-grant-public-client")
+    @Produces("text/plain")
+    public Uni<String> passwordGrantPublicClient() {
+        return clients.getClient("password-grant-public-client").getTokens().onItem().transform(t -> t.getAccessToken());
+    }
 }
diff --git a/integration-tests/oidc-client-wiremock/src/main/resources/application.properties b/integration-tests/oidc-client-wiremock/src/main/resources/application.properties
@@ -7,6 +7,12 @@ quarkus.oidc-client.grant.type=password
 quarkus.oidc-client.grant-options.password.username=alice
 quarkus.oidc-client.grant-options.password.password=alice
 
+quarkus.oidc-client.password-grant-public-client.token-path=${keycloak.url}/tokens_public_client
+quarkus.oidc-client.password-grant-public-client.client-id=quarkus-app
+quarkus.oidc-client.password-grant-public-client.grant.type=password
+quarkus.oidc-client.password-grant-public-client.grant-options.password.username=alice
+quarkus.oidc-client.password-grant-public-client.grant-options.password.password=alice
+
 quarkus.oidc-client.non-standard-response.token-path=${keycloak.url}/non-standard-tokens
 quarkus.oidc-client.non-standard-response.client-id=quarkus-app
 quarkus.oidc-client.non-standard-response.credentials.secret=secret

diff --git a/...dc-client-wiremock/src/test/java/io/quarkus/it/keycloak/KeycloakRealmResourceManager.java b/...dc-client-wiremock/src/test/java/io/quarkus/it/keycloak/KeycloakRealmResourceManager.java
@@ -35,6 +35,13 @@ public Map<String, String> start() {
                         .withHeader("Content-Type", MediaType.APPLICATION_JSON)
                         .withBody(
                                 "{\"access_token\":\"access_token_1\", \"expires_in\":4, \"refresh_token\":\"refresh_token_1\"}")));
+        server.stubFor(WireMock.post("/tokens_public_client")
+                .withRequestBody(matching("grant_type=password&username=alice&password=alice&client_id=quarkus-app"))
+                .willReturn(WireMock
+                        .aResponse()
+                        .withHeader("Content-Type", MediaType.APPLICATION_JSON)
+                        .withBody(
+                                "{\"access_token\":\"access_token_public_client\", \"expires_in\":20}")));
         server.stubFor(WireMock.post("/non-standard-tokens")
                 .withHeader("X-Custom", matching("XCustomHeaderValue"))
                 .withRequestBody(matching("grant_type=password&username=alice&password=alice&extra_param=extra_param_value"))

diff --git a/...ation-tests/oidc-client-wiremock/src/test/java/io/quarkus/it/keycloak/OidcClientTest.java b/...ation-tests/oidc-client-wiremock/src/test/java/io/quarkus/it/keycloak/OidcClientTest.java
@@ -76,6 +76,18 @@ public Boolean call() throws Exception {
                 });
     }
 
+    @Test
+    public void testEchoTokensPasswordGrantPublicClient() {
+        RestAssured.when().get("/frontend/password-grant-public-client")
+                .then()
+                .statusCode(200)
+                .body(equalTo("access_token_public_client"));
+        RestAssured.when().get("/frontend/password-grant-public-client")
+                .then()
+                .statusCode(200)
+                .body(equalTo("access_token_public_client"));
+    }
+
     @Test
     public void testEchoTokensNonStandardResponse() {
         RestAssured.when().get("/frontend/echoTokenNonStandardResponse")