Merge pull request #2353 from github/fixes/2352-open-fron-github-login

jcansdale · web-flow · commit ba38028a9660 · 2019-05-22T18:16:07.000+01:00
Add a login option to Open from GitHub
diff --git a/src/GitHub.App/SampleData/Dialog/Clone/RepositoryCloneViewModelDesigner.cs b/src/GitHub.App/SampleData/Dialog/Clone/RepositoryCloneViewModelDesigner.cs
@@ -27,6 +27,7 @@ public RepositoryCloneViewModelDesigner()
         public IRepositorySelectViewModel EnterpriseTab { get; }
         public ReactiveCommand<Unit, Unit> Browse { get; }
         public ReactiveCommand<Unit, CloneDialogResult> Clone { get; }
+        public ReactiveCommand<Unit, Unit> LoginAsDifferentUser { get; }
 
         public Task InitializeAsync(IConnection connection)
         {
diff --git a/src/GitHub.App/ViewModels/Dialog/Clone/RepositoryCloneViewModel.cs b/src/GitHub.App/ViewModels/Dialog/Clone/RepositoryCloneViewModel.cs
@@ -26,6 +26,7 @@ public class RepositoryCloneViewModel : ViewModelBase, IRepositoryCloneViewModel
         readonly IRepositoryCloneService service;
         readonly IGitService gitService;
         readonly IUsageTracker usageTracker;
+        readonly IDialogService dialogService;
         readonly IReadOnlyList<IRepositoryCloneTabViewModel> tabs;
         string path;
         UriString url;
@@ -40,6 +41,7 @@ public RepositoryCloneViewModel(
             IRepositoryCloneService service,
             IGitService gitService,
             IUsageTracker usageTracker,
+            IDialogService dialogService,
             IRepositorySelectViewModel gitHubTab,
             IRepositorySelectViewModel enterpriseTab)
         {
@@ -48,6 +50,7 @@ public RepositoryCloneViewModel(
             this.service = service;
             this.gitService = gitService;
             this.usageTracker = usageTracker;
+            this.dialogService = dialogService;
 
             GitHubTab = gitHubTab;
             EnterpriseTab = enterpriseTab;
@@ -82,6 +85,8 @@ public RepositoryCloneViewModel(
             Open = ReactiveCommand.CreateFromObservable(
                 () => repository.Select(x => new CloneDialogResult(Path, x?.CloneUrl)),
                 canOpen);
+
+            LoginAsDifferentUser = ReactiveCommand.CreateFromTask(LoginAsDifferentUserAsync);
         }
 
         public IRepositorySelectViewModel GitHubTab { get; }
@@ -111,6 +116,8 @@ public int SelectedTabIndex
 
         public IObservable<object> Done => Observable.Merge(Clone, Open);
 
+        public ReactiveCommand<Unit, Unit> LoginAsDifferentUser { get; }
+
         public ReactiveCommand<Unit, Unit> Browse { get; }
 
         public ReactiveCommand<Unit, CloneDialogResult> Clone { get; }
@@ -133,7 +140,11 @@ public async Task InitializeAsync(IConnection connection)
                 EnterpriseTab.Initialize(enterpriseConnection);
             }
 
-            if (connection == enterpriseConnection)
+            if (connection == gitHubConnection)
+            {
+                SelectedTabIndex = 0;
+            }
+            else if (connection == enterpriseConnection)
             {
                 SelectedTabIndex = 1;
             }
@@ -155,6 +166,28 @@ public async Task InitializeAsync(IConnection connection)
             this.WhenAnyValue(x => x.SelectedTabIndex).Subscribe(x => tabs[x].Activate().Forget());
         }
 
+        async Task LoginAsDifferentUserAsync()
+        {
+            if (await dialogService.ShowLoginDialog() is IConnection connection)
+            {
+                var connections = await connectionManager.GetLoadedConnections();
+                var gitHubConnection = connections.FirstOrDefault(x => x.HostAddress.IsGitHubDotCom());
+
+                if (connection == gitHubConnection)
+                {
+                    SelectedTabIndex = 0;
+                    GitHubTab.Initialize(connection);
+                    GitHubTab.Activate().Forget();
+                }
+                else
+                {
+                    SelectedTabIndex = 1;
+                    EnterpriseTab.Initialize(connection);
+                    EnterpriseTab.Activate().Forget();
+                }
+            }
+        }
+
         void BrowseForDirectory()
         {
             var result = os.Dialog.BrowseForDirectory(Path, Resources.BrowseForDirectory);
diff --git a/src/GitHub.App/ViewModels/Dialog/Clone/RepositorySelectViewModel.cs b/src/GitHub.App/ViewModels/Dialog/Clone/RepositorySelectViewModel.cs
@@ -129,7 +129,7 @@ static string GroupName(KeyValuePair<string, IReadOnlyList<RepositoryListItemMod
 
         async Task LoadItems(bool refresh)
         {
-            if (connection == null && !IsLoading) return;
+            if (connection == null || IsLoading) return;
 
             Error = null;
             IsLoading = true;
diff --git a/src/GitHub.Exports.Reactive/ViewModels/Dialog/Clone/IRepositoryCloneViewModel.cs b/src/GitHub.Exports.Reactive/ViewModels/Dialog/Clone/IRepositoryCloneViewModel.cs
@@ -53,5 +53,7 @@ public interface IRepositoryCloneViewModel : IDialogContentViewModel, IConnectio
         /// Gets the command executed when the user clicks "Clone".
         /// </summary>
         ReactiveCommand<Unit, CloneDialogResult> Clone { get; }
+
+        ReactiveCommand<Unit, Unit> LoginAsDifferentUser { get; }
     }
 }
diff --git a/src/GitHub.Resources/Resources.Designer.cs b/src/GitHub.Resources/Resources.Designer.cs
diff --git a/src/GitHub.Resources/Resources.cs-CZ.resx b/src/GitHub.Resources/Resources.cs-CZ.resx
@@ -888,4 +888,7 @@ https://git-scm.com/download/win</value>
   <data name="OpenFromGitHubClone" xml:space="preserve">
     <value>Klon</value>
   </data>
+  <data name="AddChangeAccounts" xml:space="preserve">
+    <value>Add/Change Accounts</value>
+  </data>
 </root>
diff --git a/src/GitHub.Resources/Resources.de-DE.resx b/src/GitHub.Resources/Resources.de-DE.resx
@@ -888,4 +888,7 @@ https://git-scm.com/download/win</value>
   <data name="OpenFromGitHubClone" xml:space="preserve">
     <value>Klonen</value>
   </data>
+  <data name="AddChangeAccounts" xml:space="preserve">
+    <value>Add/Change Accounts</value>
+  </data>
 </root>
diff --git a/src/GitHub.Resources/Resources.es-ES.resx b/src/GitHub.Resources/Resources.es-ES.resx
@@ -888,4 +888,7 @@ https://git-scm.com/download/win</value>
   <data name="OpenFromGitHubClone" xml:space="preserve">
     <value>Clonar</value>
   </data>
+  <data name="AddChangeAccounts" xml:space="preserve">
+    <value>Add/Change Accounts</value>
+  </data>
 </root>
diff --git a/src/GitHub.Resources/Resources.fr-FR.resx b/src/GitHub.Resources/Resources.fr-FR.resx
@@ -888,4 +888,7 @@ https://git-scm.com/download/win</value>
   <data name="OpenFromGitHubClone" xml:space="preserve">
     <value>Cloner</value>
   </data>
+  <data name="AddChangeAccounts" xml:space="preserve">
+    <value>Add/Change Accounts</value>
+  </data>
 </root>
diff --git a/src/GitHub.Resources/Resources.it-IT.resx b/src/GitHub.Resources/Resources.it-IT.resx
@@ -888,4 +888,7 @@ https://git-scm.com/download/win</value>
   <data name="OpenFromGitHubClone" xml:space="preserve">
     <value>Clona</value>
   </data>
+  <data name="AddChangeAccounts" xml:space="preserve">
+    <value>Add/Change Accounts</value>
+  </data>
 </root>
diff --git a/src/GitHub.Resources/Resources.ja-JP.resx b/src/GitHub.Resources/Resources.ja-JP.resx
@@ -888,4 +888,7 @@ https://git-scm.com/download/win</value>
   <data name="OpenFromGitHubClone" xml:space="preserve">
     <value>複製</value>
   </data>
+  <data name="AddChangeAccounts" xml:space="preserve">
+    <value>Add/Change Accounts</value>
+  </data>
 </root>
diff --git a/src/GitHub.Resources/Resources.ko-KR.resx b/src/GitHub.Resources/Resources.ko-KR.resx
@@ -888,4 +888,7 @@ https://git-scm.com/download/win</value>
   <data name="OpenFromGitHubClone" xml:space="preserve">
     <value>복제</value>
   </data>
+  <data name="AddChangeAccounts" xml:space="preserve">
+    <value>Add/Change Accounts</value>
+  </data>
 </root>
diff --git a/src/GitHub.Resources/Resources.pl-PL.resx b/src/GitHub.Resources/Resources.pl-PL.resx
@@ -888,4 +888,7 @@ https://git-scm.com/download/win</value>
   <data name="OpenFromGitHubClone" xml:space="preserve">
     <value>Klonuj</value>
   </data>
+  <data name="AddChangeAccounts" xml:space="preserve">
+    <value>Add/Change Accounts</value>
+  </data>
 </root>
diff --git a/src/GitHub.Resources/Resources.pt-BR.resx b/src/GitHub.Resources/Resources.pt-BR.resx
@@ -888,4 +888,7 @@ https://git-scm.com/download/win</value>
   <data name="OpenFromGitHubClone" xml:space="preserve">
     <value>Clonar</value>
   </data>
+  <data name="AddChangeAccounts" xml:space="preserve">
+    <value>Add/Change Accounts</value>
+  </data>
 </root>
diff --git a/src/GitHub.Resources/Resources.resx b/src/GitHub.Resources/Resources.resx
@@ -888,4 +888,7 @@ https://git-scm.com/download/win</value>
   <data name="OpenFromGitHubClone" xml:space="preserve">
     <value>Clone</value>
   </data>
+  <data name="AddChangeAccounts" xml:space="preserve">
+    <value>Add/Change Accounts</value>
+  </data>
 </root>
diff --git a/src/GitHub.Resources/Resources.ru-RU.resx b/src/GitHub.Resources/Resources.ru-RU.resx
@@ -888,4 +888,7 @@ https://git-scm.com/download/win</value>
   <data name="OpenFromGitHubClone" xml:space="preserve">
     <value>Клонировать</value>
   </data>
+  <data name="AddChangeAccounts" xml:space="preserve">
+    <value>Add/Change Accounts</value>
+  </data>
 </root>
diff --git a/src/GitHub.Resources/Resources.tr-TR.resx b/src/GitHub.Resources/Resources.tr-TR.resx
@@ -888,4 +888,7 @@ https://git-scm.com/download/win</value>
   <data name="OpenFromGitHubClone" xml:space="preserve">
     <value>Kopyalama</value>
   </data>
+  <data name="AddChangeAccounts" xml:space="preserve">
+    <value>Add/Change Accounts</value>
+  </data>
 </root>
diff --git a/src/GitHub.Resources/Resources.zh-CN.resx b/src/GitHub.Resources/Resources.zh-CN.resx
@@ -888,4 +888,7 @@ https://git-scm.com/download/win</value>
   <data name="OpenFromGitHubClone" xml:space="preserve">
     <value>克隆</value>
   </data>
+  <data name="AddChangeAccounts" xml:space="preserve">
+    <value>Add/Change Accounts</value>
+  </data>
 </root>
diff --git a/src/GitHub.Resources/Resources.zh-TW.resx b/src/GitHub.Resources/Resources.zh-TW.resx
@@ -888,4 +888,7 @@ https://git-scm.com/download/win</value>
   <data name="OpenFromGitHubClone" xml:space="preserve">
     <value>複製</value>
   </data>
+  <data name="AddChangeAccounts" xml:space="preserve">
+    <value>Add/Change Accounts</value>
+  </data>
 </root>
diff --git a/src/GitHub.VisualStudio.UI/Views/Dialog/Clone/RepositoryCloneView.xaml b/src/GitHub.VisualStudio.UI/Views/Dialog/Clone/RepositoryCloneView.xaml
@@ -39,6 +39,12 @@
                 KeyboardNavigation.TabIndex="6"/>
         </StackPanel>
 
+        <TextBlock DockPanel.Dock="Top" TextAlignment="Right">
+            <Hyperlink Command="{Binding LoginAsDifferentUser}">
+                <Run Text="{x:Static ghfvs:Resources.LoginLink}" />
+            </Hyperlink>
+        </TextBlock>
+            
         <DockPanel DockPanel.Dock="Bottom" Margin="0,9,0,0">
             <Label DockPanel.Dock="Left" Content="{x:Static ghfvs:Resources.localPathText}" />
             <Button DockPanel.Dock="Right"
diff --git a/src/GitHub.VisualStudio.UI/Views/Dialog/LoginCredentialsView.xaml.cs b/src/GitHub.VisualStudio.UI/Views/Dialog/LoginCredentialsView.xaml.cs
@@ -32,7 +32,7 @@ public LoginCredentialsView()
             {
                 SetupDotComBindings(d);
                 SetupEnterpriseBindings(d);
-                SetupSelectedAndVisibleTabBindings(d);
+                SetupSelectedTabBindings(d);
                 d(Disposable.Create(Deactivate));
             });
 
@@ -110,16 +110,8 @@ void SetupEnterpriseBindings(Action<IDisposable> d)
             d(this.OneWayBind(ViewModel, vm => vm.EnterpriseLogin.Error, v => v.enterpriseErrorMessage.UserError));
         }
 
-        void SetupSelectedAndVisibleTabBindings(Action<IDisposable> d)
+        void SetupSelectedTabBindings(Action<IDisposable> d)
         {
-            d(this.WhenAny(x => x.ViewModel.LoginMode, x => x.Value)
-                .Select(x => x == LoginMode.DotComOrEnterprise || x == LoginMode.DotComOnly)
-                .BindTo(this, v => v.dotComTab.IsEnabled));
-
-            d(this.WhenAny(x => x.ViewModel.LoginMode, x => x.Value)
-                .Select(x => x == LoginMode.DotComOrEnterprise || x == LoginMode.EnterpriseOnly)
-                .BindTo(this, v => v.enterpriseTab.IsEnabled));
-
             d(this.WhenAny(x => x.ViewModel.LoginMode, x => x.Value)
                 .Select(x => x == LoginMode.DotComOrEnterprise || x == LoginMode.DotComOnly)
                 .Where(x => x == true)
diff --git a/test/GitHub.App.UnitTests/ViewModels/Dialog/Clone/RepositoryCloneViewModelTests.cs b/test/GitHub.App.UnitTests/ViewModels/Dialog/Clone/RepositoryCloneViewModelTests.cs
@@ -424,6 +424,7 @@ static RepositoryCloneViewModel CreateTarget(
             IConnectionManager connectionManager = null,
             IRepositoryCloneService service = null,
             IUsageTracker usageTracker = null,
+            IDialogService dialogService = null,
             IRepositorySelectViewModel gitHubTab = null,
             IRepositorySelectViewModel enterpriseTab = null,
             IGitService gitService = null,
@@ -433,6 +434,7 @@ static RepositoryCloneViewModel CreateTarget(
             connectionManager = connectionManager ?? CreateConnectionManager("https://github.com");
             service = service ?? CreateRepositoryCloneService(defaultClonePath);
             usageTracker = usageTracker ?? Substitute.For<IUsageTracker>();
+            dialogService = dialogService ?? Substitute.For<IDialogService>();
             gitHubTab = gitHubTab ?? CreateSelectViewModel();
             enterpriseTab = enterpriseTab ?? CreateSelectViewModel();
             gitService = gitService ?? CreateGitService(true, "https://github.com/owner/repo");
@@ -443,6 +445,7 @@ static RepositoryCloneViewModel CreateTarget(
                 service,
                 gitService,
                 usageTracker,
+                dialogService,
                 gitHubTab,
                 enterpriseTab);
         }

Original file line number	Diff line number	Diff line change
`@@ -27,6 +27,7 @@ public RepositoryCloneViewModelDesigner()`
`27`	`27`	`public IRepositorySelectViewModel EnterpriseTab { get; }`
`28`	`28`	`public ReactiveCommand<Unit, Unit> Browse { get; }`
`29`	`29`	`public ReactiveCommand<Unit, CloneDialogResult> Clone { get; }`
	`30`	`+ public ReactiveCommand<Unit, Unit> LoginAsDifferentUser { get; }`
`30`	`31`
`31`	`32`	`public Task InitializeAsync(IConnection connection)`
`32`	`33`	`{`
Original file line number	Diff line number	Diff line change
`@@ -129,7 +129,7 @@ static string GroupName(KeyValuePair<string, IReadOnlyList<RepositoryListItemMod`
`129`	`129`
`130`	`130`	`async Task LoadItems(bool refresh)`
`131`	`131`	`{`
`132`		`- if (connection == null && !IsLoading) return;`
	`132`	`+ if (connection == null \|\| IsLoading) return;`
`133`	`133`
`134`	`134`	`Error = null;`
`135`	`135`	`IsLoading = true;`
Original file line number	Diff line number	Diff line change
`@@ -53,5 +53,7 @@ public interface IRepositoryCloneViewModel : IDialogContentViewModel, IConnectio`
`53`	`53`	`/// Gets the command executed when the user clicks "Clone".`
`54`	`54`	`/// </summary>`
`55`	`55`	`ReactiveCommand<Unit, CloneDialogResult> Clone { get; }`
	`56`	`+`
	`57`	`+ ReactiveCommand<Unit, Unit> LoginAsDifferentUser { get; }`
`56`	`58`	`}`
`57`	`59`	`}`