Correcting usage of WebUri and ApiUri

Author: StanleyGoldman

src/GitHub.Api/Application/ApiClient.cs

@@ -262,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)
@@ -279,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);
 
@@ -321,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)
@@ -388,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/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()