Merge pull request #436 from zowe/prompting-fix

Fixing prompting in ConnectionPropsForSessCfg
zowe · Aug 21, 2020 · 04c9ea0 · 04c9ea0
2 parents 9358746 + cccdc15
commit 04c9ea0
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 All notable changes to the Imperative package will be documented in this file.
 
+## Recent Changes
+
+- Updated the SSO Callback so it doesn't prompt for user/password if a token exists
+
 ## `4.8.0`
 
 - Add the SSO Callback to allow other applications to call their own function in validating sessions

diff --git a/packages/rest/src/session/ConnectionPropsForSessCfg.ts b/packages/rest/src/session/ConnectionPropsForSessCfg.ts
@@ -136,12 +136,14 @@ export class ConnectionPropsForSessCfg {
                 promptForValues.push("port");
             }
 
-            if (ConnectionPropsForSessCfg.propHasValue(finalSessCfg.user)=== false) {
-                promptForValues.push("user");
-            }
+            if (ConnectionPropsForSessCfg.propHasValue(finalSessCfg.tokenValue)=== false) {
+                if (ConnectionPropsForSessCfg.propHasValue(finalSessCfg.user)=== false) {
+                    promptForValues.push("user");
+                }
 
-            if (ConnectionPropsForSessCfg.propHasValue(finalSessCfg.password)=== false) {
-                promptForValues.push("password");
+                if (ConnectionPropsForSessCfg.propHasValue(finalSessCfg.password)=== false) {
+                    promptForValues.push("password");
+                }
             }
 
             // put all the needed properties in an array and call the external function