Merge pull request #364 from github/fixes/354-github-pane-signin-register-2

Make "Sign in"/"Create an account" links in GitHub pane work.

Author: shana

src/GitHub.App/GitHub.App.csproj

@@ -198,6 +198,7 @@
     <Compile Include="ViewModels\BaseViewModel.cs" />
     <Compile Include="Models\ConnectionRepositoryHostMap.cs" />
     <Compile Include="ViewModels\GistCreationViewModel.cs" />
+    <Compile Include="ViewModels\LoggedOutViewModel.cs" />
     <Compile Include="ViewModels\LogoutRequiredViewModel.cs" />
     <Compile Include="ViewModels\PullRequestCreationViewModel.cs" />
     <Compile Include="ViewModels\PullRequestDetailViewModel.cs" />

src/GitHub.App/Models/RepositoryHosts.cs

@@ -157,11 +157,20 @@ public IObservable<AuthenticationResult> LogIn(
                     );
                     if (successful)
                     {
+                        // Make sure that GitHubHost/EnterpriseHost are set when the connections
+                        // changed event is raised and likewise that the connection is added when
+                        // the property changed notification is sent.
                         if (isDotCom)
-                            GitHubHost = host;
+                            githubHost = host;
                         else
-                            EnterpriseHost = host;
+                            enterpriseHost = host;
+
                         connectionManager.AddConnection(address, usernameOrEmail);
+
+                        if (isDotCom)
+                            this.RaisePropertyChanged(nameof(GitHubHost));
+                        else
+                            this.RaisePropertyChanged(nameof(EnterpriseHost));
                     }
                 });
         }

src/GitHub.App/ViewModels/LoggedOutViewModel.cs

@@ -0,0 +1,62 @@
+using System;
+using System.ComponentModel.Composition;
+using System.Reactive.Linq;
+using GitHub.Exports;
+using GitHub.Info;
+using GitHub.Services;
+using GitHub.UI;
+using ReactiveUI;
+
+namespace GitHub.ViewModels
+{
+    /// <summary>
+    /// The view model for the "Sign in to GitHub" view in the GitHub pane.
+    /// </summary>
+    [ExportViewModel(ViewType = UIViewType.LoggedOut)]
+    [PartCreationPolicy(CreationPolicy.NonShared)]
+    public class LoggedOutViewModel : BaseViewModel, ILoggedOutViewModel
+    {
+        IUIProvider uiProvider;
+        IVisualStudioBrowser browser;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="LoggedOutViewModel"/> class.
+        /// </summary>
+        [ImportingConstructor]
+        public LoggedOutViewModel(IUIProvider uiProvider, IVisualStudioBrowser browser)
+        {
+            this.uiProvider = uiProvider;
+            this.browser = browser;
+            SignIn = ReactiveCommand.Create();
+            SignIn.Subscribe(_ => OnSignIn());
+            Register = ReactiveCommand.Create();
+            Register.Subscribe(_ => OnRegister());
+        }
+
+        /// <inheritdoc/>
+        public IReactiveCommand<object> SignIn { get; }
+
+        /// <inheritdoc/>
+        public IReactiveCommand<object> Register { get; }
+
+        /// <summary>
+        /// Called when the <see cref="SignIn"/> command is executed.
+        /// </summary>
+        void OnSignIn()
+        {
+            // Show the Sign In dialog. We don't need to listen to the outcome of this: the parent
+            // GitHubPaneViewModel will listen to RepositoryHosts.IsLoggedInToAnyHost and close
+            // this view when the user logs in.
+            uiProvider.SetupUI(UIControllerFlow.Authentication, null);
+            uiProvider.RunUI();
+        }
+
+        /// <summary>
+        /// Called when the <see cref="Register"/> command is executed.
+        /// </summary>
+        void OnRegister()
+        {
+            browser.OpenUrl(GitHubUrls.Pricing);
+        }
+    }
+}

src/GitHub.Exports.Reactive/GitHub.Exports.Reactive.csproj

@@ -97,6 +97,7 @@
     <Compile Include="Services\IGistPublishService.cs" />
     <Compile Include="ViewModels\IGistCreationViewModel.cs" />
     <Compile Include="Services\NotificationDispatcher.cs" />
+    <Compile Include="ViewModels\ILoggedOutViewModel.cs" />
     <Compile Include="ViewModels\ILogoutRequiredViewModel.cs" />
     <Compile Include="ViewModels\ILoginControlViewModel.cs" />
     <Compile Include="ViewModels\ILoginToGitHubForEnterpriseViewModel.cs" />

src/GitHub.Exports.Reactive/ViewModels/ILoggedOutViewModel.cs

@@ -0,0 +1,22 @@
+using System;
+using System.Reactive;
+using ReactiveUI;
+
+namespace GitHub.ViewModels
+{
+    /// <summary>
+    /// Defines the view model for the "Sign in to GitHub" view in the GitHub pane.
+    /// </summary>
+    public interface ILoggedOutViewModel : IViewModel
+    {
+        /// <summary>
+        /// Gets the command executed when the user clicks the "Sign in" link.
+        /// </summary>
+        IReactiveCommand<object> SignIn { get; }
+
+        /// <summary>
+        /// Gets the command executed when the user clicks the "Create an Account" link.
+        /// </summary>
+        IReactiveCommand<object> Register { get; }
+    }
+}

src/GitHub.VisualStudio/GitHub.VisualStudio.csproj

@@ -273,7 +273,6 @@
     <Compile Include="UI\Views\GitHubPaneView.xaml.cs">
       <DependentUpon>GitHubPaneView.xaml</DependentUpon>
     </Compile>
-    <Compile Include="UI\Views\LoggedOutViewModel.cs" />
     <Compile Include="UI\Views\GitHubPaneViewModel.cs" />
     <Compile Include="UI\Views\LoggedOutView.xaml.cs">
       <DependentUpon>LoggedOutView.xaml</DependentUpon>

src/GitHub.VisualStudio/UI/Views/GitHubPaneViewModel.cs

@@ -51,6 +51,8 @@ public GitHubPaneViewModel(ISimpleApiClientFactory apiFactory, ITeamExplorerServ
             syncContext = SynchronizationContext.Current;
             CancelCommand = ReactiveCommand.Create();
             Title = "GitHub";
+
+            hosts.WhenAnyValue(x => x.IsLoggedInToAnyHost).Subscribe(_ => Reload().Forget());
         }
 
         public override void Initialize(IServiceProvider serviceProvider)
@@ -140,6 +142,7 @@ async Task Reload([AllowNull] ViewWithData data = null, bool navigating = false)
             {
                 var factory = ServiceProvider.GetExportedValue<IUIFactory>();
                 var c = factory.CreateViewAndViewModel(UIViewType.LoggedOut);
+                c.View.DataContext = c.ViewModel;
                 Control = c.View;
             }
             return;

src/GitHub.VisualStudio/UI/Views/LoggedOutView.xaml

@@ -53,13 +53,13 @@
             <TextBlock
                 Margin="10,0"
                 HorizontalAlignment="Center">
-                <Hyperlink>Sign in</Hyperlink>
+                <Hyperlink Command="{Binding SignIn}">Sign in</Hyperlink>
             </TextBlock>
 
             <TextBlock
                 Margin="10,0"
                 HorizontalAlignment="Center">
-                <Hyperlink>Create an account</Hyperlink>
+                <Hyperlink Command="{Binding Register}">Create an account</Hyperlink>
             </TextBlock>
         </StackPanel>
     </StackPanel>

src/GitHub.VisualStudio/UI/Views/LoggedOutView.xaml.cs

@@ -6,7 +6,7 @@
 
 namespace GitHub.VisualStudio.UI.Views
 {
-    public class GenericLoggedOutView : SimpleViewUserControl<IViewModel, GenericLoggedOutView>
+    public class GenericLoggedOutView : SimpleViewUserControl<ILoggedOutViewModel, GenericLoggedOutView>
     {
     }