feat: refactor jwt props

(cherry picked from commit ccda4b3)
camunda-community-hub · Dec 25, 2023 · 149f7e3 · 149f7e3
1 parent 3a23cbe
commit 149f7e3
Showing 1 changed file with 23 additions and 16 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
@@ -85,24 +85,31 @@ public Authentication authentication() {
 
   private JwtConfig configureJwtConfig() {
     JwtConfig jwtConfig = new JwtConfig();
-    if (zeebeClientConfigurationProperties.isEnabled()) {
-      if (zeebeClientConfigurationProperties.getCloud().getClientId() != null && zeebeClientConfigurationProperties.getCloud().getClientSecret() != null) {
-        jwtConfig.addProduct(Product.ZEEBE, new JwtCredential(
-          zeebeClientConfigurationProperties.getCloud().getClientId(),
-          zeebeClientConfigurationProperties.getCloud().getClientSecret(),
-          zeebeClientConfigurationProperties.getCloud().getAudience(),
-          zeebeClientConfigurationProperties.getCloud().getAuthUrl())
-        );
-      } else if (commonConfigurationProperties.getClientId() != null && commonConfigurationProperties.getClientSecret() != null) {
-        jwtConfig.addProduct(Product.ZEEBE, new JwtCredential(
-          commonConfigurationProperties.getClientId(),
-          commonConfigurationProperties.getClientSecret(),
-          zeebeClientConfigurationProperties.getCloud().getAudience(),
-          zeebeClientConfigurationProperties.getCloud().getAuthUrl())
-        );
-      }
+    // ZEEBE
+    if (zeebeClientConfigurationProperties.getCloud().getClientId() != null && zeebeClientConfigurationProperties.getCloud().getClientSecret() != null) {
+      jwtConfig.addProduct(Product.ZEEBE, new JwtCredential(
+        zeebeClientConfigurationProperties.getCloud().getClientId(),
+        zeebeClientConfigurationProperties.getCloud().getClientSecret(),
+        zeebeClientConfigurationProperties.getCloud().getAudience(),
+        zeebeClientConfigurationProperties.getCloud().getAuthUrl())
+      );
+    } else if (zeebeSelfManagedProperties.getClientId() != null && zeebeSelfManagedProperties.getClientSecret() != null) {
+      jwtConfig.addProduct(Product.ZEEBE, new JwtCredential(
+        zeebeSelfManagedProperties.getClientId(),
+        zeebeSelfManagedProperties.getClientSecret(),
+        zeebeSelfManagedProperties.getAudience(),
+        zeebeSelfManagedProperties.getAuthServer())
+      );
+    } else if (commonConfigurationProperties.getClientId() != null && commonConfigurationProperties.getClientSecret() != null) {
+      jwtConfig.addProduct(Product.ZEEBE, new JwtCredential(
+        commonConfigurationProperties.getClientId(),
+        commonConfigurationProperties.getClientSecret(),
+        zeebeClientConfigurationProperties.getCloud().getAudience(),
+        zeebeClientConfigurationProperties.getCloud().getAuthUrl())
+      );
     }
 
+    // OPERATE
     String operateAuthUrl = zeebeClientConfigurationProperties.getCloud().getAuthUrl();
     String operateAudience = "operate.camunda.io";
     if (operateClientConfigurationProperties != null) {