Skip to content

Commit

Permalink
Use params over queryParams for backwards compatibility's sake
Browse files Browse the repository at this point in the history
  • Loading branch information
s4cha committed Nov 15, 2023
1 parent 47e39cd commit f05c24b
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 11 deletions.
2 changes: 1 addition & 1 deletion Sources/Networking/Async Api/Get.swift
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ public extension NetworkingClient {
}

func get(_ route: String, params: Params? = nil) async throws -> Data {
try await request(.get, route, queryParams: params).execute()
try await request(.get, route, params: params).execute()
}
}

Expand Down
2 changes: 1 addition & 1 deletion Sources/Networking/Combine Api/Get+Combine.swift
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ public extension NetworkingClient {
}

func get(_ route: String, params: Params? = nil) -> AnyPublisher<Data, Error> {
request(.get, route, queryParams: params).publisher()
request(.get, route, params: params).publisher()
}
}

Expand Down
8 changes: 4 additions & 4 deletions Sources/Networking/NetworkingClient+Requests.swift
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ import Combine

public extension NetworkingClient {

func getRequest(_ route: String, queryParams: Params? = nil) -> NetworkingRequest {
request(.get, route, queryParams: queryParams)
func getRequest(_ route: String, params: Params? = nil) -> NetworkingRequest {
request(.get, route, params: params)
}

func postRequest(_ route: String, body: HTTPBody? = nil) -> NetworkingRequest {
Expand All @@ -32,13 +32,13 @@ public extension NetworkingClient {

internal func request(_ httpMethod: HTTPMethod,
_ route: String,
queryParams: Params? = nil,
params: Params? = nil,
body: HTTPBody? = nil
) -> NetworkingRequest {
let req = NetworkingRequest()
req.httpMethod = httpMethod
req.route = route
req.queryParams = queryParams
req.params = params ?? Params()
req.httpBody = body

let updateRequest = { [weak req, weak self] in
Expand Down
7 changes: 3 additions & 4 deletions Sources/Networking/NetworkingRequest.swift
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ public class NetworkingRequest: NSObject, URLSessionTaskDelegate {
var route = ""
var httpMethod = HTTPMethod.get
var httpBody: HTTPBody? = nil
public var queryParams: Params? = nil
public var params: Params = Params()
var headers = [String: String]()
var logLevel: NetworkingLogLevel {
get { return logger.logLevel }
Expand Down Expand Up @@ -134,14 +134,13 @@ public class NetworkingRequest: NSObject, URLSessionTaskDelegate {

private func getURLWithParams() -> String {
let urlString = baseURL + route
guard let queryParams else { return urlString }
if queryParams.isEmpty { return urlString }
if params.isEmpty { return urlString }
guard let url = URL(string: urlString) else {
return urlString
}
if var urlComponents = URLComponents(url: url ,resolvingAgainstBaseURL: false) {
var queryItems = urlComponents.queryItems ?? [URLQueryItem]()
queryParams.forEach { param in
params.forEach { param in
// arrayParam[] syntax
if let array = param.value as? [CustomStringConvertible] {
array.forEach {
Expand Down
2 changes: 1 addition & 1 deletion Tests/NetworkingTests/GetRequestTests.swift
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ final class GetRequestTests: XCTestCase {
{ "response": "OK" }
"""

let _:Void = try await network.get("/users", urlParams: ["search" : "lion"])
let _:Void = try await network.get("/users", params: ["search" : "lion"])
XCTAssertEqual(MockingURLProtocol.currentRequest?.httpMethod, "GET")
XCTAssertEqual(MockingURLProtocol.currentRequest?.url?.absoluteString, "https://mocked.com/users?search=lion")
}
Expand Down

0 comments on commit f05c24b

Please sign in to comment.