-
Notifications
You must be signed in to change notification settings - Fork 270
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Enable wk cookie store #171
Open
pwallrich
wants to merge
8
commits into
CRAlpha:master
Choose a base branch
from
inovex:enable-wk-cookie-store
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from 5 commits
Commits
Show all changes
8 commits
Select commit
Hold shift + click to select a range
1580336
Added Cookie Handling
d54fd07
added missing Method
232de7e
Added new useWKCookieStore option
7f2e56d
clean spaces
jigfox 3c8c29d
Set cookie from cookiesWithResponseHeaderFields
whck6 0dd8f06
remove spaces
jigfox 1c08e36
remove duplicated method
jigfox 8d4382e
add Secure and HttpOnly flags to cookie
jigfox File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -35,6 +35,7 @@ @interface RCTWKWebView () <WKNavigationDelegate, RCTAutoInsetsProtocol, WKScrip | |
@property (nonatomic, copy) RCTDirectEventBlock onScroll; | ||
@property (nonatomic, copy) RCTDirectEventBlock onNavigationResponse; | ||
@property (assign) BOOL sendCookies; | ||
@property (assign) BOOL useWKCookieStore; | ||
@property (nonatomic, strong) WKUserScript *atStartScript; | ||
@property (nonatomic, strong) WKUserScript *atEndScript; | ||
|
||
|
@@ -306,11 +307,67 @@ - (void)stopLoading | |
[_webView stopLoading]; | ||
} | ||
|
||
- (NSString *) cookieDescription:(NSHTTPCookie *)cookie { | ||
|
||
NSMutableString *cDesc = [[NSMutableString alloc] init]; | ||
[cDesc appendFormat:@"%@=%@;", | ||
[[cookie name] stringByReplacingPercentEscapesUsingEncoding:NSUTF8StringEncoding], | ||
[[cookie value] stringByReplacingPercentEscapesUsingEncoding:NSUTF8StringEncoding]]; | ||
if ([cookie.domain length] > 0) | ||
[cDesc appendFormat:@"domain=%@;", [cookie domain]]; | ||
if ([cookie.path length] > 0) | ||
[cDesc appendFormat:@"path=%@;", [cookie path]]; | ||
if (cookie.expiresDate != nil) | ||
[cDesc appendFormat:@"expiresDate=%@;", [cookie expiresDate]]; | ||
|
||
|
||
return cDesc; | ||
} | ||
|
||
- (void) copyCookies { | ||
|
||
NSHTTPCookieStorage* storage = [NSHTTPCookieStorage sharedHTTPCookieStorage]; | ||
NSArray* array = [storage cookies]; | ||
|
||
|
||
if (@available(ios 11,*)) { | ||
|
||
// The webView websiteDataStore only gets initialized, when needed. Setting cookies on the dataStore's | ||
// httpCookieStore doesn't seem to initialize it. That's why fetchDataRecordsOfTypes is called. | ||
// All the cookies of the sharedHttpCookieStorage, which is used in react-native-cookie, | ||
// are copied to the webSiteDataStore's httpCookieStore. | ||
// https://bugs.webkit.org/show_bug.cgi?id=185483 | ||
[_webView.configuration.websiteDataStore fetchDataRecordsOfTypes:[NSSet<NSString *> setWithObject:WKWebsiteDataTypeCookies] completionHandler:^(NSArray<WKWebsiteDataRecord *> *records) { | ||
for (NSHTTPCookie* cookie in array) { | ||
[_webView.configuration.websiteDataStore.httpCookieStore setCookie:cookie completionHandler:nil]; | ||
} | ||
}]; | ||
} else { | ||
// Create WKUserScript for each cookie | ||
// Cookies are injected with Javascript AtDocumentStart | ||
for (NSHTTPCookie* cookie in array){ | ||
NSString* cookieSource = [NSString stringWithFormat:@"document.cookie = '%@'", [self cookieDescription:cookie]]; | ||
WKUserScript* cookieScript = [[WKUserScript alloc] | ||
initWithSource:cookieSource | ||
injectionTime:WKUserScriptInjectionTimeAtDocumentStart forMainFrameOnly:NO]; | ||
|
||
|
||
[_webView.configuration.userContentController addUserScript:cookieScript]; | ||
} | ||
} | ||
} | ||
|
||
- (void)setSource:(NSDictionary *)source | ||
{ | ||
if (![_source isEqualToDictionary:source]) { | ||
_source = [source copy]; | ||
_sendCookies = [source[@"sendCookies"] boolValue]; | ||
_useWKCookieStore = [source[@"useWKCookieStore"] boolValue]; | ||
|
||
if (_useWKCookieStore) { | ||
[self copyCookies]; | ||
} | ||
|
||
if ([source[@"customUserAgent"] length] != 0 && [_webView respondsToSelector:@selector(setCustomUserAgent:)]) { | ||
[_webView setCustomUserAgent:source[@"customUserAgent"]]; | ||
} | ||
|
@@ -455,6 +512,18 @@ - (void)scrollViewDidScroll:(UIScrollView *)scrollView | |
|
||
#pragma mark - WKNavigationDelegate methods | ||
|
||
- (void)webView:(WKWebView *)webView decidePolicyForNavigationResponse:(WKNavigationResponse *)navigationResponse decisionHandler:(void (^)(WKNavigationResponsePolicy))decisionHandler { | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. there are duplicate methods with this same name, can you please fix this? This is breaking my build with compilation issue |
||
if (_sendCookies) { | ||
NSHTTPURLResponse *response = (NSHTTPURLResponse *)navigationResponse.response; | ||
NSArray *cookies = [NSHTTPCookie cookiesWithResponseHeaderFields:[response allHeaderFields] forURL:response.URL]; | ||
for (NSHTTPCookie *cookie in cookies) { | ||
[[NSHTTPCookieStorage sharedHTTPCookieStorage] setCookie:cookie]; | ||
} | ||
} | ||
|
||
decisionHandler(WKNavigationResponsePolicyAllow); | ||
} | ||
|
||
#if DEBUG | ||
- (void)webView:(WKWebView *)webView didReceiveAuthenticationChallenge:(NSURLAuthenticationChallenge *)challenge completionHandler:(void (^)(NSURLSessionAuthChallengeDisposition, NSURLCredential * _Nullable))completionHandler { | ||
NSURLCredential * credential = [[NSURLCredential alloc] initWithTrust:[challenge protectionSpace].serverTrust]; | ||
|
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Its missing HttpOnly, secure and sessionOnly property. Is this something you would be able to add?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
for the HttpOnly: I can do that,
for the sessionOnly there ist no such thing, If there is no expire date than it should be a session cookie, otherwise it will be stored until the expire date
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
https://developer.apple.com/documentation/foundation/nshttpcookie/1392991-sessiononly?language=objc
I was referencing that boolean to indicate its a session only cookie
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
And Thanks for fixing this issue!