Merge branch 'fixes/1332-validate-scopes' into feature/sso

Author: grokys

src/GitHub.App/ViewModels/LoginControlViewModel.cs

@@ -86,8 +86,11 @@ void UpdateLoginMode()
 
             foreach (var connection in connectionManager.Connections)
             {
-                result &= ~((connection.HostAddress == HostAddress.GitHubDotComHostAddress) ?
-                    LoginMode.DotComOnly : LoginMode.EnterpriseOnly);
+                if (connection.IsLoggedIn)
+                {
+                    result &= ~((connection.HostAddress == HostAddress.GitHubDotComHostAddress) ?
+                        LoginMode.DotComOnly : LoginMode.EnterpriseOnly);
+                }
             }
 
             LoginMode = result;

src/GitHub.App/ViewModels/LoginTabViewModel.cs

@@ -144,13 +144,20 @@ protected IObservable<AuthenticationResult> LogInToHost(HostAddress hostAddress)
         {
             Guard.ArgumentNotNull(hostAddress, nameof(hostAddress));
 
-            return Observable.Defer(() =>
+            return Observable.Defer(async () =>
             {
-                return hostAddress != null ?
-                    ConnectionManager.LogIn(hostAddress, UsernameOrEmail, Password)
-                        .ToObservable()
-                        .Select(_ => AuthenticationResult.Success)
-                    : Observable.Return(AuthenticationResult.CredentialFailure);
+                if (hostAddress != null)
+                {
+                    if (await ConnectionManager.GetConnection(hostAddress) != null)
+                    {
+                        await ConnectionManager.LogOut(hostAddress);
+                    }
+
+                    await ConnectionManager.LogIn(hostAddress, UsernameOrEmail, Password);
+                    return Observable.Return(AuthenticationResult.Success);
+                }
+
+                return Observable.Return(AuthenticationResult.CredentialFailure);
             })
             .ObserveOn(RxApp.MainThreadScheduler)
             .Do(authResult => {

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

@@ -42,6 +42,16 @@ public static IObservable<bool> IsLoggedIn(this IConnection connection)
             return Observable.Return(connection?.IsLoggedIn ?? false);
         }
 
+        public static IObservable<IConnection> GetConnection(this IConnectionManager cm, HostAddress address)
+        {
+            Guard.ArgumentNotNull(cm, nameof(cm));
+            Guard.ArgumentNotNull(address, nameof(address));
+
+            return cm.GetLoadedConnections()
+                .ToObservable()
+                .Select(x => x.FirstOrDefault(y => y.HostAddress == address));
+        }
+
         public static IObservable<IConnection> GetLoggedInConnections(this IConnectionManager cm)
         {
             Guard.ArgumentNotNull(cm, nameof(cm));

src/GitHub.TeamFoundation.14/Connect/GitHubConnectSection.cs

@@ -174,7 +174,7 @@ void RefreshConnections(object sender, NotifyCollectionChangedEventArgs e)
 
         protected void Refresh(IConnection connection)
         {
-            if (connection == null)
+            if (connection == null || !connection.IsLoggedIn)
             {
                 LoggedIn = false;
                 IsVisible = false;

src/GitHub.TeamFoundation.14/Connect/GitHubInvitationSection.cs

@@ -11,6 +11,7 @@
 using System.Windows;
 using System.Windows.Media;
 using GitHub.VisualStudio.UI;
+using System.Linq;
 
 namespace GitHub.VisualStudio.TeamExplorer.Connect
 {
@@ -40,9 +41,9 @@ public GitHubInvitationSection(IGitHubServiceProvider serviceProvider, IConnecti
                 OnThemeChanged();
             };
 
-            IsVisible = cm.Connections.Count == 0;
+            IsVisible = !cm.Connections.Where(x => x.IsLoggedIn).Any();
 
-            cm.Connections.CollectionChanged += (s, e) => IsVisible = cm.Connections.Count == 0;
+            cm.Connections.CollectionChanged += (s, e) => IsVisible = !cm.Connections.Where(x => x.IsLoggedIn).Any();
         }
 
         public override void Connect()

src/GitHub.VisualStudio/Services/ConnectionManager.cs

@@ -75,7 +75,7 @@ public async Task<IConnection> LogIn(HostAddress address, string userName, strin
 
             if (conns.Any(x => x.HostAddress == address))
             {
-                throw new InvalidOperationException($"A connection to {address} already exists.");
+                throw new InvalidOperationException($"A connection to {address.Title} already exists.");
             }
 
             var client = CreateClient(address);
@@ -116,7 +116,7 @@ public async Task LogOut(HostAddress address)
 
             if (connection == null)
             {
-                throw new KeyNotFoundException($"Could not find a connection to {address}.");
+                throw new KeyNotFoundException($"Could not find a connection to {address.Title}.");
             }
 
             var client = CreateClient(address);

test/UnitTests/GitHub.App/ViewModels/LoginControlViewModelTests.cs

@@ -96,6 +96,8 @@ public void LoginModeTracksAvailableConnections()
             connectionManager.Connections.Returns(connections);
             gitHubConnection.HostAddress.Returns(HostAddress.GitHubDotComHostAddress);
             enterpriseConnection.HostAddress.Returns(HostAddress.Create("https://enterprise.url"));
+            gitHubConnection.IsLoggedIn.Returns(true);
+            enterpriseConnection.IsLoggedIn.Returns(true);
 
             var loginViewModel = new LoginControlViewModel(connectionManager, gitHubLogin, enterpriseLogin);