Skip to content

Commit 662d985

Browse files
authored
[Fix #1205] Making easier inheriting from ConfigCredentialsProvider (#1206)
1 parent d7b1410 commit 662d985

File tree

1 file changed

+26
-27
lines changed

1 file changed

+26
-27
lines changed

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

Lines changed: 26 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@
66
import jakarta.ws.rs.client.ClientRequestContext;
77

88
import org.eclipse.microprofile.config.ConfigProvider;
9-
import org.slf4j.Logger;
10-
import org.slf4j.LoggerFactory;
119

1210
@Dependent
1311
@Alternative
@@ -19,48 +17,49 @@ public class ConfigCredentialsProvider implements CredentialsProvider {
1917
static final String BEARER_TOKEN = "bearer-token";
2018
static final String API_KEY = "api-key";
2119

22-
private static final Logger LOGGER = LoggerFactory.getLogger(ConfigCredentialsProvider.class);
23-
24-
public ConfigCredentialsProvider() {
25-
26-
}
27-
2820
@Override
29-
public String getApiKey(ClientRequestContext requestContext, String openApiSpecId, String authName) {
30-
final String key = ConfigProvider.getConfig()
31-
.getOptionalValue(AbstractAuthProvider.getCanonicalAuthConfigPropertyName(API_KEY, openApiSpecId, authName),
32-
String.class)
33-
.orElse("");
34-
if (key.isEmpty()) {
35-
LOGGER.warn("configured {} property (see application.properties) is empty. hint: configure it.",
36-
AbstractAuthProvider.getCanonicalAuthConfigPropertyName(API_KEY, openApiSpecId, authName));
37-
}
38-
return key;
21+
public Optional<String> getApiKey(CredentialsContext input) {
22+
return ConfigProvider.getConfig()
23+
.getOptionalValue(
24+
AbstractAuthProvider.getCanonicalAuthConfigPropertyName(API_KEY, getConfigKey(input),
25+
input.getAuthName()),
26+
String.class);
27+
3928
}
4029

4130
@Override
4231
public String getBasicUsername(ClientRequestContext requestContext, String openApiSpecId, String authName) {
4332
return ConfigProvider.getConfig()
44-
.getOptionalValue(AbstractAuthProvider.getCanonicalAuthConfigPropertyName(USER_NAME, openApiSpecId, authName),
45-
String.class)
46-
.orElse("");
33+
.getOptionalValue(
34+
AbstractAuthProvider.getCanonicalAuthConfigPropertyName(USER_NAME, getConfigKey(input),
35+
input.getAuthName()),
36+
String.class);
4737
}
4838

4939
@Override
5040
public String getBasicPassword(ClientRequestContext requestContext, String openApiSpecId, String authName) {
5141
return ConfigProvider.getConfig()
52-
.getOptionalValue(AbstractAuthProvider.getCanonicalAuthConfigPropertyName(PASSWORD, openApiSpecId, authName),
53-
String.class)
54-
.orElse("");
42+
.getOptionalValue(
43+
AbstractAuthProvider.getCanonicalAuthConfigPropertyName(PASSWORD, getConfigKey(input),
44+
input.getAuthName()),
45+
String.class);
5546
}
5647

5748
@Override
5849
public String getBearerToken(ClientRequestContext requestContext, String openApiSpecId, String authName) {
5950
return ConfigProvider.getConfig()
6051
.getOptionalValue(
61-
AbstractAuthProvider.getCanonicalAuthConfigPropertyName(BEARER_TOKEN, openApiSpecId, authName),
62-
String.class)
63-
.orElse("");
52+
AbstractAuthProvider.getCanonicalAuthConfigPropertyName(BEARER_TOKEN, getConfigKey(input),
53+
input.getAuthName()),
54+
String.class);
55+
}
56+
57+
protected String getConfigKey(CredentialsContext input) {
58+
return input.getOpenApiSpecId();
6459
}
6560

61+
@Override
62+
public Optional<String> getOauth2BearerToken(CredentialsContext input) {
63+
return Optional.empty();
64+
}
6665
}

0 commit comments

Comments
 (0)