Skip to content

Commit 611ebf1

Browse files
committed
Review comments 2
1 parent aacfbd8 commit 611ebf1

File tree

4 files changed

+29
-2
lines changed

4 files changed

+29
-2
lines changed

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,9 @@ public void filter(ClientRequestContext requestContext) throws IOException {
3434
String bearerToken = sanitizeBearerToken(getTokenForPropagation(requestContext.getHeaders()));
3535
if (!isEmptyOrBlank(bearerToken)) {
3636
addAuthorizationHeader(requestContext.getHeaders(), OidcConstants.BEARER_SCHEME + " " + bearerToken);
37+
} else {
38+
LOGGER.debug("No oauth2 bearer token was found to propagate for the security scheme: {}." +
39+
" You must verify that the request header: {} is set.", getName(), getHeaderForPropagation());
3740
}
3841
} else {
3942
delegate.filter(requestContext);

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

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,11 +67,14 @@ public boolean isTokenPropagation() {
6767
}
6868

6969
public String getTokenForPropagation(MultivaluedMap<String, Object> httpHeaders) {
70-
String headerName = getHeaderName() != null ? getHeaderName() : HttpHeaders.AUTHORIZATION;
71-
String propagatedHeaderName = propagationHeaderName(getOpenApiSpecId(), getName(), headerName);
70+
String propagatedHeaderName = propagationHeaderName(getOpenApiSpecId(), getName(), getHeaderForPropagation());
7271
return Objects.toString(httpHeaders.getFirst(propagatedHeaderName), null);
7372
}
7473

74+
public String getHeaderForPropagation() {
75+
return getHeaderName() != null ? getHeaderName() : HttpHeaders.AUTHORIZATION;
76+
}
77+
7578
public String getHeaderName() {
7679
return ConfigProvider.getConfig()
7780
.getOptionalValue(getCanonicalAuthConfigPropertyName(AuthConfig.HEADER_NAME), String.class).orElse(null);

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

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
package io.quarkiverse.openapi.generator.providers;
22

3+
import static io.quarkiverse.openapi.generator.providers.ConfigCredentialsProvider.PASSWORD;
4+
import static io.quarkiverse.openapi.generator.providers.ConfigCredentialsProvider.USER_NAME;
5+
36
import java.io.IOException;
47
import java.util.List;
58

@@ -45,6 +48,12 @@ public void filter(ClientRequestContext requestContext) throws IOException {
4548

4649
if (!isEmptyOrBlank(basicToken)) {
4750
addAuthorizationHeader(requestContext.getHeaders(), AuthUtils.basicAuthAccessToken(basicToken));
51+
} else {
52+
LOGGER.debug("No basic authentication token was found for the security scheme: {}." +
53+
" You must verify that the properties: {} and {} are properly configured, or the request header: {} is set when the token propagation is enabled.",
54+
getName(), getCanonicalAuthConfigPropertyName(USER_NAME, getOpenApiSpecId(), getName()),
55+
getCanonicalAuthConfigPropertyName(PASSWORD, getOpenApiSpecId(), getName()),
56+
getHeaderForPropagation());
4857
}
4958
}
5059
}

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

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,24 @@
11
package io.quarkiverse.openapi.generator.providers;
22

3+
import static io.quarkiverse.openapi.generator.providers.ConfigCredentialsProvider.BEARER_TOKEN;
4+
35
import java.io.IOException;
46
import java.util.List;
57

68
import jakarta.ws.rs.client.ClientRequestContext;
79

10+
import org.slf4j.Logger;
11+
import org.slf4j.LoggerFactory;
12+
813
/**
914
* Provides bearer token authentication or any other valid scheme.
1015
*
1116
* @see <a href="https://swagger.io/docs/specification/authentication/bearer-authentication/">Bearer Authentication</a>
1217
*/
1318
public class BearerAuthenticationProvider extends AbstractAuthProvider {
1419

20+
private static final Logger LOGGER = LoggerFactory.getLogger(BearerAuthenticationProvider.class);
21+
1522
private final String scheme;
1623

1724
public BearerAuthenticationProvider(final String openApiSpecId, final String name, final String scheme,
@@ -35,6 +42,11 @@ public void filter(ClientRequestContext requestContext) throws IOException {
3542

3643
if (!isEmptyOrBlank(bearerToken)) {
3744
addAuthorizationHeader(requestContext.getHeaders(), AuthUtils.authTokenOrBearer(this.scheme, bearerToken));
45+
} else {
46+
LOGGER.debug("No bearer token was found for the security scheme: {}." +
47+
" You must verify that the property: {} is properly configured, or the request header: {} is set when the token propagation is enabled.",
48+
getName(), getCanonicalAuthConfigPropertyName(BEARER_TOKEN, getOpenApiSpecId(), getName()),
49+
getHeaderForPropagation());
3850
}
3951
}
4052

0 commit comments

Comments
 (0)