Fixes again

src/BCC.Web.IntegrationTests/IntegrationTestsBase.cs

@@ -38,37 +38,16 @@ protected IGitHubClient CreateGitHubAppClient()
             return gitHubClientFactory.CreateAppClient(tokenGenerator);
         }
 
-        protected IGitHubGraphQLClient CreateGitHubAppGraphQLClient()
-        {
-            var gitHubClientFactory = CreateGitHubAppClientFactory();
-            var tokenGenerator = CreateTokenGenerator();
-            return gitHubClientFactory.CreateAppGraphQLClient(tokenGenerator);
-        }
-
         protected async Task<IGitHubClient> CreateGitHubAppClientForLogin(string login)
         {
             var gitHubClientFactory = CreateGitHubAppClientFactory();
             var tokenGenerator = CreateTokenGenerator();
             return await gitHubClientFactory.CreateAppClientForLoginAsync(tokenGenerator, login);
         }
-
-        protected async Task<IGitHubGraphQLClient> CreateGitHubAppGraphQLClientForLogin(string login)
-        {
-            var gitHubClientFactory = CreateGitHubAppClientFactory();
-            var tokenGenerator = CreateTokenGenerator();
-            return await gitHubClientFactory.CreateAppGraphQLClientForLoginAsync(tokenGenerator, login);
-        }
-
         protected IGitHubClient CreateGitHubTokenClient()
         {
             var gitHubClientFactory = new GitHubClientFactory();
             return gitHubClientFactory.CreateClient(TestToken);
         }
-
-        protected IGitHubGraphQLClient CreateGitHubGraphQLTokenClient()
-        {
-            var gitHubClientFactory = new GitHubClientFactory();
-            return gitHubClientFactory.CreateGraphQLClient(TestToken);
-        }
     }
 }

src/BCC.Web.IntegrationTests/Services/GitHubAppModelServiceBaseTests.cs

@@ -27,17 +27,15 @@ public async Task ShouldNotGetFileThatDoesNotExist()
 
         private TestAppModelService CreateTarget()
         {
-            return new TestAppModelService(CreateGitHubTokenClient(), CreateGitHubGraphQLTokenClient());
+            return new TestAppModelService(CreateGitHubTokenClient());
         }
 
         private class TestAppModelService : GitHubAppModelServiceBase
         {
             private readonly IGitHubClient _gitHubClient;
-            private readonly IGitHubGraphQLClient _graphQLClient;
 
-            public TestAppModelService(IGitHubClient gitHubClient, IGitHubGraphQLClient graphQLClient)
+            public TestAppModelService(IGitHubClient gitHubClient)
             {
-                _graphQLClient = graphQLClient;
                 _gitHubClient = gitHubClient;
             }
 

src/BCC.Web.Tests/Services/AccessTokenServiceTests.cs

@@ -143,7 +143,7 @@ public async Task CreateValidTokenTest()
             jsonWebToken.GetPayloadValue<string>(JwtRegisteredClaimNames.Aud).Should().Be(".Api");
             jsonWebToken.GetPayloadValue<string>(JwtRegisteredClaimNames.Jti).Should().Be(accessToken.Id.ToString());
             DateTimeOffset.FromUnixTimeSeconds(jsonWebToken.GetPayloadValue<int>(JwtRegisteredClaimNames.Iat)).Should()
-                .BeCloseTo(DateTimeOffset.UtcNow, 1000);
+                .BeCloseTo(DateTimeOffset.UtcNow, 2000);
             jsonWebToken.GetPayloadValue<long>("urn:bcc:repositoryId").Should().Be(userRepository.Id);
         }
 

src/BCC.Web/BCC.Web.csproj

@@ -26,7 +26,6 @@
     <PackageReference Include="morelinq" Version="3.0.0" />
     <PackageReference Include="Nito.AsyncEx" Version="5.0.0-pre-05" />
     <PackageReference Include="Octokit" Version="0.32.0" />
-    <PackageReference Include="Octokit.GraphQL" Version="0.1.2-beta" />
     <PackageReference Include="Swashbuckle.AspNetCore" Version="3.0.0" />
     <PackageReference Include="Swashbuckle.AspNetCore.Annotations" Version="3.0.0" />
     <PackageReference Include="System.IO.Abstractions" Version="2.1.0.256" />

src/BCC.Web/Interfaces/GitHub/IGitHubAppClientFactory.cs

@@ -16,26 +16,11 @@ public interface IGitHubAppClientFactory
         /// <returns>A client</returns>
         Task<IGitHubClient> CreateAppClientForLoginAsync(ITokenGenerator tokenGenerator, string login);
 
-        /// <summary>
-        /// Create a IGitHubGraphQLClient configured for GitHub App Installation Authentication.
-        /// </summary>
-        /// <param name="tokenGenerator">A token generator configured for the GitHub App.</param>
-        /// <param name="login">The login to authenticate.</param>
-        /// <returns>A graphql client</returns>
-        Task<IGitHubGraphQLClient> CreateAppGraphQLClientForLoginAsync(ITokenGenerator tokenGenerator, string login);
-
         /// <summary>
         /// Create a IGitHubClient configured for GitHub App Authentication.
         /// </summary>
         /// <param name="tokenGenerator">A token generator configured for the GitHub App.</param>
         /// <returns>A client</returns>
         IGitHubClient CreateAppClient(ITokenGenerator tokenGenerator);
-
-        /// <summary>
-        /// Create a IGitHubGraphQLClient configured for GitHub App Authentication.
-        /// </summary>
-        /// <param name="tokenGenerator">A token generator configured for the GitHub App.</param>
-        /// <returns>A graphql client</returns>
-        IGitHubGraphQLClient CreateAppGraphQLClient(ITokenGenerator tokenGenerator);
     }
 }

src/BCC.Web/Interfaces/GitHub/IGitHubClientFactory.cs

@@ -13,12 +13,5 @@ public interface IGitHubClientFactory
         /// <param name="token">The token.</param>
         /// <returns>A client</returns>
         IGitHubClient CreateClient(string token);
-
-        /// <summary>
-        /// Create a IGitHubGraphQLClient configured with a token for Authentication.
-        /// </summary>
-        /// <param name="token">The token.</param>
-        /// <returns>A graphql client</returns>
-        IGitHubGraphQLClient CreateGraphQLClient(string token);
     }
 }

src/BCC.Web/Interfaces/GitHub/IGitHubUserClientFactory.cs

@@ -13,11 +13,5 @@ public interface IGitHubUserClientFactory
         /// </summary>
         /// <returns>A client</returns>
         Task<IGitHubClient> CreateClient();
-
-        /// <summary>
-        /// Create a IGitHubGraphQLClient configured for GitHub App User-To-Server Authentication.
-        /// </summary>
-        /// <returns>A graphql client</returns>
-        Task<IGitHubGraphQLClient> CreateGraphQLClient();
     }
 }

src/BCC.Web/Services/GitHub/GitHubAppClientFactory.cs

@@ -3,7 +3,6 @@
 using System.Threading.Tasks;
 using Octokit;
 using IGitHubAppClientFactory = BCC.Web.Interfaces.GitHub.IGitHubAppClientFactory;
-using IGitHubGraphQLClient = BCC.Web.Interfaces.GitHub.IGitHubGraphQLClient;
 using ITokenGenerator = BCC.Web.Interfaces.GitHub.ITokenGenerator;
 
 namespace BCC.Web.Services.GitHub
@@ -29,20 +28,6 @@ public IGitHubClient CreateAppClient(ITokenGenerator tokenGenerator)
             };
         }
 
-        /// <inheritdoc />
-        public IGitHubGraphQLClient CreateAppGraphQLClient(ITokenGenerator tokenGenerator)
-        {
-            var token = tokenGenerator.GetToken();
-            return GitHubClientFactoryHelper.GraphQLClient(token, GitHubClientFactory.UserAgent);
-        }
-
-        /// <inheritdoc />
-        public async Task<IGitHubGraphQLClient> CreateAppGraphQLClientForLoginAsync(ITokenGenerator tokenGenerator, string login)
-        {
-            var (installation, token) = await FindInstallationAndGetToken(tokenGenerator, login);
-            return GitHubClientFactoryHelper.GraphQLClient(token, GetUserAgent(installation));
-        }
-
         private async Task<ValueTuple<Installation, string>> FindInstallationAndGetToken(ITokenGenerator tokenGenerator, string login)
         {
             var appClient = CreateAppClient(tokenGenerator);

src/BCC.Web/Services/GitHub/GitHubAppModelService.cs

@@ -175,8 +175,6 @@ private static NewCheckRunAnnotation CreateNewCheckRunAnnotation(Annotation anno
                 newCheckRunAnnotation.Title = annotation.Title;
             }
 
-            newCheckRunAnnotation.RawDetails = "##Even More PlainText\r\n- No Markdown Here.\r\n- What? Why?";
-
             return newCheckRunAnnotation;
         }
 

src/BCC.Web/Services/GitHub/GitHubClientFactory.cs

@@ -1,6 +1,5 @@
 using Octokit;
 using IGitHubClientFactory = BCC.Web.Interfaces.GitHub.IGitHubClientFactory;
-using IGitHubGraphQLClient = BCC.Web.Interfaces.GitHub.IGitHubGraphQLClient;
 
 namespace BCC.Web.Services.GitHub
 {
@@ -14,11 +13,5 @@ public IGitHubClient CreateClient(string token)
         {
             return GitHubClientFactoryHelper.GitHubClient(token, UserAgent);
         }
-
-        /// <inheritdoc />
-        public IGitHubGraphQLClient CreateGraphQLClient(string token)
-        {
-            return GitHubClientFactoryHelper.GraphQLClient(token, UserAgent);
-        }
     }
 }

src/BCC.Web/Services/GitHub/GitHubClientFactoryHelper.cs

@@ -1,6 +1,5 @@
 using Octokit;
 using Octokit.Internal;
-using IGitHubGraphQLClient = BCC.Web.Interfaces.GitHub.IGitHubGraphQLClient;
 
 namespace BCC.Web.Services.GitHub
 {
@@ -12,10 +11,5 @@ public static IGitHubClient GitHubClient(string token, string userAgent)
             var credentialStore = new InMemoryCredentialStore(new Credentials(token));
             return new GitHubClient(productHeaderValue, credentialStore);
         }
-
-        public static IGitHubGraphQLClient GraphQLClient(string token, string userAgent)
-        {
-            return new GitHubGraphQLClient(new Octokit.GraphQL.ProductHeaderValue(userAgent), token);
-        }
     }
 }

src/BCC.Web/Services/GitHub/GitHubUserModelService.cs

@@ -5,7 +5,6 @@
 using Nito.AsyncEx;
 using Octokit;
 using AccountType = BCC.Web.Models.GitHub.AccountType;
-using IGitHubGraphQLClient = BCC.Web.Interfaces.GitHub.IGitHubGraphQLClient;
 using IGitHubUserClientFactory = BCC.Web.Interfaces.GitHub.IGitHubUserClientFactory;
 using IGitHubUserModelService = BCC.Web.Interfaces.GitHub.IGitHubUserModelService;
 using Installation = BCC.Web.Models.GitHub.Installation;
@@ -17,12 +16,10 @@ namespace BCC.Web.Services.GitHub
     public class GitHubUserModelService : IGitHubUserModelService
     {
         private readonly AsyncLazy<IGitHubClient> _lazyGitHubUserClient;
-        private readonly AsyncLazy<IGitHubGraphQLClient> _lazyGitHubUserGraphQLClient;
 
         public GitHubUserModelService(IGitHubUserClientFactory gitHubUserClientFactory)
         {
             _lazyGitHubUserClient = new AsyncLazy<IGitHubClient>(() => gitHubUserClientFactory.CreateClient());
-            _lazyGitHubUserGraphQLClient = new AsyncLazy<IGitHubGraphQLClient>(() => gitHubUserClientFactory.CreateGraphQLClient());
         }
 
         /// <inheritdoc />

src/BCC.Web/Services/GitHubUserClientFactory.cs

@@ -3,7 +3,6 @@
 using Microsoft.AspNetCore.Http;
 using Octokit;
 using IGitHubClientFactory = BCC.Web.Interfaces.GitHub.IGitHubClientFactory;
-using IGitHubGraphQLClient = BCC.Web.Interfaces.GitHub.IGitHubGraphQLClient;
 using IGitHubUserClientFactory = BCC.Web.Interfaces.GitHub.IGitHubUserClientFactory;
 
 namespace BCC.Web.Services
@@ -27,13 +26,6 @@ public async Task<IGitHubClient> CreateClient()
             return _gitHubClientFactory.CreateClient(token);
         }
 
-        /// <inheritdoc />
-        public async Task<IGitHubGraphQLClient> CreateGraphQLClient()
-        {
-            var token = await GetAccessToken();
-            return _gitHubClientFactory.CreateGraphQLClient(token);
-        }
-
         private async Task<string> GetAccessToken()
         {
             return await _contextAccessor.HttpContext.GetTokenAsync("access_token");