Master PR for Pull Request Reviews

README.md

@@ -98,3 +98,4 @@ Visit the [Contributor Guidelines](CONTRIBUTING.md) for details on how to contri
 Copyright 2015 - 2017 GitHub, Inc.
 
 Licensed under the [MIT License](LICENSE.md)
+

appveyor.yml

@@ -1,4 +1,4 @@
-version: '2.4.4.{build}'
+version: '2.4.99.{build}'
 skip_tags: true
 install:
 - ps: |

lib/.gitignore

@@ -0,0 +1 @@
+!*.nupkg

src/GitHub.Api/GitHub.Api.csproj

@@ -46,6 +46,18 @@
   </PropertyGroup>
   <Import Project="$(SolutionDir)\src\common\signing.props" />
   <ItemGroup>
+    <Reference Include="Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Octokit.GraphQL, Version=0.0.2.0, Culture=neutral, PublicKeyToken=0be8860aee462442, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Octokit.GraphQL.0.0.2-alpha\lib\netstandard1.1\Octokit.GraphQL.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Octokit.GraphQL.Core, Version=0.0.2.0, Culture=neutral, PublicKeyToken=0be8860aee462442, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Octokit.GraphQL.0.0.2-alpha\lib\netstandard1.1\Octokit.GraphQL.Core.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
     <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>
@@ -66,6 +78,9 @@
       <Link>ApiClientConfiguration_User.cs</Link>
     </Compile>
     <Compile Include="ApiClientConfiguration_User.cs" Condition="$(Buildtype) != 'Internal'" />
+    <Compile Include="GraphQLKeychainCredentialStore.cs" />
+    <Compile Include="IGraphQLClientFactory.cs" />
+    <Compile Include="GraphQLClientFactory.cs" />
     <Compile Include="IKeychain.cs" />
     <Compile Include="ILoginManager.cs" />
     <Compile Include="IOAuthCallbackListener.cs" />

src/GitHub.Api/GraphQLClientFactory.cs

@@ -0,0 +1,41 @@
+using System;
+using System.ComponentModel.Composition;
+using System.Threading.Tasks;
+using GitHub.Models;
+using GitHub.Primitives;
+using Octokit.GraphQL;
+
+namespace GitHub.Api
+{
+    /// <summary>
+    /// Creates GraphQL <see cref="Octokit.GraphQL.IConnection"/>s for querying the
+    /// GitHub GraphQL API.
+    /// </summary>
+    [Export(typeof(IGraphQLClientFactory))]
+    [PartCreationPolicy(CreationPolicy.Shared)]
+    public class GraphQLClientFactory : IGraphQLClientFactory
+    {
+        readonly IKeychain keychain;
+        readonly IProgram program;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="GraphQLClientFactory"/> class.
+        /// </summary>
+        /// <param name="keychain">The <see cref="IKeychain"/> to use.</param>
+        /// <param name="program">The program details.</param>
+        [ImportingConstructor]
+        public GraphQLClientFactory(IKeychain keychain, IProgram program)
+        {
+            this.keychain = keychain;
+            this.program = program;
+        }
+
+        /// <inheirtdoc/>
+        public Task<Octokit.GraphQL.IConnection> CreateConnection(HostAddress address)
+        {
+            var credentials = new GraphQLKeychainCredentialStore(keychain, address);
+            var header = new ProductHeaderValue(program.ProductHeader.Name, program.ProductHeader.Version);
+            return Task.FromResult<Octokit.GraphQL.IConnection>(new Connection(header, address.GraphQLUri, credentials));
+        }
+    }
+}

src/GitHub.Api/GraphQLKeychainCredentialStore.cs

@@ -0,0 +1,32 @@
+using System;
+using System.Threading.Tasks;
+using GitHub.Extensions;
+using GitHub.Primitives;
+using Octokit.GraphQL;
+
+namespace GitHub.Api
+{
+    /// <summary>
+    /// An Octokit.GraphQL credential store that reads from an <see cref="IKeychain"/>.
+    /// </summary>
+    public class GraphQLKeychainCredentialStore : ICredentialStore
+    {
+        readonly IKeychain keychain;
+        readonly HostAddress address;
+
+        public GraphQLKeychainCredentialStore(IKeychain keychain, HostAddress address)
+        {
+            Guard.ArgumentNotNull(keychain, nameof(keychain));
+            Guard.ArgumentNotNull(address, nameof(keychain));
+
+            this.keychain = keychain;
+            this.address = address;
+        }
+
+        public async Task<string> GetCredentials()
+        {
+            var userPass = await keychain.Load(address).ConfigureAwait(false);
+            return userPass?.Item2;
+        }
+    }
+}

src/GitHub.Api/IGraphQLClientFactory.cs

@@ -0,0 +1,19 @@
+using System.Threading.Tasks;
+using GitHub.Primitives;
+
+namespace GitHub.Api
+{
+    /// <summary>
+    /// Creates GraphQL <see cref="Octokit.GraphQL.IConnection"/>s for querying the
+    /// GitHub GraphQL API.
+    /// </summary>
+    public interface IGraphQLClientFactory
+    {
+        /// <summary>
+        /// Creates a new <see cref="Octokit.GraphQL.IConnection"/>.
+        /// </summary>
+        /// <param name="address">The address of the server.</param>
+        /// <returns>A task returning the created connection.</returns>
+        Task<Octokit.GraphQL.IConnection> CreateConnection(HostAddress address);
+    }
+}

src/GitHub.Api/packages.config

@@ -1,4 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
+  <package id="Newtonsoft.Json" version="10.0.3" targetFramework="net461" />
+  <package id="Octokit.GraphQL" version="0.0.2-alpha" targetFramework="net461" />
   <package id="Serilog" version="2.5.0" targetFramework="net461" />
 </packages>

src/GitHub.App/Api/ApiClient.cs

@@ -48,6 +48,27 @@ public IObservable<Repository> CreateRepository(NewRepository repository, string
             return (isUser ? client.Create(repository) : client.Create(login, repository));
         }
 
+        public IObservable<PullRequestReview> PostPullRequestReview(
+            string owner,
+            string name,
+            int number,
+            string commitId,
+            string body,
+            PullRequestReviewEvent e)
+        {
+            Guard.ArgumentNotEmptyString(owner, nameof(owner));
+            Guard.ArgumentNotEmptyString(name, nameof(name));
+
+            var review = new PullRequestReviewCreate
+            {
+                Body = body,
+                CommitId = commitId,
+                Event = e,
+            };
+
+            return gitHubClient.PullRequest.Review.Create(owner, name, number, review);
+        }
+
         public IObservable<PullRequestReviewComment> CreatePullRequestReviewComment(
             string owner,
             string name,
@@ -88,6 +109,11 @@ public IObservable<User> GetUser()
             return gitHubClient.User.Current();
         }
 
+        public IObservable<User> GetUser(string login)
+        {
+            return gitHubClient.User.Get(login);
+        }
+
         public IObservable<Organization> GetOrganizations()
         {
             // Organization.GetAllForCurrent doesn't return all of the information we need (we 
@@ -123,30 +149,10 @@ public IObservable<LicenseMetadata> GetLicenses()
 
         public HostAddress HostAddress { get; }
 
-        static string GetSha256Hash(string input)
-        {
-            Guard.ArgumentNotEmptyString(input, nameof(input));
-
-            try
-            {
-                using (var sha256 = SHA256.Create())
-                {
-                    var bytes = Encoding.UTF8.GetBytes(input);
-                    var hash = sha256.ComputeHash(bytes);
-
-                    return string.Join("", hash.Select(b => b.ToString("x2", CultureInfo.InvariantCulture)));
-                }
-            }
-            catch (Exception e)
-            {
-                log.Error(e, "IMPOSSIBLE! Generating Sha256 hash caused an exception");
-                return null;
-            }
-        }
-
         static string GetFingerprint()
         {
-            return GetSha256Hash(ProductName + ":" + GetMachineIdentifier());
+            var fingerprint = ProductName + ":" + GetMachineIdentifier();
+            return fingerprint.GetSha256Hash();
         }
 
         static string GetMachineNameSafe()
@@ -269,11 +275,7 @@ public IObservable<Branch> GetBranches(string owner, string repo)
             Guard.ArgumentNotEmptyString(owner, nameof(owner));
             Guard.ArgumentNotEmptyString(repo, nameof(repo));
 
-#pragma warning disable 618
-            // GetAllBranches is obsolete, but don't want to introduce the change to fix the
-            // warning in the PR, so disabling for now.
-            return gitHubClient.Repository.GetAllBranches(owner, repo);
-#pragma warning restore
+            return gitHubClient.Repository.Branch.GetAll(owner, repo);
         }
 
         public IObservable<Repository> GetRepository(string owner, string repo)

src/GitHub.App/Factories/ModelServiceFactory.cs

@@ -3,6 +3,7 @@
 using System.ComponentModel.Composition;
 using System.Threading;
 using System.Threading.Tasks;
+using GitHub.Api;
 using GitHub.Caches;
 using GitHub.Models;
 using GitHub.Services;
@@ -15,6 +16,7 @@ namespace GitHub.Factories
     public sealed class ModelServiceFactory : IModelServiceFactory, IDisposable
     {
         readonly IApiClientFactory apiClientFactory;
+        readonly IGraphQLClientFactory graphQLClientFactory;
         readonly IHostCacheFactory hostCacheFactory;
         readonly IAvatarProvider avatarProvider;
         readonly Dictionary<IConnection, ModelService> cache = new Dictionary<IConnection, ModelService>();
@@ -23,10 +25,12 @@ public sealed class ModelServiceFactory : IModelServiceFactory, IDisposable
         [ImportingConstructor]
         public ModelServiceFactory(
             IApiClientFactory apiClientFactory,
+            IGraphQLClientFactory graphQLClientFactory,
             IHostCacheFactory hostCacheFactory,
             IAvatarProvider avatarProvider)
         {
             this.apiClientFactory = apiClientFactory;
+            this.graphQLClientFactory = graphQLClientFactory;
             this.hostCacheFactory = hostCacheFactory;
             this.avatarProvider = avatarProvider;
         }
@@ -43,6 +47,7 @@ public async Task<IModelService> CreateAsync(IConnection connection)
                 {
                     result = new ModelService(
                         await apiClientFactory.Create(connection.HostAddress),
+                        await graphQLClientFactory.CreateConnection(connection.HostAddress),
                         await hostCacheFactory.Create(connection.HostAddress),
                         avatarProvider);
                     result.InsertUser(AccountCacheItem.Create(connection.User));