Fast login switch enhancement and account command added

Author: MikeBild

bin/dropstack

@@ -18,14 +18,15 @@ process.on('SIGINT', () => {
 
 program
   .version(`${pkg.name} v${pkg.version}`)
-  .command('login <url>', 'Log-in to URL given deployment environment. (default http://api.cloud.dropstack.run)')
+  .command('login <url>', 'Log-in to URL given deployment environment. (default https://api.cloud.dropstack.run)')
   .command('logout', 'Log-out from current deployment environment.')
-  .command('deploy [folder]', 'Deploy to current deployment environment.')
-  .command('list', 'List', 'List your active deployment from current environment.')
-  .command('remove [name]', 'Remove deployment from current environment.')
-  .command('ssl [name]', 'Manage SSL for deployments')
-  .command('alias [name]', 'Manage alias for deployments')
-  .command('logs [name]', 'Show libe StdOut/StdErr logs')
-  .command('metric [name]', 'Show metrics for deployments')
-  .command('scale [name]', 'Scale instances for deployments')
+  .command('account', 'Show account informations.')
+  .command('deploy [folder]', 'Deploy to current deployment environment.').alias('add')
+  .command('list', 'List your active deployment from current environment.').alias('ls')
+  .command('remove [name]', 'Remove deployment from current environment.').alias('rm')
+  .command('ssl [name]', 'Manage SSL for deployments.')
+  .command('alias [name]', 'Manage domain for deployments.')
+  .command('logs [name]', 'Show StdOut/StdErr logs for deployment.').alias('log')
+  .command('metric [name]', 'Show metrics for deployments.')
+  .command('scale [name]', 'Scale instances for deployments.')
   .parse(process.argv);

bin/dropstack-list

@@ -20,13 +20,13 @@ function list(){
     .then(response => response.json()))
   .then(data => Boolean(data.message) ? Promise.reject(new Error(data.message)) : data)
   .then(data => {
-    console.log(`${chalk.bold(pad(7, 'TYPE', ' '))} | ${chalk.bold(pad(5, 'COUNT', ' '))} | ${chalk.bold(pad(9, 'ID/NAME', ' '))} | ${chalk.bold(pad(45, 'URL', ' '))}`);
+    console.log(`${chalk.bold(pad(7, 'TYPE', ' '))} | ${chalk.bold(pad(5, 'NUM #', ' '))} | ${chalk.bold(pad(9, 'ID/NAME', ' '))} | ${chalk.bold(pad(45, 'URL', ' '))}`);
     return data;
   })
   .then(data => (data || []).map(x => `${chalk.gray(pad(7, x.serviceType.toUpperCase(), ' '))} | ${chalk.gray(pad(5, x.serviceInstances, ' '))} | ${chalk.green(pad(9, x.serviceName, ' '))} | ${chalk.bold(pad(45,  `https://${x.serviceUrl || '-'}`, ' '))}`))
   .then(data => {
     if(data.length > 0) return data.map(x => console.log(x));
-    console.log('Nothing deployed');
+    console.log(chalk.gray('\nNothing deployed'));
   })
   .catch(err => {
     if(err.message === 'Sign in failed. Use `dropstack login` to log in with your credentials.'){

bin/dropstack-login

@@ -11,31 +11,27 @@ const configuration = require('../lib/settings')();
 
 program
   .arguments('<url>')
-  .option('-r, --reset', 'Request password reset')
-  .option('-t, --token', 'Display current JSON Web Token')
-  .action(url => account(Object.assign({url: url}, program)))
+  .action(url => login(Object.assign({url: url, program})))
   .parse(process.argv);
 
-if(!program.args.length) account(program.opts());
+if(!program.args.length) login(program.opts());
 
-function account({url, token, reset}) {
+function login({url}) {
   if(url && !urlRegex({exact: true}).test(url)) {
-    console.log(chalk.red('Invalid DROPSTACK URL. Must be the format http(s)://host.domain.com.'));
+    console.log(chalk.red('Invalid Dropstack-Server-URL. Must be the format http(s)://host.domain.com.'));
     return process.exit(1);
   }
 
-  configuration
-  .load({url, reset})
-  .then(settings => configuration.save(settings))
+  configuration.removeGlobalFile()
+  .then(()  => configuration.load({url}))
   .then(settings => {
     console.log(chalk.green(`Account information for ${chalk.green.underline(settings.username || '-')} on ${chalk.green.underline(settings.url || '-')}`));
-    if(!(settings.token && settings.username)) console.log(chalk.yellow(`Enter your email and password to log in or sign up for free!\n`));
+    console.log(chalk.yellow(`Enter your email and password to log in or sign up for free!\n`));
     return settings;
   })
-  .then(settings => reset ? credentials.reset(settings).then(data => Promise.reject(data)) : Promise.resolve(settings))
-  .then(settings => !settings.token ? credentials.inputEmail(settings.username).then(data => Object.assign(settings, data)) : Promise.resolve(settings))
-  .then(settings => !settings.token ? credentials.inputPassword(settings.password).then(data => Object.assign(settings, data)) : Promise.resolve(settings))
-  .then(settings => !settings.token ? credentials.login(settings).catch(() => credentials.signup(settings)).then(data => Object.assign(settings, data)) : Promise.resolve(settings))
+  .then(settings => credentials.inputEmail(settings.username).then(data => Object.assign(settings, data)))
+  .then(settings => credentials.inputPassword(settings.password).then(data => Object.assign(settings, data)))
+  .then(settings => credentials.login(settings).catch(() => credentials.signup(settings)).then(data => Object.assign(settings, data)))
   .then(settings => {
     if(!settings.token) return Promise.reject(new Error('Sign in failed. Use `dropstack login` to log in with your credentials.'));
     if(settings.message) return Promise.reject(new Error(settings.message));
@@ -51,17 +47,11 @@ function account({url, token, reset}) {
   .then(data => Boolean(data.message) ? Promise.reject(new Error(data.message)) : data)
   .then(data => {
     let message = `${chalk.green(`User ${chalk.bold(data.id)} logged in successful!\n\n`)}`;
-    message += `• ${chalk.gray(`Server-Version: ${data.version}`)}`;
-    if(token) message = `${chalk.gray(`JWT: ${data.token}`)}`;
+    message += `• ${chalk.gray(`Server Version: ${chalk.white(data.version)}`)}`;
     console.log(boxen(message, {padding: 1, borderColor: 'gray', margin: 1}));
-
     process.exit(0);
   })
   .catch(err => {
-    if(err.message === '"We\'ve just sent you an email to reset your password"') {
-      console.log(chalk.red(err.message));
-      return process.exit(0);
-    }
     if(err.message === 'canceled') {
       console.log(chalk.yellow('aborted'));
       return process.exit(0);

package.json

@@ -1,6 +1,6 @@
 {
   "name": "dropstack-cli",
-  "version": "2.3.14",
+  "version": "2.4.0",
   "description": "A CLI to simplify continuous deployments into hybrid clouds.",
   "author": "Mike Bild <mike@codecommission.com>",
   "homepage": "https://github.com/codecommission/dropstack-cli#readme",