Merge master into feature/link-to-vs

Author: shana

README.md

@@ -7,6 +7,14 @@ Official builds of this extension are available at [the official website](https:
 
 [![Join the chat at https://gitter.im/github/VisualStudio](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/github/VisualStudio?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 
+## Installing beta versions
+
+Older and pre-release/beta/untested versions are available at [the releases page](https://github.com/github/VisualStudio/releases), and also via a custom gallery feed for Visual Studio.
+
+You can configure the gallery by going to `Tools / Options / Extensions and Updates` and adding a new gallery with the url https://visualstudio.github.com/releases/feed.rss. The gallery will now be available from `Tools / Extensions and Updates`.
+
+Beta releases will have `(beta)` in their title in the gallery, following the version number. You can view the release notes in the gallery by hovering over the description, or by clicking the `Release Notes` link on the right side.
+
 ## Build requirements
 
 * Visual Studio 2015

deploy-local.cmd

@@ -0,0 +1 @@
+powershell.exe .\script\deploy.ps1 production None -Force -NoChat -NoPush -NoUpload

documentation/manifest.md

@@ -110,3 +110,6 @@
       - [ ] Login button is disabled
 - [ ] **Login to an enterprise instance**
       - [ ] Team Explorer Connect page shows two github connections - one titled GitHub, another with the enterprise url
+- [ ] **Login with 2FA on**
+      - [ ] Login GitHub with 2FA turned on
+      - [ ] Resend works

script

@@ -56,7 +56,7 @@ public Credential(
             Password = password;
             Target = target;
             Type = CredentialType.Generic;
-            PersistenceType = PersistenceType.Session;
+            PersistenceType = PersistenceType.LocalComputer;
             _lastWriteTime = DateTime.MinValue;
         }
 

src/CredentialManagement/Credential.cs

@@ -18,6 +18,7 @@
 using ReactiveUI;
 using Stateless;
 using System.Collections.Specialized;
+using System.Linq;
 
 namespace GitHub.Controllers
 {
@@ -121,6 +122,7 @@ public UIController(IUIProvider uiProvider, IRepositoryHosts hosts, IExportFacto
             machine.Configure(UIViewType.End)
                 .OnEntryFrom(Trigger.Cancel, () => End(false))
                 .OnEntryFrom(Trigger.Next, () => End(true))
+                .OnEntryFrom(Trigger.Finish, () => End(true))
                 .Permit(Trigger.Next, UIViewType.Finished);
 
             machine.Configure(UIViewType.Finished);
@@ -151,10 +153,9 @@ public IObservable<bool> ListenToCompletionState()
         void End(bool success)
         {
             uiProvider.RemoveService(typeof(IConnection));
-            transition.OnCompleted();
             completion?.OnNext(success);
             completion?.OnCompleted();
-            completion = null;
+            transition.OnCompleted();
         }
 
         void RunView(UIViewType viewType)
@@ -226,7 +227,11 @@ public void Start([AllowNull] IConnection connection)
         {
             if (connection != null)
             {
-                uiProvider.AddService(typeof(IConnection), connection);
+                if (currentFlow != UIControllerFlow.Authentication)
+                    uiProvider.AddService(connection);
+                else // sanity check: it makes zero sense to pass a connection in when calling the auth flow
+                    Debug.Assert(false, "Calling the auth flow with a connection makes no sense!");
+
                 connection.Login()
                     .Select(c => hosts.LookupHost(connection.HostAddress))
                     .Do(host =>
@@ -250,16 +255,26 @@ public void Start([AllowNull] IConnection connection)
             else
             {
                 connectionManager
-                    .IsLoggedIn(hosts)
-                    .Do(loggedin =>
+                    .GetLoggedInConnections(hosts)
+                    .FirstOrDefaultAsync()
+                    .Select(c =>
                     {
-                        if (!loggedin && currentFlow != UIControllerFlow.Authentication)
+                        bool loggedin = c != null;
+                        if (currentFlow != UIControllerFlow.Authentication)
                         {
-                            connectionAdded = (s, e) => {
-                                if (e.Action == NotifyCollectionChangedAction.Add)
-                                    uiProvider.AddService(typeof(IConnection), e.NewItems[0]);
-                            };
-                            connectionManager.Connections.CollectionChanged += connectionAdded;
+                            if (loggedin) // register the first available connection so the viewmodel can use it
+                                uiProvider.AddService(c);
+                            else
+                            {
+                                // a connection will be added to the list when auth is done, register it so the next
+                                // viewmodel can use it
+                                connectionAdded = (s, e) =>
+                                {
+                                    if (e.Action == NotifyCollectionChangedAction.Add)
+                                        uiProvider.AddService(typeof(IConnection), e.NewItems[0]);
+                                };
+                                connectionManager.Connections.CollectionChanged += connectionAdded;
+                            }
                         }
 
                         machine.Configure(UIViewType.None)
@@ -270,6 +285,8 @@ public void Start([AllowNull] IConnection connection)
                             .PermitIf(Trigger.Clone, UIViewType.Login, () => !loggedin)
                             .PermitIf(Trigger.Publish, UIViewType.Publish, () => loggedin)
                             .PermitIf(Trigger.Publish, UIViewType.Login, () => !loggedin);
+
+                        return loggedin;
                     })
                     .ObserveOn(RxApp.MainThreadScheduler)
                     .Subscribe(_ => { }, () =>
@@ -292,15 +309,19 @@ protected virtual void Dispose(bool disposing)
             if (disposing)
             {
                 if (disposed) return;
+                disposed = true;
 
-                Debug.WriteLine("Disposing ({0})", GetHashCode());
-                disposables.Dispose();
-                transition?.Dispose();
-                completion?.Dispose();
                 if (connectionAdded != null)
                     connectionManager.Connections.CollectionChanged -= connectionAdded;
                 connectionAdded = null;
-                disposed = true;
+
+                var tr = transition;
+                var cmp = completion;
+                transition = null;
+                completion = null;
+                disposables.Dispose();
+                tr?.Dispose();
+                cmp?.Dispose();
             }
         }
 

src/GitHub.App/Controllers/UIController.cs

@@ -10,7 +10,7 @@ public class ConnectionRepositoryHostMap : IConnectionRepositoryHostMap
     {
         [ImportingConstructor]
         public ConnectionRepositoryHostMap(IUIProvider provider, IRepositoryHosts hosts)
-            : this(provider.GetService<IConnection>(), hosts)
+            : this(provider.TryGetService<IConnection>(), hosts)
         {
         }
 

src/GitHub.App/Models/ConnectionRepositoryHostMap.cs

@@ -153,6 +153,9 @@
   <data name="PublishToTitle" xml:space="preserve">
     <value>Publish repository to {0}</value>
   </data>
+  <data name="RepositoryCloneFailedNoSelectedRepo" xml:space="preserve">
+    <value>No selected repository.</value>
+  </data>
   <data name="RepositoryCreationFailedAlreadyExists" xml:space="preserve">
     <value>Repository '{0}/{1}' already exists.</value>
   </data>

src/GitHub.App/Resources.Designer.cs

@@ -27,7 +27,7 @@ public class RepositoryCloneViewModel : BaseViewModel, IRepositoryCloneViewModel
         readonly IRepositoryHost repositoryHost;
         readonly IRepositoryCloneService cloneService;
         readonly IOperatingSystem operatingSystem;
-        readonly IVSServices vsServices;
+        readonly INotificationService notificationService;
         readonly IReactiveCommand<IReadOnlyList<IRepositoryModel>> loadRepositoriesCommand;
         readonly ReactiveCommand<object> browseForDirectoryCommand = ReactiveCommand.Create();
         readonly ObservableAsPropertyHelper<bool> isLoading;
@@ -41,20 +41,20 @@ public class RepositoryCloneViewModel : BaseViewModel, IRepositoryCloneViewModel
             IConnectionRepositoryHostMap connectionRepositoryHostMap,
             IRepositoryCloneService repositoryCloneService,
             IOperatingSystem operatingSystem,
-            IVSServices vsServices)
-            : this(connectionRepositoryHostMap.CurrentRepositoryHost, repositoryCloneService, operatingSystem, vsServices)
+            INotificationService notificationService)
+            : this(connectionRepositoryHostMap.CurrentRepositoryHost, repositoryCloneService, operatingSystem, notificationService)
         { }
 
         public RepositoryCloneViewModel(
             IRepositoryHost repositoryHost,
             IRepositoryCloneService cloneService,
             IOperatingSystem operatingSystem,
-            IVSServices vsServices)
+            INotificationService notificationService)
         {
             this.repositoryHost = repositoryHost;
             this.cloneService = cloneService;
             this.operatingSystem = operatingSystem;
-            this.vsServices = vsServices;
+            this.notificationService = notificationService;
 
             Title = string.Format(CultureInfo.CurrentCulture, Resources.CloneTitle, repositoryHost.Title);
             Repositories = new ReactiveList<IRepositoryModel>();
@@ -120,6 +120,11 @@ IObservable<Unit> OnCloneRepository(object state)
             {
                 var repository = SelectedRepository;
                 Debug.Assert(repository != null, "Should not be able to attempt to clone a repo when it's null");
+                if (repository == null)
+                {
+                    notificationService.ShowError(Resources.RepositoryCloneFailedNoSelectedRepo);
+                    return Observable.Return(Unit.Default);
+                }
                 // The following is a noop if the directory already exists.
                 operatingSystem.Directory.CreateDirectory(BaseRepositoryPath);
                 return cloneService.CloneRepository(repository.CloneUrl, repository.Name, BaseRepositoryPath);
@@ -129,7 +134,7 @@ IObservable<Unit> OnCloneRepository(object state)
             {
                 var repository = SelectedRepository;
                 Debug.Assert(repository != null, "Should not be able to attempt to clone a repo when it's null");
-                vsServices.ShowError(e.GetUserFriendlyErrorMessage(ErrorType.ClonedFailed, repository.Name));
+                notificationService.ShowError(e.GetUserFriendlyErrorMessage(ErrorType.ClonedFailed, repository.Name));
                 return Observable.Return(Unit.Default);
             });
         }