Skip to content

#1566 Bugfix/twitter cancel continue app crash #1567

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.

Sign up for GitHub

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

Merged
merged 3 commits into from
Nov 9, 2020
Merged

#1566 Bugfix/twitter cancel continue app crash #1567

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4594bc9
Looking for Oauth and denied params
dhanax Oct 23, 2020
153fec7
updated test cases and removed 'and' condition for successful redire…
dsp1589 Oct 23, 2020
1089ad6
Update Gemfile.lock
dsp1589 Oct 23, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 15 additions & 1 deletion ParseTwitterUtils/ParseTwitterUtils/Internal/Dialog/PFOAuth1FlowDialog.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -414,7 +414,21 @@ - (void)webView:(WKWebView *)webView decidePolicyForNavigationAction:(WKNavigati
NSURL *url = navigationAction.request.URL;
BOOL hasPrefix = [url.absoluteString hasPrefix:self.redirectURLPrefix];
if (hasPrefix) {
[self _dismissWithSuccess:YES url:url error:nil];
NSURLComponents* components = [[NSURLComponents alloc] initWithString:url.absoluteString];
NSArray<NSURLQueryItem *> * items = components.queryItems;
if (items) {
for (NSURLQueryItem * queryItem in items) {
if ([queryItem.name isEqualToString:@"denied"]) {
[self _dismissWithSuccess:NO url:url error:nil];
break;
} else if ([queryItem.name isEqualToString:@"oauth_verifier"] || [queryItem.name isEqualToString:@"oauth_token" ]) {
[self _dismissWithSuccess:YES url:url error:nil];
break;;
}
}
} else {
[self _dismissWithSuccess:NO url:url error:nil];
}
decisionHandler(WKNavigationActionPolicyCancel);
return;
} else if (navigationAction.navigationType == UIWebViewNavigationTypeLinkClicked && [self.dataSource dialog:self shouldOpenURLInExternalBrowser:url]) {
Expand Down
20 changes: 18 additions & 2 deletions ParseTwitterUtils/Tests/Unit/OAuth1FlowDialogTests.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,8 @@ - (void)skip_testRotation {

- (void)testWebViewDelegate {
NSURL *sampleURL = [NSURL URLWithString:@"http://foo.bar"];
NSURL *successURL = [NSURL URLWithString:@"foo://success"];
NSURL *successURL = [NSURL URLWithString:@"foo://success/?oauth_verifier=abcd&oauth_token=authtoken123"];
NSURL *rejectedURL = [NSURL URLWithString:@"foo://success/?denied=authtoken123"];

//XCTestExpectation *flowExpectation = [[XCTestExpectation alloc] initWithDescription: @"Waiting for redirect"];
XCTestExpectation *flowExpectation = [self currentSelectorTestExpectation];
Expand Down Expand Up @@ -172,7 +173,22 @@ - (void)testWebViewDelegate {
[canceledExpectation fulfill];
}];

[self waitForExpectations:@[policyExpectation, flowExpectation, canceledExpectation] timeout:20];
XCTestExpectation *canceledOnDeniedExpectation = [[XCTestExpectation alloc] initWithDescription:@"Waiting for canceled policy decision"];

WKNavigation* rejectNavigation = (WKNavigation *)([[NSObject alloc] init]);
[flowDialog webView:webView didStartProvisionalNavigation:rejectNavigation];
[flowDialog webView:webView didFinishNavigation:rejectNavigation];

FakeWKNavigationAction *rejectAction = [[FakeWKNavigationAction alloc] init];
rejectAction.navigationType = WKNavigationTypeOther;
rejectAction.request = [NSURLRequest requestWithURL:rejectedURL];

[flowDialog webView:webView decidePolicyForNavigationAction:rejectAction decisionHandler:^(WKNavigationActionPolicy policy) {
XCTAssertTrue(policy == WKNavigationActionPolicyCancel);
[canceledOnDeniedExpectation fulfill];
}];

[self waitForExpectations:@[policyExpectation, flowExpectation, canceledExpectation, canceledOnDeniedExpectation] timeout:20];
}

@end