Merge pull request #210 from jacoblee93/master

Update hostnames:remove command and adds support for two factor authentication

Author: keithwhor

cli/commands/hostnames/remove.js

@@ -49,7 +49,7 @@ class HostnamesRemoveCommand extends Command {
         return callback(err);
       }
 
-      let ids = results.map(host => host.id);
+      let sids = results.map(host => host.sid);
       let answers = await inquirer.prompt(
         [
           {
@@ -65,7 +65,7 @@ class HostnamesRemoveCommand extends Command {
                   Hostname: hostnameRoute.formatted_hostname,
                   Target: hostnameRoute.target,
                   'Created At': hostnameRoute.created_at,
-                  value: ids[index]
+                  value: sids[index]
                 };
               }),
               true,
@@ -97,7 +97,9 @@ class HostnamesRemoveCommand extends Command {
 
       let resource = new APIResource(host, port);
       resource.authorize(config.get('ACCESS_TOKEN'));
-      resource.request('/v1/hostname_routes').destroy(answers.route.value, {}, (err, response) => {
+      resource.request('/v1/hostname_routes').destroy(null, {
+        sid: answers.route.value
+      }, (err, response) => {
         if (err) {
           return callback(err);
         }

cli/commands/login.js

@@ -55,54 +55,85 @@ class LoginCommand extends Command {
       message: 'Password',
     });
 
-    let loopCb = async (err) => {
+    let resource = new APIResource(host, port);
 
-      err && errorLog(err);
+    let setAccessToken = (accessToken, cb) => {
 
-      let promptResult = await inquirer.prompt(questions);
+      config.set('ACCESS_TOKEN', accessToken);
+      config.set('ACTIVE_LIBRARY_TOKEN', '');
+      config.unset('LIBRARY_TOKENS');
+      config.write();
 
-      email = promptResult.email || email;
-      password = promptResult.password || password;
-
-      let resource = new APIResource(host, port);
+      console.log();
+      console.log(chalk.bold.green('Logged in successfully!') + ' Retrieving default Identity Token (API Key)...');
 
-      resource.request('v1/access_tokens').create({}, {grant_type: 'password', username: email, password: password}, (err, response) => {
+      resource.authorize(config.get('ACCESS_TOKEN'));
+      resource.request('/v1/library_tokens').index({default: true}, (err, response) => {
 
         if (err) {
-          questions.filter(q => q.name === 'email').forEach(q => q.default = email);
-          password = null;
-          return loopCb(err);
+          return cb(err);
         }
 
-        config.set('ACCESS_TOKEN', response.data[0].access_token);
-        config.set('ACTIVE_LIBRARY_TOKEN', '');
-        config.unset('LIBRARY_TOKENS');
-        config.write();
+        let tokens = (response && response.data) || [];
+
+        if (!tokens.length) {
+          console.log('Logged in, but could not retrieve default Identity Token.');
+        } else {
+          config.save('ACTIVE_LIBRARY_TOKEN', tokens[0].token);
+          console.log(`Active Identity Token (API Key) set to: ${chalk.bold(tokens[0].label)}`);
+        }
 
         console.log();
-        console.log(chalk.bold.green('Logged in successfully!') + ' Retrieving default Identity Token (API Key)...');
+        return cb();
 
-        resource.authorize(config.get('ACCESS_TOKEN'));
-        resource.request('/v1/library_tokens').index({default: true}, (err, response) => {
+      });
+    }
 
-          if (err) {
-            return callback(err);
-          }
+    let loopCb = async (err) => {
 
-          let tokens = (response && response.data) || [];
+      err && errorLog(err);
 
-          if (!tokens.length) {
-            console.log('Logged in, but could not retrieve default Identity Token.');
-          } else {
-            config.save('ACTIVE_LIBRARY_TOKEN', tokens[0].token);
-            console.log(`Active Identity Token (API Key) set to: ${chalk.bold(tokens[0].label)}`);
-          }
+      let promptResult = await inquirer.prompt(questions);
 
-          console.log();
-          return callback();
+      email = promptResult.email || email;
+      password = promptResult.password || password;
 
+      resource.request('v1/login').create({}, {grant_type: 'password', username: email, password: password}, (err, response) => {
 
-        });
+        if (err) {
+          questions.filter(q => q.name === 'email').forEach(q => q.default = email);
+          password = null;
+          return loopCb(err);
+        }
+
+        if (!!response.data[0].factor_identifier) {
+          console.log();
+          console.log(`Your account has two-factor authentication enabled. Please enter a valid verification code from your device to finish logging in.`);
+          console.log();
+          inquirer.prompt({
+            name: 'verificationCode',
+            type: 'input',
+            default: '',
+            message: 'Verification Code',
+          }).then((promptResult) => {
+            resource.request('v1/login').create({}, {
+              grant_type: 'password',
+              username: email,
+              password: password,
+              factor_verification_check_sid: response.data[0].sid,
+              factor_verification_code: promptResult.verificationCode,
+            }, (err, response) => {
+              if (err) {
+                questions.filter(q => q.name === 'email').forEach(q => q.default = email);
+                password = null;
+                return loopCb(err);
+              }
+              setAccessToken(response.data[0].access_token, callback);
+            });
+          });
+        } else {
+          setAccessToken(response.data[0].access_token, callback);
+        }
 
       });
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "lib.cli",
-  "version": "5.3.0",
+  "version": "5.4.0",
   "description": "Command Line tools for Autocode - autocode.com",
   "main": "index.js",
   "scripts": {