Skip to content

Commit 9483701

Browse files
authored
Merge pull request quarkusio#36459 from sberyozkin/oidc_token_propagation_client_name
Let custom OIDC token propagation filters provide client name
2 parents b3a623a + 283389b commit 9483701

File tree

2 files changed

+12
-2
lines changed

2 files changed

+12
-2
lines changed

extensions/oidc-token-propagation-reactive/runtime/src/main/java/io/quarkus/oidc/token/propagation/reactive/AccessTokenRequestReactiveFilter.java

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,8 @@ public AccessTokenRequestReactiveFilter() {
6161
public void initExchangeTokenClient() {
6262
if (exchangeToken) {
6363
OidcClients clients = Arc.container().instance(OidcClients.class).get();
64-
exchangeTokenClient = oidcClientName.isPresent() ? clients.getClient(oidcClientName.get()) : clients.getClient();
64+
String clientName = getClientName();
65+
exchangeTokenClient = clientName != null ? clients.getClient(clientName) : clients.getClient();
6566
Grant.Type exchangeTokenGrantType = ConfigProvider.getConfig()
6667
.getValue(
6768
"quarkus.oidc-client." + (oidcClientName.isPresent() ? oidcClientName.get() + "." : "")
@@ -113,6 +114,10 @@ public void accept(Throwable t) {
113114
}
114115
}
115116

117+
protected String getClientName() {
118+
return oidcClientName.orElse(null);
119+
}
120+
116121
public void propagateToken(ResteasyReactiveClientRequestContext requestContext, String accessToken) {
117122
if (accessToken != null) {
118123
requestContext.getHeaders().add(HttpHeaders.AUTHORIZATION, BEARER_SCHEME_WITH_SPACE + accessToken);

extensions/oidc-token-propagation/runtime/src/main/java/io/quarkus/oidc/token/propagation/AccessTokenRequestFilter.java

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,8 @@ public AccessTokenRequestFilter() {
5454
public void initExchangeTokenClient() {
5555
if (exchangeToken) {
5656
OidcClients clients = Arc.container().instance(OidcClients.class).get();
57-
exchangeTokenClient = oidcClientName.isPresent() ? clients.getClient(oidcClientName.get()) : clients.getClient();
57+
String clientName = getClientName();
58+
exchangeTokenClient = clientName != null ? clients.getClient(clientName) : clients.getClient();
5859
Grant.Type exchangeTokenGrantType = ConfigProvider.getConfig()
5960
.getValue(
6061
"quarkus.oidc-client." + (oidcClientName.isPresent() ? oidcClientName.get() + "." : "")
@@ -92,6 +93,10 @@ private String exchangeTokenIfNeeded(String token) {
9293
}
9394
}
9495

96+
protected String getClientName() {
97+
return oidcClientName.orElse(null);
98+
}
99+
95100
private boolean acquireTokenCredentialFromCtx(ClientRequestContext requestContext) {
96101
if (enabledDuringAuthentication) {
97102
TokenCredential tokenCredential = getTokenCredentialFromContext();

0 commit comments

Comments
 (0)