Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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<String> getApiKey(CredentialsContext input) {
return ConfigProvider.getConfig()
.getOptionalValue(
AbstractAuthProvider.getCanonicalAuthConfigPropertyName(API_KEY, input.getOpenApiSpecId(),
AbstractAuthProvider.getCanonicalAuthConfigPropertyName(API_KEY, getConfigKey(input),
input.getAuthName()),
String.class);

Expand All @@ -40,7 +32,7 @@ public Optional<String> getApiKey(CredentialsContext input) {
public Optional<String> getBasicUsername(CredentialsContext input) {
return ConfigProvider.getConfig()
.getOptionalValue(
AbstractAuthProvider.getCanonicalAuthConfigPropertyName(USER_NAME, input.getOpenApiSpecId(),
AbstractAuthProvider.getCanonicalAuthConfigPropertyName(USER_NAME, getConfigKey(input),
input.getAuthName()),
String.class);
}
Expand All @@ -49,7 +41,7 @@ public Optional<String> getBasicUsername(CredentialsContext input) {
public Optional<String> getBasicPassword(CredentialsContext input) {
return ConfigProvider.getConfig()
.getOptionalValue(
AbstractAuthProvider.getCanonicalAuthConfigPropertyName(PASSWORD, input.getOpenApiSpecId(),
AbstractAuthProvider.getCanonicalAuthConfigPropertyName(PASSWORD, getConfigKey(input),
input.getAuthName()),
String.class);
}
Expand All @@ -58,11 +50,15 @@ public Optional<String> getBasicPassword(CredentialsContext input) {
public Optional<String> 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<String> getOauth2BearerToken(CredentialsContext input) {
return Optional.empty();
Expand Down