Merge pull request #199 from github/shana/uicontroller-cleanup

Make UIController connection handling safer

Author: haacked

src/GitHub.App/Controllers/UIController.cs

@@ -256,13 +256,15 @@ public void Start([AllowNull] IConnection connection)
             else
             {
                 connectionManager
-                    .IsLoggedIn(hosts)
-                    .Do(loggedin =>
+                    .GetLoggedInConnections(hosts)
+                    .FirstOrDefaultAsync()
+                    .Select(c =>
                     {
+                        bool loggedin = c != null;
                         if (currentFlow != UIControllerFlow.Authentication)
                         {
                             if (loggedin) // register the first available connection so the viewmodel can use it
-                                uiProvider.AddService(connectionManager.Connections.First(c => hosts.LookupHost(c.HostAddress).IsLoggedIn));
+                                uiProvider.AddService(c);
                             else
                             {
                                 // a connection will be added to the list when auth is done, register it so the next
@@ -284,6 +286,8 @@ public void Start([AllowNull] IConnection connection)
                             .PermitIf(Trigger.Clone, UIViewType.Login, () => !loggedin)
                             .PermitIf(Trigger.Publish, UIViewType.Publish, () => loggedin)
                             .PermitIf(Trigger.Publish, UIViewType.Login, () => !loggedin);
+
+                        return loggedin;
                     })
                     .ObserveOn(RxApp.MainThreadScheduler)
                     .Subscribe(_ => { }, () =>

src/GitHub.Exports.Reactive/Extensions/ConnectionManagerExtensions.cs

@@ -12,17 +12,22 @@ public static IObservable<bool> IsLoggedIn(this IConnectionManager cm, IReposito
         {
             return cm.Connections.ToObservable()
                     .SelectMany(c => c.Login())
-                    .Select(c => hosts.LookupHost(c.HostAddress))
-                    .Any(h => h.IsLoggedIn);
+                    .Any(c => hosts.LookupHost(c.HostAddress).IsLoggedIn);
         }
 
         public static IObservable<bool> IsLoggedIn(this IConnectionManager cm, IRepositoryHosts hosts, HostAddress address)
         {
             return cm.Connections.ToObservable()
                     .Where(c => c.HostAddress.Equals(address))
                     .SelectMany(c => c.Login())
-                    .Select(c => hosts.LookupHost(c.HostAddress))
-                    .Any(h => h.IsLoggedIn);
+                    .Any(c => hosts.LookupHost(c.HostAddress).IsLoggedIn);
+        }
+
+        public static IObservable<IConnection> GetLoggedInConnections(this IConnectionManager cm, IRepositoryHosts hosts)
+        {
+            return cm.Connections.ToObservable()
+                    .SelectMany(c => c.Login())
+                    .Where(c => hosts.LookupHost(c.HostAddress).IsLoggedIn);
         }
     }
 }