Simplify ApiClient

Author: StanleyGoldman

src/GitHub.Api/Application/ApiClient.cs

@@ -27,17 +27,20 @@ class ApiClient : IApiClient
         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)
+        public ApiClient(IKeychain keychain, IProcessManager processManager, ITaskManager taskManager,
+            IEnvironment environment, UriString host = null)
         {
-        }
-
-        public ApiClient(UriString host, IKeychain keychain, IProcessManager processManager, ITaskManager taskManager, IEnvironment environment)
-        {
-            Guard.ArgumentNotNull(host, nameof(host));
             Guard.ArgumentNotNull(keychain, nameof(keychain));
 
-            host = new UriString(host.ToRepositoryUri().GetComponents(UriComponents.SchemeAndServer, UriFormat.SafeUnescaped));
+            if (host == null)
+            {
+                host = UriString.ToUriString(HostAddress.GitHubDotComHostAddress.WebUri);
+            }
+            else
+            {
+                host = new UriString(host.ToRepositoryUri().GetComponents(UriComponents.SchemeAndServer, UriFormat.SafeUnescaped));
+            }
+
             HostAddress = HostAddress.Create(host);
 
             this.keychain = keychain;

src/GitHub.Api/Authentication/OAuthCallbackManager.cs

@@ -60,7 +60,8 @@ public void Start()
 
         public void Stop()
         {
-            logger.Debug("Stop");
+            logger.Trace("Stopping");
+            cancelSource.Cancel();
         }
 
         private void Listen()
@@ -86,15 +87,14 @@ private void Listen()
                             }
 
                             context.Response.StatusCode = 200;
-                            context.Response.OutputStream.Flush();
                             context.Response.Close();
                         }
                     }
                 }
             }
             catch (Exception ex)
             {
-                logger.Warning(ex, "OAuthCallbackManager Error");
+                logger.Trace(ex.Message);
             }
             finally
             {

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

@@ -16,9 +16,7 @@ public AuthenticationService(UriString host, IKeychain keychain,
             IEnvironment environment
         )
         {
-            client = host == null
-                ? new ApiClient(keychain, processManager, taskManager, environment)
-                : new ApiClient(host, keychain, processManager, taskManager, environment);
+            client = new ApiClient(keychain, processManager, taskManager, environment, host);
         }
 
         public HostAddress HostAddress { get { return client.HostAddress; } }

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

@@ -39,8 +39,8 @@ public override void InitializeView(IView parent)
                 Logger.Trace(ex, "Error Starting OAuthCallbackManager");
             }
 
-            gitHubAuthenticationView.InitializeView(parent);
-            gitHubEnterpriseAuthenticationView.InitializeView(parent);
+            gitHubAuthenticationView.InitializeView(this);
+            gitHubEnterpriseAuthenticationView.InitializeView(this);
 
             hasGitHubDotComConnection = Platform.Keychain.Connections.Any(HostAddress.IsGitHubDotCom);
             hasGitHubEnterpriseConnection = Platform.Keychain.Connections.Any(connection => !HostAddress.IsGitHubDotCom(connection));
@@ -76,8 +76,8 @@ public override void OnDataUpdate()
 
         public override void Finish(bool result)
         {
-            base.Finish(result);
             OAuthCallbackManager.Stop();
+            base.Finish(result);
         }
 
         private void MaybeUpdateData()

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

@@ -120,8 +120,8 @@ private void Open(PopupViewType popupViewType, Action<bool> onClose)
                 var userHasAuthentication = false;
                 foreach (var keychainConnection in Platform.Keychain.Connections.OrderByDescending(HostAddress.IsGitHubDotCom))
                 {
-                    var apiClient = new ApiClient(keychainConnection.Host, Platform.Keychain, Platform.ProcessManager, TaskManager,
-                        Environment);
+                    var apiClient = new ApiClient(Platform.Keychain, Platform.ProcessManager, TaskManager,
+                        Environment, keychainConnection.Host);
 
                     try
                     {

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

@@ -79,9 +79,7 @@ private IApiClient GetApiClient(Connection connection)
 
             if (!clients.TryGetValue(connection.Host, out client))
             {
-                client = HostAddress.IsGitHubDotCom(connection)
-                    ? new ApiClient(Platform.Keychain, Platform.ProcessManager, TaskManager, Environment)
-                    : new ApiClient(connection.Host, Platform.Keychain, Platform.ProcessManager, TaskManager, Environment);
+                client = new ApiClient(Platform.Keychain, Platform.ProcessManager, TaskManager, Environment, connection.Host);
 
                 clients.Add(connection.Host, client);
             }