From b252069b208442745399c376d53612fe857e44df Mon Sep 17 00:00:00 2001
From: Ruud Senden <8635138+rsenden@users.noreply.github.com>
Date: Mon, 16 Jan 2023 14:56:47 +0100
Subject: [PATCH] fix: `fcli sc-sast session login`: Require SSC credentials to
 be specified (fixes #222)

---
 .../session/cli/cmd/SCSastSessionLoginCommand.java  |  4 ++--
 .../cli/mixin/SCSastSessionLoginOptions.java        | 13 ++-----------
 2 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/fcli-sc-sast/src/main/java/com/fortify/cli/sc_sast/session/cli/cmd/SCSastSessionLoginCommand.java b/fcli-sc-sast/src/main/java/com/fortify/cli/sc_sast/session/cli/cmd/SCSastSessionLoginCommand.java
index f2e11dd0c9..90dc3ecddf 100644
--- a/fcli-sc-sast/src/main/java/com/fortify/cli/sc_sast/session/cli/cmd/SCSastSessionLoginCommand.java
+++ b/fcli-sc-sast/src/main/java/com/fortify/cli/sc_sast/session/cli/cmd/SCSastSessionLoginCommand.java
@@ -45,13 +45,13 @@ public class SCSastSessionLoginCommand extends AbstractSessionLoginCommand<SCSas
     
     @Override
     protected void logoutBeforeNewLogin(String sessionName, SCSastSessionData sessionData) {
-        sessionData.logout(tokenHelper, sessionLoginOptions.getUserCredentialsConfig());
+        sessionData.logout(tokenHelper, sessionLoginOptions.getCredentialOptions().getUserCredentialsConfig());
     }
     
     @Override
     protected SCSastSessionData login(String sessionName) {
         IUrlConfig urlConfig = sessionLoginOptions.getUrlConfigOptions();
-        ISSCCredentialsConfig credentialsConfig = sessionLoginOptions.getCredentialsConfig();
+        ISSCCredentialsConfig credentialsConfig = sessionLoginOptions.getCredentialOptions();
         return new SCSastSessionData(urlConfig, credentialsConfig, sessionLoginOptions.getClientAuthToken(), tokenHelper);
     }
 }
diff --git a/fcli-sc-sast/src/main/java/com/fortify/cli/sc_sast/session/cli/mixin/SCSastSessionLoginOptions.java b/fcli-sc-sast/src/main/java/com/fortify/cli/sc_sast/session/cli/mixin/SCSastSessionLoginOptions.java
index a4be41cac3..5f012c4f93 100644
--- a/fcli-sc-sast/src/main/java/com/fortify/cli/sc_sast/session/cli/mixin/SCSastSessionLoginOptions.java
+++ b/fcli-sc-sast/src/main/java/com/fortify/cli/sc_sast/session/cli/mixin/SCSastSessionLoginOptions.java
@@ -1,7 +1,6 @@
 package com.fortify.cli.sc_sast.session.cli.mixin;
 
 import com.fortify.cli.ssc.session.manager.ISSCCredentialsConfig;
-import com.fortify.cli.ssc.session.manager.ISSCUserCredentialsConfig;
 import com.fortify.cli.ssc.token.helper.SSCTokenConverter;
 
 import lombok.Getter;
@@ -15,16 +14,8 @@ public class SCSastSessionLoginOptions {
     @Option(names = {"--client-auth-token", "-c"}, required = true, interactive = true, arity = "0..1", echo = false) 
     @Getter private char[] clientAuthToken;
     
-    @ArgGroup(exclusive = false, multiplicity = "1", order = 2)
-    @Getter private SSCAuthOptions authOptions = new SSCAuthOptions();
-    
-    public ISSCCredentialsConfig getCredentialsConfig() {
-        return authOptions==null ? null : authOptions.getCredentialOptions();
-    }
-    
-    public ISSCUserCredentialsConfig getUserCredentialsConfig() {
-        return getCredentialsConfig()==null ? null : getCredentialsConfig().getUserCredentialsConfig();
-    }
+    @ArgGroup(exclusive = true, multiplicity = "1", order = 2)
+    @Getter private SSCCredentialOptions credentialOptions = new SSCCredentialOptions();
     
     public static class SSCAuthOptions {
         @ArgGroup(exclusive = true, multiplicity = "1", order = 3)