Merge pull request #107 from pusher/Noobish1-feature/urlrequest-foundation-types

Noobish1 feature/urlrequest foundation types

Author: hamchapman

Source/PusherClientOptions.swift

@@ -19,7 +19,7 @@ public enum PusherHost {
 }
 
 @objc public protocol AuthRequestBuilderProtocol {
-    func requestFor(socketID: String, channel: PusherChannel) -> NSMutableURLRequest?
+    func requestFor(socketID: String, channel: PusherChannel) -> URLRequest?
 }
 
 public enum AuthMethod {

Source/PusherConnection.swift

@@ -524,7 +524,7 @@ open class PusherConnection: NSObject {
 
                     case .authRequestBuilder(authRequestBuilder: let builder):
                         if let request = builder.requestFor(socketID: socketID, channel: channel) {
-                            sendAuthorisationRequest(request: request as URLRequest, channel: channel, callback: callback)
+                            sendAuthorisationRequest(request: request, channel: channel, callback: callback)
 
                             return true
                         } else {
@@ -613,7 +613,7 @@ open class PusherConnection: NSObject {
         - parameter socketID: The socketId of the connection's websocket
         - parameter channel:  The PusherChannel to authenticate subsciption for
 
-        - returns: NSURLRequest object to be used by the function making the auth request
+        - returns: URLRequest object to be used by the function making the auth request
     */
     fileprivate func requestForAuthValue(from endpoint: String, socketID: String, channel: PusherChannel) -> URLRequest {
         var request = URLRequest(url: URL(string: endpoint)!)

Source/PusherSwift.swift

@@ -101,7 +101,7 @@ let CLIENT_NAME = "pusher-websocket-swift"
         channelName: String,
         onMemberAdded: ((PusherPresenceChannelMember) -> ())? = nil,
         onMemberRemoved: ((PusherPresenceChannelMember) -> ())? = nil) -> PusherPresenceChannel {
-        return self.connection.subscribeToPresenceChannel(channelName: channelName, onMemberAdded: onMemberAdded, onMemberRemoved: onMemberRemoved)
+            return self.connection.subscribeToPresenceChannel(channelName: channelName, onMemberAdded: onMemberAdded, onMemberRemoved: onMemberRemoved)
     }
 
     /**

Tests/AuthenticationTests.swift

@@ -111,8 +111,8 @@ class AuthenticationTests: XCTestCase {
     func testAuthorizationUsingSomethingConformingToTheAuthRequestBuilderProtocol() {
 
         class AuthRequestBuilder: AuthRequestBuilderProtocol {
-            func requestFor(socketID: String, channel: PusherChannel) -> NSMutableURLRequest? {
-                let request = NSMutableURLRequest(url: URL(string: "http://localhost:9292/builder")!)
+            func requestFor(socketID: String, channel: PusherChannel) -> URLRequest? {
+                var request = URLRequest(url: URL(string: "http://localhost:9292/builder")!)
                 request.httpMethod = "POST"
                 request.httpBody = "socket_id=\(socketID)&channel_name=\(channel.name)".data(using: String.Encoding.utf8)
                 request.addValue("myToken", forHTTPHeaderField: "Authorization")

iOS Example Obj-C/iOS Example Obj-C/ViewController.m

@@ -8,6 +8,25 @@
 
 #import "ViewController.h"
 
+@interface AuthRequestBuilder : NSObject <AuthRequestBuilderProtocol>
+
+- (NSMutableURLRequest*)requestForSocketID:(NSString *)socketID channel:(PusherChannel *)channel;
+
+@end
+
+@implementation AuthRequestBuilder
+
+- (NSMutableURLRequest*)requestForSocketID:(NSString *)socketID channel:(PusherChannel *)channel {
+    NSMutableURLRequest *request = [[NSMutableURLRequest alloc] initWithURL: [[NSURL alloc] initWithString:@"http://localhost:9292/pusher/auth"]];
+    NSString *dataStr = [NSString stringWithFormat: @"socket_id=%@&channel_name=%@", socketID, [channel name]];
+    NSData *data = [dataStr dataUsingEncoding:NSUTF8StringEncoding];
+    request.HTTPBody = data;
+    request.HTTPMethod = @"POST";
+    return request;
+}
+
+@end
+
 @interface ViewController ()
 
 @end
@@ -20,6 +39,10 @@ - (void)viewDidLoad {
     OCAuthMethod *authMethod = [[OCAuthMethod alloc] initWithSecret:@"YOUR_APP_SECRET"];
     PusherClientOptions *options = [[PusherClientOptions alloc] initWithAuthMethod:authMethod];
 
+    // Use this if you want to try out your auth Endpoint
+//    OCAuthMethod *endpointAuthMethod = [[OCAuthMethod alloc] initWithAuthRequestBuilder:[[AuthRequestBuilder alloc] init]];
+//    PusherClientOptions *optionsWithEndpoint = [[PusherClientOptions alloc] initWithAuthMethod:endpointAuthMethod];
+
     self.client = [[Pusher alloc] initWithAppKey:@"YOUR_APP_KEY" options:options];
     self.client.connection.delegate = self;
 
@@ -88,3 +111,4 @@ - (void)didReceiveMemoryWarning {
 }
 
 @end
+

iOS Example Swift/iOS Example Swift/ViewController.swift

@@ -25,8 +25,14 @@ class ViewController: UIViewController, PusherDelegate {
 
         // Only use your secret here for testing or if you're sure that there's
         // no security risk
-        let pusherClientOptions = PusherClientOptions(authMethod: .inline(secret: "daef58559fdd0aba8b63"))
-        pusher = Pusher(key: "568d5a3851502158a022", options: pusherClientOptions)
+        let pusherClientOptions = PusherClientOptions(authMethod: .inline(secret: "YOUR_APP_SECRET"))
+        pusher = Pusher(key: "YOUR_APP_KEY", options: pusherClientOptions)
+
+        // Use this if you want to try out your auth endpoint
+//        let optionsWithEndpoint = PusherClientOptions(
+//            authMethod: AuthMethod.authRequestBuilder(authRequestBuilder: AuthRequestBuilder())
+//        )
+//        pusher = Pusher(key: "YOUR_APP_KEY", options: optionsWithEndpoint)
 
         pusher.delegate = self
 
@@ -77,3 +83,11 @@ class ViewController: UIViewController, PusherDelegate {
     }
 }
 
+class AuthRequestBuilder: AuthRequestBuilderProtocol {
+    func requestFor(socketID: String, channel: PusherChannel) -> URLRequest? {
+        var request = URLRequest(url: URL(string: "http://localhost:9292/pusher/auth")!)
+        request.httpMethod = "POST"
+        request.httpBody = "socket_id=\(socketID)&channel_name=\(channel.name)".data(using: String.Encoding.utf8)
+        return request
+    }
+}