Ability to login with a token

Author: StanleyGoldman

octorun/src/octokit.js

@@ -9,8 +9,9 @@ var createOctokit = function (appName, host) {
         }
     };
 
-    if(host) {
-        octokitConfiguration.baseUrl = "https://" + host;
+    if (host) {
+        octokitConfiguration.host = host;
+        octokitConfiguration.pathPrefix = 'api/v3';
     }
 
     return Octokit(octokitConfiguration);

octorun/version

@@ -1 +1 @@
-902910f45
+902910f46

src/GitHub.Api/Application/ApiClient.cs

@@ -248,6 +248,27 @@ public void GetCurrentUser(Action<GitHubUser> onSuccess, Action<Exception> onErr
                 .Start();
         }
 
+        public void LoginWithToken(string token, Action<bool> result)
+        {
+            Guard.ArgumentNotNull(token, "token");
+            Guard.ArgumentNotNull(result, "result");
+
+            new FuncTask<bool>(taskManager.Token,
+                    () => loginManager.LoginWithToken(OriginalUrl, token))
+                .FinallyInUI((success, ex, res) =>
+                {
+                    if (!success)
+                    {
+                        logger.Warning(ex);
+                        result(false);
+                        return;
+                    }
+
+                    result(res);
+                })
+                .Start();
+        }
+
         public void Login(string username, string password, Action<LoginResult> need2faCode, Action<bool, string> result)
         {
             Guard.ArgumentNotNull(need2faCode, "need2faCode");

src/GitHub.Api/Application/IApiClient.cs

@@ -11,6 +11,7 @@ void CreateRepository(string name, string description, bool isPrivate,
         void GetOrganizations(Action<Organization[]> onSuccess, Action<Exception> onError = null);
         void Login(string username, string password, Action<LoginResult> need2faCode, Action<bool, string> result);
         void ContinueLogin(LoginResult loginResult, string code);
+        void LoginWithToken(string token, Action<bool> result);
         ITask Logout(UriString host);
         void GetCurrentUser(Action<GitHubUser> onSuccess, Action<Exception> onError = null);
         void GetServerMeta(Action<GitHubHostMeta> onSuccess, Action<Exception> onError = null);

src/GitHub.Api/Authentication/ILoginManager.cs

@@ -27,5 +27,9 @@ interface ILoginManager
         /// <param name="hostAddress">The address of the server.</param>
         /// <inheritdoc/>
         ITask Logout(UriString hostAddress);
+
+        bool LoginWithToken(
+            UriString host,
+            string token);
     }
 }

src/GitHub.Api/Authentication/LoginManager.cs

@@ -44,6 +44,33 @@ public LoginManager(
             this.environment = environment;
         }
 
+        public bool LoginWithToken(
+            UriString host,
+            string token)
+        {
+            Guard.ArgumentNotNull(host, nameof(host));
+            Guard.ArgumentNotNullOrWhiteSpace(token, nameof(token));
+
+            var keychainAdapter = keychain.Connect(host);
+            keychainAdapter.Set(new Credential(host, "[token]", token));
+
+            try
+            {
+                var username = RetrieveUsername(token, host);
+                keychainAdapter.Update(token, username);
+                keychain.SaveToSystem(host);
+
+                return true;
+            }
+            catch (Exception e)
+            {
+                logger.Warning(e, "Login Exception");
+
+                keychain.Clear(host, false);
+                return false;
+            }
+        }
+
         /// <inheritdoc/>
         public LoginResultData Login(
             UriString host,
@@ -73,7 +100,7 @@ public LoginResultData Login(
 
                     if (loginResultData.Code == LoginResultCodes.Success)
                     {
-                        username = RetrieveUsername(loginResultData.Token, username, host);
+                        username = RetrieveUsername(loginResultData.Token, host, username);
                         keychainAdapter.Update(loginResultData.Token, username);
                         keychain.SaveToSystem(host);
                     }
@@ -113,7 +140,7 @@ public LoginResultData ContinueLogin(LoginResultData loginResultData, string two
                     }
 
                     keychainAdapter.Update(loginResultData.Token, username);
-                    username = RetrieveUsername(loginResultData.Token, username, host);
+                    username = RetrieveUsername(loginResultData.Token, host, username);
                     keychainAdapter.Update(loginResultData.Token, username);
                     keychain.SaveToSystem(host);
 
@@ -180,9 +207,9 @@ private LoginResultData TryLogin(
             return new LoginResultData(LoginResultCodes.Failed, ret.GetApiErrorMessage() ?? "Failed.", host);
         }
 
-        private string RetrieveUsername(string token, string username, UriString host)
+        private string RetrieveUsername(string token, UriString host, string username = null)
         {
-            if (!username.Contains("@"))
+            if (username != null && !username.Contains("@"))
             {
                 return username;
             }

src/UnityExtension/Assets/Editor/GitHub.Unity/Services/AuthenticationService.cs

@@ -28,12 +28,11 @@ public void Login(string username, string password, Action<string> twofaRequired
             }, authResult);
         }
 
-        public void LoginWithToken(string token, Action<string> twofaRequired, Action<bool, string> authResult)
+        public void LoginWithToken(string token, Action<bool> authResult)
         {
-            Login("[token]", token, twofaRequired, authResult);
+            client.LoginWithToken(token, authResult);
         }
 
-
         public void LoginWith2fa(string code)
         {
             if (loginResultData == null)

src/UnityExtension/Assets/Editor/GitHub.Unity/UI/GitHubEnterpriseAuthenticationView.cs

@@ -249,7 +249,7 @@ private void OnGUITokenLogin()
                         GUI.FocusControl(null);
                         isBusy = true;
                         GetAuthenticationService(serverAddress)
-                            .LoginWithToken(token, DoRequire2fa, DoResult);
+                            .LoginWithToken(token, DoTokenResult);
                     }
                 }
                 GUILayout.EndHorizontal();
@@ -346,6 +346,23 @@ private void DoResult(bool success, string msg)
             }
         }
 
+        private void DoTokenResult(bool success)
+        {
+            isBusy = false;
+            if (success)
+            {
+                UsageTracker.IncrementAuthenticationViewButtonAuthentication();
+
+                Clear();
+                Finish(true);
+            }
+            else
+            {
+                errorMessage = "Error validating token.";
+                Redraw();
+            }
+        }
+
         private void ShowMessage()
         {
             if (message != null)