Merge pull request #428 from CheckmarxDev/cx-client-id-support-AST-105859

Dynamic client id support for refresh token grant (AST-105859)

Author: cx-atish-jadhav

pom.xml

@@ -24,7 +24,7 @@
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-lang3</artifactId>
-            <version>3.18.0</version>
+            <version>3.14.0</version>
         </dependency>
         <dependency>
             <groupId>com.googlecode.json-simple</groupId>
@@ -44,7 +44,7 @@
         <dependency>
             <groupId>com.google.code.gson</groupId>
             <artifactId>gson</artifactId>
-            <version>2.12.0</version>
+            <version>2.10.1</version>
         </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>

src/main/java/com/checkmarx/ast/wrapper/CxConfig.java

@@ -5,6 +5,7 @@
 import lombok.Data;
 import lombok.Setter;
 import org.apache.commons.lang3.StringUtils;
+
 import java.util.ArrayList;
 import java.util.List;
 import java.util.regex.Matcher;
@@ -33,7 +34,15 @@ public void setAdditionalParameters(String additionalParameters) {
     List<String> toArguments() {
         List<String> commands = new ArrayList<>();
 
-        if (StringUtils.isNotBlank(getApiKey())) {
+        if (StringUtils.isNotBlank(getClientId()) && StringUtils.isNotBlank(getApiKey())) {
+            /*
+             * Added dynamic client-id support for refresh_token grant flow
+             */
+            commands.add(CxConstants.CLIENT_ID);
+            commands.add(getClientId());
+            commands.add(CxConstants.API_KEY);
+            commands.add(getApiKey());
+        } else if (StringUtils.isNotBlank(getApiKey())) {
             commands.add(CxConstants.API_KEY);
             commands.add(getApiKey());
         } else if (StringUtils.isNotBlank(getClientId()) && StringUtils.isNotBlank(getClientSecret())) {