From 405c768c77419c44ee79b079b6619f5375a59283 Mon Sep 17 00:00:00 2001 From: Seth Fitzsimmons Date: Fri, 15 Mar 2019 14:41:47 -0700 Subject: [PATCH 1/3] Use createCookieList helper --- ios/RNCookieManagerIOS/RNCookieManagerIOS.m | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/ios/RNCookieManagerIOS/RNCookieManagerIOS.m b/ios/RNCookieManagerIOS/RNCookieManagerIOS.m index 47609f69..8c55ebe0 100644 --- a/ios/RNCookieManagerIOS/RNCookieManagerIOS.m +++ b/ios/RNCookieManagerIOS/RNCookieManagerIOS.m @@ -145,17 +145,7 @@ -(NSString *)getDomainName:(NSURL *) url reject(@"", NOT_AVAILABLE_ERROR_MESSAGE, nil); } } else { - NSMutableDictionary *cookies = [NSMutableDictionary dictionary]; - for (NSHTTPCookie *c in [[NSHTTPCookieStorage sharedHTTPCookieStorage] cookiesForURL:url]) { - NSMutableDictionary *d = [NSMutableDictionary dictionary]; - [d setObject:c.value forKey:@"value"]; - [d setObject:c.name forKey:@"name"]; - [d setObject:c.domain forKey:@"domain"]; - [d setObject:c.path forKey:@"path"]; - [d setObject:[self.formatter stringFromDate:c.expiresDate] forKey:@"expiresDate"]; - [cookies setObject:d forKey:c.name]; - } - resolve(cookies); + resolve([self createCookieList:[[NSHTTPCookieStorage sharedHTTPCookieStorage] cookiesForURL:url]]); } } From 797039128a19e284fb33d57fe71abd433a777143 Mon Sep 17 00:00:00 2001 From: Seth Fitzsimmons Date: Fri, 15 Mar 2019 14:42:34 -0700 Subject: [PATCH 2/3] Remove duplicate getAll method --- ios/RNCookieManagerIOS/RNCookieManagerIOS.m | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/ios/RNCookieManagerIOS/RNCookieManagerIOS.m b/ios/RNCookieManagerIOS/RNCookieManagerIOS.m index 8c55ebe0..14210ba4 100644 --- a/ios/RNCookieManagerIOS/RNCookieManagerIOS.m +++ b/ios/RNCookieManagerIOS/RNCookieManagerIOS.m @@ -220,21 +220,6 @@ -(NSString *)getDomainName:(NSURL *) url } } -RCT_EXPORT_METHOD(getAll:(RCTPromiseResolveBlock)resolve - rejecter:(RCTPromiseRejectBlock)reject) { - NSHTTPCookieStorage *cookieStorage = [NSHTTPCookieStorage sharedHTTPCookieStorage]; - NSMutableDictionary *cookies = [NSMutableDictionary dictionary]; - for (NSHTTPCookie *c in cookieStorage.cookies) { - NSMutableDictionary *d = [NSMutableDictionary dictionary]; - [d setObject:c.value forKey:@"value"]; - [d setObject:c.name forKey:@"name"]; - [d setObject:c.domain forKey:@"domain"]; - [d setObject:c.path forKey:@"path"]; - [d setObject:[self.formatter stringFromDate:c.expiresDate] forKey:@"expiresDate"]; - [cookies setObject:d forKey:c.name]; - } -} - -(NSDictionary *)createCookieList:(NSArray*)cookies { NSMutableDictionary *cookieList = [NSMutableDictionary dictionary]; From 5c8c2c0c2775d9a0b9535400662222400d7e0d37 Mon Sep 17 00:00:00 2001 From: Seth Fitzsimmons Date: Fri, 15 Mar 2019 14:43:22 -0700 Subject: [PATCH 3/3] Format cookie expiration *if present* --- ios/RNCookieManagerIOS/RNCookieManagerIOS.m | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/ios/RNCookieManagerIOS/RNCookieManagerIOS.m b/ios/RNCookieManagerIOS/RNCookieManagerIOS.m index 14210ba4..78472093 100644 --- a/ios/RNCookieManagerIOS/RNCookieManagerIOS.m +++ b/ios/RNCookieManagerIOS/RNCookieManagerIOS.m @@ -237,6 +237,11 @@ -(NSDictionary *)createCookieData:(NSHTTPCookie *)cookie [cookieData setObject:cookie.name forKey:@"name"]; [cookieData setObject:cookie.domain forKey:@"domain"]; [cookieData setObject:cookie.path forKey:@"path"]; + + if (cookie.expiresDate) { + [cookieData setObject:[self.formatter stringFromDate:cookie.expiresDate] forKey:@"expiresDate"]; + } + return cookieData; }