Skip to content
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

Jump to bottom

Add URL to RequestError #198

Open
wants to merge 5 commits into
base: main
Choose a base branch
from
Open

Add URL to RequestError #198

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
81a56c9
add httpResponse to RequestError
jrmsklar May 10, 2017
38e68ef
make httpResponse a let
jrmsklar May 10, 2017
edb56ac
Revert "make httpResponse a let"
jrmsklar May 15, 2017
ef69869
Revert "add httpResponse to RequestError"
jrmsklar May 15, 2017
c22b6b8
add url property
jrmsklar May 15, 2017
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
13 changes: 10 additions & 3 deletions Source/Siesta/RequestError.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,15 @@ public struct RequestError: Error
*/
public var userMessage: String

/// The HTTP response if this error came from an HTTP response.
public var httpResponse: HTTPURLResponse?
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Perhaps this should be private(set)

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What are your thoughts on me changing it to a let?

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, if it's only set in init then I'd say that's appropriate.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

go for let

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍 will do. Thanks!

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@victorcotap all set!


/// The HTTP status code (e.g. 404) if this error came from an HTTP response.
public var httpStatusCode: Int?
public var httpStatusCode: Int? {
get {
return httpResponse?.statusCode
}
}

/// The response body if this error came from an HTTP response. Its meaning is API-specific.
public var entity: Entity<Any>?
Expand All @@ -63,7 +70,7 @@ public struct RequestError: Error
cause: Error?,
userMessage: String? = nil)
{
self.httpStatusCode = response?.statusCode
self.httpResponse = response
self.cause = cause

if let content = content
Expand All @@ -73,7 +80,7 @@ public struct RequestError: Error
{ self.userMessage = message }
else if let message = cause?.localizedDescription
{ self.userMessage = message }
else if let code = self.httpStatusCode
else if let code = self.httpResponse?.statusCode
{ self.userMessage = HTTPURLResponse.localizedString(forStatusCode: code).capitalized }
else
{ self.userMessage = NSLocalizedString("Request failed", comment: "userMessage") } // Is this reachable?
Expand Down