Centralizing logout functionality

Author: StanleyGoldman

src/GitHub.Api/Api/ApiClient.cs

@@ -49,6 +49,16 @@ public async void GetRepository(Action<Octokit.Repository> callback)
             callback(repo);
         }
 
+        public async void Logout(UriString host)
+        {
+            await LogoutInternal(host);
+        }
+
+        private async Task LogoutInternal(UriString host)
+        {
+            await loginManager.Logout(host);
+        }
+
         public async Task Login(string username, string password, Action<LoginResult> need2faCode, Action<bool, string> result)
         {
             Guard.ArgumentNotNull(need2faCode, "need2faCode");

src/GitHub.Api/Api/IApiClient.cs

@@ -13,5 +13,6 @@ interface IApiClient
         Task ContinueLogin(LoginResult loginResult, string code);
         Task<bool> LoginAsync(string username, string password, Func<LoginResult, string> need2faCode);
         Task<bool> ValidateCredentials();
+        void Logout(UriString host);
     }
 }

src/GitHub.Api/Authentication/ILoginManager.cs

@@ -21,5 +21,12 @@ interface ILoginManager
         /// </exception>
         Task<LoginResultData> Login(UriString host, IGitHubClient client, string username, string password);
         Task<LoginResultData> ContinueLogin(LoginResultData loginResultData, string twofacode);
+
+        /// <summary>
+        /// Logs out of GitHub server.
+        /// </summary>
+        /// <param name="hostAddress">The address of the server.</param>
+        /// <inheritdoc/>
+        Task Logout(UriString hostAddress);
     }
 }

src/GitHub.Api/Authentication/LoginManager.cs

@@ -3,6 +3,7 @@
 using System.Threading.Tasks;
 using Octokit;
 using GitHub.Unity;
+using Octokit_Extensions35;
 
 namespace GitHub.Unity
 {
@@ -188,6 +189,14 @@ public async Task<LoginResultData> ContinueLogin(LoginResultData loginResultData
             }
         }
 
+        /// <inheritdoc/>
+        public async Task Logout(UriString hostAddress)
+        {
+            Guard.ArgumentNotNull(hostAddress, nameof(hostAddress));
+
+            await new ActionTask(keychain.Clear(hostAddress, true)).StartAwait();
+        }
+
         private async Task<ApplicationAuthorization> CreateAndDeleteExistingApplicationAuthorization(
             IGitHubClient client,
             NewAuthorization newAuth,

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

@@ -223,10 +223,12 @@ private void GoToProfile(object obj)
         }
         private void SignOut(object obj)
         {
-            var uriString = Platform.Keychain.Connections.First();
+            var host = Repository != null
+                ? new UriString(Repository.CloneUrl.ToRepositoryUri().GetComponents(UriComponents.SchemeAndServer, UriFormat.SafeUnescaped))
+                : UriString.ToUriString(HostAddress.GitHubDotComHostAddress.WebUri);
 
-            new ActionTask(Platform.Keychain.Clear(uriString, true))
-                .Start();
+            var apiClient = ApiClient.Create(host, Platform.Keychain, new AppConfiguration());
+            apiClient.Logout(host);
         }
 
         private bool ValidateSettings()