Merge remote-tracking branch 'refs/remotes/origin/settings/add-property-events' into feature/metrics

Author: Steven Kirk

.gitignore

@@ -238,4 +238,4 @@ WiX.Toolset.DummyFile.txt
 nunit-UnitTests.xml
 nunit-TrackingCollectionTests.xml
 GitHubVS.sln.DotSettings
-**/generated/*.cs
+**/generated/*.cs

CONTRIBUTING.md

@@ -31,9 +31,33 @@ There are certain areas of the extension that are restricted in what they can do
 - Team Explorer content outside the Home page is slightly less restricted, but not by much
 - Dialogs and views that don't inherit from TeamExplorer classes are free to use what they need.
 
+## Submitting an Issue
+
+### Bug Reporting
+
+Here are a few helpful tips when reporting a bug:
+- Verify the bug resides in the GitHub for Visual Studio extension
+  - A lot of functionality provided by this extension resides in the Team Explorer pane, alongside other non-GitHub tools to manage and collaborate on source code, including Visual Studio's Git support, which is owned by Microsoft.
+  - If this bug not is related to the GitHub extension, visit the [Visual Studio support page](https://www.visualstudio.com/support/support-overview-vs) for help
+- Screenshots are very helpful in diagnosing bugs and understanding the state of the extension when it's experiencing problems. Please include them whenever possible.
+- A log file is helpful in diagnosing bug issues. To include log files in your issue:
+
+  1. Close Visual Studio if it's open
+  2. Open a Developer Command Prompt for VS2015
+  3. Run devenv /log
+  4. Reproduce your issue
+  5. Close VS
+  6. Locate the following files on your system and email them to [email protected] or create a gist and link it in the issue report:
+    - `%appdata%\Microsoft\VisualStudio\14.0\ActivityLog.xml`
+    - `%localappdata%\temp\extension.log`
+    - `%localappdata%\GitHubVisualStudio\extension.log`
+
+### Feature Requests
+If you have a feature that you think would be a great addition to the extension, we might already have thought about it too, so be sure to check if your suggestion matches our [roadmap](#roadmap-and-future-feature-ideas) before making a request. Also take a peek at our [pull requests](https://github.com/github/VisualStudio/pulls) to see what we're currently working on. Additionally, someone might have already thought of your idea, so check out Issues labeled as [features](https://github.com/github/VisualStudio/issues?q=is%3Aopen+is%3Aissue+label%3Afeature) to see if it already exists.
+
 ## Things to improve in the current version
 
-- Localization
+- [Localization](https://github.com/github/VisualStudio/issues/18)
 
 ## Roadmap and future feature ideas
 

README.md

@@ -44,6 +44,6 @@ Visit the [Contributor Guidelines](CONTRIBUTING.md) for details on how to contri
 
 ## Copyright
 
-Copyright 2015 GitHub, Inc.
+Copyright 2015 - 2016 GitHub, Inc.
 
 Licensed under the [MIT License](LICENSE.md)

src/GitHub.App/Api/ApiClient.cs

@@ -13,21 +13,27 @@
 using Octokit;
 using Octokit.Reactive;
 using ReactiveUI;
+using System.Threading.Tasks;
+using System.Reactive.Threading.Tasks;
+using Octokit.Internal;
+using System.Collections.Generic;
+using GitHub.Models;
 
 namespace GitHub.Api
 {
     public partial class ApiClient : IApiClient
     {
-        static readonly Logger log = LogManager.GetCurrentClassLogger();
-
+        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:
         // The old scopes must be used by older versions of Enterprise that don't support the new scopes:
-        readonly string[] oldAuthorizationScopes = { "user", "repo" };
+        readonly string[] oldAuthorizationScopes = { "user", "repo", "gist" };
         // These new scopes include write:public_key, which allows us to add public SSH keys to an account:
-        readonly string[] newAuthorizationScopes = { "user", "repo", "write:public_key" };
+        readonly string[] newAuthorizationScopes = { "user", "repo", "gist", "write:public_key" };
         readonly static Lazy<string> lazyNote = new Lazy<string>(() => ProductName + " on " + GetMachineNameSafe());
         readonly static Lazy<string> lazyFingerprint = new Lazy<string>(GetFingerprint);
 
@@ -52,9 +58,35 @@ public IObservable<Repository> CreateRepository(NewRepository repository, string
             return (isUser ? client.Create(repository) : client.Create(login, repository));
         }
 
-        public IObservable<User> GetUser()
+        public IObservable<Gist> CreateGist(NewGist newGist)
+        {
+            return gitHubClient.Gist.Create(newGist);
+        }
+
+        public IObservable<UserAndScopes> GetUser()
         {
-            return gitHubClient.User.Current();
+            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);
         }
 
         public IObservable<ApplicationAuthorization> GetOrCreateApplicationAuthenticationCode(

src/GitHub.App/Controllers/UIController.cs

@@ -170,7 +170,9 @@ public UIController(IUIProvider uiProvider, IRepositoryHosts hosts, IUIFactory f
 
             uiStateMachine = new StateMachineType(UIViewType.None);
             triggers = new Dictionary<Trigger, StateMachineType.TriggerWithParameters<ViewWithData>>();
+
             ConfigureUIHandlingStates();
+
         }
 
         public IObservable<LoadData> SelectFlow(UIControllerFlow choice)
@@ -257,12 +259,12 @@ public void Start([AllowNull] IConnection conn)
 
         public void Jump(ViewWithData where)
         {
-            Debug.Assert(where.Flow == mainFlow, "Jump called for flow " + where.Flow + " but this is " + mainFlow);
-            if (where.Flow != mainFlow)
+            Debug.Assert(where.ActiveFlow == mainFlow, "Jump called for flow " + where.ActiveFlow + " but this is " + mainFlow);
+            if (where.ActiveFlow != mainFlow)
                 return;
 
             requestedTarget = where;
-            if (activeFlow == where.Flow)
+            if (activeFlow == where.ActiveFlow)
                 Fire(Trigger.Next, where);
         }
 
@@ -295,8 +297,7 @@ void ConfigureUIHandlingStates()
                 .OnEntry(tr => stopping = false)
                 .PermitDynamic(Trigger.Next, () =>
                     {
-                        var loggedIn = connection != null && hosts.LookupHost(connection.HostAddress).IsLoggedIn;
-                        activeFlow = loggedIn ? mainFlow : UIControllerFlow.Authentication;
+                        activeFlow = SelectActiveFlow();
                         return Go(Trigger.Next);
                     })
                 .PermitDynamic(Trigger.Finish, () => Go(Trigger.Finish));
@@ -352,6 +353,18 @@ void ConfigureUIHandlingStates()
                 .PermitDynamic(Trigger.Cancel, () => Go(Trigger.Cancel))
                 .PermitDynamic(Trigger.Finish, () => Go(Trigger.Finish));
 
+            uiStateMachine.Configure(UIViewType.Gist)
+                .OnEntry(tr => RunView(UIViewType.Gist, CalculateDirection(tr)))
+                .PermitDynamic(Trigger.Next, () => Go(Trigger.Next))
+                .PermitDynamic(Trigger.Cancel, () => Go(Trigger.Cancel))
+                .PermitDynamic(Trigger.Finish, () => Go(Trigger.Finish));
+
+            uiStateMachine.Configure(UIViewType.LogoutRequired)
+                .OnEntry(tr => RunView(UIViewType.LogoutRequired, CalculateDirection(tr)))
+                .PermitDynamic(Trigger.Next, () => Go(Trigger.Next))
+                .PermitDynamic(Trigger.Cancel, () => Go(Trigger.Cancel))
+                .PermitDynamic(Trigger.Finish, () => Go(Trigger.Finish));
+
             uiStateMachine.Configure(UIViewType.End)
                 .OnEntryFrom(Trigger.Cancel, () => End(false))
                 .OnEntryFrom(Trigger.Next, () => End(true))
@@ -518,6 +531,43 @@ void ConfigureLogicStates()
             logic.Configure(UIViewType.End)
                 .Permit(Trigger.Next, UIViewType.None);
             machines.Add(UIControllerFlow.PullRequests, logic);
+
+            // gist flow
+            logic = new StateMachine<UIViewType, Trigger>(UIViewType.None);
+            logic.Configure(UIViewType.None)
+                .Permit(Trigger.Next, UIViewType.Gist)
+                .Permit(Trigger.Finish, UIViewType.End);
+            logic.Configure(UIViewType.Gist)
+                .Permit(Trigger.Next, UIViewType.End)
+                .Permit(Trigger.Cancel, UIViewType.End)
+                .Permit(Trigger.Finish, UIViewType.End);
+            logic.Configure(UIViewType.End)
+                .Permit(Trigger.Next, UIViewType.None);
+            machines.Add(UIControllerFlow.Gist, logic);
+
+            // logout required flow
+            logic = new StateMachine<UIViewType, Trigger>(UIViewType.None);
+            logic.Configure(UIViewType.None)
+                .Permit(Trigger.Next, UIViewType.LogoutRequired)
+                .Permit(Trigger.Finish, UIViewType.End);
+            logic.Configure(UIViewType.LogoutRequired)
+                .Permit(Trigger.Next, UIViewType.End)
+                .Permit(Trigger.Cancel, UIViewType.End)
+                .Permit(Trigger.Finish, UIViewType.End);
+            logic.Configure(UIViewType.End)
+                .Permit(Trigger.Next, UIViewType.None);
+            machines.Add(UIControllerFlow.LogoutRequired, logic);
+        }
+
+        UIControllerFlow SelectActiveFlow()
+        {
+            var host = connection != null ? hosts.LookupHost(connection.HostAddress) : null;
+            var loggedIn = host?.IsLoggedIn ?? false;
+            if (!loggedIn || mainFlow != UIControllerFlow.Gist)
+                return loggedIn ? mainFlow : UIControllerFlow.Authentication;
+
+            var supportsGist = host?.SupportsGist ?? false;
+            return supportsGist ? mainFlow : UIControllerFlow.LogoutRequired;
         }
 
         static LoadDirection CalculateDirection(StateMachineType.Transition tr)
@@ -580,12 +630,14 @@ void RunView(UIViewType viewType, LoadDirection direction, ViewWithData arg = nu
                 requestedTarget = null;
             }
 
+            if (arg == null)
+                arg = new ViewWithData { ActiveFlow = activeFlow, MainFlow = mainFlow, ViewType = viewType };
             bool firstTime = CreateViewAndViewModel(viewType, arg);
             var view = GetObjectsForFlow(activeFlow)[viewType].View;
             transition.OnNext(new LoadData
             {
                 View = view,
-                Data = arg ?? new ViewWithData { Flow = activeFlow, ViewType = viewType },
+                Data = arg,
                 Direction = direction
             });
 
@@ -660,7 +712,7 @@ void SetupView(UIViewType viewType, IView view)
         /// </summary>
         /// <param name="viewType"></param>
         /// <returns>true if the View/ViewModel didn't exist and had to be created</returns>
-        bool CreateViewAndViewModel(UIViewType viewType, [AllowNull]ViewWithData data = null)
+        bool CreateViewAndViewModel(UIViewType viewType, ViewWithData data = null)
         {
             var list = GetObjectsForFlow(activeFlow);
             if (viewType == UIViewType.Login)

src/GitHub.App/GitHub.App.csproj

@@ -54,6 +54,7 @@
     <Reference Include="Microsoft.VisualStudio.ComponentModelHost, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
     <Reference Include="Microsoft.VisualStudio.Shell.14.0, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
     <Reference Include="Microsoft.VisualStudio.Shell.Immutable.10.0" />
+    <Reference Include="Microsoft.VisualStudio.TextManager.Interop, Version=7.1.40304.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
     <Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\packages\Newtonsoft.Json.6.0.8\lib\net45\Newtonsoft.Json.dll</HintPath>
@@ -183,6 +184,7 @@
     <Compile Include="Services\IEnterpriseProbe.cs" />
     <Compile Include="Factories\RepositoryHostFactory.cs" />
     <Compile Include="Services\RepositoryCreationService.cs" />
+    <Compile Include="Services\GistPublishService.cs" />
     <Compile Include="Services\RepositoryPublishService.cs" />
     <Compile Include="Services\SerializedObjectProvider.cs" />
     <Compile Include="Services\StandardUserErrors.cs" />
@@ -194,6 +196,8 @@
     <Compile Include="UserErrors\PrivateRepositoryQuotaExceededUserError.cs" />
     <Compile Include="ViewModels\BaseViewModel.cs" />
     <Compile Include="Models\ConnectionRepositoryHostMap.cs" />
+    <Compile Include="ViewModels\GistCreationViewModel.cs" />
+    <Compile Include="ViewModels\LogoutRequiredViewModel.cs" />
     <Compile Include="ViewModels\PullRequestCreationViewModel.cs" />
     <Compile Include="ViewModels\PullRequestDetailViewModel.cs" />
     <Compile Include="ViewModels\PullRequestListViewModel.cs" />

src/GitHub.App/Models/ConnectionRepositoryHostMap.cs

@@ -1,6 +1,7 @@
 using System.ComponentModel.Composition;
 using GitHub.Models;
 using GitHub.Services;
+using GitHub.Extensions;
 
 namespace GitHub.ViewModels
 {

src/GitHub.App/Models/DisconnectedRepositoryHosts.cs

@@ -26,6 +26,7 @@ public DisconnectedRepositoryHost()
         [AllowNull]
         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; }