Skip to content

fix(http-client): error handling improvement #24

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Apr 27, 2022
Merged

fix(http-client): error handling improvement #24

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d9b9e9e
fix(http-client): error handling improvement
renatoaguimaraes Apr 27, 2022
f8ef527
fix
renatoaguimaraes Apr 27, 2022
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
11 changes: 11 additions & 0 deletions Sources/YData/Client/InternalClient.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,17 @@ private extension EventLoopFuture where Value: InternalResponse {
return .failure(Internal.ErrorResponse(headers: response.headers,
status: response.status,
message:contentError.message))
} catch DecodingError.keyNotFound {
do {
let contentError = try response.content.decode(String.self)
return .failure(Internal.ErrorResponse(headers: response.headers,
status: response.status,
message: contentError))
} catch {
return .failure(Internal.ErrorResponse(headers: [:],
status: .internalServerError,
message: "failed to decode response with error \(error)"))
}
} catch {
return .failure(Internal.ErrorResponse(headers: [:],
status: .internalServerError,
Expand Down
6 changes: 5 additions & 1 deletion Sources/YData/Client/InternalResponse+Vapor.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,6 @@ public extension ClientResponse {
func mapToModel<C>() throws -> C where C: Decodable {
switch status.code {
case (100..<400):

do {
return try content.decode(C.self)
} catch {
Expand All @@ -68,6 +67,11 @@ public extension ClientResponse {
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)
} catch {
throw Internal.ErrorResponse(headers: [:],
status: .internalServerError,
Expand Down