fix issue in tenant (#5)

* fix issue in tenant

* update cli version and fix scan show

Author: cx-pedro-lopes

src/main/java/com/checkmarx/ast/CxAuth.java

@@ -4,6 +4,7 @@
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.gson.Gson;
+import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -25,22 +26,25 @@
 public class CxAuth {
     private Logger log = LoggerFactory.getLogger(CxAuth.class.getName());
     private String baseuri;
+    private String baseAuthUri;
+    private String tenant;
     private String key;
     private String secret;
     private String apikey;
     private URI executable = null;
     private static final Gson gson = new Gson();
 
     public CxAuth(CxScanConfig scanConfig, Logger log)
-            throws InterruptedException, IOException, URISyntaxException, CxExeception {
-        if (scanConfig == null) throw new CxExeception("CxScanConfig object returned as null!");   
+            throws IOException, URISyntaxException, CxException {
+        if (scanConfig == null) throw new CxException("CxScanConfig object returned as null!");
+
         this.baseuri = scanConfig.getBaseUri();
-        if (scanConfig.getClientId() != null && scanConfig.getClientSecret() != null) {
-            this.key = scanConfig.getClientId();
-            this.secret = scanConfig.getClientSecret();
-        } else if (scanConfig.getApiKey() != null) {
-            this.apikey = scanConfig.getApiKey();
-        }
+        this.baseAuthUri = scanConfig.getBaseAuthUri();
+        this.tenant = scanConfig.getTenant();
+        this.key = scanConfig.getClientId();
+        this.secret = scanConfig.getClientSecret();
+        this.apikey = scanConfig.getApiKey();
+
         if (scanConfig.getPathToExecutable() != null && !scanConfig.getPathToExecutable().isEmpty()) {
             File file = new File(scanConfig.getPathToExecutable());
             this.executable = file.toURI();
@@ -157,6 +161,7 @@ public CxScan cxScanShow(String id) throws IOException, InterruptedException {
         List<String> commands = initialCommands();
         commands.add("scan");
         commands.add("show");
+        commands.add("--scan-id");
         commands.add(id);
         CxScan scanObject = runExecutionCommands(commands);
         if (scanObject != null)
@@ -197,10 +202,23 @@ public List<String> initialCommands() {
         List<String> commands = new ArrayList<String>();
         commands.add(executable.getPath());
         addAuthCredentials(commands);
+
+        if (!StringUtils.isEmpty(this.tenant)) {
+            commands.add("--tenant");
+            commands.add(this.tenant);
+        }
+
         commands.add("--base-uri");
         commands.add(baseuri);
+
+        if (!StringUtils.isEmpty(this.baseAuthUri)) {
+            commands.add("--base-auth-uri");
+            commands.add(this.baseAuthUri);
+        }
+
         commands.add("--format");
         commands.add("json");
+
         return commands;
     }
 

src/main/java/com/checkmarx/ast/CxAuthType.java

@@ -0,0 +1,7 @@
+package com.checkmarx.ast;
+
+public class CxException extends RuntimeException{
+    public CxException(String errorMessage) {
+        super(errorMessage);
+    }
+}

src/main/java/com/checkmarx/ast/CxException.java

@@ -1,5 +1,5 @@
 package com.checkmarx.ast;
 
 public enum CxParamType {
-    S, V, G, PROJECT_NAME, SCAN_TYPES, SAST_PRESET_NAME, FILTER, DIRECTORY, ADDITIONAL_PARAMETERS, AGENT, SOURCES, TENANT
+    S, V, G, PROJECT_NAME, SCAN_TYPES, SAST_PRESET_NAME, FILTER, DIRECTORY, ADDITIONAL_PARAMETERS, AGENT, SOURCES
 }

src/main/java/com/checkmarx/ast/CxExeception.java

@@ -7,14 +7,13 @@
 
 @Getter
 @Setter
-
 public class CxScanConfig implements Serializable {
 
     private String baseUri;
-    private String pathToExecutable;
-    private CxAuthType authType;
+    private String baseAuthUri;
+    private String tenant;
     private String clientId;
     private String clientSecret;
     private String apiKey;
-
+    private String pathToExecutable;
 }

src/main/java/com/checkmarx/ast/CxParamType.java

@@ -15,7 +15,5 @@ public BufferedReader executeCommand(List<String> commands) throws IOException {
 		InputStreamReader isr = new InputStreamReader(is);
 		BufferedReader br = new BufferedReader(isr);
 		return br;
-
 	}
-
 }