Merge pull request #37361 from sberyozkin/skip_disabled_oidc_client_f…

…ilter Do not fail the request in OidcClient filters if OidcClient is disabled
quarkusio · Nov 29, 2023 · 6b6d9e1 · 6b6d9e1
2 parents a81dd3a + ec9c312
commit 6b6d9e1
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/.../src/main/java/io/quarkus/oidc/client/filter/runtime/AbstractOidcClientRequestFilter.java b/.../src/main/java/io/quarkus/oidc/client/filter/runtime/AbstractOidcClientRequestFilter.java
@@ -25,8 +25,8 @@ public void filter(ClientRequestContext requestContext) throws IOException {
             final String accessToken = getAccessToken();
             requestContext.getHeaders().add(HttpHeaders.AUTHORIZATION, BEARER_SCHEME_WITH_SPACE + accessToken);
         } catch (DisabledOidcClientException ex) {
-            LOG.debug("Client is disabled, aborting the request");
-            throw ex;
+            LOG.debug("Client is disabled, acquiring and propagating the token is not necessary");
+            return;
         } catch (Exception ex) {
             LOG.debugf("Access token is not available, cause: %s, aborting the request", ex.getMessage());
             throw (ex instanceof RuntimeException) ? (RuntimeException) ex : new RuntimeException(ex);

diff --git a/.../quarkus/oidc/client/reactive/filter/runtime/AbstractOidcClientRequestReactiveFilter.java b/.../quarkus/oidc/client/reactive/filter/runtime/AbstractOidcClientRequestReactiveFilter.java
@@ -39,11 +39,12 @@ public void accept(Tokens tokens) {
             @Override
             public void accept(Throwable t) {
                 if (t instanceof DisabledOidcClientException) {
-                    LOG.debug("Client is disabled, aborting the request");
+                    LOG.debug("Client is disabled, acquiring and propagating the token is not necessary");
+                    requestContext.resume();
                 } else {
                     LOG.debugf("Access token is not available, cause: %s, aborting the request", t.getMessage());
+                    requestContext.resume((t instanceof RuntimeException) ? t : new RuntimeException(t));
                 }
-                requestContext.resume((t instanceof RuntimeException) ? t : new RuntimeException(t));
             }
         });
     }