Merge branch 'master' into fixes/usage-service-initialization

Author: grokys

.gitmodules

@@ -12,4 +12,4 @@
 	url = https://github.com/editor-tools/Akavache
 [submodule "script"]
 	path = script
-	url = [email protected]:github/VisualStudioBuildScripts
+	url = [email protected]:github/VisualStudioBuildScripts

lib/Rothko.0.0.2-ghfvs.nupkg

@@ -1,12 +1,11 @@
 using System;
+using System.Collections.Generic;
 using System.Globalization;
 using System.Linq;
 using System.Net;
 using System.Net.NetworkInformation;
-using System.Reflection;
 using System.Security.Cryptography;
 using System.Text;
-using GitHub.Primitives;
 
 namespace GitHub.Api
 {
@@ -33,6 +32,11 @@ static ApiClientConfiguration()
         /// </summary>
         public static string ClientSecret { get; private set; }
 
+        /// <summary>
+        /// Gets the scopes required by the application.
+        /// </summary>
+        public static IReadOnlyList<string> RequiredScopes { get; } = new[] { "user", "repo", "gist", "write:public_key" };
+
         /// <summary>
         /// Gets a note that will be stored with the OAUTH token.
         /// </summary>

lib/Rothko.0.0.3-ghfvs.nupkg

@@ -46,6 +46,10 @@
   </PropertyGroup>
   <Import Project="$(SolutionDir)\src\common\signing.props" />
   <ItemGroup>
+    <Reference Include="Serilog, Version=2.0.0.0, Culture=neutral, PublicKeyToken=24c2f752a8e58a10, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Serilog.2.5.0\lib\net46\Serilog.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.ComponentModel.Composition" />
     <Reference Include="System.Core" />
@@ -64,6 +68,8 @@
     <Compile Include="ApiClientConfiguration_User.cs" Condition="$(Buildtype) != 'Internal'" />
     <Compile Include="IKeychain.cs" />
     <Compile Include="ILoginManager.cs" />
+    <Compile Include="IOAuthCallbackListener.cs" />
+    <Compile Include="IncorrectScopesException.cs" />
     <Compile Include="ITwoFactorChallengeHandler.cs" />
     <Compile Include="LoginManager.cs" />
     <Compile Include="KeychainCredentialStore.cs" />
@@ -99,6 +105,9 @@
       <Name>GitHub.Logging</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.

src/GitHub.Api/ApiClientConfiguration.cs

@@ -1,4 +1,6 @@
-using System.Runtime.InteropServices;
+using System;
+using System.Runtime.InteropServices;
+using System.Threading;
 using System.Threading.Tasks;
 using GitHub.Primitives;
 using GitHub.VisualStudio;
@@ -25,6 +27,36 @@ public interface ILoginManager
         /// </exception>
         Task<User> Login(HostAddress hostAddress, IGitHubClient client, string userName, string password);
 
+        /// <summary>
+        /// Attempts to log into a GitHub server via OAuth in the browser.
+        /// </summary>
+        /// <param name="hostAddress">The address of the server.</param>
+        /// <param name="client">An octokit client configured to access the server.</param>
+        /// <param name="oauthClient">An octokit OAuth client configured to access the server.</param>
+        /// <param name="openBrowser">A callback that should open a browser at the requested URL.</param>
+        /// <param name="cancel">A cancellation token used to cancel the operation.</param>
+        /// <returns>The logged in user.</returns>
+        /// <exception cref="AuthorizationException">
+        /// The login authorization failed.
+        /// </exception>
+        Task<User> LoginViaOAuth(
+            HostAddress hostAddress,
+            IGitHubClient client,
+            IOauthClient oauthClient,
+            Action<Uri> openBrowser,
+            CancellationToken cancel);
+
+        /// <summary>
+        /// Attempts to log into a GitHub server with a token.
+        /// </summary>
+        /// <param name="hostAddress">The address of the server.</param>
+        /// <param name="client">An octokit client configured to access the server.</param>
+        /// <param name="token">The token.</param>
+        Task<User> LoginWithToken(
+            HostAddress hostAddress,
+            IGitHubClient client,
+            string token);
+
         /// <summary>
         /// Attempts to log into a GitHub server using existing credentials.
         /// </summary>

src/GitHub.Api/GitHub.Api.csproj

@@ -0,0 +1,20 @@
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace GitHub.Api
+{
+    /// <summary>
+    /// Listens for a callback from the OAuth endpoint signalling successful login.
+    /// </summary>
+    public interface IOAuthCallbackListener
+    {
+        /// <summary>
+        /// Listens for a callback with a `state` matching <paramref name="id"/>.
+        /// </summary>
+        /// <param name="id">The ID of the operation.</param>
+        /// <param name="cancel">A cancellation token.</param>
+        /// <returns>The temporary code included in the callback.</returns>
+        Task<string> Listen(string id, CancellationToken cancel);
+    }
+}

src/GitHub.Api/ILoginManager.cs

@@ -0,0 +1,32 @@
+using System;
+using System.Runtime.Serialization;
+
+namespace GitHub.Api
+{
+    /// <summary>
+    /// Thrown when the login for a user does not have the required API scopes.
+    /// </summary>
+    [Serializable]
+    public class IncorrectScopesException : Exception
+    {
+        public IncorrectScopesException()
+            : this("Incorrect API scopes.")
+        {
+        }
+
+        public IncorrectScopesException(string message)
+            : base(message)
+        {
+        }
+
+        public IncorrectScopesException(string message, Exception innerException)
+            : base(message, innerException)
+        {
+        }
+
+        protected IncorrectScopesException(SerializationInfo info, StreamingContext context) 
+            : base(info, context)
+        {
+        }
+    }
+}