Merge pull request #246 from SeaLife/master

#244 allow exoframe rm with authentication token

Author: yamalight

.gitignore

@@ -8,3 +8,5 @@ exoframe-win.exe
 .idea/
 .DS_Store
 
+package-lock.json
+exoframe.json

src/commands/remove.js

@@ -7,20 +7,35 @@ const {userConfig, isLoggedIn, logout} = require('../config');
 
 exports.command = ['remove <id>', 'rm <id>'];
 exports.describe = 'remove active deployment';
-exports.builder = {};
-exports.handler = async ({id}) => {
- if (!isLoggedIn()) {
+exports.builder = {
+ token: {
+ alias: 't',
+ description: 'Deployment token to be used for authentication',
+ },
+};
+exports.handler = async (args = {}) => {
+ const deployToken = args.token;
+ const id = args.id;
+
+ if (!deployToken && !isLoggedIn()) {
+ console.log(chalk.red('Error!'), '\nYou need to sign in first or supply a authentication token.');
  return;
  }
 
  console.log(chalk.bold('Removing deployment:'), id);
 
  // services request url
  const remoteUrl = `${userConfig.endpoint}/remove/${encodeURIComponent(id)}`;
+ let authToken = userConfig.token;
+
+ if (deployToken) {
+ authToken = deployToken;
+ console.log('\nRemoving using given token..');
+ }
  // construct shared request params
  const options = {
  headers: {
- Authorization: `Bearer ${userConfig.token}`,
+ Authorization: `Bearer ${authToken}`,
  },
  body: {},
  json: true,

test/__snapshots__/remove.test.js.snap

@@ -25,6 +25,34 @@ Array [
 ]
 `;
 
+exports[`Should remove by token instead of default auth 1`] = `
+Array [
+ Array [
+ "Removing deployment:",
+ "test-id",
+ ],
+ Array [
+ "
+Removing using given token..",
+ ],
+ Array [
+ "Deployment removed!",
+ ],
+]
+`;
+
+exports[`Should remove by url 1`] = `
+Array [
+ Array [
+ "Removing deployment:",
+ "test.example.com",
+ ],
+ Array [
+ "Deployment removed!",
+ ],
+]
+`;
+
 exports[`Should show not found error 1`] = `
 Array [
  Array [

test/remove.test.js

@@ -11,6 +11,7 @@ const {handler: remove} = require('../src/commands/remove');
 const cfg = require('../src/config');
 
 const id = 'test-id';
+const url = 'test.example.com';
 
 // test removal
 test('Should remove', done => {
@@ -34,6 +35,46 @@ test('Should remove', done => {
  });
 });
 
+test('Should remove by url', done => {
+ const rmServer = nock('http://localhost:8080')
+ .post(`/remove/${url}`)
+ .reply(204);
+
+ const consoleSpy = sinon.spy(console, 'log');
+
+ remove({id: url}).then(() => {
+ // make sure log in was successful
+ // check that server was called
+ expect(rmServer.isDone()).toBeTruthy();
+ // first check console output
+ expect(consoleSpy.args).toMatchSnapshot();
+ // restore console
+ console.log.restore();
+ rmServer.done();
+ done();
+ });
+});
+
+test('Should remove by token instead of default auth', done => {
+ const rmServer = nock('http://localhost:8080')
+ .post(`/remove/${id}`)
+ .reply(204);
+
+ const consoleSpy = sinon.spy(console, 'log');
+
+ remove({id: id, token: 'test-token'}).then(() => {
+ // make sure log in was successful
+ // check that server was called
+ expect(rmServer.isDone()).toBeTruthy();
+ // first check console output
+ expect(consoleSpy.args).toMatchSnapshot();
+ // restore console
+ console.log.restore();
+ rmServer.done();
+ done();
+ });
+});
+
 // test removal error
 test('Should show remove error', done => {
  // handle correct request