Fix #66 don't prompt when token or user+pass set

rundeck · Feb 2, 2017 · 45c9a53 · 45c9a53
1 parent 386960d
commit 45c9a53
Showing 1 changed file with 11 additions and 9 deletions.
diff --git a/src/main/java/org/rundeck/client/tool/Main.java b/src/main/java/org/rundeck/client/tool/Main.java
@@ -175,17 +175,13 @@ private static void setupColor(final ToolBelt belt, AppConfig config) {
     public static Client<RundeckApi> createClient(AppConfig config) throws InputError {
         Auth auth = new Auth() {
         };
-        String baseUrl = null;
         auth = auth.chain(new ConfigAuth(config));
+        String baseUrl = config.require(
+                ENV_URL,
+                "Please specify the Rundeck base URL, e.g. http://host:port or http://host:port/api/14"
+        );
 
-        if (null == baseUrl) {
-            baseUrl = config.require(
-                    ENV_URL,
-                    "Please specify the Rundeck base URL, e.g. http://host:port or http://host:port/api/14"
-            );
-        }
-
-        if (config.getBool(ENV_AUTH_PROMPT, true) && null != System.console()) {
+        if (!auth.isConfigured() && config.getBool(ENV_AUTH_PROMPT, true) && null != System.console()) {
             auth = auth.chain(new ConsoleAuth(String.format("Credentials for URL: %s", baseUrl)).memoize());
         }
 
@@ -217,6 +213,12 @@ public static Client<RundeckApi> createClient(AppConfig config) throws InputErro
     }
 
     static interface Auth {
+        default boolean isConfigured() {
+            return null != getToken() || (
+                    null != getUsername() && null != getPassword()
+            );
+        }
+
         default String getUsername() {
             return null;
         }