Merge branch 'master' into refactor/usage-tracker

 Conflicts:
	src/GitHub.App/Models/RepositoryHost.cs
	src/GitHub.VisualStudio/source.extension.vsixmanifest
	src/MsiInstaller/Version.wxi
	src/common/SolutionInfo.cs

Author: grokys

README.md

@@ -1,6 +1,20 @@
 # GitHub Extension for Visual Studio
 
-**The location of the submodules has changed as of 31-01-2017.** If you have an existing clone, make sure to run `git submodule sync` to update your local clone with the new locations for the submodules.
+## Notices
+
+### VS 2017 v15.3 users, please read
+
+If you need to downgrade or uninstall the extension, **do not use** ***Revert*** in Visual Studio 2017 15.3. Instead, manually uninstall the extension with the steps listed in https://github.com/github/VisualStudio/issues/1206#issuecomment-326558902
+
+If you have a corrupted extension cache, steps for fixing it are in https://github.com/github/VisualStudio/issues/1206#issuecomment-326053090
+
+The Visual Studio 2017 15.3 installer [has a bug](https://github.com/github/VisualStudio/issues/1206) that causes a corruption of the installed extensions data when you revert an installation of the extension (see also [this MS issue](https://developercommunity.visualstudio.com/content/problem/102178/error-installing-github-extension.html)). Until VS 2017 15.4 comes out, **do not use Revert in** ***Extensions and Updates***.
+
+### The location of the submodules has changed as of 31-01-2017
+
+If you have an existing clone, make sure to run `git submodule sync` to update your local clone with the new locations for the submodules.
+
+## About
 
 The GitHub Extension for Visual Studio provides GitHub integration in Visual Studio 2015.
 Most of the extension UI lives in the Team Explorer pane, which is available from the View menu.

script

@@ -39,8 +39,14 @@ public Task SaveLogin(string userName, string password, HostAddress hostAddress)
             Guard.ArgumentNotEmptyString(password, nameof(password));
             Guard.ArgumentNotNull(hostAddress, nameof(hostAddress));
 
+            var keyGit = GetKeyGit(hostAddress.CredentialCacheKeyHost);
             var keyHost = GetKeyHost(hostAddress.CredentialCacheKeyHost);
 
+            using (var credential = new Credential(userName, password, keyGit))
+            {
+                credential.Save();
+            }
+
             using (var credential = new Credential(userName, password, keyHost))
             {
                 credential.Save();
@@ -54,8 +60,16 @@ public Task EraseLogin(HostAddress hostAddress)
         {
             Guard.ArgumentNotNull(hostAddress, nameof(hostAddress));
 
+            var keyGit = GetKeyGit(hostAddress.CredentialCacheKeyHost);
             var keyHost = GetKeyHost(hostAddress.CredentialCacheKeyHost);
 
+            using (var credential = new Credential())
+            {
+                credential.Target = keyGit;
+                credential.Type = CredentialType.Generic;
+                credential.Delete();
+            }
+
             using (var credential = new Credential())
             {
                 credential.Target = keyHost;
@@ -66,6 +80,17 @@ public Task EraseLogin(HostAddress hostAddress)
             return Task.CompletedTask;
         }
 
+        static string GetKeyGit(string key)
+        {
+            key = FormatKey(key);
+            // it appears this is how MS expects the host key
+            if (!key.StartsWith("git:", StringComparison.Ordinal))
+                key = "git:" + key;
+            if (key.EndsWith("/", StringComparison.Ordinal))
+                key = key.Substring(0, key.Length - 1);
+            return key;
+        }
+
         static string GetKeyHost(string key)
         {
             key = FormatKey(key);

src/GitHub.Api/WindowsLoginCache.cs

@@ -26,7 +26,6 @@ public partial class ApiClient : IApiClient
         const string ScopesHeader = "X-OAuth-Scopes";
         const string ProductName = Info.ApplicationInfo.ApplicationDescription;
         static readonly Logger log = LogManager.GetCurrentClassLogger();
-        static readonly Uri userEndpoint = new Uri("user", UriKind.Relative);
 
         readonly IObservableGitHubClient gitHubClient;
         // There are two sets of authorization scopes, old and new:
@@ -96,30 +95,9 @@ public IObservable<Gist> CreateGist(NewGist newGist)
             return gitHubClient.Gist.Create(newGist);
         }
 
-        public IObservable<UserAndScopes> GetUser()
+        public IObservable<User> GetUser()
         {
-            return GetUserInternal().ToObservable();
-        }
-
-        async Task<UserAndScopes> GetUserInternal()
-        {
-            var response = await gitHubClient.Connection.Get<User>(
-                userEndpoint, null, null).ConfigureAwait(false);
-            var scopes = default(string[]);
-
-            if (response.HttpResponse.Headers.ContainsKey(ScopesHeader))
-            {
-                scopes = response.HttpResponse.Headers[ScopesHeader]
-                    .Split(',')
-                    .Select(x => x.Trim())
-                    .ToArray();
-            }
-            else
-            {
-                log.Error($"Error reading scopes: /user succeeded but {ScopesHeader} was not present.");
-            }
-
-            return new UserAndScopes(response.Body, scopes);
+            return gitHubClient.User.Current();
         }
 
         public IObservable<ApplicationAuthorization> GetOrCreateApplicationAuthenticationCode(

src/GitHub.App/Api/ApiClient.cs

@@ -319,7 +319,6 @@ void ConfigureUIHandlingStates()
             ConfigureEntriesExitsForView(UIViewType.Login);
             ConfigureEntriesExitsForView(UIViewType.TwoFactor);
             ConfigureEntriesExitsForView(UIViewType.Gist);
-            ConfigureEntriesExitsForView(UIViewType.LogoutRequired);
             ConfigureEntriesExitsForView(UIViewType.StartPageClone);
 
             uiStateMachine.Configure(UIViewType.End)
@@ -421,7 +420,6 @@ void ConfigureLogicStates()
             ConfigureSingleViewLogic(UIControllerFlow.Create, UIViewType.Create);
             ConfigureSingleViewLogic(UIControllerFlow.Gist, UIViewType.Gist);
             ConfigureSingleViewLogic(UIControllerFlow.Home, UIViewType.PRList);
-            ConfigureSingleViewLogic(UIControllerFlow.LogoutRequired, UIViewType.LogoutRequired);
             ConfigureSingleViewLogic(UIControllerFlow.Publish, UIViewType.Publish);
             ConfigureSingleViewLogic(UIControllerFlow.PullRequestList, UIViewType.PRList);
             ConfigureSingleViewLogic(UIControllerFlow.PullRequestDetail, UIViewType.PRDetail);
@@ -448,11 +446,7 @@ UIControllerFlow SelectActiveFlow()
         {
             var host = connection != null ? hosts.LookupHost(connection.HostAddress) : null;
             var loggedIn = host?.IsLoggedIn ?? false;
-            if (!loggedIn || selectedFlow != UIControllerFlow.Gist)
-                return loggedIn ? selectedFlow : UIControllerFlow.Authentication;
-
-            var supportsGist = host?.SupportsGist ?? false;
-            return supportsGist ? selectedFlow : UIControllerFlow.LogoutRequired;
+            return loggedIn ? selectedFlow : UIControllerFlow.Authentication;
         }
 
         /// <summary>

src/GitHub.App/Controllers/UIController.cs

@@ -216,7 +216,6 @@
     <Compile Include="ViewModels\NotAGitRepositoryViewModel.cs" />
     <Compile Include="ViewModels\NotAGitHubRepositoryViewModel.cs" />
     <Compile Include="ViewModels\LoggedOutViewModel.cs" />
-    <Compile Include="ViewModels\LogoutRequiredViewModel.cs" />
     <Compile Include="ViewModels\PullRequestCreationViewModel.cs" />
     <Compile Include="ViewModels\PullRequestDetailViewModel.cs" />
     <Compile Include="ViewModels\PullRequestDirectoryNode.cs" />

src/GitHub.App/GitHub.App.csproj

@@ -25,7 +25,6 @@ public DisconnectedRepositoryHost()
 
         public bool IsLoggedIn { get; private set; }
         public bool IsLoggingIn { get; private set; }
-        public bool SupportsGist { get; private set; }
         public ReactiveList<IAccount> Organizations { get; private set; }
         public ReactiveList<IAccount> Accounts { get; private set; }
         public string Title { get; private set; }

src/GitHub.App/Models/DisconnectedRepositoryHosts.cs

@@ -27,7 +27,6 @@ namespace GitHub.Models
     public class RepositoryHost : ReactiveObject, IRepositoryHost
     {
         static readonly Logger log = LogManager.GetCurrentClassLogger();
-        static readonly UserAndScopes unverifiedUser = new UserAndScopes(null, null);
 
         readonly ILoginManager loginManager;
         readonly HostAddress hostAddress;
@@ -65,8 +64,6 @@ public bool IsLoggedIn
             private set { this.RaiseAndSetIfChanged(ref isLoggedIn, value); }
         }
 
-        public bool SupportsGist { get; private set; }
-
         public string Title { get; private set; }
 
         [SuppressMessage("Microsoft.Reliability", "CA2000:Dispose objects before losing scope")]
@@ -82,7 +79,7 @@ public IObservable<AuthenticationResult> LogInFromCache()
                     await usage.IncrementCounter(x => x.NumberOfLogins);
                     await ModelService.InsertUser(accountCacheItem);
 
-                    if (user != unverifiedUser.User)
+                    if (user != null)
                     {
                         IsLoggedIn = true;
                         return AuthenticationResult.Success;
@@ -114,7 +111,7 @@ public IObservable<AuthenticationResult> LogIn(string usernameOrEmail, string pa
                 await usage.IncrementCounter(x => x.NumberOfLogins);
                 await ModelService.InsertUser(accountCacheItem);
 
-                if (user != unverifiedUser.User)
+                if (user != null)
                 {
                     IsLoggedIn = true;
                     return Observable.Return(AuthenticationResult.Success);
@@ -151,53 +148,6 @@ public IObservable<Unit> LogOut()
                 });
         }
 
-        static IObservable<AuthenticationResult> GetAuthenticationResultForUser(UserAndScopes account)
-        {
-            return Observable.Return(account == null ? AuthenticationResult.CredentialFailure
-                : account == unverifiedUser
-                    ? AuthenticationResult.VerificationFailure
-                    : AuthenticationResult.Success);
-        }
-
-        IObservable<AuthenticationResult> LoginWithApiUser(UserAndScopes userAndScopes)
-        {
-            return GetAuthenticationResultForUser(userAndScopes)
-                .SelectMany(result =>
-                {
-                    if (result.IsSuccess())
-                    {
-                        var accountCacheItem = new AccountCacheItem(userAndScopes.User);
-                        usage.IncrementCounter(x => x.NumberOfLogins).Forget();
-                        return ModelService.InsertUser(accountCacheItem).Select(_ => result);
-                    }
-
-                    if (result == AuthenticationResult.VerificationFailure)
-                    {
-                        return loginCache.EraseLogin(Address).Select(_ => result);
-                    }
-                    return Observable.Return(result);
-                })
-                .ObserveOn(RxApp.MainThreadScheduler)
-                .Do(result =>
-                {
-                    if (result.IsSuccess())
-                    {
-                        SupportsGist = userAndScopes.Scopes?.Contains("gist") ?? true;
-                        IsLoggedIn = true;
-                    }
-
-                    log.Info("Log in from cache for login '{0}' to host '{1}' {2}",
-                        userAndScopes?.User?.Login ?? "(null)",
-                        hostAddress.ApiUri,
-                        result.IsSuccess() ? "SUCCEEDED" : "FAILED");
-                });
-        }
-
-        IObservable<UserAndScopes> GetUserFromApi()
-        {
-            return Observable.Defer(() => ApiClient.GetUser());
-        }
-
         protected virtual void Dispose(bool disposing)
         {}
 

src/GitHub.App/Models/RepositoryHost.cs

@@ -159,15 +159,6 @@
   <data name="LoginTitle" xml:space="preserve">
     <value>Connect To GitHub</value>
   </data>
-  <data name="LogoutRequiredFeatureGist" xml:space="preserve">
-    <value>create a Gist</value>
-  </data>
-  <data name="LogoutRequiredMessage" xml:space="preserve">
-    <value>To {0} you need to sign out and back in.</value>
-  </data>
-  <data name="LogoutRequiredTitle" xml:space="preserve">
-    <value>Sign Out Required</value>
-  </data>
   <data name="PasswordValidatorEmpty" xml:space="preserve">
     <value>Please enter your password</value>
   </data>