Use get token instead of set

Author: gabriel-farache

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

@@ -12,9 +12,9 @@
 import org.slf4j.LoggerFactory;
 
 import io.quarkiverse.openapi.generator.providers.AbstractAuthProvider;
+import io.quarkiverse.openapi.generator.providers.AuthUtils;
 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 {
 
@@ -31,15 +31,20 @@ public OAuth2AuthenticationProvider(String name,
 
     @Override
     public void filter(ClientRequestContext requestContext) throws IOException {
+        String bearerToken;
+
         if (this.isTokenPropagation()) {
-            String bearerToken = this.getTokenForPropagation(requestContext.getHeaders());
-            requestContext.getHeaders().add(HttpHeaders.AUTHORIZATION,
-                    OidcConstants.BEARER_SCHEME + " " + AbstractAuthProvider.sanitizeBearerToken(bearerToken));
+            bearerToken = this.getTokenForPropagation(requestContext.getHeaders());
         } else {
             delegate.filter(requestContext);
+            bearerToken = this.getCredentialsProvider().getOauth2BearerToken(requestContext, this.getOpenApiSpecId(),
+                    this.getName());
+        }
+
+        if (bearerToken != null && !bearerToken.isBlank()) {
+            requestContext.getHeaders().add(HttpHeaders.AUTHORIZATION,
+                    AuthUtils.authTokenOrBearer("Bearer", AbstractAuthProvider.sanitizeBearerToken(bearerToken)));
         }
-        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

@@ -4,6 +4,7 @@
 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;
@@ -64,9 +65,7 @@ public String getBearerToken(ClientRequestContext requestContext, String openApi
     }
 
     @Override
-    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
+    public String getOauth2BearerToken(ClientRequestContext requestContext, String openApiSpecId, String authName) {
+        return requestContext.getHeaderString(HttpHeaders.AUTHORIZATION);
     }
-
 }

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

@@ -46,12 +46,12 @@ public interface CredentialsProvider {
     String getBearerToken(ClientRequestContext requestContext, String openApiSpecId, String authName);
 
     /**
-     * Sets the Access Token in the request context
+     * Gets the OAuth2 Bearer Token given the OpenAPI definition and security schema
      *
      * @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
+     * @return the Bearer Token to use when filtering the request
      */
-    void setOauth2BearerToken(ClientRequestContext requestContext, String accessToken, String openApiSpecId, String authName);
+    String getOauth2BearerToken(ClientRequestContext requestContext, String openApiSpecId, String authName);
 }