Merge pull request #36459 from sberyozkin/oidc_token_propagation_clie…

…nt_name Let custom OIDC token propagation filters provide client name
quarkusio · Oct 13, 2023 · 9483701 · 9483701
2 parents b3a623a + 283389b
commit 9483701
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/...ain/java/io/quarkus/oidc/token/propagation/reactive/AccessTokenRequestReactiveFilter.java b/...ain/java/io/quarkus/oidc/token/propagation/reactive/AccessTokenRequestReactiveFilter.java
@@ -61,7 +61,8 @@ public AccessTokenRequestReactiveFilter() {
     public void initExchangeTokenClient() {
         if (exchangeToken) {
             OidcClients clients = Arc.container().instance(OidcClients.class).get();
-            exchangeTokenClient = oidcClientName.isPresent() ? clients.getClient(oidcClientName.get()) : clients.getClient();
+            String clientName = getClientName();
+            exchangeTokenClient = clientName != null ? clients.getClient(clientName) : clients.getClient();
             Grant.Type exchangeTokenGrantType = ConfigProvider.getConfig()
                     .getValue(
                             "quarkus.oidc-client." + (oidcClientName.isPresent() ? oidcClientName.get() + "." : "")
@@ -113,6 +114,10 @@ public void accept(Throwable t) {
         }
     }
 
+    protected String getClientName() {
+        return oidcClientName.orElse(null);
+    }
+
     public void propagateToken(ResteasyReactiveClientRequestContext requestContext, String accessToken) {
         if (accessToken != null) {
             requestContext.getHeaders().add(HttpHeaders.AUTHORIZATION, BEARER_SCHEME_WITH_SPACE + accessToken);

diff --git a/...ion/runtime/src/main/java/io/quarkus/oidc/token/propagation/AccessTokenRequestFilter.java b/...ion/runtime/src/main/java/io/quarkus/oidc/token/propagation/AccessTokenRequestFilter.java
@@ -54,7 +54,8 @@ public AccessTokenRequestFilter() {
     public void initExchangeTokenClient() {
         if (exchangeToken) {
             OidcClients clients = Arc.container().instance(OidcClients.class).get();
-            exchangeTokenClient = oidcClientName.isPresent() ? clients.getClient(oidcClientName.get()) : clients.getClient();
+            String clientName = getClientName();
+            exchangeTokenClient = clientName != null ? clients.getClient(clientName) : clients.getClient();
             Grant.Type exchangeTokenGrantType = ConfigProvider.getConfig()
                     .getValue(
                             "quarkus.oidc-client." + (oidcClientName.isPresent() ? oidcClientName.get() + "." : "")
@@ -92,6 +93,10 @@ private String exchangeTokenIfNeeded(String token) {
         }
     }
 
+    protected String getClientName() {
+        return oidcClientName.orElse(null);
+    }
+
     private boolean acquireTokenCredentialFromCtx(ClientRequestContext requestContext) {
         if (enabledDuringAuthentication) {
             TokenCredential tokenCredential = getTokenCredentialFromContext();