Fix parenthesis bug in IsApiResponse expression, which caused IApiRes…

…ponse-returning methods to throw ApiException on error, rather than assigning the exception to IApiResponse.Error
dtewinkel · Jan 15, 2022 · 397ada2 · 397ada2
1 parent ed78b92
commit 397ada2
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 3 deletions.
diff --git a/Refit.Tests/ResponseTests.cs b/Refit.Tests/ResponseTests.cs
@@ -51,6 +51,9 @@ public interface IMyAliasService
 
             [Get("/GetApiResponseTestObject")]
             Task<ApiResponse<TestAliasObject>> GetApiResponseTestObject();
+
+            [Get("/GetIApiResponse")]
+            Task<IApiResponse> GetIApiResponse();
         }
 
         [Fact]
@@ -250,6 +253,26 @@ public async Task BadRequestWithEmptyContent_ShouldReturnApiResponse()
             Assert.Equal("Hello world", apiResponse.Error.Content);
         }
 
+        [Fact]
+        public async Task BadRequestWithStringContent_ShouldReturnIApiResponse()
+        {
+            var expectedResponse = new HttpResponseMessage(HttpStatusCode.BadRequest)
+            {
+                Content = new StringContent("Hello world")
+            };
+            expectedResponse.Content.Headers.Clear();
+
+            mockHandler.Expect(HttpMethod.Get, $"http://api/{nameof(fixture.GetIApiResponse)}")
+                .Respond(req => expectedResponse);
+
+            var apiResponse = await fixture.GetIApiResponse();
+
+            Assert.NotNull(apiResponse);
+            Assert.NotNull(apiResponse.Error);
+            Assert.NotNull(apiResponse.Error.Content);
+            Assert.Equal("Hello world", apiResponse.Error.Content);
+        }
+
         [Fact]
         public async Task ValidationApiException_HydratesBaseContent()
         {

diff --git a/Refit/RestMethodInfo.cs b/Refit/RestMethodInfo.cs
@@ -126,9 +126,9 @@ public RestMethodInfo(Type targetInterface, MethodInfo methodInfo, RefitSettings
             CancellationToken = ctParams.FirstOrDefault();
 
             IsApiResponse = ReturnResultType!.GetTypeInfo().IsGenericType &&
-                            (ReturnResultType!.GetGenericTypeDefinition() == typeof(ApiResponse<>)
-                             || ReturnResultType.GetGenericTypeDefinition()  == typeof(IApiResponse<>)
-                             || ReturnResultType == typeof(IApiResponse));
+                              (ReturnResultType!.GetGenericTypeDefinition() == typeof(ApiResponse<>)
+                              || ReturnResultType.GetGenericTypeDefinition()  == typeof(IApiResponse<>))
+                            || ReturnResultType == typeof(IApiResponse);
         }
 
         private ISet<int> BuildHeaderCollectionParameterMap(List<ParameterInfo> parameterList)