Merge pull request #87 from joukevandermaas/merge-back-86

Fix regression: `HttpError` not passed through

CHANGELOG.md

@@ -1,10 +1,14 @@
+## Version 1.4.1
+
+- [**REGRESSION**] `HttpError` not passed through; Saule specific error is serialized instead.
+
 ## Version 1.4
 
 - [**FEATURE**] Filtering of attributes through user queries
   - You can specify the expression that will be executed for specific types, allowing
     e.g. case-insensitive filtering, and much more.
 - [**FEATURE**] Custom properties to specify the Id of a resource (using `WithId`)
-- [**FEATURE**] New way to set up Saule: use the extension method `ConfigureJsonApi` 
+- [**FEATURE**] New way to set up Saule: use the extension method `ConfigureJsonApi`
   instead of manually adding the `JsonApiMediaTypeFormatter`.
 - [**FEATURE**] Better response code handling; Saule will now always send a 4xx or 5xx when an exception occurs
   (requires the new setup)

Saule/Http/PreprocessingDelegatingHandler.cs

@@ -35,9 +35,11 @@ internal static PreprocessResult PreprocessRequest(
             {
                 resource = (ApiResource)request.Properties[Constants.RequestPropertyName];
             }
-            else
+            else if (!(content is HttpError))
             {
-                content = new JsonApiException(ErrorType.Server, "You must add a [ReturnsResourceAttribute] to action methods.")
+                content = new JsonApiException(
+                    ErrorType.Server,
+                    "You must add a [ReturnsResourceAttribute] to action methods.")
                 {
                     HelpLink = "https://github.com/joukevandermaas/saule/wiki"
                 };

Tests/Controllers/BrokenController.cs

@@ -1,4 +1,6 @@
-using System.Web.Http;
+using System.Linq;
+using System.Web.Http;
+using Saule.Http;
 using Tests.Helpers;
 using Tests.Models;
 
@@ -12,5 +14,14 @@ public Person GetPerson(string id)
         {
             return Get.Person(id);
         }
+
+        [HttpGet]
+        [ReturnsResource(typeof(PersonResource))]
+        [Route("api/broken")]
+        [Authorize]
+        public IQueryable<Person> GetPeople()
+        {
+            return Get.People(20).AsQueryable();
+        }
     }
 }

Tests/Integration/JsonApiMediaTypeFormatterTests.cs

@@ -448,7 +448,24 @@ public async Task PassesThrough400Errors()
                 var client = server.GetClient();
                 var response = await client.GetAsync("does/not/exist");
 
-                Assert.Equal(response.StatusCode, HttpStatusCode.NotFound);
+                Assert.Equal(HttpStatusCode.NotFound, response.StatusCode);
+            }
+        }
+
+        [Fact(DisplayName = "Passes through HttpError")]
+        public async Task PassesThroughHttpErrors()
+        {
+            using (var server = new NewSetupJsonApiServer())
+            {
+                var client = server.GetClient();
+                var response = await client.GetFullJsonResponseAsync("api/broken");
+
+                _output.WriteLine(response.Content.ToString());
+
+                var errorText = response.Content["errors"][0]["title"].Value<string>();
+
+                Assert.Equal(HttpStatusCode.Unauthorized, response.StatusCode);
+                Assert.Equal("Authorization has been denied for this request.", errorText);
             }
         }
 

appveyor.yml

@@ -1,5 +1,6 @@
-version: 1.4.0.{build}
+version: 1.4.1.{build}
 configuration: Release
+skip_tags: true
 assembly_info:
   patch: true
   file: '**\AssemblyInfo.*'
@@ -18,6 +19,7 @@ deploy:
   api_key:
     secure: dtP6YFOY3quvyRlH0DYG/i4AbOegM/5oT8Q+IcpKMqKZgBiAmm+XRs2TN9+ju9oe
   on:
+    appveyor_repo_tag: false
     branch: /(master|release-v.+)/
 - release: saule-v$(appveyor_build_version)
   description: ''