Merge pull request #137 from justaprogrammer/fixes-again

StanleyGoldman · web-flow · commit 30daf5f2d88f · 2018-11-02T18:48:42.000-04:00
Fixes again
diff --git a/src/BCC.Web.IntegrationTests/IntegrationTestsBase.cs b/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);
-        }
     }
 }
diff --git a/src/BCC.Web.IntegrationTests/Services/GitHubAppModelServiceBaseTests.cs b/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;
             }
 
diff --git a/src/BCC.Web.IntegrationTests/Services/GitHubGraphQLClientIntegrationTests.cs b/src/BCC.Web.IntegrationTests/Services/GitHubGraphQLClientIntegrationTests.cs
diff --git a/src/BCC.Web.Tests/Services/AccessTokenServiceTests.cs b/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);
         }
 
diff --git a/src/BCC.Web/BCC.Web.csproj b/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" />
diff --git a/src/BCC.Web/Interfaces/GitHub/IGitHubAppClientFactory.cs b/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);
     }
 }
diff --git a/src/BCC.Web/Interfaces/GitHub/IGitHubClientFactory.cs b/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);
     }
 }
diff --git a/src/BCC.Web/Interfaces/GitHub/IGitHubGraphQLClient.cs b/src/BCC.Web/Interfaces/GitHub/IGitHubGraphQLClient.cs
diff --git a/src/BCC.Web/Interfaces/GitHub/IGitHubUserClientFactory.cs b/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();
     }
 }
diff --git a/src/BCC.Web/Services/GitHub/GitHubAppClientFactory.cs b/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);
diff --git a/src/BCC.Web/Services/GitHub/GitHubAppModelService.cs b/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;
         }
 
diff --git a/src/BCC.Web/Services/GitHub/GitHubClientFactory.cs b/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);
-        }
     }
 }
diff --git a/src/BCC.Web/Services/GitHub/GitHubClientFactoryHelper.cs b/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);
-        }
     }
 }
diff --git a/src/BCC.Web/Services/GitHub/GitHubGraphQLClient.cs b/src/BCC.Web/Services/GitHub/GitHubGraphQLClient.cs
diff --git a/src/BCC.Web/Services/GitHub/GitHubUserModelService.cs b/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 />
diff --git a/src/BCC.Web/Services/GitHubUserClientFactory.cs b/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");

Original file line number	Diff line number	Diff line change
`@@ -38,37 +38,16 @@ protected IGitHubClient CreateGitHubAppClient()`
`38`	`38`	`return gitHubClientFactory.CreateAppClient(tokenGenerator);`
`39`	`39`	`}`
`40`	`40`
`41`		`- protected IGitHubGraphQLClient CreateGitHubAppGraphQLClient()`
`42`		`- {`
`43`		`- var gitHubClientFactory = CreateGitHubAppClientFactory();`
`44`		`- var tokenGenerator = CreateTokenGenerator();`
`45`		`- return gitHubClientFactory.CreateAppGraphQLClient(tokenGenerator);`
`46`		`- }`
`47`		`-`
`48`	`41`	`protected async Task<IGitHubClient> CreateGitHubAppClientForLogin(string login)`
`49`	`42`	`{`
`50`	`43`	`var gitHubClientFactory = CreateGitHubAppClientFactory();`
`51`	`44`	`var tokenGenerator = CreateTokenGenerator();`
`52`	`45`	`return await gitHubClientFactory.CreateAppClientForLoginAsync(tokenGenerator, login);`
`53`	`46`	`}`
`54`		`-`
`55`		`- protected async Task<IGitHubGraphQLClient> CreateGitHubAppGraphQLClientForLogin(string login)`
`56`		`- {`
`57`		`- var gitHubClientFactory = CreateGitHubAppClientFactory();`
`58`		`- var tokenGenerator = CreateTokenGenerator();`
`59`		`- return await gitHubClientFactory.CreateAppGraphQLClientForLoginAsync(tokenGenerator, login);`
`60`		`- }`
`61`		`-`
`62`	`47`	`protected IGitHubClient CreateGitHubTokenClient()`
`63`	`48`	`{`
`64`	`49`	`var gitHubClientFactory = new GitHubClientFactory();`
`65`	`50`	`return gitHubClientFactory.CreateClient(TestToken);`
`66`	`51`	`}`
`67`		`-`
`68`		`- protected IGitHubGraphQLClient CreateGitHubGraphQLTokenClient()`
`69`		`- {`
`70`		`- var gitHubClientFactory = new GitHubClientFactory();`
`71`		`- return gitHubClientFactory.CreateGraphQLClient(TestToken);`
`72`		`- }`
`73`	`52`	`}`
`74`	`53`	`}`
Original file line number	Diff line number	Diff line change
`@@ -27,17 +27,15 @@ public async Task ShouldNotGetFileThatDoesNotExist()`
`27`	`27`
`28`	`28`	`private TestAppModelService CreateTarget()`
`29`	`29`	`{`
`30`		`- return new TestAppModelService(CreateGitHubTokenClient(), CreateGitHubGraphQLTokenClient());`
	`30`	`+ return new TestAppModelService(CreateGitHubTokenClient());`
`31`	`31`	`}`
`32`	`32`
`33`	`33`	`private class TestAppModelService : GitHubAppModelServiceBase`
`34`	`34`	`{`
`35`	`35`	`private readonly IGitHubClient _gitHubClient;`
`36`		`- private readonly IGitHubGraphQLClient _graphQLClient;`
`37`	`36`
`38`		`- public TestAppModelService(IGitHubClient gitHubClient, IGitHubGraphQLClient graphQLClient)`
	`37`	`+ public TestAppModelService(IGitHubClient gitHubClient)`
`39`	`38`	`{`
`40`		`- _graphQLClient = graphQLClient;`
`41`	`39`	`_gitHubClient = gitHubClient;`
`42`	`40`	`}`
`43`	`41`
Original file line number	Diff line number	Diff line change
`@@ -143,7 +143,7 @@ public async Task CreateValidTokenTest()`
`143`	`143`	`jsonWebToken.GetPayloadValue<string>(JwtRegisteredClaimNames.Aud).Should().Be(".Api");`
`144`	`144`	`jsonWebToken.GetPayloadValue<string>(JwtRegisteredClaimNames.Jti).Should().Be(accessToken.Id.ToString());`
`145`	`145`	`DateTimeOffset.FromUnixTimeSeconds(jsonWebToken.GetPayloadValue<int>(JwtRegisteredClaimNames.Iat)).Should()`
`146`		`- .BeCloseTo(DateTimeOffset.UtcNow, 1000);`
	`146`	`+ .BeCloseTo(DateTimeOffset.UtcNow, 2000);`
`147`	`147`	`jsonWebToken.GetPayloadValue<long>("urn:bcc:repositoryId").Should().Be(userRepository.Id);`
`148`	`148`	`}`
`149`	`149`
Original file line number	Diff line number	Diff line change
`@@ -13,12 +13,5 @@ public interface IGitHubClientFactory`
`13`	`13`	`/// <param name="token">The token.</param>`
`14`	`14`	`/// <returns>A client</returns>`
`15`	`15`	`IGitHubClient CreateClient(string token);`
`16`		`-`
`17`		`- /// <summary>`
`18`		`- /// Create a IGitHubGraphQLClient configured with a token for Authentication.`
`19`		`- /// </summary>`
`20`		`- /// <param name="token">The token.</param>`
`21`		`- /// <returns>A graphql client</returns>`
`22`		`- IGitHubGraphQLClient CreateGraphQLClient(string token);`
`23`	`16`	`}`
`24`	`17`	`}`
Original file line number	Diff line number	Diff line change
`@@ -13,11 +13,5 @@ public interface IGitHubUserClientFactory`
`13`	`13`	`/// </summary>`
`14`	`14`	`/// <returns>A client</returns>`
`15`	`15`	`Task<IGitHubClient> CreateClient();`
`16`		`-`
`17`		`- /// <summary>`
`18`		`- /// Create a IGitHubGraphQLClient configured for GitHub App User-To-Server Authentication.`
`19`		`- /// </summary>`
`20`		`- /// <returns>A graphql client</returns>`
`21`		`- Task<IGitHubGraphQLClient> CreateGraphQLClient();`
`22`	`16`	`}`
`23`	`17`	`}`