Swift 3 conformance.

Author: agordeev

Sources/ParseLiveQuery/Client.swift

@@ -152,7 +152,7 @@ extension Client {
 
         if socket?.readyState == .OPEN {
             _ = sendOperationAsync(.subscribe(requestId: subscriptionRecord.requestId, query: query as! PFQuery<PFObject>,
-            sessionToken: PFUser.currentUser()?.sessionToken))
+            sessionToken: PFUser.current()?.sessionToken))
         } else if socket == nil || socket?.readyState != .CONNECTING {
             if !userDisconnected {
                 reconnect()

Sources/ParseLiveQuery/Internal/ClientPrivate.swift

@@ -138,8 +138,8 @@ extension Client: SRWebSocketDelegate {
     }
 
     public func webSocketDidOpen(_ webSocket: SRWebSocket!) {
-        // TODO: Add support for session token and user authetication.
-        _ = self.sendOperationAsync(.connect(applicationId: applicationId, sessionToken: PFUser.currentUser()?.sessionToken))
+        let sessionToken = PFUser.current()?.sessionToken ?? ""
+        _ = self.sendOperationAsync(.connect(applicationId: applicationId, sessionToken: sessionToken))
     }
 
     public func webSocket(_ webSocket: SRWebSocket!, didFailWithError error: Error!) {
@@ -227,7 +227,7 @@ extension Client {
 
             switch response {
             case .connected:
-                let sessionToken = PFUser.currentUser()?.sessionToken
+                let sessionToken = PFUser.current()?.sessionToken
                 self.subscriptions.forEach {
                     _ = self.sendOperationAsync(.subscribe(requestId: $0.requestId, query: $0.query, sessionToken: sessionToken))
                 }

Sources/ParseLiveQuery/Internal/Operation.swift

@@ -18,16 +18,15 @@ enum ClientOperation {
     var JSONObjectRepresentation: [String : Any] {
         switch self {
         case .connect(let applicationId, let sessionToken):
-            var result: [String: Any] = [ "op": "connect", "applicationId": applicationId ]
             return [ "op": "connect", "applicationId": applicationId, "sessionToken": sessionToken ]
+
+        case .subscribe(let requestId, let query, let sessionToken):
+            var result: [String: Any] =  [ "op": "subscribe", "requestId": requestId.value, "query": Dictionary<String, AnyObject>(query: query) ]
             if let sessionToken = sessionToken {
                 result["sessionToken"] = sessionToken
             }
             return result
 
-        case .subscribe(let requestId, let query, let sessionToken):
-            return [ "op": "subscribe", "requestId": requestId.value, "query": Dictionary<String, AnyObject>(query: query), "sessionToken": sessionToken ]
-
         case .unsubscribe(let requestId):
             return [ "op": "unsubscribe", "requestId": requestId.value ]
         }