feat: remove global configureJwt as it interferes with simple mode

camunda-community-hub · Jan 24, 2024 · 466c98d · 466c98d
1 parent bff459f
commit 466c98d
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/...src/main/java/io/camunda/zeebe/spring/client/configuration/CommonClientConfiguration.java b/...src/main/java/io/camunda/zeebe/spring/client/configuration/CommonClientConfiguration.java
@@ -53,12 +53,11 @@ public Authentication authentication() {
           .build();
       } else if (zeebeClientConfigurationProperties.getBroker().getGatewayAddress() != null || zeebeSelfManagedProperties.getGatewayAddress() != null) {
         // figure out if Self-Managed JWT or Self-Managed Basic
-        JwtConfig jwtConfig = configureJwtConfig();
-        IdentityConfig identityConfig = configureIdentities(jwtConfig);
-
         // Operate Client props take first priority
         if (operateClientConfigurationProperties != null) {
           if (hasText(operateClientConfigurationProperties.getKeycloakUrl()) || hasText(operateClientConfigurationProperties.getKeycloakTokenUrl())) {
+            JwtConfig jwtConfig = configureJwtConfig();
+            IdentityConfig identityConfig = configureIdentities(jwtConfig);
             return SelfManagedAuthentication.builder()
               .jwtConfig(jwtConfig)
               .identityConfig(identityConfig)
@@ -77,6 +76,8 @@ public Authentication authentication() {
         // Identity props take second priority
         if (identityConfigurationFromProperties != null) {
           if (hasText(identityConfigurationFromProperties.getClientId())) {
+            JwtConfig jwtConfig = configureJwtConfig();
+            IdentityConfig identityConfig = configureIdentities(jwtConfig);
             return SelfManagedAuthentication.builder()
               .jwtConfig(jwtConfig)
               .identityConfig(identityConfig)
@@ -87,11 +88,15 @@ public Authentication authentication() {
         // Fallback to common props
         if (commonConfigurationProperties != null) {
           if (commonConfigurationProperties.getKeycloak().getUrl() != null) {
+            JwtConfig jwtConfig = configureJwtConfig();
+            IdentityConfig identityConfig = configureIdentities(jwtConfig);
             return SelfManagedAuthentication.builder()
               .jwtConfig(jwtConfig)
               .identityConfig(identityConfig)
               .build();
           } else if (commonConfigurationProperties.getKeycloak().getTokenUrl() != null) {
+            JwtConfig jwtConfig = configureJwtConfig();
+            IdentityConfig identityConfig = configureIdentities(jwtConfig);
             return SelfManagedAuthentication.builder()
               .jwtConfig(jwtConfig)
               .identityConfig(identityConfig)