From f05c24b98e4183a2dba7267970be8e3c0c3e10d0 Mon Sep 17 00:00:00 2001
From: Sacha DSO <sachadso@gmail.com>
Date: Tue, 14 Nov 2023 16:00:41 -1000
Subject: [PATCH] Use params over queryParams for backwards compatibility's
 sake

---
 Sources/Networking/Async Api/Get.swift             | 2 +-
 Sources/Networking/Combine Api/Get+Combine.swift   | 2 +-
 Sources/Networking/NetworkingClient+Requests.swift | 8 ++++----
 Sources/Networking/NetworkingRequest.swift         | 7 +++----
 Tests/NetworkingTests/GetRequestTests.swift        | 2 +-
 5 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/Sources/Networking/Async Api/Get.swift b/Sources/Networking/Async Api/Get.swift
index 9481f3a..534961c 100644
--- a/Sources/Networking/Async Api/Get.swift	
+++ b/Sources/Networking/Async Api/Get.swift	
@@ -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()
     }
 }
 
diff --git a/Sources/Networking/Combine Api/Get+Combine.swift b/Sources/Networking/Combine Api/Get+Combine.swift
index 97263ed..991ced9 100644
--- a/Sources/Networking/Combine Api/Get+Combine.swift	
+++ b/Sources/Networking/Combine Api/Get+Combine.swift	
@@ -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()
     }
 }
 
diff --git a/Sources/Networking/NetworkingClient+Requests.swift b/Sources/Networking/NetworkingClient+Requests.swift
index 3782554..3ff0e6c 100644
--- a/Sources/Networking/NetworkingClient+Requests.swift
+++ b/Sources/Networking/NetworkingClient+Requests.swift
@@ -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 {
@@ -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
diff --git a/Sources/Networking/NetworkingRequest.swift b/Sources/Networking/NetworkingRequest.swift
index dea07ed..e4b1b2e 100644
--- a/Sources/Networking/NetworkingRequest.swift
+++ b/Sources/Networking/NetworkingRequest.swift
@@ -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 }
@@ -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 {
diff --git a/Tests/NetworkingTests/GetRequestTests.swift b/Tests/NetworkingTests/GetRequestTests.swift
index 1e8805e..4d22f88 100644
--- a/Tests/NetworkingTests/GetRequestTests.swift
+++ b/Tests/NetworkingTests/GetRequestTests.swift
@@ -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")
     }