Merge pull request #23 from sacOO7/develop

Library upgrades and SSL pinning methods

Author: sacOO7

Package.resolved

@@ -12,8 +12,8 @@ let package = Package(
     ],
     dependencies: [
         // Dependencies declare other packages that this package depends on.
-        .package(url: "https://github.com/daltoniam/Starscream.git", .exact("3.0.4")),
-        .package(url: "https://github.com/alibaba/HandyJSON.git", .exact("4.1.0")),
+        .package(url: "https://github.com/daltoniam/Starscream.git", .exact("3.0.5")),
+        .package(url: "https://github.com/alibaba/HandyJSON.git", .exact("4.2.0")),
         ],
     targets: [
         .target(

Package.swift

@@ -16,7 +16,7 @@ Pod::Spec.new do |s|
   #
 
   s.name         = "ScClient"
-  s.version      = "1.0.7"
+  s.version      = "1.0.8"
   s.summary      = "A socketcluster client for iOS and OSX."
   s.swift_version = '3.2'
 
@@ -136,6 +136,6 @@ Pod::Spec.new do |s|
     s.requires_arc = true
 
   # s.xcconfig = { "HEADER_SEARCH_PATHS" => "$(SDKROOT)/usr/include/libxml2" }
-  s.dependency "Starscream", "~> 3.0.4"
-  s.dependency "HandyJSON", "~> 4.1.0"
+  s.dependency "Starscream", "~> 3.0.5"
+  s.dependency "HandyJSON", "~> 4.2.0"
 end

ScClient.podspec

@@ -196,5 +196,23 @@ public class ScClient : Listener, WebSocketDelegate {
     public func disableSSLVerification(value : Bool) {
         socket.disableSSLCertValidation = value
     }
+    
+    /**
+    Uses the .cer files in your app's bundle
+    */
+    public func useSSLCertificate() {
+        socket.security = SSLSecurity()
+    }
+    
+    /**
+    You load either a Data blob of your certificate or you can use a SecKeyRef if you have a public key you want to use.
+     - Parameters:
+        - data: Data blob of your certificate.
+        - usePublicKeys: The usePublicKeys bool is whether to use the certificates for validation or the public keys.
+    */
+    public func loadSSLCertificateFromData(data : Data, usePublicKeys : Bool = false) {
+        socket.security = SSLSecurity(certs: [SSLCert(data: data)], usePublicKeys: usePublicKeys)
+    }
+    
 }
 

Sources/ScClient/client.swift

@@ -11,7 +11,7 @@ class MiscellaneousTest: XCTestCase {
 
     func testShouldSerializeData() {
         let emitEvent = Model.getEmitEventObject(eventName: "chat", data: "My Sample Data" as AnyObject, messageId: 2)
-        let expectedData = "{\"cid\":2,\"event\":\"chat\",\"data\":\"My Sample Data\"}"
+        let expectedData = "{\"data\":\"My Sample Data\",\"event\":\"chat\",\"cid\":2}"
         XCTAssertEqual(expectedData, emitEvent.toJSONString())
     }