Merge branch 'github-enterprise' into releases/v1.2.0

Author: StanleyGoldman

src/GitHub.Api/Application/ApiClient.cs

@@ -32,14 +32,9 @@ public ApiClient(IKeychain keychain, IProcessManager processManager, ITaskManage
         {
             Guard.ArgumentNotNull(keychain, nameof(keychain));
 
-            if (host == null)
-            {
-                host = UriString.ToUriString(HostAddress.GitHubDotComHostAddress.WebUri);
-            }
-            else
-            {
-                host = new UriString(host.ToRepositoryUri().GetComponents(UriComponents.SchemeAndServer, UriFormat.SafeUnescaped));
-            }
+            host = host == null
+                ? UriString.ToUriString(HostAddress.GitHubDotComHostAddress.WebUri)
+                : new UriString(host.ToRepositoryUri().GetComponents(UriComponents.SchemeAndServer, UriFormat.SafeUnescaped));
 
             HostAddress = HostAddress.Create(host);
 
@@ -267,7 +262,7 @@ public void LoginWithToken(string token, Action<bool> result)
             Guard.ArgumentNotNull(result, "result");
 
             new FuncTask<bool>(taskManager.Token,
-                    () => loginManager.LoginWithToken(HostAddress.ApiUri.Host, token))
+                    () => loginManager.LoginWithToken(HostAddress.WebUri.Host, token))
                 .FinallyInUI((success, ex, res) =>
                 {
                     if (!success)
@@ -284,7 +279,7 @@ public void LoginWithToken(string token, Action<bool> result)
 
         public void CreateOAuthToken(string code, Action<bool, string> result)
         {
-            var command = "token -h " + HostAddress.WebUri.Host;
+            var command = "token -h " + HostAddress.ApiUri.Host;
             var octorunTask = new OctorunTask(taskManager.Token, environment, command, code)
                 .Configure(processManager);
 
@@ -326,7 +321,7 @@ public void Login(string username, string password, Action<LoginResult> need2faC
             Guard.ArgumentNotNull(result, "result");
 
             new FuncTask<LoginResultData>(taskManager.Token,
-                () => loginManager.Login(HostAddress.ApiUri.Host, username, password))
+                () => loginManager.Login(HostAddress.WebUri.Host, username, password))
                 .FinallyInUI((success, ex, res) =>
                 {
                     if (!success)
@@ -393,7 +388,7 @@ private Connection Connection
             {
                 if (connection == null)
                 {
-                    connection = keychain.Connections.FirstOrDefault(x => x.Host == (UriString)HostAddress.ApiUri.Host);
+                    connection = keychain.Connections.FirstOrDefault(x => x.Host == (UriString)HostAddress.WebUri.Host);
                 }
 
                 return connection;

src/GitHub.Api/Application/ApplicationManagerBase.cs

@@ -210,8 +210,6 @@ public void SetupGit(GitInstaller.GitInstallationState state)
                             return true;
                         }).RunSynchronously();
 
-                    Logger.Trace("Credential Helper: {0}", credentialHelper);
-
                     if (string.IsNullOrEmpty(credentialHelper))
                     {
                         Logger.Warning("No Windows CredentialHelper found: Setting to wincred");

src/GitHub.Api/Authentication/ILoginManager.cs

@@ -10,7 +10,7 @@ interface ILoginManager
         /// <summary>
         /// Attempts to log into a GitHub server with a username and password.
         /// </summary>
-        /// <param name="host"></param>
+        /// <param name="host">The host.</param>
         /// <param name="username">The username.</param>
         /// <param name="password">The password.</param>
         /// <returns>The logged in user.</returns>
@@ -28,8 +28,12 @@ interface ILoginManager
         /// <inheritdoc/>
         ITask Logout(UriString hostAddress);
 
-        bool LoginWithToken(
-            UriString host,
-            string token);
+        /// <summary>
+        /// Attempts to log into a GitHub server with a token.
+        /// </summary>
+        /// <param name="host">The host.</param>
+        /// <param name="token">The token.</param>
+        /// <returns></returns>
+        bool LoginWithToken(UriString host, string token);
     }
 }

src/GitHub.Api/Authentication/Keychain.cs

@@ -133,8 +133,6 @@ 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/Authentication/LoginManager.cs

@@ -45,9 +45,7 @@ public LoginManager(
             this.environment = environment;
         }
 
-        public bool LoginWithToken(
-            UriString host,
-            string token)
+        public bool LoginWithToken(UriString host, string token)
         {
             Guard.ArgumentNotNull(host, nameof(host));
             Guard.ArgumentNotNullOrWhiteSpace(token, nameof(token));

src/GitHub.Api/Primitives/HostAddress.cs

@@ -87,9 +87,11 @@ public static bool IsGitHubDotCom(Connection connection)
             if (connection == null || String.IsNullOrEmpty(connection.Host))
                 return false;
 
-            return connection.Host == GitHubDotComHostAddress.WebUri.Host
-                || connection.Host == GitHubDotComHostAddress.ApiUri.Host
-                || connection.Host == gistUri.Host;
+            var connectionHost = connection.Host.ToUriString();
+
+            return connectionHost.Host == GitHubDotComHostAddress.WebUri.Host
+                || connectionHost.Host == GitHubDotComHostAddress.ApiUri.Host
+                || connectionHost.Host == gistUri.Host;
         }
 
         public bool IsGitHubDotCom()

src/GitHub.Api/Tasks/OctorunTask.cs

@@ -71,27 +71,7 @@ public OctorunTask(CancellationToken token, IEnvironment environment,
             this.pathToNodeJs = environment.NodeJsExecutablePath;
             this.pathToOctorunJs = environment.OctorunScriptPath;
             this.arguments = $"\"{pathToOctorunJs}\" {arguments}";
-
             this.userToken = userToken;
-
-//            var cloneUrl = environment.Repository?.CloneUrl;
-//            var host = String.IsNullOrEmpty(cloneUrl)
-//                ? UriString.ToUriString(HostAddress.GitHubDotComHostAddress.WebUri)
-//                : new UriString(cloneUrl.ToRepositoryUri()
-//                    .GetComponents(UriComponents.SchemeAndServer, UriFormat.SafeUnescaped));
-//
-//            var adapter = keychain.Connect(host);
-//            if (adapter.Credential?.Token != null)
-//            {
-//                userToken = adapter.Credential.Token;
-//            }
-//            else
-//            {
-//                // use a cached adapter if there is one filled out
-//                adapter = keychain.LoadFromSystem(host);
-//                if (adapter != null)
-//                    userToken = adapter.Credential.Token;
-//            }
         }
 
         public override void Configure(ProcessStartInfo psi)

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

@@ -2,7 +2,6 @@
 using System.Linq;
 using UnityEditor;
 using UnityEngine;
-using Object = System.Object;
 
 namespace GitHub.Unity
 {