AST-14325 - Change authentication screen

cx-hugo-machado · cx-hugo-machado · commit 80ca9fddef09 · 2022-09-28T17:27:02.000+01:00
- Check is base-uri is defined before adding it to commands;
diff --git a/src/main/java/com/checkmarx/ast/wrapper/CxConfig.java b/src/main/java/com/checkmarx/ast/wrapper/CxConfig.java
@@ -43,15 +43,17 @@ List<String> toArguments() {
             commands.add(getClientSecret());
         }
 
-        if (StringUtils.isNotBlank(getTenant())) {
+        if (StringUtils.isNotEmpty(getTenant())) {
             commands.add(CxConstants.TENANT);
             commands.add(getTenant());
         }
 
-        commands.add(CxConstants.BASE_URI);
-        commands.add(getBaseUri());
+        if (StringUtils.isNotEmpty(getBaseUri())) {
+            commands.add(CxConstants.BASE_URI);
+            commands.add(getBaseUri());
+        }
 
-        if (StringUtils.isNotBlank(getBaseAuthUri())) {
+        if (StringUtils.isNotEmpty(getBaseAuthUri())) {
             commands.add(CxConstants.BASE_AUTH_URI);
             commands.add(getBaseAuthUri());
         }

Original file line number	Diff line number	Diff line change
`@@ -43,15 +43,17 @@ List<String> toArguments() {`
`43`	`43`	`commands.add(getClientSecret());`
`44`	`44`	`}`
`45`	`45`
`46`		`- if (StringUtils.isNotBlank(getTenant())) {`
	`46`	`+ if (StringUtils.isNotEmpty(getTenant())) {`
`47`	`47`	`commands.add(CxConstants.TENANT);`
`48`	`48`	`commands.add(getTenant());`
`49`	`49`	`}`
`50`	`50`
`51`		`- commands.add(CxConstants.BASE_URI);`
`52`		`- commands.add(getBaseUri());`
	`51`	`+ if (StringUtils.isNotEmpty(getBaseUri())) {`
	`52`	`+ commands.add(CxConstants.BASE_URI);`
	`53`	`+ commands.add(getBaseUri());`
	`54`	`+ }`
`53`	`55`
`54`		`- if (StringUtils.isNotBlank(getBaseAuthUri())) {`
	`56`	`+ if (StringUtils.isNotEmpty(getBaseAuthUri())) {`
`55`	`57`	`commands.add(CxConstants.BASE_AUTH_URI);`
`56`	`58`	`commands.add(getBaseAuthUri());`
`57`	`59`	`}`