Skip to content
This repository was archived by the owner on Jun 13, 2023. It is now read-only.

Adds optional client key as part of connect message #136

Merged
merged 1 commit into from
Dec 4, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Sources/ParseLiveQuery/Internal/ClientPrivate.swift
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ extension Client: WebSocketDelegate {

public func websocketDidConnect(socket: WebSocket) {
let sessionToken = PFUser.current()?.sessionToken ?? ""
_ = self.sendOperationAsync(.connect(applicationId: applicationId, sessionToken: sessionToken))
_ = self.sendOperationAsync(.connect(applicationId: applicationId, sessionToken: sessionToken, clientKey: clientKey))
}

public func websocketDidDisconnect(socket: WebSocket, error: NSError?) {
Expand Down
10 changes: 7 additions & 3 deletions Sources/ParseLiveQuery/Internal/Operation.swift
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,19 @@ import Foundation
import Parse

enum ClientOperation {
case connect(applicationId: String, sessionToken: String)
case connect(applicationId: String, sessionToken: String, clientKey: String?)
case subscribe(requestId: Client.RequestId, query: PFQuery<PFObject>, sessionToken: String?)
case update(requestId: Client.RequestId, query: PFQuery<PFObject>)
case unsubscribe(requestId: Client.RequestId)

var JSONObjectRepresentation: [String : Any] {
switch self {
case .connect(let applicationId, let sessionToken):
return [ "op": "connect", "applicationId": applicationId, "sessionToken": sessionToken ]
case .connect(let applicationId, let sessionToken, let clientKey):
var message: [String: Any] = [ "op": "connect", "applicationId": applicationId, "sessionToken": sessionToken ]
if let clientKey = clientKey {
message.updateValue(clientKey, forKey: "clientKey")
}
return message

case .subscribe(let requestId, let query, let sessionToken):
var result: [String: Any] = [ "op": "subscribe", "requestId": requestId.value, "query": Dictionary<String, AnyObject>(query: query) ]
Expand Down