Merge pull request #129 from pusher/manual-auth

Manual auth

Author: hamchapman

Source/ObjectiveC.swift

@@ -11,8 +11,22 @@ public extension Pusher {
         return self.subscribe(channelName, onMemberAdded: nil, onMemberRemoved: nil)
     }
 
+    @objc public func subscribe(
+        channelName: String,
+        onMemberAdded: ((PusherPresenceChannelMember) -> ())? = nil,
+        onMemberRemoved: ((PusherPresenceChannelMember) -> ())? = nil) -> PusherChannel {
+            return self.subscribe(channelName, auth: nil, onMemberAdded: onMemberAdded, onMemberRemoved: onMemberRemoved)
+    }
+
     @objc public func subscribeToPresenceChannel(channelName: String) -> PusherPresenceChannel {
-        return self.subscribeToPresenceChannel(channelName: channelName, onMemberAdded: nil, onMemberRemoved: nil)
+        return self.subscribeToPresenceChannel(channelName: channelName, auth: nil, onMemberAdded: nil, onMemberRemoved: nil)
+    }
+
+    @objc public func subscribeToPresenceChannel(
+        channelName: String,
+        onMemberAdded: ((PusherPresenceChannelMember) -> ())? = nil,
+        onMemberRemoved: ((PusherPresenceChannelMember) -> ())? = nil) -> PusherPresenceChannel {
+            return self.subscribeToPresenceChannel(channelName: channelName, auth: nil, onMemberAdded: onMemberAdded, onMemberRemoved: onMemberRemoved)
     }
 
     @objc public convenience init(withAppKey key: String, options: PusherClientOptions) {

Source/PusherChannel.swift

@@ -10,11 +10,11 @@ public enum PusherChannelType {
     case `private`
     case presence
     case normal
-    
+
     public init(name: String) {
         self = type(of: self).type(forName: name)
     }
-    
+
     public static func type(forName name: String) -> PusherChannelType {
         if (name.components(separatedBy: "-")[0] == "presence") {
             return .presence
@@ -24,7 +24,7 @@ public enum PusherChannelType {
             return .normal
         }
     }
-    
+
     public static func isPresenceChannel(name: String) -> Bool {
         return PusherChannelType(name: name) == .presence
     }
@@ -37,18 +37,22 @@ open class PusherChannel: NSObject {
     open weak var connection: PusherConnection?
     open var unsentEvents = [PusherEvent]()
     open let type: PusherChannelType
+    public var auth: PusherAuth?
 
     /**
         Initializes a new PusherChannel with a given name and conenction
 
         - parameter name:       The name of the channel
         - parameter connection: The connection that this channel is relevant to
+        - parameter auth:       A PusherAuth value if subscription is being made to an
+                                authenticated channel without using the default auth methods
 
         - returns: A new PusherChannel instance
     */
-    public init(name: String, connection: PusherConnection) {
+    public init(name: String, connection: PusherConnection, auth: PusherAuth? = nil) {
         self.name = name
         self.connection = connection
+        self.auth = auth
         self.type = PusherChannelType(name: name)
     }
 

Source/PusherChannels.swift

@@ -15,6 +15,8 @@ open class PusherChannels: NSObject {
 
         - parameter name:            The name of the channel to create
         - parameter connection:      The connection associated with the channel being created
+        - parameter auth:            A PusherAuth value if subscription is being made to an
+                                     authenticated channel without using the default auth methods
         - parameter onMemberAdded:   A function that will be called with information about the
                                      member who has just joined the presence channel
         - parameter onMemberRemoved: A function that will be called with information about the
@@ -25,6 +27,7 @@ open class PusherChannels: NSObject {
     internal func add(
         name: String,
         connection: PusherConnection,
+        auth: PusherAuth? = nil,
         onMemberAdded: ((PusherPresenceChannelMember) -> ())? = nil,
         onMemberRemoved: ((PusherPresenceChannelMember) -> ())? = nil) -> PusherChannel {
             if let channel = self.channels[name] {
@@ -35,11 +38,12 @@ open class PusherChannels: NSObject {
                     newChannel = PusherPresenceChannel(
                         name: name,
                         connection: connection,
+                        auth: auth,
                         onMemberAdded: onMemberAdded,
                         onMemberRemoved: onMemberRemoved
                     )
                 } else {
-                    newChannel = PusherChannel(name: name, connection: connection)
+                    newChannel = PusherChannel(name: name, connection: connection, auth: auth)
                 }
                 self.channels[name] = newChannel
                 return newChannel
@@ -52,6 +56,8 @@ open class PusherChannels: NSObject {
 
         - parameter channelName:     The name of the channel to create
         - parameter connection:      The connection associated with the channel being created
+        - parameter auth:            A PusherAuth value if subscription is being made to an
+                                     authenticated channel without using the default auth methods
         - parameter onMemberAdded:   A function that will be called with information about the
                                      member who has just joined the presence channel
         - parameter onMemberRemoved: A function that will be called with information about the
@@ -62,6 +68,7 @@ open class PusherChannels: NSObject {
     internal func addPresence(
         channelName: String,
         connection: PusherConnection,
+        auth: PusherAuth? = nil,
         onMemberAdded: ((PusherPresenceChannelMember) -> ())? = nil,
         onMemberRemoved: ((PusherPresenceChannelMember) -> ())? = nil) -> PusherPresenceChannel {
         if let channel = self.channels[channelName] as? PusherPresenceChannel {
@@ -70,6 +77,7 @@ open class PusherChannels: NSObject {
             let newChannel = PusherPresenceChannel(
                 name: channelName,
                 connection: connection,
+                auth: auth,
                 onMemberAdded: onMemberAdded,
                 onMemberRemoved: onMemberRemoved
             )