feat(api): refactor to remove flurl apiclient dependency

jrgcubano · jrgcubano · commit f9aaa5c7887f · 2021-06-01T14:37:26.000+02:00
diff --git a/src/Appy.Configuration.1Password/Internals/DependencyRegistration.cs b/src/Appy.Configuration.1Password/Internals/DependencyRegistration.cs
@@ -53,7 +53,8 @@ internal static IServiceCollection AddOnePasswordToolDependencies(
             services
                 .AddSingleton<OnePasswordApiClientSettings>()
                 .AddSingleton<IOnePasswordApiClientFactory>(sp => new OnePasswordApiClientFactory(
-                    sp.GetRequiredService<IHttpClientFactory>()))
+                    sp.GetRequiredService<IHttpClientFactory>(),
+                    sp.GetRequiredService<IAppyJsonSerializer>()))
                 .AddIfElse(useLocalTool,
                     s => s.AddSingleton<IOnePasswordTool, OnePasswordLocalTool>(),
                     s => s.AddSingleton<IOnePasswordTool, OnePasswordRemoteTool>());
diff --git a/src/Appy.Configuration.1Password/Internals/OnePasswordApiClientFactory.cs b/src/Appy.Configuration.1Password/Internals/OnePasswordApiClientFactory.cs
@@ -1,23 +1,28 @@
 using System;
 using System.Net.Http;
+using Appy.Configuration.Serializers;
 using Appy.Infrastructure.OnePassword.ApiClient;
 
 namespace Appy.Configuration.OnePassword.Internals
 {
     public class OnePasswordApiClientFactory: IOnePasswordApiClientFactory
     {
         readonly IHttpClientFactory _httpClientFactory;
+        readonly IAppyJsonSerializer _jsonSerializer;
 
-        public OnePasswordApiClientFactory(IHttpClientFactory httpClientFactory)
+        public OnePasswordApiClientFactory(
+            IHttpClientFactory httpClientFactory,
+            IAppyJsonSerializer jsonSerializer)
         {
             _httpClientFactory = httpClientFactory ?? throw new ArgumentNullException(nameof(httpClientFactory));
+            _jsonSerializer = jsonSerializer ?? throw new ArgumentNullException(nameof(jsonSerializer));
         }
 
         public OnePasswordApiClient Create()
         {
             var httpClient = _httpClientFactory.CreateClient(nameof(OnePasswordApiClient));
-            
-            return new OnePasswordApiClient(httpClient);
+
+            return new OnePasswordApiClient(httpClient, _jsonSerializer);
         }
     }
 }
diff --git a/src/Appy.Infrastructure.1Password/ApiClient/OnePasswordApiClient.cs b/src/Appy.Infrastructure.1Password/ApiClient/OnePasswordApiClient.cs
@@ -1,26 +1,54 @@
+using System;
 using System.Net.Http;
+using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
+using Appy.Configuration.Serializers;
 using Appy.Infrastructure.OnePassword.Queries;
-using Flurl.Http;
 
 namespace Appy.Infrastructure.OnePassword.ApiClient
 {
     public class OnePasswordApiClient
     {
-        readonly FlurlClient  _client;
+        readonly HttpClient _httpClient;
+        readonly IAppyJsonSerializer _jsonSerializer;
 
-        public OnePasswordApiClient(HttpClient httpClient)
+        public OnePasswordApiClient(
+            HttpClient httpClient,
+            IAppyJsonSerializer jsonSerializer)
         {
-            _client = new FlurlClient(httpClient);
+            _httpClient = httpClient;
+            _jsonSerializer = jsonSerializer;
         }
 
-        public virtual Task<Response<GetOnePasswordNoteQueryResult>> Execute(GetOnePasswordNoteQuery query, CancellationToken cancellationToken = default(CancellationToken))
+        public virtual Task<Response<GetOnePasswordNoteQueryResult>> Execute(GetOnePasswordNoteQuery query, CancellationToken cancellationToken = default)
         {
-            return _client
-                .Request("queries/getOnePasswordNote")
-                .PostJsonAsync(query, cancellationToken)
-                .ReceiveJson<Response<GetOnePasswordNoteQueryResult>>();
+            return PostJsonAsync<GetOnePasswordNoteQueryResult>("queries/getOnePasswordNote", query, cancellationToken);
+        }
+
+        async Task<Response<TResponse>> PostJsonAsync<TResponse>(string url, object request, CancellationToken cancellationToken)
+        {
+            var content = _jsonSerializer.Serialize(request);
+
+            var requestMessage = new HttpRequestMessage
+            {
+                Method = HttpMethod.Post,
+                RequestUri = new Uri(_httpClient.BaseAddress, url),
+                Content = new StringContent(content, Encoding.UTF8, "application/json")
+            };
+
+            var rawResponse = await _httpClient.SendAsync(requestMessage, cancellationToken);
+
+            var json = await rawResponse.Content.ReadAsStringAsync();
+
+            var response = _jsonSerializer.Deserialize<Response<TResponse>>(json);
+
+            if (rawResponse.IsSuccessStatusCode)
+                return response;
+
+            throw new OnePasswordApiClientException(
+                statusCode: (int)rawResponse.StatusCode,
+                response);
         }
     }
 }
diff --git a/src/Appy.Infrastructure.1Password/ApiClient/OnePasswordApiClientException.cs b/src/Appy.Infrastructure.1Password/ApiClient/OnePasswordApiClientException.cs
@@ -0,0 +1,17 @@
+﻿using System;
+
+namespace Appy.Infrastructure.OnePassword.ApiClient
+{
+    public class OnePasswordApiClientException : Exception
+    {
+        public Response Response { get; }
+
+        public int? StatusCode { get; }
+
+        public OnePasswordApiClientException(int? statusCode, Response response)
+        {
+            StatusCode = statusCode;
+            Response = response;
+        }
+    }
+}
diff --git a/src/Appy.Infrastructure.1Password/Appy.Infrastructure.1Password.csproj b/src/Appy.Infrastructure.1Password/Appy.Infrastructure.1Password.csproj
@@ -13,10 +13,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Flurl" Version="$(FlurlPackageVersion)" />
-    <PackageReference Include="Flurl.Http" Version="$(FlurlPackageVersion)" />
     <PackageReference Include="TunnelVisionLabs.ReferenceAssemblyAnnotator" Version="$(TunnelVisionLabsRefAssemblyAnnotatorPackageVersion)" PrivateAssets="all" />
-    <PackageDownload  Include="Microsoft.NETCore.App.Ref" Version="[$(AnnotatedReferenceAssemblyVersion)]" />
+    <PackageDownload Include="Microsoft.NETCore.App.Ref" Version="[$(AnnotatedReferenceAssemblyVersion)]" />
     <PackageReference Include="Nullable" Version="$(NullablePackageVersion)">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
diff --git a/src/Appy.Infrastructure.1Password/Tooling/RemoteToolExtensions.cs b/src/Appy.Infrastructure.1Password/Tooling/RemoteToolExtensions.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Threading.Tasks;
 using Appy.Infrastructure.OnePassword.ApiClient;
-using Flurl.Http;
 
 namespace Appy.Infrastructure.OnePassword.Tooling
 {
@@ -24,9 +23,9 @@ internal static async Task<T> UnWrap<T>(this Task<Response<T>> task)
 
                 message = response?.Message!;
             }
-            catch (FlurlHttpException httpException)
+            catch (OnePasswordApiClientException httpException)
             {
-                var response = await httpException.GetResponseJsonAsync<Response>();
+                var response = httpException.Response;
                 message = response?.Message;
                 exceptionResult = response;
                 innerException = httpException;
diff --git a/src/Appy.Tool.1Password.Tests/Api/Fixtures/OnePasswordApiTestClientFactory.cs b/src/Appy.Tool.1Password.Tests/Api/Fixtures/OnePasswordApiTestClientFactory.cs
@@ -1,20 +1,23 @@
 using System.Net.Http;
+using Appy.Configuration.Serializers;
 using Appy.Infrastructure.OnePassword.ApiClient;
 
 namespace Appy.Tool.OnePassword.Tests.Api.Fixtures
 {
     public class OnePasswordApiTestClientFactory: IOnePasswordApiClientFactory
     {
-        private readonly HttpClient _httpClient;
+        readonly HttpClient _httpClient;
+        readonly IAppyJsonSerializer _jsonSerializer;
 
-        public OnePasswordApiTestClientFactory(HttpClient httpClient)
+        public OnePasswordApiTestClientFactory(HttpClient httpClient, IAppyJsonSerializer jsonSerializer)
         {
             _httpClient = httpClient;
+            _jsonSerializer = jsonSerializer;
         }
 
         public OnePasswordApiClient Create()
         {
-            return new OnePasswordApiClient(_httpClient);
+            return new OnePasswordApiClient(_httpClient, _jsonSerializer);
         }
     }
 }
diff --git a/src/Appy.Tool.1Password.Tests/Api/OnePasswordApiToolEndpointsTests.cs b/src/Appy.Tool.1Password.Tests/Api/OnePasswordApiToolEndpointsTests.cs
@@ -4,6 +4,7 @@
 using System.Threading.Tasks;
 using Appy.Configuration;
 using Appy.Configuration.Common;
+using Appy.Configuration.Serializers;
 using Appy.Configuration.Validation;
 using Appy.Infrastructure.OnePassword.ApiClient;
 using Appy.Infrastructure.OnePassword.Model;
@@ -12,7 +13,6 @@
 using Appy.Infrastructure.OnePassword.Tooling;
 using Appy.Tool.OnePassword.Tests.Api.Fixtures;
 using FluentAssertions;
-using Flurl.Http;
 using Microsoft.Extensions.DependencyInjection;
 using Xunit;
 using Xunit.Abstractions;
@@ -68,7 +68,7 @@ public async Task ShouldBeUnsuccessfulResponseWithValidationInfo()
                 Func<Task> act = async () => await fixture.RemoteTool.Execute(query);
 
                 var assertion = await act.Should().ThrowAsync<OnePasswordToolException>();
-                assertion.WithInnerException<FlurlHttpException>();
+                assertion.WithInnerException<OnePasswordApiClientException>();
 
                 var response = assertion.And.GetContentAs<Response>();
                 response.Success.Should().BeFalse();
@@ -101,7 +101,7 @@ public async Task ShouldBeUnsuccessfulResponseWithLocalExceptionInfo()
                 Func<Task> act = async () => await fixture.RemoteTool.Execute(query);
 
                 var assertion = await act.Should().ThrowAsync<OnePasswordToolException>();
-                assertion.WithInnerException<FlurlHttpException>();
+                assertion.WithInnerException<OnePasswordApiClientException>();
 
                 var response = assertion.And.GetContentAs<Response>();
                 response.Success.Should().BeFalse();
@@ -130,7 +130,7 @@ public async Task ShouldBeUnsuccessfulResponseWithInternalErrorMessage()
                 Func<Task> act = async () => await fixture.RemoteTool.Execute(query);
 
                 var assertion = await act.Should().ThrowAsync<OnePasswordToolException>();
-                assertion.WithInnerException<FlurlHttpException>();
+                assertion.WithInnerException<OnePasswordApiClientException>();
 
                 var response = assertion.And.GetContentAs<Response>();
                 response.Success.Should().BeFalse();
@@ -155,11 +155,11 @@ public Fixture(OnePasswordApiTestFixture apiTestFixture)
                 _apiTestFixture = apiTestFixture;
                 _apiTestFixture.ServicesConfiguration = services => services
                     .ReplaceSingleton<IOnePasswordTool>(sp =>
-                        LocalTool.Object.WithValidation(sp.GetService<IValidator>()));
+                        LocalTool.Object.WithValidation(sp.GetService<IValidator>()!));
 
                 LocalTool = new OnePasswordToolMock();
                 RemoteTool = new OnePasswordRemoteTool(
-                    new OnePasswordApiTestClientFactory(_apiTestFixture.CreateClient()));
+                    new OnePasswordApiTestClientFactory(_apiTestFixture.CreateClient(), new NewtonsoftAppyJsonSerializer()));
 
                 Organization = "appy";
                 Environment = "DEV";
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
@@ -44,7 +44,6 @@
 
   <PropertyGroup Label="Package Versions">
     <MicrosoftWin32RegistryPackageVersion>5.0.0</MicrosoftWin32RegistryPackageVersion>
-    <FlurlPackageVersion>3.0.0</FlurlPackageVersion>
     <NewtonsoftJsonPackageVersion>12.0.3</NewtonsoftJsonPackageVersion>
     <MedallionShellPackageVersion>1.6.1</MedallionShellPackageVersion>
     <McMasterExtensionsCommandLineUtilsPackageVersion>3.1.0-rc.371</McMasterExtensionsCommandLineUtilsPackageVersion>

Original file line number	Diff line number	Diff line change
`@@ -1,23 +1,28 @@`
`1`	`1`	`using System;`
`2`	`2`	`using System.Net.Http;`
	`3`	`+using Appy.Configuration.Serializers;`
`3`	`4`	`using Appy.Infrastructure.OnePassword.ApiClient;`
`4`	`5`
`5`	`6`	`namespace Appy.Configuration.OnePassword.Internals`
`6`	`7`	`{`
`7`	`8`	`public class OnePasswordApiClientFactory: IOnePasswordApiClientFactory`
`8`	`9`	`{`
`9`	`10`	`readonly IHttpClientFactory _httpClientFactory;`
	`11`	`+ readonly IAppyJsonSerializer _jsonSerializer;`
`10`	`12`
`11`		`- public OnePasswordApiClientFactory(IHttpClientFactory httpClientFactory)`
	`13`	`+ public OnePasswordApiClientFactory(`
	`14`	`+ IHttpClientFactory httpClientFactory,`
	`15`	`+ IAppyJsonSerializer jsonSerializer)`
`12`	`16`	`{`
`13`	`17`	`_httpClientFactory = httpClientFactory ?? throw new ArgumentNullException(nameof(httpClientFactory));`
	`18`	`+ _jsonSerializer = jsonSerializer ?? throw new ArgumentNullException(nameof(jsonSerializer));`
`14`	`19`	`}`
`15`	`20`
`16`	`21`	`public OnePasswordApiClient Create()`
`17`	`22`	`{`
`18`	`23`	`var httpClient = _httpClientFactory.CreateClient(nameof(OnePasswordApiClient));`
`19`		`-`
`20`		`- return new OnePasswordApiClient(httpClient);`
	`24`	`+`
	`25`	`+ return new OnePasswordApiClient(httpClient, _jsonSerializer);`
`21`	`26`	`}`
`22`	`27`	`}`
`23`	`28`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,6 @@`
`1`	`1`	`using System;`
`2`	`2`	`using System.Threading.Tasks;`
`3`	`3`	`using Appy.Infrastructure.OnePassword.ApiClient;`
`4`		`-using Flurl.Http;`
`5`	`4`
`6`	`5`	`namespace Appy.Infrastructure.OnePassword.Tooling`
`7`	`6`	`{`
`@@ -24,9 +23,9 @@ internal static async Task<T> UnWrap<T>(this Task<Response<T>> task)`
`24`	`23`
`25`	`24`	`message = response?.Message!;`
`26`	`25`	`}`
`27`		`- catch (FlurlHttpException httpException)`
	`26`	`+ catch (OnePasswordApiClientException httpException)`
`28`	`27`	`{`
`29`		`- var response = await httpException.GetResponseJsonAsync<Response>();`
	`28`	`+ var response = httpException.Response;`
`30`	`29`	`message = response?.Message;`
`31`	`30`	`exceptionResult = response;`
`32`	`31`	`innerException = httpException;`
Original file line number	Diff line number	Diff line change
`@@ -1,20 +1,23 @@`
`1`	`1`	`using System.Net.Http;`
	`2`	`+using Appy.Configuration.Serializers;`
`2`	`3`	`using Appy.Infrastructure.OnePassword.ApiClient;`
`3`	`4`
`4`	`5`	`namespace Appy.Tool.OnePassword.Tests.Api.Fixtures`
`5`	`6`	`{`
`6`	`7`	`public class OnePasswordApiTestClientFactory: IOnePasswordApiClientFactory`
`7`	`8`	`{`
`8`		`- private readonly HttpClient _httpClient;`
	`9`	`+ readonly HttpClient _httpClient;`
	`10`	`+ readonly IAppyJsonSerializer _jsonSerializer;`
`9`	`11`
`10`		`- public OnePasswordApiTestClientFactory(HttpClient httpClient)`
	`12`	`+ public OnePasswordApiTestClientFactory(HttpClient httpClient, IAppyJsonSerializer jsonSerializer)`
`11`	`13`	`{`
`12`	`14`	`_httpClient = httpClient;`
	`15`	`+ _jsonSerializer = jsonSerializer;`
`13`	`16`	`}`
`14`	`17`
`15`	`18`	`public OnePasswordApiClient Create()`
`16`	`19`	`{`
`17`		`- return new OnePasswordApiClient(_httpClient);`
	`20`	`+ return new OnePasswordApiClient(_httpClient, _jsonSerializer);`
`18`	`21`	`}`
`19`	`22`	`}`
`20`	`23`	`}`