fix(ssh): fix ssh password being ignored

Closes #13
luin · Feb 1, 2016 · 4dfdbcd · 4dfdbcd
1 parent ed892b7
commit 4dfdbcd
Showing 1 changed file with 16 additions and 7 deletions.
diff --git a/client/actions.js b/client/actions.js
@@ -30,13 +30,22 @@ const actions = {
         });
 
         try {
-          conn.connect({
-            host: config.sshHost,
-            port: config.sshPort || 22,
-            username: config.sshUser,
-            privateKey: config.sshKey,
-            passphrase: config.sshKeyPassphrase
-          });
+          if (config.sshKey) {
+            conn.connect({
+              host: config.sshHost,
+              port: config.sshPort || 22,
+              username: config.sshUser,
+              privateKey: config.sshKey,
+              passphrase: config.sshKeyPassphrase
+            });
+          } else {
+            conn.connect({
+              host: config.sshHost,
+              port: config.sshPort || 22,
+              username: config.sshUser,
+              password: config.sshPassword
+            });
+          }
         } catch (err) {
           dispatch({ type: 'disconnect' });
           alert(`SSH Error: ${err.message}`);