|
1 | 1 | import Vapor
|
2 | 2 |
|
3 |
| -final class CommonErrorMiddleware: Middleware { |
4 |
| - func respond(to request: Request, chainingTo next: Responder) -> EventLoopFuture<Response> { |
5 |
| - return next.respond(to: request).flatMapError { (error) in |
| 3 | +struct CommonErrorMiddleware: AsyncMiddleware { |
| 4 | + func respond(to request: Vapor.Request, chainingTo next: any Vapor.AsyncResponder) async throws -> Vapor.Response { |
| 5 | + do { |
| 6 | + return try await next.respond(to: request) |
| 7 | + } catch let error { |
6 | 8 | let headers: HTTPHeaders
|
7 | 9 | let status: HTTPResponseStatus
|
8 | 10 | switch error {
|
@@ -33,16 +35,28 @@ final class CommonErrorMiddleware: Middleware {
|
33 | 35 | ]
|
34 | 36 |
|
35 | 37 | if request.headers[.accept].map({ $0.lowercased() }).contains("application/json") {
|
36 |
| - return request.eventLoop.makeSucceededFuture(["error": status.code]) |
37 |
| - .encodeResponse(status: status, headers: headers, for: request) |
| 38 | + let data = try JSONEncoder().encode(["error": status.code]) |
| 39 | + |
| 40 | + return .init( |
| 41 | + status: status, |
| 42 | + headers: headers, |
| 43 | + body: .init(data: data) |
| 44 | + ) |
38 | 45 | } else {
|
39 |
| - return request.view.render("error", [ |
40 |
| - "title": "We've got some trouble", |
41 |
| - "error": errotTitles[status.code], |
42 |
| - "reason": errotReasons[status.code], |
43 |
| - "status": "\(status.code)", |
| 46 | + let data = try JSONEncoder().encode([ |
| 47 | + "error": [ |
| 48 | + "title": "We've got some trouble", |
| 49 | + "error": errotTitles[status.code], |
| 50 | + "reason": errotReasons[status.code], |
| 51 | + "status": "\(status.code)", |
| 52 | + ] |
44 | 53 | ])
|
45 |
| - .encodeResponse(status: status, headers: headers, for: request) |
| 54 | + |
| 55 | + return .init( |
| 56 | + status: status, |
| 57 | + headers: headers, |
| 58 | + body: .init(data: data) |
| 59 | + ) |
46 | 60 | }
|
47 | 61 | }
|
48 | 62 | }
|
|
0 commit comments