Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 30 additions & 12 deletions Package.resolved

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ let package = Package(
],
dependencies: [
// Dependencies declare other packages that this package depends on.
.package(url: "https://github.com/vapor/vapor.git", from: "4.0.0"),
.package(url: "https://github.com/vapor/fluent.git", from: "4.0.0")
.package(url: "https://github.com/vapor/vapor.git", from: "4.61.1"),
.package(url: "https://github.com/vapor/fluent.git", from: "4.4.0")
],
targets: [
// Targets are the basic building blocks of a package. A target can define a module or a test suite.
Expand Down
32 changes: 18 additions & 14 deletions Sources/YData/Client/InternalResponse+Vapor.swift
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import Vapor
extension ResponseEncodable where Self: InternalResponse {
func encodeResponse(for request: Request) -> EventLoopFuture<Vapor.Response> {
let response = Vapor.Response(status: status, headers: headers)
response.body ?= body.flatMap(Vapor.Response.Body.init)
response.body ?= body.flatMap { Vapor.Response.Body(buffer: $0) }
return request.eventLoop.makeSucceededFuture(response)
}
}
Expand Down Expand Up @@ -57,25 +57,29 @@ public extension ClientResponse {
do {
return try content.decode(C.self)
} catch {
throw Internal.ErrorResponse(headers: [:],
status: .internalServerError,
message: "failed to decode response \(error)")
throw Internal.ErrorResponse(
headers: [:],
status: .internalServerError,
message: "failed to decode response \(error)")
}
default:
do {
let contentError = try content.decode(Internal.ServiceError.self)
throw Internal.ErrorResponse(headers: headers,
status: status,
message:contentError.message)
throw Internal.ErrorResponse(
headers: headers,
status: status,
message: contentError.message)
} catch DecodingError.keyNotFound {
let contentError = try content.decode(String.self)
throw Internal.ErrorResponse(headers: headers,
status: status,
message: contentError)
throw Internal.ErrorResponse(
headers: headers,
status: status,
message: contentError)
} catch {
throw Internal.ErrorResponse(headers: [:],
status: .internalServerError,
message: "failed to decode response with error \(error)")
throw Internal.ErrorResponse(
headers: [:],
status: .internalServerError,
message: "failed to decode response with error \(error)")
}
}
}
Expand All @@ -84,7 +88,7 @@ public extension ClientResponse {
extension Internal.SuccessResponse: ResponseEncodable {
public func encodeResponse(for request: Request) -> EventLoopFuture<Vapor.Response> {
let response = Vapor.Response(status: status, headers: headers)
response.body ?= body.flatMap(Vapor.Response.Body.init)
response.body ?= body.flatMap { Vapor.Response.Body(buffer: $0) }
return request.eventLoop.makeSucceededFuture(response)
}
}