Last fixes and tests for Keychain; Fix GitCredentialManager bug

Author: StanleyGoldman

src/GitHub.Api/Authentication/ILoginManager.cs

@@ -21,11 +21,5 @@ 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>
-        Task Logout(UriString hostAddress);
     }
 }

src/GitHub.Api/Authentication/Keychain.cs

@@ -72,11 +72,12 @@ public async Task<IKeychainAdapter> Load(UriString host)
 
             if (keychainItem == null)
             {
+                logger.Warning("Cannot load host from credential manager; removing from cache");
                 await Clear(host, false);
             }
             else
             {
-                logger.Trace("Loading KeychainItem:{0}", keychainItem?.ToString() ?? "NULL");
+                logger.Trace("Loading KeychainItem:{0}", keychainItem.ToString());
                 keychainAdapter.Set(keychainItem);
             }
 
@@ -201,16 +202,16 @@ public void SetCredentials(ICredential credential)
         {
             logger.Trace("SetCredentials Host:{0}", credential.Host);
 
-            var credentialAdapter = FindOrCreateAdapter(credential.Host);
-            credentialAdapter.Set(credential);
+            var keychainAdapter = keychainAdapters[credential.Host];
+            keychainAdapter.Set(credential);
         }
 
         public void SetToken(UriString host, string token)
         {
             logger.Trace("SetToken Host:{0}", host);
 
-            var credentialAdapter = FindOrCreateAdapter(host);
-            credentialAdapter.UpdateToken(token);
+            var keychainAdapter = keychainAdapters[host];
+            keychainAdapter.UpdateToken(token);
         }
 
         public void UpdateToken(UriString host, string token)

src/GitHub.Api/Authentication/LoginManager.cs

@@ -70,9 +70,8 @@ public async Task<LoginResultData> Login(
 
             // Start by saving the username and password, these will be used by the `IGitHubClient`
             // until an authorization token has been created and acquired:
-            var keychainAdapter = keychain.Connect(host);
-            var keychainItem = new Credential(host, username, password);
-            keychain.SetCredentials(keychainItem);
+            keychain.Connect(host);
+            keychain.SetCredentials(new Credential(host, username, password));
 
             var newAuth = new NewAuthorization
             {

src/GitHub.Api/Git/GitCredentialManager.cs

@@ -85,8 +85,13 @@ public async Task<ICredential> Load(UriString host)
                     return null;
                 }
 
-                string user = null;
-                dict.TryGetValue("user", out user);
+                string user;
+                if (!dict.TryGetValue("username", out user))
+                {
+                    Logger.Error("No username is stored");
+                    return null;
+                }
+
                 credential = new Credential(host, user, password);
             }
             return credential;

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

@@ -224,7 +224,7 @@ private void GoToProfile(object obj)
         private void SignOut(object obj)
         {
             var uriString = Platform.Keychain.Connections.First();
-            
+
             new ActionTask(Platform.Keychain.Clear(uriString, true))
                 .Start();
         }