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

fix: Endpoint url should be nil if host or scheme is missing #614

Merged
merged 2 commits into from
Oct 31, 2023
Merged

fix: Endpoint url should be nil if host or scheme is missing #614

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
a5ef3e5
address endpoint test TODO
dayaffe Oct 31, 2023
9241a7c
fix code logic to throw nil
dayaffe Oct 31, 2023
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
4 changes: 2 additions & 2 deletions Sources/ClientRuntime/Networking/Endpoint.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,10 +63,10 @@ extension Endpoint {
public var url: URL? {
var components = URLComponents()
components.scheme = protocolType?.rawValue
components.host = host
components.host = host.isEmpty ? nil : host // If host is empty, URL is invalid
components.percentEncodedPath = path
components.percentEncodedQuery = queryItemString
return components.url
return (components.host == nil || components.scheme == nil) ? nil : components.url
}

var queryItemString: String? {
Expand Down
6 changes: 4 additions & 2 deletions Tests/ClientRuntimeTests/NetworkingTests/HttpRequestTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,9 @@ class HttpRequestTests: NetworkingTestUtils {
}

func testConversionToUrlRequestFailsWithInvalidEndpoint() {
// TODO:: When is the endpoint invalid or endpoint.url nil?
_ = Endpoint(host: "", path: "", protocolType: nil)
// Testing with an invalid endpoint where host is empty,
// path is empty, and protocolType is nil.
let endpoint = Endpoint(host: "", path: "", protocolType: nil)
XCTAssertNil(endpoint.url, "An invalid endpoint should result in a nil URL.")
}
}
Loading