Allow no credentials with ApiClient

conductor-oss · Oct 30, 2024 · 654aaae · 654aaae
1 parent a4f8af9
commit 654aaae
Showing 1 changed file with 11 additions and 14 deletions.
diff --git a/...src/main/java/io/orkes/conductor/client/spring/OrkesConductorClientAutoConfiguration.java b/...src/main/java/io/orkes/conductor/client/spring/OrkesConductorClientAutoConfiguration.java
@@ -55,24 +55,21 @@ public ApiClient orkesConductorClient(ClientProperties clientProperties,
             return null;
         }
 
-        String key = null;
-        String secret = null;
-        if (orkesClientProperties.getKeyId() != null) {
-            key = orkesClientProperties.getKeyId();
-            secret = orkesClientProperties.getSecret();
-        } else if (orkesClientProperties.getSecurityKeyId() != null) {
-            key = orkesClientProperties.getSecurityKeyId();
-            secret = orkesClientProperties.getSecuritySecret();
-        }
-
-        return ApiClient.builder()
+        var builder = ApiClient.builder()
                 .basePath(basePath)
-                .credentials(key, secret)
                 .connectTimeout(clientProperties.getTimeout().getConnect())
                 .readTimeout(clientProperties.getTimeout().getRead())
                 .writeTimeout(clientProperties.getTimeout().getWrite())
-                .verifyingSsl(clientProperties.isVerifyingSsl())
-                .build();
+                .verifyingSsl(clientProperties.isVerifyingSsl());
+
+
+        if (orkesClientProperties.getKeyId() != null) {
+            builder.credentials(orkesClientProperties.getKeyId(), orkesClientProperties.getSecret());
+        } else if (orkesClientProperties.getSecurityKeyId() != null) {
+            builder.credentials(orkesClientProperties.getSecurityKeyId(), orkesClientProperties.getSecuritySecret());
+        }
+
+        return builder.build();
     }
 
     @Bean