Decided that we can trust the cached username if it validates

Author: StanleyGoldman

src/GitHub.Api/Application/ApiClient.cs

@@ -71,17 +71,18 @@ public async Task GetOrganizations(Action<IList<Organization>> callback)
             callback(organizations);
         }
 
-        public async Task GetCurrentUser(Action<Octokit.User> callback)
+        public async Task LoadKeychain(Action<bool> callback)
         {
             Guard.ArgumentNotNull(callback, "callback");
-            var user = await GetCurrentUserInternal();
-            callback(user);
+            var hasLoadedKeys = await LoadKeychainInternal();
+            callback(hasLoadedKeys);
         }
 
-        public async Task GetCurrentUserAndOrganizations(Action<Octokit.User, IList<Organization>> callback)
+        public async Task GetCurrentUser(Action<Octokit.User> callback)
         {
             Guard.ArgumentNotNull(callback, "callback");
-            await GetUsersAndOrganizationInternal(callback);
+            var user = await GetCurrentUserInternal();
+            callback(user);
         }
 
         public async Task Login(string username, string password, Action<LoginResult> need2faCode, Action<bool, string> result)
@@ -186,7 +187,7 @@ private async Task CreateRepositoryInternal(NewRepository newRepository, Action<
             {
                 logger.Trace("Creating repository");
 
-                if (!await EnsureKeychainLoaded())
+                if (!await LoadKeychainInternal())
                 {
                     callback(null, new Exception("Keychain Not Loaded"));
                     return;
@@ -223,7 +224,7 @@ private async Task<IList<Organization>> GetOrganizationInternal()
             {
                 logger.Trace("Getting Organizations");
 
-                if (!await EnsureKeychainLoaded())
+                if (!await LoadKeychainInternal())
                 {
                     return null;
                 }
@@ -252,7 +253,7 @@ private async Task<IList<Organization>> GetOrganizationInternal()
             {
                 logger.Trace("Getting Organizations");
 
-                if (!await EnsureKeychainLoaded())
+                if (!await LoadKeychainInternal())
                 {
                     return null;
                 }
@@ -268,44 +269,27 @@ private async Task<IList<Organization>> GetOrganizationInternal()
             return userCache;
         }
 
-        private async Task GetUsersAndOrganizationInternal(Action<Octokit.User, IList<Organization>> callback)
-        {
-            if (!await EnsureKeychainLoaded())
-            {
-                callback(null, null);
-                return;
-            }
-
-            var currentUserInternal = GetCurrentUserInternal();
-            var organizationInternal = GetOrganizationInternal();
-
-            currentUserInternal.Start(TaskScheduler.Current);
-            organizationInternal.Start(TaskScheduler.Current);
-
-            callback(await currentUserInternal,await organizationInternal);
-        }
-
-        private async Task<bool> EnsureKeychainLoaded()
+        private async Task<bool> LoadKeychainInternal()
         {
-            logger.Trace("EnsureKeychainLoaded");
+            logger.Trace("LoadKeychainInternal");
 
             if (keychain.HasKeys)
             {
                 if (!keychain.NeedsLoad)
                 {
-                    logger.Trace("EnsureKeychainLoaded: Has keys does not need load");
+                    logger.Trace("LoadKeychainInternal: Has keys does not need load");
                     return true;
                 }
 
-                logger.Trace("EnsureKeychainLoaded: Loading");
+                logger.Trace("LoadKeychainInternal: Loading");
 
                 var uriString = keychain.Connections.First().Host;
                 var keychainAdapter = await keychain.Load(uriString);
 
                 return keychainAdapter.OctokitCredentials != Credentials.Anonymous;
             }
 
-            logger.Trace("EnsureKeychainLoaded: No keys to load");
+            logger.Trace("LoadKeychainInternal: No keys to load");
 
             return false;
         }

src/GitHub.Api/Application/IApiClient.cs

@@ -17,6 +17,6 @@ interface IApiClient
         Task<bool> ValidateCredentials();
         Task Logout(UriString host);
         Task GetCurrentUser(Action<Octokit.User> callback);
-        Task GetCurrentUserAndOrganizations(Action<Octokit.User, IList<Organization>> callback);
+        Task LoadKeychain(Action<bool> callback);
     }
 }

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

@@ -68,19 +68,22 @@ private void PopulateView()
 
                     isLoading = true;
 
-                    Client.GetCurrentUserAndOrganizations((user, organizations) => {
-                        if (user == null)
+                    Client.LoadKeychain(hasKeys => {
+                        if (!hasKeys)
                         {
                             return;
                         }
 
-                        username = user.Login;
+                        username = keychainConnections.First().Username;
 
-                        var organizationLogins = (organizations ?? Enumerable.Empty<Organization>())
-                            .OrderBy(organization => organization.Login)
-                            .Select(organization => organization.Login);
+                        Client.GetOrganizations(organizations => {
 
-                        owners = new[] { user.Login }.Union(organizationLogins).ToArray();
+                            var organizationLogins = (organizations ?? Enumerable.Empty<Organization>())
+                                .OrderBy(organization => organization.Login)
+                                .Select(organization => organization.Login);
+
+                            owners = new[] { username }.Union(organizationLogins).ToArray();
+                        });
                     }).Finally(task => {
                         isLoading = false;
                     });