Merge pull request #165 from pusher/escaping-authorizer-completion-handler

Escaping authorizer completion handler

Author: hamchapman

PusherSwift/PusherSwift.xcodeproj/project.pbxproj

@@ -138,9 +138,9 @@
 				3389F5751CAEDE2800563F49 /* PusherGlobalChannel.swift */,
 				3389F5711CAEDDF300563F49 /* PusherChannels.swift */,
 				3341A3391D819FBC007191AD /* NativePusher.swift */,
-				33C1FD6E1D81BFC300921AD7 /* ObjectiveC.swift */,
 				3390D1E51F054D0400E1944D /* AuthRequestBuilderProtocol.swift */,
 				3390D1E71F054D1E00E1944D /* Authorizer.swift */,
+				33C1FD6E1D81BFC300921AD7 /* ObjectiveC.swift */,
 				33C0D2E71CB5C54C003FE13E /* Dependencies */,
 				33831CD61A9CFFF200B124F1 /* PusherSwift.h */,
 				33831C8C1A9CF61600B124F1 /* Supporting Files */,

Sources/AuthRequestBuilderProtocol.swift

@@ -1,8 +1,8 @@
 import Foundation
 
 @objc public protocol AuthRequestBuilderProtocol {
+    @objc optional func requestFor(socketID: String, channelName: String) -> URLRequest?
+
     @available(*, deprecated: 4.0.2, message: "use requestFor(socketID: String, channelName: String) -> URLRequest? instead")
     @objc optional func requestFor(socketID: String, channel: PusherChannel) -> NSMutableURLRequest?
-
-    @objc optional func requestFor(socketID: String, channelName: String) -> URLRequest?
 }

Sources/Authorizer.swift

@@ -1,5 +1,5 @@
 import Foundation
 
 @objc public protocol Authorizer {
-    @objc func fetchAuthValue(socketID: String, channelName: String, completionHandler: (PusherAuth?) -> ())
+    @objc func fetchAuthValue(socketID: String, channelName: String, completionHandler: @escaping (PusherAuth?) -> ())
 }

Sources/PusherConnection.swift

@@ -613,7 +613,7 @@ public typealias PusherEventJSON = [String: AnyObject]
                         return
                     }
 
-                    handleAuthInfo(authString: authInfo.auth, channelData: authInfo.channelData, channel: channel)
+                    self.handleAuthInfo(authString: authInfo.auth, channelData: authInfo.channelData, channel: channel)
                 }
 
                 return true

Tests/AuthenticationTests.swift

@@ -250,7 +250,7 @@ class AuthenticationTests: XCTestCase {
     func testAuthorizationUsingSomethingConformingToTheAuthorizerProtocol() {
 
         class SomeAuthorizer: Authorizer {
-            func fetchAuthValue(socketID: String, channelName: String, completionHandler: (PusherAuth?) -> ()) {
+            func fetchAuthValue(socketID: String, channelName: String, completionHandler: @escaping (PusherAuth?) -> ()) {
                 completionHandler(PusherAuth(auth: "testKey123:authorizerblah123"))
             }
         }
@@ -280,7 +280,7 @@ class AuthenticationTests: XCTestCase {
     func testAuthorizationOfPresenceChannelSubscriptionUsingSomethingConformingToTheAuthorizerProtocol() {
 
         class SomeAuthorizer: Authorizer {
-            func fetchAuthValue(socketID: String, channelName: String, completionHandler: (PusherAuth?) -> ()) {
+            func fetchAuthValue(socketID: String, channelName: String, completionHandler: @escaping (PusherAuth?) -> ()) {
                 completionHandler(PusherAuth(
                     auth: "testKey123:authorizerblah1234",
                     channelData: "{\"user_id\":\"777\", \"user_info\":{\"twitter\":\"hamchapman\"}}"