Apply feedback

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

Author: gabriel-farache

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

@@ -7,6 +7,7 @@
 import java.util.Optional;
 
 import jakarta.ws.rs.client.ClientRequestContext;
+import jakarta.ws.rs.core.HttpHeaders;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -55,10 +56,9 @@ public void filter(ClientRequestContext requestContext) throws IOException {
             addAuthorizationHeader(requestContext.getHeaders(),
                     AuthUtils.authTokenOrBearer("Bearer", AbstractAuthProvider.sanitizeBearerToken(bearerToken)));
         } else {
-            LOGGER.debug("No bearer token was found for the oauth2 security scheme: {}." +
-                    " You must verify that a Quarkus OIDC Client with the name: {} is properly configured," +
-                    " or the request header: {} is set when the token propagation is enabled.",
-                    getName(), getName(), getHeaderForPropagation(getOpenApiSpecId(), getName()));
+            LOGGER.debug("Token propagation is not enabled or {} configured propagation header not populated and there is" +
+                    " no custom credential provider implementation. The {} header will be set using delegate's filter. ",
+                    getHeaderForPropagation(getOpenApiSpecId(), getName()), HttpHeaders.AUTHORIZATION);
         }
     }
 

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

@@ -11,6 +11,8 @@
 import jakarta.ws.rs.core.UriBuilder;
 
 import org.eclipse.microprofile.config.ConfigProvider;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import io.quarkiverse.openapi.generator.OpenApiGeneratorException;
 
@@ -23,6 +25,8 @@ public class ApiKeyAuthenticationProvider extends AbstractAuthProvider {
     private final ApiKeyIn apiKeyIn;
     private final String apiKeyName;
 
+    private static final Logger LOGGER = LoggerFactory.getLogger(ApiKeyAuthenticationProvider.class);
+
     public ApiKeyAuthenticationProvider(final String openApiSpecId, final String name, final ApiKeyIn apiKeyIn,
             final String apiKeyName, List<OperationAuthInfo> operations, CredentialsProvider credentialsProvider) {
         super(name, openApiSpecId, operations, credentialsProvider);
@@ -54,11 +58,20 @@ && isUseAuthorizationHeaderValue()) {
     }
 
     private String getApiKey(ClientRequestContext requestContext) {
-        return credentialsProvider.getApiKey(CredentialsContext.builder()
+        final String key = credentialsProvider.getApiKey(CredentialsContext.builder()
                 .requestContext(requestContext)
                 .openApiSpecId(getOpenApiSpecId())
                 .authName(getName())
-                .build()).orElseThrow();
+                .build()).orElse("");
+
+        if (key.isEmpty()) {
+            LOGGER.warn("configured {} property (see application.properties) is empty. hint: configure it.",
+                    AbstractAuthProvider.getCanonicalAuthConfigPropertyName(ConfigCredentialsProvider.API_KEY,
+                            getOpenApiSpecId(),
+                            getName()));
+        }
+
+        return key;
     }
 
     private boolean isUseAuthorizationHeaderValue() {

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

@@ -29,15 +29,15 @@ private String getUsername(ClientRequestContext requestContext) {
                 .requestContext(requestContext)
                 .openApiSpecId(getOpenApiSpecId())
                 .authName(getName())
-                .build()).orElseThrow();
+                .build()).orElse("");
     }
 
     private String getPassword(ClientRequestContext requestContext) {
         return credentialsProvider.getBasicPassword(CredentialsContext.builder()
                 .requestContext(requestContext)
                 .openApiSpecId(getOpenApiSpecId())
                 .authName(getName())
-                .build()).orElseThrow();
+                .build()).orElse("");
     }
 
     @Override

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

@@ -51,6 +51,6 @@ private String getBearerToken(ClientRequestContext requestContext) {
                 .requestContext(requestContext)
                 .openApiSpecId(getOpenApiSpecId())
                 .authName(getName())
-                .build()).orElseThrow();
+                .build()).orElse("");
     }
 }

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

@@ -28,48 +28,39 @@ public ConfigCredentialsProvider() {
 
     @Override
     public Optional<String> getApiKey(CredentialsContext input) {
-        final String key = ConfigProvider.getConfig()
+        return ConfigProvider.getConfig()
                 .getOptionalValue(
                         AbstractAuthProvider.getCanonicalAuthConfigPropertyName(API_KEY, input.getOpenApiSpecId(),
                                 input.getAuthName()),
-                        String.class)
-                .orElse("");
-        if (key.isEmpty()) {
-            LOGGER.warn("configured {} property (see application.properties) is empty. hint: configure it.",
-                    AbstractAuthProvider.getCanonicalAuthConfigPropertyName(API_KEY, input.getOpenApiSpecId(),
-                            input.getAuthName()));
-        }
-        return Optional.of(key);
+                        String.class);
+
     }
 
     @Override
     public Optional<String> getBasicUsername(CredentialsContext input) {
-        return Optional.of(ConfigProvider.getConfig()
+        return ConfigProvider.getConfig()
                 .getOptionalValue(
                         AbstractAuthProvider.getCanonicalAuthConfigPropertyName(USER_NAME, input.getOpenApiSpecId(),
                                 input.getAuthName()),
-                        String.class)
-                .orElse(""));
+                        String.class);
     }
 
     @Override
     public Optional<String> getBasicPassword(CredentialsContext input) {
-        return Optional.of(ConfigProvider.getConfig()
+        return ConfigProvider.getConfig()
                 .getOptionalValue(
                         AbstractAuthProvider.getCanonicalAuthConfigPropertyName(PASSWORD, input.getOpenApiSpecId(),
                                 input.getAuthName()),
-                        String.class)
-                .orElse(""));
+                        String.class);
     }
 
     @Override
     public Optional<String> getBearerToken(CredentialsContext input) {
-        return Optional.of(ConfigProvider.getConfig()
+        return ConfigProvider.getConfig()
                 .getOptionalValue(
                         AbstractAuthProvider.getCanonicalAuthConfigPropertyName(BEARER_TOKEN, input.getOpenApiSpecId(),
                                 input.getAuthName()),
-                        String.class)
-                .orElse(""));
+                        String.class);
     }
 
     @Override