Merge pull request #62 from Iterable/bugfix/mob-238-url-encoding

[MOB-238] - Encoding get url query parameters

Author: tapashmajumder

Tests/swift-sdk-swift-tests/IterableRequestUtilTests.swift

@@ -57,6 +57,15 @@ class IterableRequestUtilTests: XCTestCase {
         TestUtils.validate(request: request, requestType: .get, apiEndPoint: apiEndPoint, path: path, queryParams: queryParams)
     }
 
+    func testGetRequestWithPlusSignInEmail() {
+        let apiEndPoint = "https://somewhere.com/"
+        let path = "path"
+        let args = ["email" : "[email protected]"]
+        let request = IterableRequestUtil.createGetRequest(forApiEndPoint: apiEndPoint, path: path, args: args)!
+        let requestString = String(describing: request)
+        XCTAssertEqual(requestString, "https://somewhere.com/path?email=user%[email protected]")
+    }
+
     func testPostRequest() {
         let apiEndPoint = "https://somewhere.com/"
         let path = "path"
@@ -77,11 +86,4 @@ class IterableRequestUtilTests: XCTestCase {
         TestUtils.validateElementPresent(withName: "var1", andValue: "val1", inDictionary: bodyFromRequest)
         TestUtils.validateElementPresent(withName: "var2", andValue: "val2", inDictionary: bodyFromRequest)
     }
-
-    func testEncodeUrlQueryParam() {
-        let encoded = IterableRequestUtil.encodeURLParam("[email protected]")
-        XCTAssertEqual(encoded!, "you%[email protected]")
-        XCTAssertEqual(IterableRequestUtil.encodeURLParam(""), "")
-        XCTAssertNil(IterableRequestUtil.encodeURLParam(nil))
-    }
 }

swift-sdk/Internal/IterableRequestUtil.swift

@@ -45,19 +45,13 @@ struct IterableRequestUtil {
         }
 
         if let args = args {
-            components.queryItems = args.map{ URLQueryItem(name: $0.key, value: encodeURLParam($0.value)) }
+            components.queryItems = args.map { URLQueryItem(name: $0.key, value: $0.value) }
         }
+        components.percentEncodedQuery = components.percentEncodedQuery?.replacingOccurrences(of: "+", with: "%2B")
 
         return components
     }
 
-    static func encodeURLParam(_ paramValue: String?) -> String? {
-        guard let paramValue = paramValue else {
-            return nil
-        }
-        return paramValue.addingPercentEncoding(withAllowedCharacters: encodedCharacterSet)
-    }
-    
     static func dictToJsonData(_ dict: [AnyHashable : Any]?) -> Data? {
         guard let dict = dict else {
             return nil
@@ -81,10 +75,4 @@ struct IterableRequestUtil {
         result.append(path2)
         return result
     }
-
-    private static let encodedCharacterSet : CharacterSet = {
-        var characterSet = CharacterSet.urlQueryAllowed
-        characterSet.remove(charactersIn: "+")
-        return characterSet
-    } ()
 }