1efb01deda
* [MM-16593] [MM-17175] [MM-17164] [MM-17189] [MM-17181] Android - Upgrade to RN 0.60 (#3145)
* Upgrade to react-native 0.60
* Use @sentry/react-native
* Manually link @sentry/react-native
* Address review comments
* Jetify after install
* Call jetify from node_modules
* [MM-17785] iOS - Upgrade to RN 0.60 (#3153)
* Upgrade to react-native 0.60
* Use @sentry/react-native
* Manually link @sentry/react-native
* Address review comments
* Jetify after install
* Call jetify from node_modules
* Get app building for iOS
* Revert react-native-image-picker upgrade
* Minor version upgrade of react-native-image-picker
* [MM-17142] Convert all string refs to callbacks (#3217)
* Replace string refs
* Fix tests
* Don't use inline functions
* Fix mattermost-redux reversion from master merge
* [MM-18336] Upload Sentry debug symbols only when SENTRY_ENABLED is true (#3227)
* Upgrade @sentry/react-native
* Run Sentry gradle tasks only when enabled
* Upgrade @sentry/react-native and remove extra Sentry build phase
* [MM-17144] Use Hermes (#3226)
* Replace string refs
* Fix tests
* Don't use inline functions
* Fix mattermost-redux reversion from master merge
* Use Hermes
* bundleCommand ram-bundle no longer needed
* Require harmony-reflect only for Android
* Fix failing test
* Path react-native's splitLayoutProps (#3337)
* [MM-18867] [MM-17186] [MM-18866] [MM-19447] [MM-18967] Upgrade to RN 0.61.2 (#3423)
* Upgrade to RN 0.61.2
* Update rn-fetch-blob commit hash
* Update react-native-keyboard-tracking-view commit hash
* Use react-native-youtube with AVPlayer fix
* Fix jest mocks
* Use updated document picker API
* Remove unnecessary linking
* Revert "MM-17759 Add code highlighting (#3072)"
This reverts commit 26b999e885.
* Fix share extension
* Revert "Revert "MM-17759 Add code highlighting (#3072)""
This reverts commit 52aca776b12dee3abe8646d0c90480f8528e86c1.
* Address PR reviews
* Rename patch to match version
* Update react-native-youtube patch
* Update dependencies
* Fix RNDocViewer reference
* Update tests and revert to redux-persist 4.10.2
* Revert "Revert "Revert "MM-17759 Add code highlighting (#3072)"""
This reverts commit 5ef383be2619b1be6167c23f128ecb4b4ad25df9.
* Android fixes after dep upgrades
* Use fresco 2.0.0
* Use mattermost forks
* Use React-Core in Mattermost.scheme instead of react
* Remove packager (#3452)
* Remove Pods from source control
* Fix unit tests
* Add new line before entering the keystore in gradle.properties
* set ios as working directory for cocoapods
* Cache cocoapods on circleCI builds
* set ios as working dir
* fix cocoapods cache key
* Unify fastlane and npm dependencies command
* Use package-lock.json checksum for npm cache
* Fix package.json and use the checksum as the cache key
* Fix package.json and use the checksum as the cache key
* changes to circleci.yaml fastlane and removing pods from git
* Fix Mattermost.xcodeproj
* Update coocoapods to 1.7.5 and fix xcode header search paths
* Update package-lock.json
* Remove unused tooltip component
* Fix incorrect ref
* Disable Hermes (#3460)
* Revert "Remove packager (#3452)"
This reverts commit b2a79e184b3242124dfdb91ae095f6ce3f4eb986.
* Disable Hermes :'(
* Update preloaded modules
* Fix packages moduleNames and modulePaths, update snapshots and update mm-redux (ts version)
* remove document picker from modulePaths
* Fix package-lock.json
* Add eslint disable rules
56 lines
3.6 KiB
Diff
56 lines
3.6 KiB
Diff
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];
|
|
}
|
|
}
|