Make sending OIDC client id with introspection credentials optional

(cherry picked from commit d6ea482)
quarkusio · Aug 24, 2022 · d85cf96 · d85cf96
1 parent 3257492
commit d85cf96
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 1 deletion.
diff --git a/extensions/oidc/runtime/src/main/java/io/quarkus/oidc/OidcTenantConfig.java b/extensions/oidc/runtime/src/main/java/io/quarkus/oidc/OidcTenantConfig.java
@@ -112,6 +112,12 @@ public static class IntrospectionCredentials {
         @ConfigItem
         public Optional<String> secret = Optional.empty();
 
+        /**
+         * Include OpenId Connect Client ID configured with 'quarkus.oidc.client-id'
+         */
+        @ConfigItem(defaultValue = "true")
+        public boolean includeClientId = true;
+
         public Optional<String> getName() {
             return name;
         }
@@ -128,6 +134,14 @@ public void setSecret(String secret) {
             this.secret = Optional.of(secret);
         }
 
+        public boolean isIncludeClientId() {
+            return includeClientId;
+        }
+
+        public void setIncludeClientId(boolean includeClientId) {
+            this.includeClientId = includeClientId;
+        }
+
     }
 
     /**

diff --git a/extensions/oidc/runtime/src/main/java/io/quarkus/oidc/runtime/OidcProviderClient.java b/extensions/oidc/runtime/src/main/java/io/quarkus/oidc/runtime/OidcProviderClient.java
@@ -126,7 +126,7 @@ private UniOnItem<HttpResponse<Buffer>> getHttpResponse(String uri, MultiMap for
         request.putHeader(ACCEPT_HEADER, APPLICATION_JSON);
         if (introspect && introspectionBasicAuthScheme != null) {
             request.putHeader(AUTHORIZATION_HEADER, introspectionBasicAuthScheme);
-            if (oidcConfig.clientId.isPresent()) {
+            if (oidcConfig.clientId.isPresent() && oidcConfig.introspectionCredentials.includeClientId) {
                 formBody.set(OidcConstants.CLIENT_ID, oidcConfig.clientId.get());
             }
         } else if (clientSecretBasicAuthScheme != null) {