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

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.WebUri.Host, token))
+                    () => loginManager.LoginWithToken(UriString.ToUriString(HostAddress.WebUri), 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.ApiUri.Host;
+            var command = "token -h " + HostAddress.WebUri.Host;
             var octorunTask = new OctorunTask(taskManager.Token, environment, command, code)
                 .Configure(processManager);
 
@@ -388,7 +388,7 @@ private Connection Connection
             {
                 if (connection == null)
                 {
-                    connection = keychain.Connections.FirstOrDefault(x => x.Host == (UriString)HostAddress.WebUri.Host);
+                    connection = keychain.Connections.FirstOrDefault(x => x.Host.ToUriString().Host == HostAddress.WebUri.Host);
                 }
 
                 return connection;

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

@@ -160,7 +160,7 @@ private void OnGUILogin()
                     GUILayout.BeginHorizontal();
                     {
                         GUILayout.FlexibleSpace();
-                        if (GUILayout.Button("Signin with your browser", Styles.HyperlinkStyle))
+                        if (GUILayout.Button("Sign in with your browser", Styles.HyperlinkStyle))
                         {
                             GUI.FocusControl(null);
                             Application.OpenURL(oAuthOpenUrl);
@@ -216,7 +216,7 @@ private void OnOAuthCallback(string state, string code)
             if (state.Equals(oAuthState))
             {
                 isBusy = true;
-                authenticationService.LoginWithOAuthCode(code, DoOAuthCodeResult);
+                authenticationService.LoginWithOAuthCode(code, (b, s) => TaskManager.RunInUI(() => DoOAuthCodeResult(b, s)));
             }
         }
 
@@ -292,7 +292,7 @@ private AuthenticationService AuthenticationService
             {
                 if (authenticationService == null)
                 {
-                    AuthenticationService = new AuthenticationService(HostAddress.GitHubDotComHostAddress.WebUri.Host, Platform.Keychain, Manager.ProcessManager, Manager.TaskManager, Environment);
+                    AuthenticationService = new AuthenticationService(UriString.ToUriString(HostAddress.GitHubDotComHostAddress.WebUri), Platform.Keychain, Manager.ProcessManager, Manager.TaskManager, Environment);
                 }
                 return authenticationService;
             }

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

@@ -126,7 +126,7 @@ public override void OnGUI()
                                 GUILayout.BeginHorizontal();
                                 {
                                     GUILayout.FlexibleSpace();
-                                    if (GUILayout.Button("Signin with your browser", Styles.HyperlinkStyle))
+                                    if (GUILayout.Button("Sign in with your browser", Styles.HyperlinkStyle))
                                     {
                                         GUI.FocusControl(null);
                                         Application.OpenURL(oAuthOpenUrl);
@@ -334,7 +334,7 @@ private void OnOAuthCallback(string state, string code)
                 if (state.Equals(oAuthState))
                 {
                     isBusy = true;
-                    authenticationService.LoginWithOAuthCode(code, DoOAuthCodeResult);
+                    authenticationService.LoginWithOAuthCode(code, (b, s) => TaskManager.RunInUI(() => DoOAuthCodeResult(b, s)));
                 }
             });
         }

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

@@ -59,7 +59,7 @@ private void MaybeUpdateData()
             {
                 connectionsNeedLoading = false;
                 connections = Platform.Keychain.Connections.OrderByDescending(HostAddress.IsGitHubDotCom).ToArray();
-                connectionLabels = connections.Select(c => HostAddress.IsGitHubDotCom(c) ? "GitHub" : c.Host).ToArray();
+                connectionLabels = connections.Select(c => HostAddress.IsGitHubDotCom(c) ? "GitHub" : c.Host.ToUriString().Host).ToArray();
 
                 var connection = connections.First();
                 selectedConnection = 0;