Added model to represent auth channel, it provides way to pass auth token

while subscribing to channel

Author: sacOO7

Sources/ScClient/Models/Event.swift

@@ -21,7 +21,6 @@ class ReceiveEvent : HandyJSON {
     var data : AnyObject?
     var error : AnyObject?
     var rid : Int!
-
 
     convenience init(data : AnyObject? , error : AnyObject?, rid : Int) {
         self.init()
@@ -38,8 +37,6 @@ class Channel : HandyJSON{
     var channel : String!
     var data : AnyObject?
 
-    
-    
     init(channel : String, data : AnyObject?) {
         self.channel = channel
         self.data = data
@@ -49,6 +46,30 @@ class Channel : HandyJSON{
     }
 }
 
+class AuthChannel : HandyJSON{
+    var channel : String!
+    var data : ChannelData?
+    
+    init(channel : String, token: String?) {
+        self.channel = channel
+        self.data = ChannelData(jwt: token)
+    }
+    
+    required init() {
+    }
+}
+
+class ChannelData: HandyJSON {
+    var jwt: String?
+    
+    init(jwt: String?) {
+        self.jwt = jwt
+    }
+    
+    required init() {
+    }
+}
+
 class AuthData : HandyJSON{
     var authToken : String?
 
@@ -101,6 +122,10 @@ class Model  {
         return EmitEvent(event: "#subscribe", data: Channel(channel: channelName, data :nil) as AnyObject, cid: messageId)
     }
 
+    public static func getSubscribeEventObject(channelName : String, messageId : Int, token: String? = nil) -> EmitEvent{
+        return EmitEvent(event: "#subscribe", data: AuthChannel(channel: channelName, token: token) as AnyObject, cid: messageId)
+    }
+    
     public static func getUnsubscribeEventObject(channelName : String, messageId : Int) -> EmitEvent{
         return EmitEvent(event: "#unsubscribe", data: Channel(channel: channelName, data :nil) as AnyObject, cid: messageId)
     }

Sources/ScClient/client.swift

@@ -39,7 +39,6 @@ public class ScClient : Listener, WebSocketDelegate {
     }
 
     public func websocketDidReceiveMessage(socket: WebSocketClient, text: String) {
-        print("got some text: \(text)")
         if (text == "#1") {
             socket.write(string: "#2")
         } else {
@@ -144,14 +143,14 @@ public class ScClient : Listener, WebSocketDelegate {
         self.socket.write(string : emitObject.toJSONString()!)
     }
 
-    public func subscribe(channelName : String) {
-        let subscribeObject = Model.getSubscribeEventObject(channelName: channelName, messageId: counter.incrementAndGet())
+    public func subscribe(channelName : String, token : String? = nil) {
+        let subscribeObject = Model.getSubscribeEventObject(channelName: channelName, messageId: counter.incrementAndGet(), token : token)
         self.socket.write(string : subscribeObject.toJSONString()!)
     }
 
-    public func subscribeAck(channelName : String, ack : @escaping (String, AnyObject?, AnyObject?)-> Void) {
+    public func subscribeAck(channelName : String, token : String? = nil, ack : @escaping (String, AnyObject?, AnyObject?)-> Void) {
         let id = counter.incrementAndGet()
-        let subscribeObject = Model.getSubscribeEventObject(channelName: channelName, messageId: id)
+        let subscribeObject = Model.getSubscribeEventObject(channelName: channelName, messageId: id, token : token)
         putEmitAck(id: id, eventName: channelName, ack: ack)
         self.socket.write(string : subscribeObject.toJSONString()!)
     }