Merge branch 'master' into essentials-publish

StanleyGoldman · StanleyGoldman · commit b4a400bf94b4 · 2019-06-04T11:28:30.000-04:00
diff --git a/src/GitHub.Api/IOAuthCallbackListener.cs b/src/GitHub.Api/IOAuthCallbackListener.cs
@@ -16,5 +16,11 @@ public interface IOAuthCallbackListener
         /// <param name="cancel">A cancellation token.</param>
         /// <returns>The temporary code included in the callback.</returns>
         Task<string> Listen(string id, CancellationToken cancel);
+
+        /// <summary>
+        /// Redirects the last context to respond with listen and stops the underlying http listener
+        /// </summary>
+        /// <param name="url">Url to redirect to.</param>
+        void RedirectLastContext(Uri url);
     }
 }
diff --git a/src/GitHub.Api/LoginManager.cs b/src/GitHub.Api/LoginManager.cs
@@ -157,6 +157,8 @@ public async Task<LoginResult> LoginViaOAuth(
             await keychain.Save("[oauth]", token.AccessToken, hostAddress).ConfigureAwait(false);
             var result = await ReadUserWithRetry(client).ConfigureAwait(false);
             await keychain.Save(result.User.Login, token.AccessToken, hostAddress).ConfigureAwait(false);
+            oauthListener.RedirectLastContext(hostAddress.WebUri.Append(result.User.Login));
+
             return result;
         }
 
diff --git a/src/GitHub.App/Services/OAuthCallbackListener.cs b/src/GitHub.App/Services/OAuthCallbackListener.cs
@@ -1,4 +1,6 @@
-﻿using System.ComponentModel.Composition;
+﻿using System;
+using System.ComponentModel.Composition;
+using System.Diagnostics;
 using System.Net;
 using System.Threading;
 using System.Threading.Tasks;
@@ -39,6 +41,7 @@ public OAuthCallbackListener(IHttpListener httpListener)
         }
 
         public readonly static string CallbackUrl = Invariant($"http://localhost:{CallbackPort}/");
+        private IHttpListenerContext lastContext;
 
         public async Task<string> Listen(string id, CancellationToken cancel)
         {
@@ -51,22 +54,29 @@ public async Task<string> Listen(string id, CancellationToken cancel)
                 {
                     while (true)
                     {
-                        var context = await httpListener.GetContextAsync().ConfigureAwait(false);
-                        var foo = context.Request;
-                        var queryParts = HttpUtility.ParseQueryString(context.Request.Url.Query);
+                        lastContext = await httpListener.GetContextAsync().ConfigureAwait(false);
+                        var queryParts = HttpUtility.ParseQueryString(lastContext.Request.Url.Query);
 
                         if (queryParts["state"] == id)
                         {
-                            context.Response.Close();
                             return queryParts["code"];
                         }
                     }
                 }
             }
-            finally
+            catch(Exception)
             {
                 httpListener.Stop();
+                throw;
             }
         }
+
+        public void RedirectLastContext(Uri url)
+        {
+            lastContext.Response.Redirect(url);
+            lastContext.Response.Close();
+
+            httpListener.Stop();
+        }
     }
 }
diff --git a/src/GitHub.Resources/Resources.cs-CZ.resx b/src/GitHub.Resources/Resources.cs-CZ.resx
@@ -889,6 +889,6 @@ https://git-scm.com/download/win</value>
     <value>Klon</value>
   </data>
   <data name="AddChangeAccounts" xml:space="preserve">
-    <value>Add/Change Accounts</value>
+    <value>Přidat nebo změnit účty</value>
   </data>
 </root>
diff --git a/src/GitHub.Resources/Resources.de-DE.resx b/src/GitHub.Resources/Resources.de-DE.resx
@@ -889,6 +889,6 @@ https://git-scm.com/download/win</value>
     <value>Klonen</value>
   </data>
   <data name="AddChangeAccounts" xml:space="preserve">
-    <value>Add/Change Accounts</value>
+    <value>Konten hinzufügen/ändern</value>
   </data>
 </root>
diff --git a/src/GitHub.Resources/Resources.es-ES.resx b/src/GitHub.Resources/Resources.es-ES.resx
@@ -889,6 +889,6 @@ https://git-scm.com/download/win</value>
     <value>Clonar</value>
   </data>
   <data name="AddChangeAccounts" xml:space="preserve">
-    <value>Add/Change Accounts</value>
+    <value>Agregar o cambiar cuentas</value>
   </data>
 </root>
diff --git a/src/GitHub.Resources/Resources.fr-FR.resx b/src/GitHub.Resources/Resources.fr-FR.resx
@@ -439,7 +439,7 @@ https://git-scm.com/download/win</value>
     <value>Chemin d'accès</value>
   </data>
   <data name="IssuesNavigationItemText" xml:space="preserve">
-    <value>Questions</value>
+    <value>Problèmes</value>
   </data>
   <data name="GraphsNavigationItemText" xml:space="preserve">
     <value>Graphes</value>
@@ -889,6 +889,6 @@ https://git-scm.com/download/win</value>
     <value>Cloner</value>
   </data>
   <data name="AddChangeAccounts" xml:space="preserve">
-    <value>Add/Change Accounts</value>
+    <value>Ajouter/Changer des comptes</value>
   </data>
 </root>
diff --git a/src/GitHub.Resources/Resources.it-IT.resx b/src/GitHub.Resources/Resources.it-IT.resx
@@ -889,6 +889,6 @@ https://git-scm.com/download/win</value>
     <value>Clona</value>
   </data>
   <data name="AddChangeAccounts" xml:space="preserve">
-    <value>Add/Change Accounts</value>
+    <value>Aggiungi/Modifica account</value>
   </data>
 </root>
diff --git a/src/GitHub.Resources/Resources.ja-JP.resx b/src/GitHub.Resources/Resources.ja-JP.resx
@@ -889,6 +889,6 @@ https://git-scm.com/download/win</value>
     <value>複製</value>
   </data>
   <data name="AddChangeAccounts" xml:space="preserve">
-    <value>Add/Change Accounts</value>
+    <value>アカウントの追加または変更</value>
   </data>
 </root>
diff --git a/src/GitHub.Resources/Resources.ko-KR.resx b/src/GitHub.Resources/Resources.ko-KR.resx
@@ -448,7 +448,7 @@ https://git-scm.com/download/win</value>
     <value>GitHub에 게시</value>
   </data>
   <data name="BlurbText" xml:space="preserve">
-    <value>오픈 소스 및 개인 프로젝트에 대한 강력한 공동 작업, 코드 검토 및 코드 관리.</value>
+    <value>오픈 소스 및 프라이빗 프로젝트에 대한 강력한 협업, 코드 검토 및 코드 관리.</value>
   </data>
   <data name="GitHubInvitationSectionConnectLabel" xml:space="preserve">
     <value>연결...</value>
@@ -550,7 +550,7 @@ https://git-scm.com/download/win</value>
     <value>설명</value>
   </data>
   <data name="NotAGitHubRepositoryMessage" xml:space="preserve">
-    <value>이 리포지토리를 GitHub에 게시하고 오픈 소스 및 개인 프로젝트에 대한 강력한 공동 작업, 코드 검토 및 코드 관리를 가져옵니다.</value>
+    <value>이 리포지토리를 GitHub에 게시하고 오픈 소스 및 프라이빗 프로젝트에 대한 강력한 협업, 코드 검토 및 코드 관리를 가져옵니다.</value>
   </data>
   <data name="NotAGitHubRepository" xml:space="preserve">
     <value>이 리포지토리가 GitHub에 없습니다.</value>
@@ -889,6 +889,6 @@ https://git-scm.com/download/win</value>
     <value>복제</value>
   </data>
   <data name="AddChangeAccounts" xml:space="preserve">
-    <value>Add/Change Accounts</value>
+    <value>계정 추가/변경</value>
   </data>
 </root>
diff --git a/src/GitHub.Resources/Resources.pl-PL.resx b/src/GitHub.Resources/Resources.pl-PL.resx
@@ -889,6 +889,6 @@ https://git-scm.com/download/win</value>
     <value>Klonuj</value>
   </data>
   <data name="AddChangeAccounts" xml:space="preserve">
-    <value>Add/Change Accounts</value>
+    <value>Dodaj/Zmień konta</value>
   </data>
 </root>
diff --git a/src/GitHub.Resources/Resources.pt-BR.resx b/src/GitHub.Resources/Resources.pt-BR.resx
@@ -889,6 +889,6 @@ https://git-scm.com/download/win</value>
     <value>Clonar</value>
   </data>
   <data name="AddChangeAccounts" xml:space="preserve">
-    <value>Add/Change Accounts</value>
+    <value>Adicionar/Alterar Contas</value>
   </data>
 </root>
diff --git a/src/GitHub.Resources/Resources.ru-RU.resx b/src/GitHub.Resources/Resources.ru-RU.resx
@@ -889,6 +889,6 @@ https://git-scm.com/download/win</value>
     <value>Клонировать</value>
   </data>
   <data name="AddChangeAccounts" xml:space="preserve">
-    <value>Add/Change Accounts</value>
+    <value>Добавить или изменить учетные записи</value>
   </data>
 </root>
diff --git a/src/GitHub.Resources/Resources.tr-TR.resx b/src/GitHub.Resources/Resources.tr-TR.resx
@@ -889,6 +889,6 @@ https://git-scm.com/download/win</value>
     <value>Kopyalama</value>
   </data>
   <data name="AddChangeAccounts" xml:space="preserve">
-    <value>Add/Change Accounts</value>
+    <value>Hesap Ekle/Değiştir</value>
   </data>
 </root>
diff --git a/src/GitHub.Resources/Resources.zh-CN.resx b/src/GitHub.Resources/Resources.zh-CN.resx
@@ -889,6 +889,6 @@ https://git-scm.com/download/win</value>
     <value>克隆</value>
   </data>
   <data name="AddChangeAccounts" xml:space="preserve">
-    <value>Add/Change Accounts</value>
+    <value>添加/更改帐户</value>
   </data>
 </root>
diff --git a/src/GitHub.Resources/Resources.zh-TW.resx b/src/GitHub.Resources/Resources.zh-TW.resx
@@ -889,6 +889,6 @@ https://git-scm.com/download/win</value>
     <value>複製</value>
   </data>
   <data name="AddChangeAccounts" xml:space="preserve">
-    <value>Add/Change Accounts</value>
+    <value>新增/變更帳戶</value>
   </data>
 </root>
diff --git a/src/GitHub.VisualStudio.16/CompositionServices.cs b/src/GitHub.VisualStudio.16/CompositionServices.cs
@@ -8,11 +8,9 @@
 using System.Linq;
 using System.Reflection;
 using GitHub.Api;
-using GitHub.Factories;
 using GitHub.Services;
 using GitHub.Settings;
 using GitHub.VisualStudio.Settings;
-using GitHub.VisualStudio.Views;
 using GitHub.VisualStudio.Views.Dialog.Clone;
 using Microsoft;
 using Microsoft.VisualStudio.Shell;
@@ -117,26 +115,17 @@ static CompositionContainer CreateCompositionContainer(ExportProvider defaultExp
 
             var gitHubServiceProvider = new MyGitHubServiceProvider(compositionContainer);
             compositionContainer.ComposeExportedValue<IGitHubServiceProvider>(gitHubServiceProvider);
+            Services.UnitTestServiceProvider = gitHubServiceProvider; // Use gitHubServiceProvider as global provider 
 
             var loginManager = CreateLoginManager(compositionContainer);
             compositionContainer.ComposeExportedValue<ILoginManager>(loginManager);
 
-            // HACK: Stop ViewLocator from attempting to fetch a global service
-            var viewViewModelFactory = compositionContainer.GetExportedValue<IViewViewModelFactory>();
-            InitializeViewLocator(viewViewModelFactory);
-            
             // Ensure GitHub.Resources.dll has been loaded and it visible to XAML
             EnsureLoaded(typeof(GitHub.Resources));
 
             return compositionContainer;
         }
 
-        static void InitializeViewLocator(IViewViewModelFactory viewViewModelFactory)
-        {
-            var factoryProviderFiled = typeof(ViewLocator).GetField("factoryProvider", BindingFlags.Static | BindingFlags.NonPublic);
-            factoryProviderFiled.SetValue(null, viewViewModelFactory);
-        }
-
         static void EnsureLoaded(Type type)
         {
             // Ensure the containing assembly has been loaded
@@ -233,6 +222,11 @@ public TRet GetService<T, TRet>()
 
         public object GetService(Type serviceType)
         {
+            if (serviceType == typeof(IGitHubServiceProvider))
+            {
+                return this;
+            }
+
             return serviceProvider.GetService(serviceType);
         }
 
diff --git a/src/GitHub.VisualStudio.16/source.extension.vsixmanifest b/src/GitHub.VisualStudio.16/source.extension.vsixmanifest
@@ -2,11 +2,11 @@
 <PackageManifest Version="2.0.0" xmlns="http://schemas.microsoft.com/developer/vsx-schema/2011" xmlns:d="http://schemas.microsoft.com/developer/vsx-schema-design/2011">
     <Metadata>
         <Identity Id="f4fbb70d-dee2-4dee-b322-bd74e3010e8f" Version="2.10.2.0" Language="en-US" Publisher="GitHub, Inc" />
-        <DisplayName>Clone from GitHub</DisplayName>
+        <DisplayName>GitHub Essentials</DisplayName>
         <Description>Clone or checkout code from GitHub</Description>
         <PackageId>GitHub.VisualStudio.16</PackageId>
     </Metadata>
-    <Installation AllUsers="true">
+    <Installation AllUsers="true" SystemComponent="true">
         <InstallationTarget Id="Microsoft.VisualStudio.Community" Version="[16.0, 17.0)" />
     </Installation>
     <Dependencies>
diff --git a/src/GitHub.VisualStudio.UI/Views/Dialog/Clone/RepositoryCloneView.xaml b/src/GitHub.VisualStudio.UI/Views/Dialog/Clone/RepositoryCloneView.xaml
@@ -41,7 +41,7 @@
 
         <TextBlock DockPanel.Dock="Top" TextAlignment="Right">
             <Hyperlink Command="{Binding LoginAsDifferentUser}">
-                <Run Text="{x:Static ghfvs:Resources.LoginLink}" />
+                <Run Text="{x:Static ghfvs:Resources.AddChangeAccounts}" />
             </Hyperlink>
         </TextBlock>
             
diff --git a/src/GitHub.VisualStudio.UI/Views/Dialog/GitHubDialogWindow.xaml.cs b/src/GitHub.VisualStudio.UI/Views/Dialog/GitHubDialogWindow.xaml.cs
@@ -25,7 +25,10 @@ void CloseButton_Click(object sender, RoutedEventArgs e)
 
         void Border_MouseDown(object sender, MouseButtonEventArgs e)
         {
-            DragMove();
+            if (e.ChangedButton == MouseButton.Left)
+            {
+                DragMove();
+            }
         }
     }
 }
diff --git a/src/GitHub.VisualStudio.UI/Views/Dialog/LoginCredentialsView.xaml.cs b/src/GitHub.VisualStudio.UI/Views/Dialog/LoginCredentialsView.xaml.cs
@@ -1,7 +1,9 @@
 ﻿using System;
 using System.ComponentModel.Composition;
+using System.Diagnostics;
 using System.Reactive.Disposables;
 using System.Reactive.Linq;
+using System.Runtime.InteropServices;
 using System.Windows;
 using System.Windows.Input;
 using GitHub.Controls;
@@ -46,7 +48,7 @@ public LoginCredentialsView()
             this.WhenAnyObservable(
                 x => x.ViewModel.GitHubLogin.LoginViaOAuth,
                 x => x.ViewModel.EnterpriseLogin.LoginViaOAuth)
-                .Subscribe(_ => Application.Current.MainWindow?.Activate());
+                .Subscribe(_ => SetForegroundWindow());
 
             hostTabControl.SelectionChanged += (s, e) =>
             {
@@ -122,5 +124,23 @@ void SetupSelectedTabBindings(Action<IDisposable> d)
                 .Where(x => x == true)
                 .BindTo(this, v => v.enterpriseTab.IsSelected));
         }
+
+        static bool SetForegroundWindow()
+        {
+            var hWnd = Process.GetCurrentProcess().MainWindowHandle;
+            if (hWnd != IntPtr.Zero)
+            {
+                return NativeMethods.SetForegroundWindow(hWnd);
+            }
+
+            return false;
+        }
+
+        class NativeMethods
+        {
+            [DllImport("user32.dll")]
+            [return: MarshalAs(UnmanagedType.Bool)]
+            internal static extern bool SetForegroundWindow(IntPtr hWnd);
+        }
     }
 }
diff --git a/src/GitHub.VisualStudio.UI/Views/Documents/IssueishCommentView.xaml.cs b/src/GitHub.VisualStudio.UI/Views/Documents/IssueishCommentView.xaml.cs
@@ -9,7 +9,6 @@
 using GitHub.ViewModels;
 using GitHub.ViewModels.Documents;
 using GitHub.VisualStudio.UI.Helpers;
-using Microsoft.VisualStudio.Shell;
 
 namespace GitHub.VisualStudio.Views.Documents
 {
@@ -28,8 +27,7 @@ public IssueishCommentView()
 
         static IVisualStudioBrowser GetBrowser()
         {
-            var serviceProvider = (IGitHubServiceProvider)Package.GetGlobalService(typeof(IGitHubServiceProvider));
-            return serviceProvider.GetService<IVisualStudioBrowser>();
+            return Services.GitHubServiceProvider.GetService<IVisualStudioBrowser>();
         }
 
         void DoOpenOnGitHub()
diff --git a/src/GitHub.VisualStudio.UI/Views/PullRequestReviewCommentView.xaml.cs b/src/GitHub.VisualStudio.UI/Views/PullRequestReviewCommentView.xaml.cs
@@ -6,7 +6,6 @@
 using GitHub.UI;
 using GitHub.ViewModels;
 using GitHub.VisualStudio.UI.Helpers;
-using Microsoft.VisualStudio.Shell;
 using ReactiveUI;
 
 namespace GitHub.VisualStudio.Views
@@ -31,8 +30,7 @@ public PullRequestReviewCommentView()
 
         static IVisualStudioBrowser GetBrowser()
         {
-            var serviceProvider = (IGitHubServiceProvider)Package.GetGlobalService(typeof(IGitHubServiceProvider));
-            return serviceProvider.GetService<IVisualStudioBrowser>();
+            return Services.GitHubServiceProvider.GetService<IVisualStudioBrowser>();
         }
 
         void DoOpenOnGitHub()
diff --git a/src/GitHub.VisualStudio.UI/Views/ViewLocator.cs b/src/GitHub.VisualStudio.UI/Views/ViewLocator.cs
@@ -32,10 +32,16 @@ public class ViewLocator : IValueConverter
         /// <param name="culture">Unused.</param>
         /// <returns>
         /// A new instance of a view for the specified view model, or an error string if a view
-        /// could not be located.
+        /// could not be located. A null view model will return null.
         /// </returns>
         public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
         {
+            if (value == null)
+            {
+                // Return null for a null view model
+                return null;
+            }
+
             var exportViewModelAttribute = value.GetType().GetCustomAttributes(typeof(ExportAttribute), false)
                 .OfType<ExportAttribute>()
                 .Where(x => typeof(IViewModel).IsAssignableFrom(x.ContractType))
diff --git a/src/GitHub.VisualStudio/Services/GitHubServiceProvider.cs b/src/GitHub.VisualStudio/Services/GitHubServiceProvider.cs
diff --git a/test/GitHub.App.UnitTests/Services/OAuthCallbackListenerTests.cs b/test/GitHub.App.UnitTests/Services/OAuthCallbackListenerTests.cs

Original file line number	Diff line number	Diff line change
`@@ -16,5 +16,11 @@ public interface IOAuthCallbackListener`
`16`	`16`	`/// <param name="cancel">A cancellation token.</param>`
`17`	`17`	`/// <returns>The temporary code included in the callback.</returns>`
`18`	`18`	`Task<string> Listen(string id, CancellationToken cancel);`
	`19`	`+`
	`20`	`+ /// <summary>`
	`21`	`+ /// Redirects the last context to respond with listen and stops the underlying http listener`
	`22`	`+ /// </summary>`
	`23`	`+ /// <param name="url">Url to redirect to.</param>`
	`24`	`+ void RedirectLastContext(Uri url);`
`19`	`25`	`}`
`20`	`26`	`}`
Original file line number	Diff line number	Diff line change
`@@ -157,6 +157,8 @@ public async Task<LoginResult> LoginViaOAuth(`
`157`	`157`	`await keychain.Save("[oauth]", token.AccessToken, hostAddress).ConfigureAwait(false);`
`158`	`158`	`var result = await ReadUserWithRetry(client).ConfigureAwait(false);`
`159`	`159`	`await keychain.Save(result.User.Login, token.AccessToken, hostAddress).ConfigureAwait(false);`
	`160`	`+ oauthListener.RedirectLastContext(hostAddress.WebUri.Append(result.User.Login));`
	`161`	`+`
`160`	`162`	`return result;`
`161`	`163`	`}`
`162`	`164`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,6 @@`
`1`		`-using System.ComponentModel.Composition;`
	`1`	`+using System;`
	`2`	`+using System.ComponentModel.Composition;`
	`3`	`+using System.Diagnostics;`
`2`	`4`	`using System.Net;`
`3`	`5`	`using System.Threading;`
`4`	`6`	`using System.Threading.Tasks;`
`@@ -39,6 +41,7 @@ public OAuthCallbackListener(IHttpListener httpListener)`
`39`	`41`	`}`
`40`	`42`
`41`	`43`	`public readonly static string CallbackUrl = Invariant($"http://localhost:{CallbackPort}/");`
	`44`	`+ private IHttpListenerContext lastContext;`
`42`	`45`
`43`	`46`	`public async Task<string> Listen(string id, CancellationToken cancel)`
`44`	`47`	`{`
`@@ -51,22 +54,29 @@ public async Task<string> Listen(string id, CancellationToken cancel)`
`51`	`54`	`{`
`52`	`55`	`while (true)`
`53`	`56`	`{`
`54`		`- var context = await httpListener.GetContextAsync().ConfigureAwait(false);`
`55`		`- var foo = context.Request;`
`56`		`- var queryParts = HttpUtility.ParseQueryString(context.Request.Url.Query);`
	`57`	`+ lastContext = await httpListener.GetContextAsync().ConfigureAwait(false);`
	`58`	`+ var queryParts = HttpUtility.ParseQueryString(lastContext.Request.Url.Query);`
`57`	`59`
`58`	`60`	`if (queryParts["state"] == id)`
`59`	`61`	`{`
`60`		`- context.Response.Close();`
`61`	`62`	`return queryParts["code"];`
`62`	`63`	`}`
`63`	`64`	`}`
`64`	`65`	`}`
`65`	`66`	`}`
`66`		`- finally`
	`67`	`+ catch(Exception)`
`67`	`68`	`{`
`68`	`69`	`httpListener.Stop();`
	`70`	`+ throw;`
`69`	`71`	`}`
`70`	`72`	`}`
	`73`	`+`
	`74`	`+ public void RedirectLastContext(Uri url)`
	`75`	`+ {`
	`76`	`+ lastContext.Response.Redirect(url);`
	`77`	`+ lastContext.Response.Close();`
	`78`	`+`
	`79`	`+ httpListener.Stop();`
	`80`	`+ }`
`71`	`81`	`}`
`72`	`82`	`}`