From aadcf4fce8a12e4557e6fcd33e87bb861fbfd2cd Mon Sep 17 00:00:00 2001 From: fjtirado Date: Wed, 18 Jun 2025 17:08:06 +0200 Subject: [PATCH] [Fix #1205] Making easier inheriting from ConfigCredentialsProvider --- .../providers/ConfigCredentialsProvider.java | 20 ++++++++----------- 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/client/runtime/src/main/java/io/quarkiverse/openapi/generator/providers/ConfigCredentialsProvider.java b/client/runtime/src/main/java/io/quarkiverse/openapi/generator/providers/ConfigCredentialsProvider.java index d89ee524..294017c9 100644 --- a/client/runtime/src/main/java/io/quarkiverse/openapi/generator/providers/ConfigCredentialsProvider.java +++ b/client/runtime/src/main/java/io/quarkiverse/openapi/generator/providers/ConfigCredentialsProvider.java @@ -7,8 +7,6 @@ import jakarta.enterprise.inject.Alternative; import org.eclipse.microprofile.config.ConfigProvider; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; @Dependent @Alternative @@ -20,17 +18,11 @@ public class ConfigCredentialsProvider implements CredentialsProvider { static final String BEARER_TOKEN = "bearer-token"; static final String API_KEY = "api-key"; - private static final Logger LOGGER = LoggerFactory.getLogger(ConfigCredentialsProvider.class); - - public ConfigCredentialsProvider() { - - } - @Override public Optional getApiKey(CredentialsContext input) { return ConfigProvider.getConfig() .getOptionalValue( - AbstractAuthProvider.getCanonicalAuthConfigPropertyName(API_KEY, input.getOpenApiSpecId(), + AbstractAuthProvider.getCanonicalAuthConfigPropertyName(API_KEY, getConfigKey(input), input.getAuthName()), String.class); @@ -40,7 +32,7 @@ public Optional getApiKey(CredentialsContext input) { public Optional getBasicUsername(CredentialsContext input) { return ConfigProvider.getConfig() .getOptionalValue( - AbstractAuthProvider.getCanonicalAuthConfigPropertyName(USER_NAME, input.getOpenApiSpecId(), + AbstractAuthProvider.getCanonicalAuthConfigPropertyName(USER_NAME, getConfigKey(input), input.getAuthName()), String.class); } @@ -49,7 +41,7 @@ public Optional getBasicUsername(CredentialsContext input) { public Optional getBasicPassword(CredentialsContext input) { return ConfigProvider.getConfig() .getOptionalValue( - AbstractAuthProvider.getCanonicalAuthConfigPropertyName(PASSWORD, input.getOpenApiSpecId(), + AbstractAuthProvider.getCanonicalAuthConfigPropertyName(PASSWORD, getConfigKey(input), input.getAuthName()), String.class); } @@ -58,11 +50,15 @@ public Optional getBasicPassword(CredentialsContext input) { public Optional getBearerToken(CredentialsContext input) { return ConfigProvider.getConfig() .getOptionalValue( - AbstractAuthProvider.getCanonicalAuthConfigPropertyName(BEARER_TOKEN, input.getOpenApiSpecId(), + AbstractAuthProvider.getCanonicalAuthConfigPropertyName(BEARER_TOKEN, getConfigKey(input), input.getAuthName()), String.class); } + protected String getConfigKey(CredentialsContext input) { + return input.getOpenApiSpecId(); + } + @Override public Optional getOauth2BearerToken(CredentialsContext input) { return Optional.empty();