Merge pull request #2 from RockfordWei/master

enforcing url encode for api requests
PerfectAccelerators · Jun 26, 2018 · be5ad27 · be5ad27
2 parents f6c8aba + 9a74504
commit be5ad27
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 14 deletions.
diff --git a/.gitignore b/.gitignore
@@ -39,6 +39,7 @@ playground.xcworkspace
 /.build
 /Packages
 Package.pins
+*.resolved
 /*.xcodeproj
 buildlinux
 Package.swift.orig

diff --git a/Sources/Curly/HttpClient.swift b/Sources/Curly/HttpClient.swift
@@ -28,7 +28,8 @@ public struct HttpClient {
 
     /// Send a request - Async - with params
     /// This method can be used for **GET** requests to external APIs
-    /// - Parameter params: GET request parameters
+    /// - Parameter params: GET request parameters **CAUTION** for api with `.valueOnly` or `.keyValuePair`, the route api could be unexpected sorted.,
+    ///   i.e., ["route1": "one", "route2": "two"] may result in /route2/two/route1/one, depends on the internal NSDictionary key arrangement structure.
     /// - Parameter responseType: expected response type
     /// - Parameter completion: Closure as the completion handler
     /// - Parameter response: mapped model ready to use
@@ -46,23 +47,20 @@ public struct HttpClient {
             break
         case .get:
             if api.paramFormat == .valueOnly {
-                for (_, value) in params {
-                    parameteredURL.append("/\(value)")
-                }
+                let path:[String] = params.map { "/" + "\($0.value)".stringByEncodingURL }
+                parameteredURL.append(path.joined())
             } else if api.paramFormat == .keyValuePair {
-                for (key, value) in params {
-                    parameteredURL.append("/\(key)/\(value)")
+                let path:[String] = params.map {
+                    "/" + $0.key.stringByEncodingURL +
+                    "/" + "\($0.value)".stringByEncodingURL 
                 }
+                parameteredURL.append(path.joined())
             } else if api.paramFormat == .urlEncoding {
-                parameteredURL.append("?")
-                var index = 0
-                for (key, value) in params {
-                    parameteredURL.append("\(key)=\(value)")
-                    index += 1
-                    if index < params.count {
-                        parameteredURL.append("&")
-                    }
+                let path:[String] = params.map {
+                    $0.key.stringByEncodingURL +
+                    "=" + "\($0.value)".stringByEncodingURL 
                 }
+                parameteredURL.append("?" + path.joined(separator: "&"))
             }
         default:
             break