Refactoring authentication.js

Author: StanleyGoldman

octorun/src/authentication.js

@@ -2,16 +2,13 @@ var endOfLine = require('os').EOL;
 var config = require("./configuration");
 var octokitWrapper = require("./octokit");
 
-var scopes = ["user", "repo", "gist", "write:public_key"];
-
 var lockedRegex = new RegExp("number of login attempts exceeded", "gi");
 var twoFactorRegex = new RegExp("must specify two-factor authentication otp code", "gi");
 var badCredentialsRegex = new RegExp("bad credentials", "gi");
 
-var lockedErrorMessage = "locked";
-var badCredentialsErrorMessage = "badcredentials";
+var scopes = ["user", "repo", "gist", "write:public_key"];
 
-var handleBasicAuthentication = function (username, password, onSuccess, onRequiresTwoFa, onFailure) {
+var handleAuthentication = function (username, password, onSuccess, onFailure, twoFactor) {
     var octokit = octokitWrapper.createOctokit();
 
     octokit.authenticate({
@@ -20,56 +17,29 @@ var handleBasicAuthentication = function (username, password, onSuccess, onRequi
         password: password
     });
 
+    var headers;
+    if (twoFactor) {
+        headers = {
+            "X-GitHub-OTP": twoFactor
+        };
+    }
+
     octokit.authorization.create({
         scopes: scopes,
         note: config.appName,
         client_id: config.clientId,
-        client_secret: config.clientSecret
+        client_secret: config.clientSecret,
+        headers: headers
     }, function (err, res) {
         if (err) {
             if (twoFactorRegex.test(err.message)) {
-                onRequiresTwoFa();
+                onSuccess(password, "2fa");
             }
             else if (lockedRegex.test(err.message)) {
-                onFailure(lockedErrorMessage)
-            }
-            else if (badCredentialsRegex.test(err.message)) {
-                onFailure(badCredentialsErrorMessage)
-            }
-            else {
-                onFailure(err)
-            }
-        }
-        else {
-            onSuccess(res.data.token);
-        }
-    });
-}
-
-var handleTwoFactorAuthentication = function (username, password, twoFactor, onSuccess, onFailure) {
-    var octokit = octokitWrapper.createOctokit();
-
-    octokit.authenticate({
-        type: "basic",
-        username: username,
-        password: password
-    });
-
-    octokit.authorization.create({
-        scopes: scopes,
-        note: config.appName,
-        client_id: config.clientId,
-        client_secret: config.clientSecret,
-        headers: {
-            "X-GitHub-OTP": twoFactor
-        }
-    }, function (err, res) {
-        if (err) {
-            if (lockedRegex.test(err.message)) {
-                onFailure(lockedErrorMessage)
+                onFailure("locked")
             }
             else if (badCredentialsRegex.test(err.message)) {
-                onFailure(badCredentialsErrorMessage)
+                onFailure("badcredentials")
             }
             else {
                 onFailure(err)
@@ -82,6 +52,5 @@ var handleTwoFactorAuthentication = function (username, password, twoFactor, onS
 }
 
 module.exports = {
-    handleBasicAuthentication: handleBasicAuthentication,
-    handleTwoFactorAuthentication: handleTwoFactorAuthentication,
+    handleAuthentication: handleAuthentication,
 };

octorun/src/bin/app-login.js

@@ -9,19 +9,24 @@ commander
     .option('-t, --twoFactor')
     .parse(process.argv);
 
-var encoding = 'utf-8';
-
-if (commander.twoFactor) {
-    var handleTwoFactorAuthentication = function (username, password, token) {
-        authentication.handleTwoFactorAuthentication(username, password, token, function (token) {
-            output.success(token);
+var handleAuthentication = function (username, password, twoFactor) {
+    authentication.handleAuthentication(username, password, function (token, status) {
+        if (status) {
+            output.custom(status, token);
             process.exit();
-        }, function (error) {
-            output.error(error);
+        }
+        else {
+            output.success(token);
             process.exit();
-        });
-    }
+        }
+    }, function (error) {
+        output.error(error);
+        process.exit();
+    }, twoFactor);
+}
 
+var encoding = 'utf-8';
+if (commander.twoFactor) {
     if (process.stdin.isTTY) {
         var readlineSync = require("readline-sync");
         var username = readlineSync.question('User: ');
@@ -31,7 +36,7 @@ if (commander.twoFactor) {
 
         var twoFactor = readlineSync.question('Two Factor: ');
 
-        handleTwoFactorAuthentication(username, password, twoFactor);
+        handleAuthentication(username, password, twoFactor);
     }
     else {
         var data = '';
@@ -49,25 +54,11 @@ if (commander.twoFactor) {
                 .split(/\r?\n/)
                 .filter(function (item) { return item; });
 
-            handleTwoFactorAuthentication(items[0], items[1], items[2]);
+            handleAuthentication(items[0], items[1], items[2]);
         });
     }
 }
 else {
-    var handleBasicAuthentication = function (username, password) {
-        authentication.handleBasicAuthentication(username, password,
-            function (token) {
-                output.success(token);
-                process.exit();
-            }, function () {
-                output.custom("2fa", password);
-                process.exit();
-            }, function (error) {
-                output.error(error);
-                process.exit();
-            });
-    }
-
     if (process.stdin.isTTY) {
         var readlineSync = require("readline-sync");
 
@@ -76,7 +67,7 @@ else {
             hideEchoBack: true
         });
 
-        handleBasicAuthentication(username, password);
+        handleAuthentication(username, password);
     }
     else {
         var data = '';
@@ -94,7 +85,7 @@ else {
                 .split(/\r?\n/)
                 .filter(function (item) { return item; });
 
-            handleBasicAuthentication(items[0], items[1]);
+            handleAuthentication(items[0], items[1]);
         });
     }
 }