Url encoding

.travis.yml

@@ -1,10 +1,10 @@
 language: objective-c
 matrix:
   include:
-    - osx_image: xcode10.2
+    - osx_image: xcode11.4
 install:
   - gem install jazzy
-  - gem install slather -v 2.4.5
+  - gem install slather -v 2.4.7
 before_script:
   - rm -rf ~/Library/Developer/Xcode/DerivedData
 script:

IBMCloudAppIDTests/UtilsTests.swift

@@ -72,6 +72,15 @@ class UtilsTest: XCTestCase {
 //        XCTAssertEqual(dictionary[AppIDConstants.JSON_APPLICATION_VERSION_KEY] as? String, appIdentity.version)
 //        XCTAssertEqual(dictionary[AppIDConstants.JSON_ENVIRONMENT_KEY] as? String, AppIDConstants.JSON_IOS_ENVIRONMENT_VALUE)
 //    }
+
+    func testURLEncoding() {
+        let strToEncode = "[email protected]"
+        let exceptedStr = "test%2Btest%40test.com"
+
+        let resultStr = Utils.urlEncode(strToEncode)
+        XCTAssertEqual(resultStr, exceptedStr, "Could not url Encoded")
+    }
+
     func testDecodeBase64WithString() {
         let str = "VGhpcyBpcyBhIFV0aWxzIHVuaXRUZXN0IHR+c/Q="
         let strSafe = "VGhpcyBpcyBhIFV0aWxzIHVuaXRUZXN0IHR-c_Q="

Podfile

@@ -3,7 +3,7 @@ use_frameworks!
 def shared_pods
 	platform :ios, '10.0'
 	pod 'BMSCore', '~> 2.4.0'
-	pod 'JOSESwift', '~> 1.8.0'
+	pod 'JOSESwift', '~> 2.1.0'
 end
 
 target 'IBMCloudAppID' do

Source/IBMCloudAppID/internal/RegistrationManager.swift

@@ -76,7 +76,7 @@ internal class RegistrationManager {
 
         let request:Request = Request(url: Config.getServerUrl(appId: self.appId) + "/clients",method: HttpMethod.POST, headers: [Request.contentType : "application/json"], queryParameters: nil, timeout: 0)
         request.timeout = BMSClient.sharedInstance.requestTimeout
-        let registrationParamsAsData = try? Utils.urlEncode(Utils.JSONStringify(registrationParams as AnyObject)).data(using: .utf8) ?? Data()
+        let registrationParamsAsData = try? Utils.JSONStringify(registrationParams as AnyObject).data(using: .utf8) ?? Data()
         sendRequest(request: request, registrationParamsAsData: registrationParamsAsData, internalCallBack: internalCallBack)
 
     }

Source/IBMCloudAppID/internal/Utils.swift

@@ -226,10 +226,10 @@ public class Utils {
     internal static func urlEncode(_ str:String) -> String{
         var encodedString = ""
         var unchangedCharacters = ""
-        let FORM_ENCODE_SET = " \"':;<=>@[]^`{}|/\\?#&!$(),~%"
+        let FORM_ENCODE_SET = " \"':;<=>@[]^`{}|/\\?#&!$(),~%+".unicodeScalars
 
         for element: Int in 0x20..<0x7f {
-            if !FORM_ENCODE_SET.contains(String(describing: UnicodeScalar(element))) {
+            if !FORM_ENCODE_SET.contains(UnicodeScalar(element)!) {
                 unchangedCharacters += String(Character(UnicodeScalar(element)!))
             }
         }