Merge pull request #10 from tonyarnold/handle-redirects

Allow Abort.redirect(…) to pass through the middleware
brokenhandsio · Sep 11, 2019 · 63dba34 · 63dba34
2 parents 9cf9e8d + f8c2249
commit 63dba34
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 1 deletion.
diff --git a/Sources/LeafErrorMiddleware/LeafErrorMiddleware.swift b/Sources/LeafErrorMiddleware/LeafErrorMiddleware.swift
@@ -22,9 +22,18 @@ public final class LeafErrorMiddleware: Middleware, Service {
             }.catchFlatMap { error in
                 switch (error) {
                 case let abort as AbortError:
+                    guard
+                        abort.status.representsError
+                    else {
+                        if let location = abort.headers[.location].first {
+                            return req.future(req.redirect(to: location))
+                        } else {
+                            return try self.handleError(for: req, status: abort.status)
+                        }
+                    }
                     return try self.handleError(for: req, status: abort.status)
                 default:
-                        return try self.handleError(for: req, status: .internalServerError)
+                    return try self.handleError(for: req, status: .internalServerError)
                 }
             }
         } catch {
@@ -82,3 +91,9 @@ extension HTTPStatus {
         }
     }
 }
+
+private extension HTTPResponseStatus {
+    var representsError: Bool {
+        return (HTTPResponseStatus.badRequest.code ... HTTPResponseStatus.networkAuthenticationRequired.code) ~= code
+    }
+}
diff --git a/Tests/LeafErrorMiddlewareTests/LeafErrorMiddlewareTests.swift b/Tests/LeafErrorMiddlewareTests/LeafErrorMiddlewareTests.swift
@@ -18,6 +18,7 @@ class LeafErrorMiddlewareTests: XCTestCase {
         ("testThatUnauthorisedIsPassedThroughToServerErrorPage", testThatUnauthorisedIsPassedThroughToServerErrorPage),
         ("testThatFuture404IsCaughtCorrectly", testThatFuture404IsCaughtCorrectly),
         ("testThatFuture403IsCaughtCorrectly", testThatFuture403IsCaughtCorrectly),
+        ("testThatRedirectIsNotCaught", testThatRedirectIsNotCaught)
     ]
 
     // MARK: - Properties
@@ -69,6 +70,10 @@ class LeafErrorMiddlewareTests: XCTestCase {
             router.get("future403") { req -> Future<Response> in
                 return req.future(error: Abort(.forbidden))
             }
+
+            router.get("future303") { req -> Future<Response> in
+                return req.future(error: Abort.redirect(to: "ok"))
+            }
         }
 
         let router = EngineRouter.default()
@@ -169,6 +174,12 @@ class LeafErrorMiddlewareTests: XCTestCase {
         XCTAssertEqual(response.http.status, .forbidden)
         XCTAssertEqual(viewRenderer.leafPath, "serverError")
     }
+
+    func testThatRedirectIsNotCaught() throws {
+        let response = try app.getResponse(to: "/future303")
+        XCTAssertEqual(response.http.status, .seeOther)
+        XCTAssertEqual(response.http.headers[.location].first, "ok")
+    }
 }
 
 extension HTTPBody {