Merge branch 'fixes/octorun-is-custom' into fixes/octorun-refactor-authentication

Author: StanleyGoldman

octorun/src/authentication.js

@@ -8,6 +8,9 @@ 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 handleBasicAuthentication = function (username, password, onSuccess, onRequiresTwoFa, onFailure) {
     var octokit = octokitWrapper.createOctokit();
 
@@ -28,10 +31,10 @@ var handleBasicAuthentication = function (username, password, onSuccess, onRequi
                 onRequiresTwoFa();
             }
             else if (lockedRegex.test(err.message)) {
-                onFailure("Account locked.")
+                onFailure(lockedErrorMessage)
             }
             else if (badCredentialsRegex.test(err.message)) {
-                onFailure("Bad credentials.")
+                onFailure(badCredentialsErrorMessage)
             }
             else {
                 onFailure(err)
@@ -63,10 +66,10 @@ var handleTwoFactorAuthentication = function (username, password, twoFactor, onS
     }, function (err, res) {
         if (err) {
             if (lockedRegex.test(err.message)) {
-                onFailure("Account locked.")
+                onFailure(lockedErrorMessage)
             }
             else if (badCredentialsRegex.test(err.message)) {
-                onFailure("Bad credentials.")
+                onFailure(badCredentialsErrorMessage)
             }
             else {
                 onFailure(err)

src/GitHub.Api/Authentication/LoginManager.cs

@@ -177,7 +177,7 @@ string password
                 return ret.Output[0];
             }
 
-            if (ret.IsCustom && ret.Status == "2fa")
+            if (ret.IsTwoFactorRequired)
             {
                 keychain.SetToken(host, ret.Output[0]);
                 await keychain.Save(host);

src/GitHub.Api/Tasks/OctorunTask.cs

@@ -123,6 +123,8 @@ public OctorunResult(string status, string[] output)
 
         public bool IsSuccess => Status.Equals("success", StringComparison.InvariantCultureIgnoreCase);
         public bool IsError => Status.Equals("error", StringComparison.InvariantCultureIgnoreCase);
-        public bool IsCustom => !IsSuccess && !IsError;
+        public bool IsTwoFactorRequired => Status.Equals("2fa", StringComparison.InvariantCultureIgnoreCase);
+        public bool IsLocked => Status.Equals("locked", StringComparison.InvariantCultureIgnoreCase);
+        public bool IsBadCredentials => Status.Equals("badcredentials", StringComparison.InvariantCultureIgnoreCase);
     }
 }