toki/mattermost-mobile
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Remove react-native-cookies patch (#3615)

Browse source
This commit is contained in:
Mattermost Build 2019-11-27 15:36:27 +01:00 committed by Elias Nahum
parent ec8c83c2eb
commit 06a10b9b75
1 changed files with 0 additions and 56 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

56
patches/react-native-cookies+3.3.0.patch
View file

@ -1,56 +0,0 @@
diff --git a/node_modules/react-native-cookies/ios/RNCookieManagerIOS/RNCookieManagerIOS.m b/node_modules/react-native-cookies/ios/RNCookieManagerIOS/RNCookieManagerIOS.m
index 47609f6..7feff14 100644
--- a/node_modules/react-native-cookies/ios/RNCookieManagerIOS/RNCookieManagerIOS.m
+++ b/node_modules/react-native-cookies/ios/RNCookieManagerIOS/RNCookieManagerIOS.m
@@ -134,7 +134,8 @@ -(NSString *)getDomainName:(NSURL *) url
[cookieStore getAllCookies:^(NSArray<NSHTTPCookie *> *allCookies) {
NSMutableDictionary *cookies = [NSMutableDictionary dictionary];
for(NSHTTPCookie *currentCookie in allCookies) {
- if([currentCookie.domain containsString:topLevelDomain]) {
+ NSString *domainWithDot = [NSString stringWithFormat:@".%@", currentCookie.domain];
+ if([currentCookie.domain containsString:topLevelDomain] || [domainWithDot containsString:topLevelDomain]) {
[cookies setObject:currentCookie.value forKey:currentCookie.name];
}
}
@@ -152,7 +153,10 @@ -(NSString *)getDomainName:(NSURL *) url
[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"];
+ NSString *expires = [self.formatter stringFromDate:c.expiresDate];
+ if (expires != nil) {
+ [d setObject:expires forKey:@"expiresDate"];
+ }
[cookies setObject:d forKey:c.name];
}
resolve(cookies);
@@ -170,16 +174,7 @@ -(NSString *)getDomainName:(NSURL *) url
WKHTTPCookieStore *cookieStore = [[WKWebsiteDataStore defaultDataStore] httpCookieStore];
[cookieStore getAllCookies:^(NSArray<NSHTTPCookie *> *allCookies) {
for(NSHTTPCookie *currentCookie in allCookies) {
- // Uses the NSHTTPCookie directly has no effect, nor deleted the cookie nor thrown an error.
- // Create a new cookie with the given values and delete this one do the work.
- NSMutableDictionary<NSHTTPCookiePropertyKey, id> *cookieData = [NSMutableDictionary dictionary];
- [cookieData setValue:currentCookie.name forKey:NSHTTPCookieName];
- [cookieData setValue:currentCookie.value forKey:NSHTTPCookieValue];
- [cookieData setValue:currentCookie.domain forKey:NSHTTPCookieDomain];
- [cookieData setValue:currentCookie.path forKey:NSHTTPCookiePath];
-
- NSHTTPCookie *newCookie = [NSHTTPCookie cookieWithProperties:cookieData];
- [cookieStore deleteCookie:newCookie completionHandler:^{}];
+ [cookieStore deleteCookie:currentCookie completionHandler:^{}];
}
resolve(nil);
}];
@@ -240,7 +235,10 @@ -(NSString *)getDomainName:(NSURL *) url
[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"];
+ NSString *expires = [self.formatter stringFromDate:c.expiresDate];
+ if (expires != nil) {
+ [d setObject:expires forKey:@"expiresDate"];
+ }
[cookies setObject:d forKey:c.name];
}
}