Change after feedback

Signed-off-by: gabriel-farache <[email protected]>

Author: gabriel-farache

client/oidc/src/main/java/io/quarkiverse/openapi/generator/oidc/ClassicOidcClientRequestFilterDelegate.java

@@ -7,6 +7,7 @@
 import jakarta.ws.rs.Priorities;
 import jakarta.ws.rs.client.ClientRequestContext;
 import jakarta.ws.rs.client.ClientRequestFilter;
+import jakarta.ws.rs.core.HttpHeaders;
 
 import org.jboss.logging.Logger;
 
@@ -41,7 +42,7 @@ protected java.util.Optional<String> clientId() {
     public void filter(ClientRequestContext requestContext) throws IOException {
         try {
             String accessToken = this.getAccessToken();
-            requestContext.getHeaders().add("Authorization", "Bearer " + accessToken);
+            requestContext.getHeaders().add(HttpHeaders.AUTHORIZATION, "Bearer " + accessToken);
         } catch (DisabledOidcClientException ex) {
             LOG.debug("Client is disabled, acquiring and propagating the token is not necessary");
         } catch (RuntimeException ex) {

client/oidc/src/main/java/io/quarkiverse/openapi/generator/oidc/providers/OAuth2AuthenticationProvider.java

@@ -6,13 +6,15 @@
 import java.util.List;
 
 import jakarta.ws.rs.client.ClientRequestContext;
+import jakarta.ws.rs.core.HttpHeaders;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import io.quarkiverse.openapi.generator.providers.AbstractAuthProvider;
 import io.quarkiverse.openapi.generator.providers.ConfigCredentialsProvider;
 import io.quarkiverse.openapi.generator.providers.OperationAuthInfo;
+import io.quarkus.oidc.common.runtime.OidcConstants;
 
 public class OAuth2AuthenticationProvider extends AbstractAuthProvider {
 
@@ -29,7 +31,15 @@ public OAuth2AuthenticationProvider(String name,
 
     @Override
     public void filter(ClientRequestContext requestContext) throws IOException {
-        getCredentialsProvider().setOauth2BearerToken(requestContext, getOpenApiSpecId(), getName(), delegate::filter);
+        if (this.isTokenPropagation()) {
+            String bearerToken = this.getTokenForPropagation(requestContext.getHeaders());
+            requestContext.getHeaders().add(HttpHeaders.AUTHORIZATION,
+                    OidcConstants.BEARER_SCHEME + " " + AbstractAuthProvider.sanitizeBearerToken(bearerToken));
+        } else {
+            delegate.filter(requestContext);
+        }
+        this.getCredentialsProvider().setOauth2BearerToken(requestContext,
+                requestContext.getHeaderString(HttpHeaders.AUTHORIZATION), this.getOpenApiSpecId(), this.getName());
     }
 
     private void validateConfig() {

client/runtime/src/main/java/io/quarkiverse/openapi/generator/providers/ConfigCredentialsProvider.java

@@ -1,19 +1,14 @@
 package io.quarkiverse.openapi.generator.providers;
 
-import java.io.IOException;
-
 import jakarta.annotation.Priority;
 import jakarta.enterprise.context.Dependent;
 import jakarta.enterprise.inject.Alternative;
 import jakarta.ws.rs.client.ClientRequestContext;
-import jakarta.ws.rs.core.HttpHeaders;
 
 import org.eclipse.microprofile.config.ConfigProvider;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import io.quarkus.oidc.common.runtime.OidcConstants;
-
 @Dependent
 @Alternative
 @Priority(100)
@@ -69,21 +64,9 @@ public String getBearerToken(ClientRequestContext requestContext, String openApi
     }
 
     @Override
-    public void setOauth2BearerToken(ClientRequestContext requestContext, String openApiSpecId, String authName,
-            ThrowingConsumer<ClientRequestContext, IOException> filter) throws IOException {
-        if (AbstractAuthProvider.isTokenPropagation(openApiSpecId, authName)) {
-            String bearerToken = AbstractAuthProvider.getTokenForPropagation(requestContext.getHeaders(), openApiSpecId,
-                    authName);
-            requestContext.getHeaders().add(HttpHeaders.AUTHORIZATION,
-                    OidcConstants.BEARER_SCHEME + " " + AbstractAuthProvider.sanitizeBearerToken(bearerToken));
-        } else {
-            filter.accept(requestContext);
-        }
-    }
-
-    @FunctionalInterface
-    public interface ThrowingConsumer<T, E extends Exception> {
-        void accept(T t) throws E;
+    public void setOauth2BearerToken(ClientRequestContext requestContext, String accessToken, String openApiSpecId,
+            String authName) {
+        // no need to do anything as the base OAuth2AuthenticationProvider class already sets the access token in the context
     }
 
 }

client/runtime/src/main/java/io/quarkiverse/openapi/generator/providers/CredentialsProvider.java

@@ -1,7 +1,5 @@
 package io.quarkiverse.openapi.generator.providers;
 
-import java.io.IOException;
-
 import jakarta.ws.rs.client.ClientRequestContext;
 
 /**
@@ -48,11 +46,12 @@ public interface CredentialsProvider {
     String getBearerToken(ClientRequestContext requestContext, String openApiSpecId, String authName);
 
     /**
-     * Gets the Bearer Token given the OpenAPI definition and security schema
+     * Sets the Access Token in the request context
      *
+     * @param requestContext The current request context in which set the authorization header token
+     * @param accessToken The accessToken to use, contains Bearer string
      * @param openApiSpecId the OpenAPI Spec identification as defined by the OpenAPI Extension
      * @param authName The security schema for this Bearer Token definition
      */
-    void setOauth2BearerToken(ClientRequestContext requestContext, String openApiSpecId, String authName,
-            ConfigCredentialsProvider.ThrowingConsumer<ClientRequestContext, IOException> filter) throws IOException;
+    void setOauth2BearerToken(ClientRequestContext requestContext, String accessToken, String openApiSpecId, String authName);
 }