adjust cookie implementation

Author: pkyeck

SocketIO.h

@@ -71,6 +71,8 @@ typedef enum {
     BOOL _isConnecting;
     BOOL _useSecure;
 
+    NSArray *_cookies;
+
     NSURLConnection *_handshake;
 
     // heartbeat
@@ -95,19 +97,16 @@ typedef enum {
 @property (nonatomic, readonly) NSString *sid;
 @property (nonatomic, readonly) NSTimeInterval heartbeatTimeout;
 @property (nonatomic) BOOL useSecure;
+@property (nonatomic) NSArray *cookies;
 @property (nonatomic, readonly) BOOL isConnected, isConnecting;
 @property (nonatomic, weak) id<SocketIODelegate> delegate;
 @property (nonatomic) BOOL returnAllDataFromAck;
 
 - (id) initWithDelegate:(id<SocketIODelegate>)delegate;
 - (void) connectToHost:(NSString *)host onPort:(NSInteger)port;
 - (void) connectToHost:(NSString *)host onPort:(NSInteger)port withParams:(NSDictionary *)params;
-- (void) connectToHost:(NSString *)host onPort:(NSInteger)port withParams:(NSDictionary *)params withCookieParams:(NSDictionary *)cookieParams;
 - (void) connectToHost:(NSString *)host onPort:(NSInteger)port withParams:(NSDictionary *)params withNamespace:(NSString *)endpoint;
-- (void) connectToHost:(NSString *)host onPort:(NSInteger)port withParams:(NSDictionary *)params withCookieParams:(NSDictionary *)cookieParams withNamespace:(NSString *)endpoint;
 - (void) connectToHost:(NSString *)host onPort:(NSInteger)port withParams:(NSDictionary *)params withNamespace:(NSString *)endpoint withConnectionTimeout: (NSTimeInterval) connectionTimeout;
-- (void) connectToHost:(NSString *)host onPort:(NSInteger)port withParams:(NSDictionary *)params withCookieParams:(NSDictionary *)cookieParams withNamespace:(NSString *)endpoint withConnectionTimeout: (NSTimeInterval) connectionTimeout;
-
 
 - (void) disconnect;
 - (void) disconnectForced;

SocketIO.m

@@ -79,6 +79,7 @@ @implementation SocketIO
 @synthesize isConnected = _isConnected, 
             isConnecting = _isConnecting, 
             useSecure = _useSecure, 
+            cookies = _cookies,
             delegate = _delegate,
             heartbeatTimeout = _heartbeatTimeout,
             returnAllDataFromAck = _returnAllDataFromAck;
@@ -106,11 +107,6 @@ - (void) connectToHost:(NSString *)host onPort:(NSInteger)port withParams:(NSDic
     [self connectToHost:host onPort:port withParams:params withNamespace:@"" withConnectionTimeout:defaultConnectionTimeout];
 }
 
-- (void) connectToHost:(NSString *)host onPort:(NSInteger)port withParams:(NSDictionary *)params withCookieParams:(NSDictionary *)cookieParams
-{
-    [self connectToHost:host onPort:port withParams:params withCookieParams:cookieParams withNamespace:@"" withConnectionTimeout:defaultConnectionTimeout];
-}
-
 - (void) connectToHost:(NSString *)host
                 onPort:(NSInteger)port
             withParams:(NSDictionary *)params
@@ -122,25 +118,6 @@ - (void) connectToHost:(NSString *)host
 - (void) connectToHost:(NSString *)host
                 onPort:(NSInteger)port
             withParams:(NSDictionary *)params
-      withCookieParams:(NSDictionary *)cookieParams
-         withNamespace:(NSString *)endpoint
-{
-    [self connectToHost:host onPort:port withParams:params withCookieParams:cookieParams withNamespace:endpoint withConnectionTimeout:defaultConnectionTimeout];
-}
-
-- (void) connectToHost:(NSString *)host
-                onPort:(NSInteger)port
-            withParams:(NSDictionary *)params
-         withNamespace:(NSString *)endpoint
- withConnectionTimeout:(NSTimeInterval)connectionTimeout
-{
-    [self connectToHost:host onPort:port withParams:params withCookieParams:nil withNamespace:endpoint withConnectionTimeout:defaultConnectionTimeout];
-}
-
-- (void) connectToHost:(NSString *)host
-                onPort:(NSInteger)port
-            withParams:(NSDictionary *)params
-      withCookieParams:(NSDictionary *)cookieParams
          withNamespace:(NSString *)endpoint
  withConnectionTimeout:(NSTimeInterval)connectionTimeout
 {
@@ -172,10 +149,9 @@ - (void) connectToHost:(NSString *)host
                                                  cachePolicy:NSURLRequestReloadIgnoringLocalAndRemoteCacheData 
                                              timeoutInterval:connectionTimeout];
 
-        if (cookieParams) {
-            NSHTTPCookie *cookie = [NSHTTPCookie cookieWithProperties:cookieParams];
-            NSArray* cookieArray = [NSArray arrayWithObjects: cookie, nil];
-            NSDictionary * headers = [NSHTTPCookie requestHeaderFieldsWithCookies:cookieArray];
+        if (_cookies != nil) {
+            DEBUGLOG(@"Adding cookie(s): %@", [_cookies description]);
+            NSDictionary *headers = [NSHTTPCookie requestHeaderFieldsWithCookies:_cookies];
             [request setAllHTTPHeaderFields:headers];
         }