Skip to content

Commit 70bb25e

Browse files
committed
Updates to readme (and Obj-C example) for auth request builder updates
1 parent dc704c2 commit 70bb25e

File tree

2 files changed

+34
-11
lines changed

2 files changed

+34
-11
lines changed

README.md

Lines changed: 17 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -130,6 +130,9 @@ This is the `AuthRequestBuilderProtocol` definition:
130130

131131
```swift
132132
public protocol AuthRequestBuilderProtocol {
133+
func requestFor(socketID: String, channelName: String) -> URLRequest?
134+
135+
// DEPRECATED
133136
func requestFor(socketID: String, channel: PusherChannel) -> NSMutableURLRequest?
134137
}
135138
```
@@ -215,8 +218,8 @@ Authenticated channel example:
215218
#### Swift
216219
```swift
217220
class AuthRequestBuilder: AuthRequestBuilderProtocol {
218-
func requestFor(socketID: String, channel: PusherChannel) -> NSMutableURLRequest? {
219-
let request = NSMutableURLRequest(url: URL(string: "http://localhost:9292/builder")!)
221+
func requestFor(socketID: String, channelName: String) -> URLRequest? {
222+
var request = URLRequest(url: URL(string: "http://localhost:9292/builder")!)
220223
request.httpMethod = "POST"
221224
request.httpBody = "socket_id=\(socketID)&channel_name=\(channel.name)".data(using: String.Encoding.utf8)
222225
request.addValue("myToken", forHTTPHeaderField: "Authorization")
@@ -237,19 +240,24 @@ let pusher = Pusher(
237240
```objc
238241
@interface AuthRequestBuilder : NSObject <AuthRequestBuilderProtocol>
239242

240-
- (NSMutableURLRequest*)requestForSocketID:(NSString *)socketID channel:(PusherChannel *)channel;
243+
- (NSURLRequest *)requestForSocketID:(NSString *)socketID channelName:(NSString *)channelName;
241244

242245
@end
243246

244247
@implementation AuthRequestBuilder
245248

246-
- (NSMutableURLRequest*)requestForSocketID:(NSString *)socketID channel:(PusherChannel *)channel {
247-
NSMutableURLRequest *request = [[NSMutableURLRequest alloc] initWithURL: [[NSURL alloc] initWithString:@"http://localhost:9292/builder"]];
248-
NSString *dataStr = [NSString stringWithFormat: @"socket_id=%@&channel_name=%@", socketID, [channel name]];
249+
- (NSURLRequest *)requestForSocketID:(NSString *)socketID channelName:(NSString *)channelName {
250+
NSURLRequest *request = [[NSURLRequest alloc] initWithURL:[[NSURL alloc] initWithString:@"http://localhost:9292/pusher/auth"]];
251+
NSMutableURLRequest *mutableRequest = [[NSMutableURLRequest alloc] initWithURL: [[NSURL alloc] initWithString:@"http://localhost:9292/pusher/auth"]];
252+
253+
NSString *dataStr = [NSString stringWithFormat: @"socket_id=%@&channel_name=%@", socketID, channelName];
249254
NSData *data = [dataStr dataUsingEncoding:NSUTF8StringEncoding];
250-
request.HTTPBody = data;
251-
request.HTTPMethod = @"POST";
252-
[request addValue:@"myToken" forHTTPHeaderField:@"Authorization"];
255+
mutableRequest.HTTPBody = data;
256+
mutableRequest.HTTPMethod = @"POST";
257+
[mutableRequest addValue:@"myToken" forHTTPHeaderField:@"Authorization"];
258+
259+
request = [mutableRequest copy];
260+
253261
return request;
254262
}
255263

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

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,14 @@
1010

1111
@interface AuthRequestBuilder : NSObject <AuthRequestBuilderProtocol>
1212

13-
- (NSMutableURLRequest*)requestForSocketID:(NSString *)socketID channel:(PusherChannel *)channel;
13+
- (NSMutableURLRequest *)requestForSocketID:(NSString *)socketID channel:(PusherChannel *)channel;
14+
- (NSURLRequest *)requestForSocketID:(NSString *)socketID channelName:(NSString *)channelName;
1415

1516
@end
1617

1718
@implementation AuthRequestBuilder
1819

19-
- (NSMutableURLRequest*)requestForSocketID:(NSString *)socketID channel:(PusherChannel *)channel {
20+
- (NSMutableURLRequest *)requestForSocketID:(NSString *)socketID channel:(PusherChannel *)channel {
2021
NSMutableURLRequest *request = [[NSMutableURLRequest alloc] initWithURL: [[NSURL alloc] initWithString:@"http://localhost:9292/pusher/auth"]];
2122
NSString *dataStr = [NSString stringWithFormat: @"socket_id=%@&channel_name=%@", socketID, [channel name]];
2223
NSData *data = [dataStr dataUsingEncoding:NSUTF8StringEncoding];
@@ -25,6 +26,20 @@ - (NSMutableURLRequest*)requestForSocketID:(NSString *)socketID channel:(PusherC
2526
return request;
2627
}
2728

29+
- (NSURLRequest *)requestForSocketID:(NSString *)socketID channelName:(NSString *)channelName {
30+
NSURLRequest *request = [[NSURLRequest alloc] initWithURL:[[NSURL alloc] initWithString:@"http://localhost:9292/pusher/auth"]];
31+
NSMutableURLRequest *mutableRequest = [[NSMutableURLRequest alloc] initWithURL: [[NSURL alloc] initWithString:@"http://localhost:9292/pusher/auth"]];
32+
33+
NSString *dataStr = [NSString stringWithFormat: @"socket_id=%@&channel_name=%@", socketID, channelName];
34+
NSData *data = [dataStr dataUsingEncoding:NSUTF8StringEncoding];
35+
mutableRequest.HTTPBody = data;
36+
mutableRequest.HTTPMethod = @"POST";
37+
38+
request = [mutableRequest copy];
39+
40+
return request;
41+
}
42+
2843
@end
2944

3045
@interface ViewController ()

0 commit comments

Comments
 (0)