X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=cli%2Factions.js;h=e5d1731eb739eda50d04a80ac03c9dae7dbeca73;hb=ec4c48f288f465d66accb4fe4b2e872feff38715;hp=77672817d88f227e6f7c46a9887cf21c293b6eb2;hpb=4f89763120ee40cf1e9ac27b55fa8cc4e7ed51e1;p=perso%2FImmae%2FProjets%2FNodejs%2FSurfer.git

diff --git a/cli/actions.js b/cli/actions.js
index 7767281..e5d1731 100644
--- a/cli/actions.js
+++ b/cli/actions.js
@@ -1,6 +1,7 @@
 'use strict';
 
 exports.login = login;
+exports.logout = logout;
 exports.put = put;
 exports.get = get;
 exports.del = del;
@@ -8,6 +9,7 @@ exports.del = del;
 var superagent = require('superagent'),
     config = require('./config.js'),
     readlineSync = require('readline-sync'),
+    safe = require('safetydance'),
     async = require('async'),
     fs = require('fs'),
     request = require('request'),
@@ -18,30 +20,40 @@ require('colors');
 
 var API = '/api/files/';
 
+var gServer = '';
 var gQuery = {};
 
-function checkConfig() {
-    if (!config.server() || !config.username() || !config.password()) {
-        console.log('You have run "login" first');
+function checkConfig(options) {
+    if (!options.parent.server && !config.server()) {
+        console.log('Run %s first, or provide %s', 'surfer login'.bold, '--server <url>'.bold);
         process.exit(1);
     }
 
-    gQuery = { username: config.username(), password: config.password() };
+    if (!options.parent.token && !config.accessToken()) {
+        console.log('Run %s first or provide %s', 'surfer login'.bold, '--token <access token>'.bold);
+        process.exit(1);
+    }
 
-    console.error('Using server %s', config.server().yellow);
+    gServer = options.parent.server || config.server();
+    gQuery = { access_token: options.parent.token || config.accessToken() };
+
+    console.error('Using server %s', gServer.cyan);
 }
 
-function collectFiles(filesOrFolders) {
+function collectFiles(filesOrFolders, options) {
     var tmp = [];
 
     filesOrFolders.forEach(function (filePath) {
+        var baseName = path.basename(filePath);
+        if (!options.all && baseName[0] === '.' && baseName.length > 1) return;
+
         var stat = fs.statSync(filePath);
 
         if (stat.isFile()) {
             tmp.push(filePath);
         } else if (stat.isDirectory()) {
             var files = fs.readdirSync(filePath).map(function (file) { return path.join(filePath, file); });
-            tmp = tmp.concat(collectFiles(files));
+            tmp = tmp.concat(collectFiles(files, options));
         } else {
             console.log('Skipping %s', filePath.cyan);
         }
@@ -50,57 +62,104 @@ function collectFiles(filesOrFolders) {
     return tmp;
 }
 
-function login(uri) {
+function login(uri, options) {
     var tmp = url.parse(uri);
-    if (!tmp.host) tmp = url.parse('https://' + uri);
+    if (!tmp.slashes) tmp = url.parse('https://' + uri);
 
     var server = tmp.protocol + '//' + tmp.host;
 
-    console.log('Using server', server.bold);
+    console.log('Using server', server.cyan);
 
-    var username = readlineSync.question('Username: ', { hideEchoBack: false });
-    var password = readlineSync.question('Password: ', { hideEchoBack: true });
+    var username = options.username || readlineSync.question('Username: ');
+    var password = options.password || readlineSync.question('Password: ', { hideEchoBack: true, mask: '' });
 
-    superagent.get(server + API + '/').query({ username: username, password: password }).end(function (error, result) {
+    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') {
-            console.log('No such server %s'.red, server.bold);
+            console.log('Server %s not found.'.red, server.bold);
             process.exit(1);
         }
         if (error && error.code) {
             console.log('Failed to connect to server %s'.red, server.bold, error.code);
             process.exit(1);
         }
-        if (result.status === 401) {
-            console.log('Login failed.'.red);
-            process.exit(1);
+        if (result.status !== 201) {
+            console.log('Login failed.\n'.red);
+
+            // 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
+        config.set('username', '');
+        config.set('password', '');
+
         config.set('server', server);
-        config.set('username', username);
+        config.set('accessToken', result.body.accessToken);
 
-        // TODO this is clearly bad and needs fixing
-        config.set('password', password);
+        console.log('Login successful'.green);
+    });
+}
 
-        gQuery = { username: username, password: password };
+function logout() {
+    if (!config.accessToken()) return console.log('Done'.green);
 
-        console.log('Ok'.green);
+    superagent.post(gServer + '/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);
+
+        // TODO remove at some point, this is just to clear the previous old version values
+        config.set('username', '');
+        config.set('password', '');
+        config.set('server', '');
+        config.set('accessToken', '');
+
+        console.log('Done'.green);
     });
 }
 
 function put(filePath, otherFilePaths, options) {
-    checkConfig();
+    checkConfig(options);
 
-    var files = collectFiles([ filePath ].concat(otherFilePaths));
+    var destination = '';
+
+    // take the last argument as destination
+    if (otherFilePaths.length > 0) {
+        destination = otherFilePaths.pop();
+        if (otherFilePaths.length > 0 && destination[destination.length-1] !== '/') destination += '/';
+    }
+
+    var files = collectFiles([ filePath ].concat(otherFilePaths), options);
 
     async.eachSeries(files, function (file, callback) {
-        var relativeFilePath = path.resolve(file).slice(process.cwd().length + 1);
+        var relativeFilePath;
+
+        if (path.isAbsolute(file)) {
+            relativeFilePath = path.basename(file);
+        } else if (path.resolve(file).indexOf(process.cwd()) === 0) { // relative to current dir
+            relativeFilePath = path.resolve(file).slice(process.cwd().length + 1);
+        } else { // relative but somewhere else
+            relativeFilePath = path.basename(file);
+        }
+
+        var destinationPath = (destination ? '/' + destination : '') + '/' + relativeFilePath;
+        console.log('Uploading file %s -> %s', relativeFilePath.cyan, destinationPath.cyan);
 
-        console.log('Uploading file %s -> %s', relativeFilePath.cyan, ((options.destination ? options.destination : '') + '/' + relativeFilePath).cyan);
+        superagent.post(gServer + API + destinationPath).query(gQuery).attach('file', file).end(function (error, result) {
+            if (result && result.statusCode === 403) return callback(new Error('Upload destination ' + destinationPath + ' not allowed'));
+            if (result && result.statusCode !== 201) return callback(new Error('Error uploading file: ' + result.statusCode));
+            if (error) return callback(error);
 
-        superagent.put(config.server() + API + relativeFilePath).query(gQuery).attach('file', file).end(callback);
+            console.log('Uploaded to ' + gServer + destinationPath);
+
+            callback(null);
+        });
     }, function (error) {
         if (error) {
-            console.log('Failed to put file.', error);
+            console.log('Failed to put file.', error.message.red);
             process.exit(1);
         }
 
@@ -108,28 +167,33 @@ function put(filePath, otherFilePaths, options) {
     });
 }
 
-function get(filePath) {
-    checkConfig();
+function get(filePath, options) {
+    checkConfig(options);
 
     // if no argument provided, fetch root
     filePath = filePath || '/';
 
-    request.get(config.server() + API + filePath, { qs: gQuery }, function (error, result, body) {
+    request.get(gServer + API + filePath, { qs: gQuery }, function (error, result, body) {
+        if (result && result.statusCode === 401) return console.log('Login failed');
+        if (result && result.statusCode === 404) return console.log('No such file or directory %s', filePath.yellow);
         if (error) return console.error(error);
-        if (result.statusCode === 401) return console.log('Login failed');
-        if (result.statusCode === 404) return console.log('No such file or directory');
 
         // 222 indicates directory listing
         if (result.statusCode === 222) {
-            console.log('Files:');
-            JSON.parse(body).entries.forEach(function (entry) {
-                console.log('\t %s', entry);
-            });
+            var files = safe.JSON.parse(body);
+            if (!files || files.entries.length === 0) {
+                console.log('No files on the server. Use %s to upload some.', 'surfer put <file>'.yellow);
+            } else {
+                console.log('Entries:');
+                files.entries.forEach(function (entry) {
+                    console.log('\t %s', entry.isDirectory ? entry.filePath + '/' : entry.filePath);
+                });
+            }
         } else {
-            console.log(body);
+            process.stdout.write(body);
         }
     });
-    // var req = superagent.get(config.server() + API + filePath);
+    // var req = superagent.get(gServer + API + filePath);
     // req.query(gQuery);
     // req.end(function (error, result) {
     //     if (error && error.status === 401) return console.log('Login failed');
@@ -147,14 +211,27 @@ function get(filePath) {
     // });
 }
 
-function del(filePath) {
-    checkConfig();
+function del(filePath, options) {
+    checkConfig(options);
+
+    var query = safe.JSON.parse(safe.JSON.stringify(gQuery));
+    query.recursive = options.recursive;
+    query.dryRun = options.dryRun;
 
     var relativeFilePath = path.resolve(filePath).slice(process.cwd().length + 1);
-    superagent.del(config.server() + API + relativeFilePath).query(gQuery).end(function (error, result) {
-        if (error && error.status === 401) return console.log('Login failed');
+    superagent.del(gServer + API + relativeFilePath).query(query).end(function (error, result) {
+        if (error && error.status === 401) return console.log('Login failed'.red);
         if (error && error.status === 404) return console.log('No such file or directory');
+        if (error && error.status === 403) return console.log('Failed. Target is a directory. Use %s to delete directories.', '--recursive'.yellow);
         if (error) return console.log('Failed', result ? result.body : error);
-        console.log('Success', result.body);
+
+        if (options.dryRun) {
+            console.log('This would remove %s files:', result.body.entries.length);
+            result.body.entries.forEach(function (entry) {
+                console.log('\t %s', entry);
+            });
+        } else {
+            console.log('Success. Removed %s files.', result.body.entries.length);
+        }
     });
 }