Do not hide menu dropdown on click

[perso/Immae/Projets/Nodejs/Surfer.git] / cli / actions.js

diff --git a/cli/actions.js b/cli/actions.js
index 5ad9dc69b95a1c8425c88935d369f47c820950dd..2440c2de6cf5e86119ee948a7687a6bb071da0e3 100644 (file)
--- a/cli/actions.js
+++ b/cli/actions.js
@@ -24,7 +24,7 @@ var gQuery = {};
 
 function checkConfig() {
     if (!config.server() || !config.accessToken()) {
-        console.log('You have run "login" first');
+        console.log('Run %s first', 'surfer login'.yellow);
         process.exit(1);
     }
 
@@ -55,7 +55,7 @@ function collectFiles(filesOrFolders, options) {
     return tmp;
 }
 
-function login(uri) {
+function login(uri, options) {
     var tmp = url.parse(uri);
     if (!tmp.slashes) tmp = url.parse('https://' + uri);
 
@@ -63,8 +63,10 @@ function login(uri) {
 
     console.log('Using server', server.cyan);
 
-    var username = readlineSync.question('Username: ');
-    var password = readlineSync.question('Password: ', { hideEchoBack: true, mask: '' });
+    var username = options.username || readlineSync.question('Username: ');
+    var password = options.password || readlineSync.question('Password: ', { hideEchoBack: true, mask: '' });
+
+    if (!username || !password) process.exit(1);
 
     superagent.post(server + '/api/login').send({ username: username, password: password }).end(function (error, result) {
         if (error && error.code === 'ENOTFOUND') {
@@ -77,7 +79,11 @@ function login(uri) {
         }
         if (result.status !== 201) {
             console.log('Login failed.\n'.red);
-            return login(uri);
+
+            // remove the password to avoid a login loop
+            delete options.password;
+
+            return login(uri, options);
         }
 
         // TODO remove at some point, this is just to clear the previous old version values
@@ -92,9 +98,9 @@ function login(uri) {
 }
 
 function logout() {
-    checkConfig();
+    if (!config.accessToken()) return console.log('Done'.green);
 
-    superagent.post(config.server() + '/api/logout').query(gQuery).end(function (error, result) {
+    superagent.post(config.server() + '/api/logout').query({ access_token: config.accessToken() }).end(function (error, result) {
         if (result && result.statusCode !== 200) console.log('Failed to logout: ' + result.statusCode);
         if (error) console.log(error);