Merge branch 'kevinresol-master'

Author: joeferraro

RNCookieManagerIOS/RNCookieManagerIOS.m

@@ -29,32 +29,30 @@ @implementation RNCookieManagerIOS
     NSHTTPCookie *cookie = [NSHTTPCookie cookieWithProperties:cookieProperties];
     [[NSHTTPCookieStorage sharedHTTPCookieStorage] setCookie:cookie];
 
-    callback(@[[NSNull null], @"success"]);
+    callback(@[[NSNull null]]);
 }
 
 RCT_EXPORT_METHOD(setFromResponse:(NSURL *)url value:(NSDictionary *)value callback:(RCTResponseSenderBlock)callback) {
   NSArray *cookies = [NSHTTPCookie cookiesWithResponseHeaderFields:value forURL:url];
   [[NSHTTPCookieStorage sharedHTTPCookieStorage] setCookies:cookies forURL:url mainDocumentURL:NULL];
-    callback(@[[NSNull null], @"success"]);
+    callback(@[[NSNull null]]);
 }
 
 
 RCT_EXPORT_METHOD(get:(NSURL *)url callback:(RCTResponseSenderBlock)callback) {
-  NSArray *cookies = [[NSHTTPCookieStorage sharedHTTPCookieStorage] cookiesForURL:url];
-    NSDictionary *headers = [NSHTTPCookie requestHeaderFieldsWithCookies:cookies];
-    if ([headers objectForKey:@"Cookie"] == nil) {
-        callback(@[[NSNull null], @"success"]);
-    } else {
-        callback(@[headers[@"Cookie"], @"success"]);
+    NSMutableDictionary *cookies = [NSMutableDictionary dictionary];
+    for (NSHTTPCookie *c in [[NSHTTPCookieStorage sharedHTTPCookieStorage] cookiesForURL:url]) {
+        [cookies setObject:c.value forKey:c.name];
     }
+    callback(@[[NSNull null], cookies]);
 }
 
 RCT_EXPORT_METHOD(clearAll:(RCTResponseSenderBlock)callback) {
     NSHTTPCookieStorage *cookieStorage = [NSHTTPCookieStorage sharedHTTPCookieStorage];
     for (NSHTTPCookie *c in cookieStorage.cookies) {
         [cookieStorage deleteCookie:c];
     }
-    callback(@[[NSNull null], @"success"]);
+    callback(@[[NSNull null]]);
 }
 
 // TODO: return a better formatted list of cookies per domain
@@ -69,7 +67,7 @@ @implementation RNCookieManagerIOS
         [d setObject:c.path forKey:@"path"];
         [cookies setObject:d forKey:c.name];
     }
-    callback(@[cookies, @"success"]);
+    callback(@[[NSNull null], cookies]);
 }
 
 @end

android/src/main/java/com/psykar/cookiemanager/CookieManagerModule.java

@@ -6,6 +6,8 @@
 import com.facebook.react.bridge.ReactMethod;
 import com.facebook.react.bridge.ReadableMap;
 import com.facebook.react.bridge.Callback;
+import com.facebook.react.bridge.Arguments;
+import com.facebook.react.bridge.WritableMap;
 
 import java.io.IOException;
 import java.net.URISyntaxException;
@@ -41,7 +43,7 @@ public void setFromResponse(String url, String value, final Callback callback) t
         headers.put("Set-cookie", Collections.singletonList(value));
         URI uri = new URI(url);
         this.cookieHandler.put(uri, headers);
-        callback.invoke(true);
+        callback.invoke(null, null);
     }
 
     @ReactMethod
@@ -56,15 +58,23 @@ public void get(String url, Callback callback) throws URISyntaxException, IOExce
         Map<String, List<String>> cookieMap = this.cookieHandler.get(uri, new HashMap());
         // If only the variables were public
         List<String> cookieList = cookieMap.get("Cookie");
+        WritableMap map = Arguments.createMap();
         if (cookieList != null) {
-            callback.invoke(cookieList.get(0));
-        } else {
-            callback.invoke(cookieList);
+            String[] cookies = cookieList.get(0).split(";");
+            for (int i = 0; i < cookies.length; i++) {
+                String[] cookie = cookies[i].split("=");
+                map.putString(cookie[0], cookie[1]);
+            }
         }
+        callback.invoke(null, map);
     }
 
     @ReactMethod
     public void clearAll(final Callback callback) {
-        this.cookieHandler.clearCookies(callback);
+        this.cookieHandler.clearCookies(new Callback() {
+            public void invoke(Object... args) {
+                callback.invoke(null, null);
+            }
+        });
     }
 }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-cookies",
-  "version": "0.0.5",
+  "version": "0.1.0",
   "description": "Cookie manager for react native",
   "keywords": [ "react", "react native", "react-component", "cookies", "webview", "react-native" ],
   "main": "index.js",