Trying to get the PublishView to load faster

Author: StanleyGoldman

src/GitHub.Api/Application/ApiClient.cs

@@ -78,6 +78,12 @@ public async Task GetCurrentUser(Action<Octokit.User> callback)
             callback(user);
         }
 
+        public async Task GetCurrentUserAndOrganizations(Action<Octokit.User, IList<Organization>> callback)
+        {
+            Guard.ArgumentNotNull(callback, "callback");
+            await GetUsersAndOrganizationInternal(callback);
+        }
+
         public async Task Login(string username, string password, Action<LoginResult> need2faCode, Action<bool, string> result)
         {
             Guard.ArgumentNotNull(need2faCode, "need2faCode");
@@ -262,6 +268,23 @@ 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()
         {
             logger.Trace("EnsureKeychainLoaded");

src/GitHub.Api/Application/IApiClient.cs

@@ -17,5 +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);
     }
 }

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

@@ -1,5 +1,6 @@
 using System;
 using System.Linq;
+using System.Threading.Tasks;
 using Octokit;
 using Rackspace.Threading;
 using UnityEditor;
@@ -67,34 +68,19 @@ private void PopulateView()
 
                     isLoading = true;
 
-                    Client.GetCurrentUser(user => {
+                    Client.GetCurrentUserAndOrganizations((user, organizations) => {
                         if (user == null)
                         {
-                            Logger.Warning("Unable to get current user");
                             return;
                         }
 
-                        owners = new[] { user.Login };
                         username = user.Login;
 
-                        Logger.Trace("GetOrganizations");
+                        var organizationLogins = (organizations ?? Enumerable.Empty<Organization>())
+                            .OrderBy(organization => organization.Login)
+                            .Select(organization => organization.Login);
 
-                        Client.GetOrganizations(organizations =>
-                        {
-                            if (organizations == null)
-                            {
-                                Logger.Warning("Unable to get list of organizations");
-                                return;
-                            }
-
-                            Logger.Trace("Loaded {0} organizations", organizations.Count);
-
-                            var organizationLogins = organizations
-                                .OrderBy(organization => organization.Login)
-                                .Select(organization => organization.Login);
-
-                            owners = owners.Union(organizationLogins).ToArray();
-                        });
+                        owners = new[] { user.Login }.Union(organizationLogins).ToArray();
                     }).Finally(task => {
                         isLoading = false;
                     });