Use the default tenant resolver if the custom one does not resolve a …

…tenant
quarkusio · Nov 21, 2023 · b67a62b · b67a62b
1 parent d443437
commit b67a62b
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 46 deletions.
diff --git a/...sions/oidc/runtime/src/main/java/io/quarkus/oidc/runtime/DefaultTenantConfigResolver.java b/...sions/oidc/runtime/src/main/java/io/quarkus/oidc/runtime/DefaultTenantConfigResolver.java
@@ -152,9 +152,12 @@ private TenantConfigContext getStaticTenantContext(RoutingContext context) {
         if (tenantId == null && context.get(CURRENT_STATIC_TENANT_ID_NULL) == null) {
             if (tenantResolver.isResolvable()) {
                 tenantId = tenantResolver.get().resolve(context);
-            } else if (tenantConfigBean.getStaticTenantsConfig().size() > 0) {
+            }
+
+            if (tenantId == null && tenantConfigBean.getStaticTenantsConfig().size() > 0) {
                 tenantId = defaultStaticTenantResolver.resolve(context);
             }
+
             if (tenantId == null) {
                 tenantId = context.get(OidcUtils.TENANT_ID_ATTRIBUTE);
             }

diff --git a/...ration-tests/oidc-wiremock/src/main/java/io/quarkus/it/keycloak/CustomTenantResolver.java b/...ration-tests/oidc-wiremock/src/main/java/io/quarkus/it/keycloak/CustomTenantResolver.java
@@ -17,54 +17,10 @@ public String resolve(RoutingContext context) {
         if (path.endsWith("code-flow") || path.endsWith("code-flow/logout")) {
             return "code-flow";
         }
-        if (path.endsWith("code-flow-encrypted-id-token-jwk")) {
-            return "code-flow-encrypted-id-token-jwk";
-        }
-        if (path.endsWith("code-flow-encrypted-id-token-pem")) {
-            return "code-flow-encrypted-id-token-pem";
-        }
         if (path.endsWith("code-flow-form-post") || path.endsWith("code-flow-form-post/front-channel-logout")) {
             return "code-flow-form-post";
         }
-        if (path.endsWith("code-flow-user-info-only")) {
-            return "code-flow-user-info-only";
-        }
-        if (path.endsWith("code-flow-user-info-github")) {
-            return "code-flow-user-info-github";
-        }
-        if (path.endsWith("bearer-user-info-github-service")) {
-            return "bearer-user-info-github-service";
-        }
-        if (path.endsWith("code-flow-user-info-github-cached-in-idtoken")) {
-            return "code-flow-user-info-github-cached-in-idtoken";
-        }
-        if (path.endsWith("code-flow-token-introspection")) {
-            return "code-flow-token-introspection";
-        }
-        if (path.endsWith("bearer")) {
-            return "bearer";
-        }
-        if (path.endsWith("bearer-id")) {
-            return "bearer-id";
-        }
-        if (path.endsWith("bearer-required-algorithm")) {
-            return "bearer-required-algorithm";
-        }
-        if (path.endsWith("bearer-azure")) {
-            return "bearer-azure";
-        }
-        if (path.endsWith("bearer-no-introspection")) {
-            return "bearer-no-introspection";
-        }
-        if (path.endsWith("bearer-role-claim-path")) {
-            return "bearer-role-claim-path";
-        }
-        if (path.endsWith("bearer-key-without-kid-thumbprint")) {
-            return "bearer-key-without-kid-thumbprint";
-        }
-        if (path.endsWith("bearer-wrong-role-path")) {
-            return "bearer-wrong-role-path";
-        }
+
         return null;
     }
 }