1.7.17

dankinsoid · Apr 15, 2024 · 230f7bb · 230f7bb
1 parent 59b12f2
commit 230f7bb
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/Sources/SwiftAPIClient/Modifiers/RequestModifiers.swift b/Sources/SwiftAPIClient/Modifiers/RequestModifiers.swift
@@ -300,20 +300,23 @@ public extension RequestBuilder where Request == HTTPRequestComponents {
 				if let host = newBaseURL.host(percentEncoded: false) {
 					$0.urlComponents.host = host
 				}
-				$0.prependPath(newBaseURL.path(percentEncoded: false))
+                let path = newBaseURL.path(percentEncoded: false)
+                if !path.isEmpty, path != "/" {
+                    $0.prependPath(path)
+                }
 			} else {
 				if let host = newBaseURL.host {
 					$0.urlComponents.percentEncodedHost = host
 				}
-				if !newBaseURL.path.isEmpty {
+                if !newBaseURL.path.isEmpty, newBaseURL.path != "/" {
 					$0.prependPath(newBaseURL.path, percentEncoded: true)
 				}
 			}
 			#else
 			if let host = newBaseURL.host {
 				$0.urlComponents.percentEncodedHost = host
 			}
-			if !newBaseURL.path.isEmpty {
+			if !newBaseURL.path.isEmpty, newBaseURL.path != "/" {
 				$0.prependPath(newBaseURL.path, percentEncoded: true)
 			}
 			#endif

diff --git a/Tests/SwiftAPIClientTests/Modifiers/RequestModifiersTests.swift b/Tests/SwiftAPIClientTests/Modifiers/RequestModifiersTests.swift
@@ -66,7 +66,7 @@ final class RequestModifiersTests: XCTestCase {
 
 	func testBaseURLSetting() throws {
 		let modifiedClient = client.query("test", "value").baseURL(URL(string: "http://test.net")!)
-		try XCTAssertEqual(modifiedClient.request().url?.absoluteString, "http://test.net/?test=value")
+		try XCTAssertEqual(modifiedClient.request().url?.absoluteString, "http://test.net?test=value")
 	}
 
 	func testRemoveSlashIfNeeded() throws {