Make sure an IConnection is always registered

Fix a bug where if we're logged in but don't pass a connection to Start,
no connection object would be passed along to whatever viewmodel we're
loading, which is a Bad Thing(tm).

If we're logged in but no connection object is passed in, we should
retrieve the first available logged-in connection from the connections
list and pass that one in, so that viewmodels *always* get a connection.

Author: shana

src/GitHub.App/Controllers/UIController.cs

@@ -18,6 +18,7 @@
 using ReactiveUI;
 using Stateless;
 using System.Collections.Specialized;
+using System.Linq;
 
 namespace GitHub.Controllers
 {
@@ -226,7 +227,11 @@ public void Start([AllowNull] IConnection connection)
         {
             if (connection != null)
             {
-                uiProvider.AddService(typeof(IConnection), connection);
+                if (currentFlow != UIControllerFlow.Authentication)
+                    uiProvider.AddService(connection);
+                else // sanity check: it makes zero sense to pass a connection in when calling the auth flow
+                    Debug.Assert(false, "Calling the auth flow with a connection makes no sense!");
+
                 connection.Login()
                     .Select(c => hosts.LookupHost(connection.HostAddress))
                     .Do(host =>
@@ -253,13 +258,21 @@ public void Start([AllowNull] IConnection connection)
                     .IsLoggedIn(hosts)
                     .Do(loggedin =>
                     {
-                        if (!loggedin && currentFlow != UIControllerFlow.Authentication)
+                        if (currentFlow != UIControllerFlow.Authentication)
                         {
-                            connectionAdded = (s, e) => {
-                                if (e.Action == NotifyCollectionChangedAction.Add)
-                                    uiProvider.AddService(typeof(IConnection), e.NewItems[0]);
-                            };
-                            connectionManager.Connections.CollectionChanged += connectionAdded;
+                            if (loggedin) // register the first available connection so the viewmodel can use it
+                                uiProvider.AddService(connectionManager.Connections.First(c => hosts.LookupHost(c.HostAddress).IsLoggedIn));
+                            else
+                            {
+                                // a connection will be added to the list when auth is done, register it so the next
+                                // viewmodel can use it
+                                connectionAdded = (s, e) =>
+                                {
+                                    if (e.Action == NotifyCollectionChangedAction.Add)
+                                        uiProvider.AddService(typeof(IConnection), e.NewItems[0]);
+                                };
+                                connectionManager.Connections.CollectionChanged += connectionAdded;
+                            }
                         }
 
                         machine.Configure(UIViewType.None)

src/UnitTests/GitHub.App/Controllers/UIControllerTests.cs

@@ -13,6 +13,7 @@
 using ReactiveUI;
 using System.Collections.Generic;
 using GitHub.Authentication;
+using System.Collections.ObjectModel;
 
 public class UIControllerTests
 {
@@ -55,8 +56,7 @@ public void ShowingCloneDialogWithoutBeingLoggedInShowsLoginDialog()
             var loginView = factory.GetView(GitHub.Exports.UIViewType.Login);
             loginView.Value.Cancel.Returns(Observable.Empty<object>());
             var cm = provider.GetConnectionManager();
-            var cons = new System.Collections.ObjectModel.ObservableCollection<IConnection>();
-            cm.Connections.Returns(cons);
+            cm.Connections.Returns(new ObservableCollection<IConnection>());
 
             using (var uiController = new UIController((IUIProvider)provider, hosts, factory, cm, LazySubstitute.For<ITwoFactorChallengeHandler>()))
             {
@@ -82,6 +82,7 @@ public void ShowingCloneDialogWhenLoggedInShowsCloneDialog()
             var connection = provider.GetConnection();
             connection.Login().Returns(Observable.Return(connection));
             var cm = provider.GetConnectionManager();
+            cm.Connections.Returns(new ObservableCollection<IConnection> { connection });
             var host = hosts.GitHubHost;
             hosts.LookupHost(connection.HostAddress).Returns(host);
             host.IsLoggedIn.Returns(true);
@@ -99,5 +100,34 @@ public void ShowingCloneDialogWhenLoggedInShowsCloneDialog()
                 uiController.Start(connection);
             }
         }
+
+        [STAFact]
+        public void CloneDialogLoggedInWithoutConnection()
+        {
+            var provider = Substitutes.GetFullyMockedServiceProvider();
+            var hosts = provider.GetRepositoryHosts();
+            var factory = SetupFactory(provider);
+            var connection = provider.GetConnection();
+            connection.Login().Returns(Observable.Return(connection));
+            var cm = provider.GetConnectionManager();
+            cm.Connections.Returns(new ObservableCollection<IConnection> { connection });
+            var host = hosts.GitHubHost;
+            hosts.LookupHost(connection.HostAddress).Returns(host);
+            host.IsLoggedIn.Returns(true);
+
+            using (var uiController = new UIController((IUIProvider)provider, hosts, factory, cm, LazySubstitute.For<ITwoFactorChallengeHandler>()))
+            {
+                var list = new List<IView>();
+                uiController.SelectFlow(UIControllerFlow.Clone)
+                    .Subscribe(uc => list.Add(uc as IView),
+                                () =>
+                                {
+                                    Assert.Equal(1, list.Count);
+                                    Assert.IsAssignableFrom<IViewFor<IRepositoryCloneViewModel>>(list[0]);
+                                    ((IUIProvider)provider).Received().AddService(connection);
+                                });
+                uiController.Start(null);
+            }
+        }
     }
 }