Seems like I have GitHub Enterprise support

Author: StanleyGoldman

src/GitHub.Api/Application/ApiClient.cs

@@ -22,6 +22,8 @@ class ApiClient : IApiClient
         private readonly ITaskManager taskManager;
         private readonly ILoginManager loginManager;
         private readonly IEnvironment environment;
+        private IKeychainAdapter keychainAdapter;
+        private Connection connection;
 
         public ApiClient(IKeychain keychain, IProcessManager processManager, ITaskManager taskManager, IEnvironment environment):
             this(UriString.ToUriString(HostAddress.GitHubDotComHostAddress.WebUri), keychain, processManager, taskManager, environment)
@@ -36,8 +38,6 @@ public ApiClient(UriString host, IKeychain keychain, IProcessManager processMana
             host = new UriString(host.ToRepositoryUri().GetComponents(UriComponents.SchemeAndServer, UriFormat.SafeUnescaped));
             HostAddress = HostAddress.Create(host);
 
-            logger.Trace("OriginalUrl: {0}", HostAddress.ApiUri.Host);
-
             this.keychain = keychain;
             this.processManager = processManager;
             this.taskManager = taskManager;
@@ -57,8 +57,7 @@ public void CreateRepository(string name, string description, bool isPrivate,
 
             new FuncTask<GitHubRepository>(taskManager.Token, () =>
             {
-                // this validates the user, again
-                GetCurrentUser();
+                EnsureValidCredentials();
 
                 var command = new StringBuilder("publish");
 
@@ -91,11 +90,7 @@ public void CreateRepository(string name, string description, bool isPrivate,
                     command.Append(" -p");
                 }
 
-                var adapter = keychain.Connect(HostAddress.ApiUri.Host);
-                if (adapter.Credential == null)
-                {
-                    throw new ApiClientException("No Credentials found");
-                }
+                var adapter = EnsureKeychainAdapter();
 
                 var octorunTask = new OctorunTask(taskManager.Token, environment, command.ToString(), adapter.Credential.Token)
                     .Configure(processManager);
@@ -199,11 +194,7 @@ public void GetOrganizations(Action<Organization[]> onSuccess, Action<Exception>
             Guard.ArgumentNotNull(onSuccess, nameof(onSuccess));
             new FuncTask<Organization[]>(taskManager.Token, () =>
             {
-                var adapter = keychain.Connect(HostAddress.ApiUri.Host);
-                if (adapter.Credential == null)
-                {
-                    throw new ApiClientException("No Credentials found");
-                }
+                var adapter = EnsureKeychainAdapter();
 
                 var command = HostAddress.IsGitHubDotCom() ? "organizations" : "organizations -h " + HostAddress.ApiUri.Host;
                 var octorunTask = new OctorunTask(taskManager.Token, environment,
@@ -240,6 +231,17 @@ public void GetOrganizations(Action<Organization[]> onSuccess, Action<Exception>
             .Start();
         }
 
+        private IKeychainAdapter EnsureKeychainAdapter()
+        {
+            var adapter = KeychainAdapter;
+            if (adapter.Credential == null)
+            {
+                throw new ApiClientException("No Credentials found");
+            }
+
+            return adapter;
+        }
+
         public void GetCurrentUser(Action<GitHubUser> onSuccess, Action<Exception> onError = null)
         {
             Guard.ArgumentNotNull(onSuccess, nameof(onSuccess));
@@ -324,68 +326,87 @@ public void ContinueLogin(LoginResult loginResult, string code)
                 .Start();
         }
 
-        public GitHubUser GetCurrentUser()
+        public void EnsureValidCredentials()
         {
-            var keychainConnection = keychain.Connections.FirstOrDefault(x => x.Host == (UriString)HostAddress.ApiUri.Host);
-            if (keychainConnection == null)
-                throw new KeychainEmptyException();
-
-            var keychainAdapter = GetValidatedKeychainAdapter(keychainConnection);
+            GetCurrentUser();
+        }
 
+        public GitHubUser GetCurrentUser()
+        {
             // we can't trust that the system keychain has the username filled out correctly.
             // if it doesn't, we need to grab the username from the server and check it
             // unfortunately this means that things will be slower when the keychain doesn't have all the info
-            if (keychainConnection.User == null || keychainAdapter.Credential.Username != keychainConnection.Username)
+            if (Connection.User == null || KeychainAdapter.Credential.Username != Connection.Username)
             {
-                keychainConnection.User = GetValidatedGitHubUser(keychainConnection, keychainAdapter);
+                Connection.User = GetValidatedGitHubUser();
             }
-            return keychainConnection.User;
+
+            return Connection.User;
         }
 
-        private IKeychainAdapter GetValidatedKeychainAdapter(Connection keychainConnection)
+        private Connection Connection
         {
-            var keychainAdapter = keychain.LoadFromSystem(keychainConnection.Host);
-            if (keychainAdapter == null)
-                throw new KeychainEmptyException();
-
-            if (string.IsNullOrEmpty(keychainAdapter.Credential?.Username))
+            get
             {
-                logger.Warning("LoadKeychainInternal: Username is empty");
-                throw new TokenUsernameMismatchException(keychainConnection.Username);
-            }
+                if (connection == null)
+                {
+                    connection = keychain.Connections.FirstOrDefault(x => x.Host == (UriString)HostAddress.ApiUri.Host);
+                }
 
-            if (keychainAdapter.Credential.Username != keychainConnection.Username)
-            {
-                logger.Warning("LoadKeychainInternal: Token username does not match");
+                return connection;
             }
-
-            return keychainAdapter;
         }
 
-        private GitHubUser GetValidatedGitHubUser(Connection keychainConnection, IKeychainAdapter keychainAdapter)
+        private IKeychainAdapter KeychainAdapter
         {
-            try
+            get
             {
-                if (keychainAdapter.Credential == null)
+                if (keychainAdapter == null)
                 {
-                    throw new ApiClientException("No Credentials found");
+                    if (Connection == null)
+                        throw new KeychainEmptyException();
+
+                    var loadedKeychainAdapter = keychain.LoadFromSystem(Connection.Host);
+                    if (loadedKeychainAdapter == null)
+                        throw new KeychainEmptyException();
+
+                    if (string.IsNullOrEmpty(loadedKeychainAdapter.Credential?.Username))
+                    {
+                        logger.Warning("LoadKeychainInternal: Username is empty");
+                        throw new TokenUsernameMismatchException(connection.Username);
+                    }
+
+                    if (loadedKeychainAdapter.Credential.Username != connection.Username)
+                    {
+                        logger.Warning("LoadKeychainInternal: Token username does not match");
+                    }
+
+                    keychainAdapter = loadedKeychainAdapter;
                 }
 
-                logger.Trace("GetValidatedGitHubUser with GitHub Token: {0} {1}", keychainAdapter.Credential.Host, keychainAdapter.Credential.Token);
+                return keychainAdapter;
+            }
+        }
+
+        private GitHubUser GetValidatedGitHubUser()
+        {
+            try
+            {
+                var adapter = EnsureKeychainAdapter();
 
                 var command = HostAddress.IsGitHubDotCom() ? "validate" : "validate -h " + HostAddress.ApiUri.Host;
-                var octorunTask = new OctorunTask(taskManager.Token, environment, command, keychainAdapter.Credential.Token)
+                var octorunTask = new OctorunTask(taskManager.Token, environment, command, adapter.Credential.Token)
                     .Configure(processManager);
 
                 var ret = octorunTask.RunSynchronously();
                 if (ret.IsSuccess)
                 {
                     var login = ret.Output[1];
 
-                    if (login != keychainConnection.Username)
+                    if (login != Connection.Username)
                     {
                         logger.Trace("LoadKeychainInternal: Api username does not match");
-                        throw new TokenUsernameMismatchException(keychainConnection.Username, login);
+                        throw new TokenUsernameMismatchException(Connection.Username, login);
                     }
 
                     return new GitHubUser

src/GitHub.Api/Authentication/ICredentialManager.cs

@@ -17,6 +17,5 @@ public interface ICredentialManager
         void Save(ICredential cred);
         void Delete(UriString host);
         bool HasCredentials();
-        ICredential CachedCredentials { get; }
     }
 }

src/GitHub.Api/Authentication/Keychain.cs

@@ -133,6 +133,8 @@ private KeychainAdapter FindOrCreateAdapter(UriString host)
             KeychainAdapter value;
             if (!keychainAdapters.TryGetValue(host, out value))
             {
+                logger.Trace("Creating Adapter {0}", host);
+
                 value = new KeychainAdapter();
                 keychainAdapters.Add(host, value);
             }

src/GitHub.Api/Git/GitCredentialManager.cs

@@ -1,18 +1,19 @@
 using GitHub.Logging;
 using System;
 using System.Collections.Generic;
+using System.Linq;
 
 namespace GitHub.Unity
 {
     class GitCredentialManager : ICredentialManager
     {
         private static ILogging Logger { get; } = LogHelper.GetLogger<GitCredentialManager>();
 
-        private ICredential credential;
         private string credHelper = null;
 
         private readonly IProcessManager processManager;
         private readonly ITaskManager taskManager;
+        private readonly Dictionary<string, ICredential> credentials = new Dictionary<string, ICredential>();
 
         public GitCredentialManager(IProcessManager processManager,
             ITaskManager taskManager)
@@ -23,11 +24,9 @@ public GitCredentialManager(IProcessManager processManager,
 
         public bool HasCredentials()
         {
-            return credential != null;
+            return credentials != null && credentials.Any();
         }
 
-        public ICredential CachedCredentials { get { return credential; } }
-
         public void Delete(UriString host)
         {
             if (!LoadCredentialHelper())
@@ -39,12 +38,13 @@ public void Delete(UriString host)
                         String.Format("protocol={0}", host.Protocol),
                         String.Format("host={0}", host.Host)
                 }).RunSynchronously();
-            credential = null;
+            credentials.Remove(host);
         }
 
         public ICredential Load(UriString host)
         {
-            if (credential == null)
+            ICredential credential;
+            if (!credentials.TryGetValue(host, out credential))
             {
                 if (!LoadCredentialHelper())
                     return null;
@@ -87,23 +87,25 @@ public ICredential Load(UriString host)
                 }
 
                 credential = new Credential(host, user, password);
+                credentials.Add(host, credential);
             }
+
             return credential;
         }
 
         public void Save(ICredential cred)
         {
-            this.credential = cred;
+            this.credentials.Add(cred.Host, cred);
 
             if (!LoadCredentialHelper())
                 return;
 
             var data = new List<string>
             {
-                String.Format("protocol={0}", credential.Host.Protocol),
-                String.Format("host={0}", credential.Host.Host),
-                String.Format("username={0}", credential.Username),
-                String.Format("password={0}", credential.Token)
+                String.Format("protocol={0}", cred.Host.Protocol),
+                String.Format("host={0}", cred.Host.Host),
+                String.Format("username={0}", cred.Username),
+                String.Format("password={0}", cred.Token)
             };
 
             var task = RunCredentialHelper("store", data.ToArray());

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

@@ -1,4 +1,6 @@
 using System;
+using System.Collections.Generic;
+using System.Linq;
 using UnityEditor;
 using UnityEngine;
 
@@ -14,8 +16,6 @@ public enum PopupViewType
             AuthenticationView,
         }
 
-//        [NonSerialized] private IApiClient client;
-
         [SerializeField] private PopupViewType activeViewType;
         [SerializeField] private AuthenticationView authenticationView;
         [SerializeField] private LoadingView loadingView;
@@ -118,14 +118,14 @@ private void Open(PopupViewType popupViewType, Action<bool> onClose)
             if (viewNeedsAuthentication)
             {
                 var userHasAuthentication = false;
-                foreach (var keychainConnection in Platform.Keychain.Connections)
+                foreach (var keychainConnection in Platform.Keychain.Connections.OrderByDescending(HostAddress.IsGitHubDotCom))
                 {
                     var apiClient = new ApiClient(keychainConnection.Host, Platform.Keychain, Platform.ProcessManager, TaskManager,
                         Environment);
 
                     try
                     {
-                        apiClient.GetCurrentUser();
+                        apiClient.EnsureValidCredentials();
                         userHasAuthentication = true;
                         break;
                     }
@@ -187,20 +187,6 @@ private void SwitchView(Subview fromView, Subview toView)
             Repaint();
         }
 
-//        public IApiClient Client
-//        {
-//            get
-//            {
-//                if (client == null)
-//                {
-//                    var repository = Environment.Repository;
-//                    UriString host = repository != null ? repository.CloneUrl : null;
-//                }
-//
-//                return client;
-//            }
-//        }
-
         private Subview ActiveView
         {
             get