Allow using token for deploy command, closes #33

Author: yamalight

src/commands/deploy.js

@@ -37,13 +37,20 @@ const streamToResponse = ({tarStream, remoteUrl, options}) =>
 
 exports.command = ['*', 'deploy'];
 exports.describe = 'deploy current folder';
-exports.builder = {};
-exports.handler = async args => {
-  if (!isLoggedIn()) {
+exports.builder = {
+  token: {
+    alias: 't',
+  },
+};
+exports.handler = async (args = {}) => {
+  const deployToken = args.token;
+
+  // exit if not logged in and no token provided
+  if (!deployToken && !isLoggedIn()) {
     return;
   }
 
-  const folder = args && args._ ? args._.filter(arg => arg !== 'deploy').shift() : undefined;
+  const folder = args._ ? args._.filter(arg => arg !== 'deploy').shift() : undefined;
 
   console.log(chalk.bold(`Deploying ${folder || 'current project'} to endpoint:`), userConfig.endpoint);
 
@@ -86,9 +93,14 @@ exports.handler = async args => {
     ignore: name => ig.ignores(name),
   });
 
+  let token = userConfig.token;
+  if (deployToken) {
+    token = deployToken;
+    console.log('Deploying using given token..');
+  }
   const options = {
     headers: {
-      Authorization: `Bearer ${userConfig.token}`,
+      Authorization: `Bearer ${token}`,
     },
   };
 

src/commands/login.js

@@ -17,10 +17,10 @@ exports.command = 'login';
 exports.describe = 'login into exoframe server';
 exports.builder = {
   key: {
-    short: 'k',
+    alias: 'k',
   },
   passphrase: {
-    short: 'p',
+    alias: 'p',
   },
 };
 exports.handler = async ({key, passphrase}) => {

test/deploy.js

@@ -104,6 +104,47 @@ module.exports = () => {
     });
   });
 
+  // test
+  tap.test('Should deploy without auth but with token', t => {
+    // spy on console
+    const consoleSpy = sinon.spy(console, 'log');
+    // copy original config for restoration
+    const originalConfig = Object.assign({}, userConfig);
+
+    // handle correct request
+    const deployServer = nock('http://localhost:8080').post('/deploy').reply((uri, requestBody, cb) => {
+      cb(null, [200, {status: 'success', deployments}]);
+    });
+
+    // remove auth from config
+    updateConfig({endpoint: 'http://localhost:8080'});
+
+    // execute login
+    deploy({token: 'test-token'}).then(() => {
+      // make sure log in was successful
+      // check that server was called
+      t.ok(deployServer.isDone());
+      // first check console output
+      t.deepEqual(
+        consoleSpy.args,
+        [
+          ['Deploying current project to endpoint:', 'http://localhost:8080'],
+          ['Deploying using given token..'],
+          ['Your project is now deployed as:\n'],
+          ['   ID         URL                    Hostname   \n   test       http://localhost       test       '],
+        ],
+        'Correct log output'
+      );
+      // restore console
+      console.log.restore();
+      // tear down nock
+      deployServer.done();
+      // restore original config
+      updateConfig(originalConfig);
+      t.end();
+    });
+  });
+
   // test
   tap.test('Should not deploy with broken config', t => {
     // spy on console