Trying to load keychain; trying to handle scenario where item is in the cache but not in the credentialManager

Author: StanleyGoldman

src/GitHub.Api/ApplicationManagerBase.cs

@@ -1,6 +1,8 @@
 using System;
+using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
+using Octokit;
 
 namespace GitHub.Unity
 {
@@ -42,8 +44,29 @@ protected void Initialize()
 
         public virtual ITask Run()
         {
+            Logger.Trace("Run");
+
             var progress = new ProgressReport();
-            return new ActionTask(SetupAndRestart(progress));
+            return new ActionTask(SetupAndRestart(progress))
+                .Then(new ActionTask(LoadKeychain()));
+        }
+
+        private async Task LoadKeychain()
+        {
+            Logger.Trace("Loading Keychain");
+
+            var firstConnection = Platform.Keychain.Connections.FirstOrDefault();
+            if (firstConnection == null)
+            {
+                Logger.Trace("No Host Found");
+            }
+            else
+            {
+                Logger.Trace("Loading Connection to Host:\"{0}\"", firstConnection);
+                var keychainAdapter = await Platform.Keychain.Load(firstConnection).SafeAwait();
+                if (keychainAdapter.OctokitCredentials == Credentials.Anonymous)
+                { }
+            }
         }
 
         protected abstract string DetermineInstallationPath();
@@ -84,6 +107,8 @@ public virtual ITask RestartRepository()
 
         private async Task SetupAndRestart(ProgressReport progress)
         {
+            Logger.Trace("SetupAndRestart");
+
             var gitSetup = new GitSetup(Environment, CancellationToken);
             var expectedPath = gitSetup.GitInstallationPath;
             var setupDone = await gitSetup.SetupIfNeeded(progress.Percentage, progress.Remaining);

src/GitHub.Api/Authentication/IKeychain.cs

@@ -1,4 +1,5 @@
-using System.Threading.Tasks;
+using System.Collections.Generic;
+using System.Threading.Tasks;
 
 namespace GitHub.Unity
 {
@@ -12,6 +13,7 @@ interface IKeychain
         void UpdateToken(UriString host, string token);
         void Save(ICredential credential);
         void Initialize();
+        IList<UriString> Connections { get; }
         bool HasKeys { get; }
     }
 }

src/GitHub.Api/Authentication/Keychain.cs

@@ -55,11 +55,23 @@ public KeychainAdapter Connect(UriString host)
 
         public async Task<KeychainAdapter> Load(UriString host)
         {
-            logger.Trace("Load Host:{0}", host);
+            logger.Trace("Load KeychainAdapter Host:\"{0}\"", host);
 
             var keychainAdapter = FindOrCreateAdapter(host);
 
+            var keychainAdapterCredential = keychainAdapter.Credential;
+            if (keychainAdapterCredential == null)
+            {
+                throw new NullReferenceException($"{nameof(keychainAdapterCredential)} is null");
+            }
+
+            logger.Trace("Load KeychainAdapter Host:\"{0}\" Username:\"{1}\"", keychainAdapterCredential.Host ?? "NULL",
+                keychainAdapterCredential.Username ?? "NULL");
+
             var keychainItem = await credentialManager.Load(host);
+
+            logger.Trace("Loading KeychainItem:{0}", keychainItem?.ToString() ?? "NULL");
+
             keychainAdapter.Set(keychainItem);
 
             return keychainAdapter;
@@ -207,6 +219,8 @@ public void UpdateToken(UriString host, string token)
             keychainItem.UpdateToken(token);
         }
 
+        public IList<UriString> Connections => connectionCache.Keys.ToArray();
+
         public bool HasKeys => connectionCache.Any();
     }
 }

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

@@ -222,15 +222,18 @@ private void GoToProfile(object obj)
         }
         private void SignOut(object obj)
         {
-            var task = new ActionTask(Platform.CredentialManager.Delete(Platform.CredentialManager.CachedCredentials.Host))
+            var credentialManager = Platform.CredentialManager;
+            var cachedCredentialsHost = credentialManager.CachedCredentials.Host;
+
+            new ActionTask(credentialManager.Delete(cachedCredentialsHost))
                 .Then(s =>
                 {
                     if (s)
                     {
                         Platform.Keychain.Clear(Repository.CloneUrl.ToRepositoryUrl());
                         Platform.Keychain.Flush(Repository.CloneUrl.ToRepositoryUrl());
                     }
-                });
+                }).Start();
         }
 
         private bool ValidateSettings()