Converting TwitterUtils to WKWebView (#1511)

* Converting UIWebView on TwitterUtils to WKWebView

* Fixing Unit Tests

Author: noobs2ninjas

ParseTwitterUtils/ParseTwitterUtils/Internal/Dialog/PFOAuth1FlowDialog.h

@@ -9,7 +9,7 @@
 
 #import <Foundation/Foundation.h>
 #import <UIKit/UIKit.h>
-
+#import <WebKit/WebKit.h>
 @class PFOAuth1FlowDialog;
 
 @protocol PFOAuth1FlowDialogDataSource <NSObject>
@@ -66,7 +66,7 @@ typedef void (^PFOAuth1FlowDialogCompletion)(BOOL succeeded, NSURL *url, NSError
 
 @end
 
-@interface PFOAuth1FlowDialog : UIView <UIWebViewDelegate, PFOAuth1FlowDialogInterface> {
+@interface PFOAuth1FlowDialog : UIView <WKNavigationDelegate, PFOAuth1FlowDialogInterface> {
 @public
     // Ensures that UI elements behind the dialog are disabled.
     UIView *_modalBackgroundView;
@@ -76,7 +76,7 @@ typedef void (^PFOAuth1FlowDialogCompletion)(BOOL succeeded, NSURL *url, NSError
 
     UILabel *_titleLabel;
     UIButton *_closeButton;
-    UIWebView *_webView;
+    WKWebView *_webView;
     UIActivityIndicatorView *_activityIndicator;
 
     UIInterfaceOrientation _orientation;

ParseTwitterUtils/ParseTwitterUtils/Internal/Dialog/PFOAuth1FlowDialog.m

@@ -8,7 +8,7 @@
  */
 
 #import "PFOAuth1FlowDialog.h"
-
+#import <WebKit/WebKit.h>
 #import <Parse/PFNetworkActivityIndicatorManager.h>
 
 @implementation PFOAuth1FlowDialog
@@ -204,9 +204,9 @@ - (instancetype)init {
         _titleLabel.font = [UIFont boldSystemFontOfSize:titleLabelFontSize];
         [self addSubview:_titleLabel];
 
-        _webView = [[UIWebView alloc] initWithFrame:CGRectZero];
+        _webView = [[WKWebView alloc] initWithFrame:CGRectZero];
         _webView.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight;
-        _webView.delegate = self;
+        _webView.navigationDelegate = self;
         [self addSubview:_webView];
 
         _activityIndicator = [[UIActivityIndicatorView alloc] initWithActivityIndicatorStyle:
@@ -240,7 +240,7 @@ + (instancetype)dialogWithURL:(NSURL *)url queryParameters:(NSDictionary *)query
 #pragma mark Dealloc
 
 - (void)dealloc {
-    _webView.delegate = nil;
+    _webView.navigationDelegate = nil;
 
     [[NSNotificationCenter defaultCenter] removeObserver:self];
 }
@@ -408,41 +408,40 @@ - (void)loadURL:(NSURL *)url queryParameters:(NSDictionary *)parameters {
 }
 
 #pragma mark -
-#pragma mark UIWebViewDelegate
-
-- (BOOL)webView:(UIWebView *)webView
-shouldStartLoadWithRequest:(NSURLRequest *)request
- navigationType:(UIWebViewNavigationType)navigationType {
-    NSURL *url = request.URL;
+#pragma mark WKWebViewNavigationDelegate
 
-    if ([url.absoluteString hasPrefix:self.redirectURLPrefix]) {
+- (void)webView:(WKWebView *)webView decidePolicyForNavigationAction:(WKNavigationAction *)navigationAction decisionHandler:(void (^)(WKNavigationActionPolicy))decisionHandler {
+    NSURL *url = navigationAction.request.URL;
+    BOOL hasPrefix = [url.absoluteString hasPrefix:self.redirectURLPrefix];
+    if (hasPrefix) {
         [self _dismissWithSuccess:YES url:url error:nil];
-        return NO;
-    } else if ([_loadingURL isEqual:url]) {
-        return YES;
-    } else if (navigationType == UIWebViewNavigationTypeLinkClicked) {
-        if ([self.dataSource dialog:self shouldOpenURLInExternalBrowser:url]) {
-            [[UIApplication sharedApplication] openURL:url];
-        } else {
-            return YES;
-        }
+        decisionHandler(WKNavigationActionPolicyCancel);
+        return;
+    } else if (navigationAction.navigationType == UIWebViewNavigationTypeLinkClicked && [self.dataSource dialog:self shouldOpenURLInExternalBrowser:url]) {
+        [[UIApplication sharedApplication] openURL:url];
+    } else {
+        decisionHandler(WKNavigationActionPolicyAllow);
     }
-
-    return YES;
 }
 
-- (void)webViewDidStartLoad:(UIWebView *)webView {
+
+
+- (void)webView:(WKWebView *)webView didStartProvisionalNavigation:(WKNavigation *)navigation {
     [[PFNetworkActivityIndicatorManager sharedManager] incrementActivityCount];
 }
 
-- (void)webViewDidFinishLoad:(UIWebView *)webView {
+- (void)webView:(WKWebView *)webView didFinishNavigation:(WKNavigation *)navigation {
     [[PFNetworkActivityIndicatorManager sharedManager] decrementActivityCount];
 
     [_activityIndicator stopAnimating];
-    self.title = [_webView stringByEvaluatingJavaScriptFromString:@"document.title"];
+    [_webView evaluateJavaScript:@"document.title" completionHandler:^(id _Nullable string, NSError * _Nullable error) {
+        self.title = (NSString *) string;
+        
+    }];
+    
 }
 
-- (void)webView:(UIWebView *)webView didFailLoadWithError:(NSError *)error {
+- (void)webView:(WKWebView *)webView didFailNavigation:(WKNavigation *)navigation withError:(NSError *)error {
     [[PFNetworkActivityIndicatorManager sharedManager] decrementActivityCount];
 
     // 102 == WebKitErrorFrameLoadInterruptedByPolicyChange

ParseTwitterUtils/Tests/Unit/OAuth1FlowDialogTests.m

@@ -9,13 +9,36 @@
 
 #import "PFOAuth1FlowDialog.h"
 #import "PFTwitterTestCase.h"
+#import <WebKit/WebKit.h>
 
 @interface UIActivityIndicatorView (Private)
 
 - (void)_generateImages;
 
 @end
 
+@interface FakeWKNavigationAction : WKNavigationAction
+// Redefined WKNavigationAction properties as readwrite.
+@property(nullable, nonatomic, copy) WKFrameInfo* sourceFrame;
+@property(nullable, nonatomic, copy) WKFrameInfo* targetFrame;
+@property(nonatomic) WKNavigationType navigationType;
+@property(nullable, nonatomic, copy) NSURLRequest* request;
+
+@end
+
+@implementation FakeWKNavigationAction
+@synthesize sourceFrame, targetFrame, navigationType, request;
+
++ (Class)class {
+    return [super class];
+}
+
++ (Class)_nilClass {
+    return nil;
+}
+
+@end
+
 @interface OAuth1FlowDialogTests : PFTwitterTestCase
 @end
 
@@ -106,33 +129,50 @@ - (void)testWebViewDelegate {
     NSURL *sampleURL = [NSURL URLWithString:@"http://foo.bar"];
     NSURL *successURL = [NSURL URLWithString:@"foo://success"];
 
-    XCTestExpectation *expectation = [self currentSelectorTestExpectation];
+    //XCTestExpectation *flowExpectation = [[XCTestExpectation alloc] initWithDescription: @"Waiting for redirect"];
+    XCTestExpectation *flowExpectation = [self currentSelectorTestExpectation];
+    
     PFOAuth1FlowDialog *flowDialog = [[PFOAuth1FlowDialog alloc] initWithURL:sampleURL queryParameters:nil];
     flowDialog.redirectURLPrefix = @"foo://";
     flowDialog.completion = ^(BOOL succeeded, NSURL *url, NSError *error) {
-        XCTAssertTrue(succeeded);
-        XCTAssertNil(error);
-        XCTAssertEqualObjects(url, successURL);
-
-        [expectation fulfill];
+        XCTAssertTrue(succeeded, @"Flow Dialogue Failed");
+        XCTAssertNil(error, @"error");
+        XCTAssertEqualObjects(url, successURL, @"url's arent equal");
+        [flowExpectation fulfill];
     };
 
     [flowDialog showAnimated:NO];
 
-    id webView = PFStrictClassMock([UIWebView class]);
+    id webView = PFClassMock([WKWebView class]);
 
     NSURLRequest *request = [NSURLRequest requestWithURL:sampleURL];
-    XCTAssertTrue([flowDialog webView:webView
-           shouldStartLoadWithRequest:request
-                       navigationType:UIWebViewNavigationTypeOther]);
-
-    [flowDialog webViewDidStartLoad:webView];
-    [flowDialog webViewDidFinishLoad:webView];
-
-    NSURLRequest *successRequest = [NSURLRequest requestWithURL:successURL];
-    [flowDialog webView:webView shouldStartLoadWithRequest:successRequest navigationType:UIWebViewNavigationTypeOther];
-
-    [self waitForTestExpectations];
+    XCTestExpectation *policyExpectation = [[XCTestExpectation alloc] initWithDescription:@"Waiting for allowed policy decision"];
+    
+    FakeWKNavigationAction *navigationAction = [[FakeWKNavigationAction alloc] init];
+    navigationAction.navigationType = WKNavigationTypeOther;
+    navigationAction.request = request;
+    
+    [flowDialog webView:webView decidePolicyForNavigationAction:navigationAction decisionHandler:^(WKNavigationActionPolicy policy) {
+        XCTAssertTrue(policy == WKNavigationActionPolicyAllow, @"policy not allowed");
+        [policyExpectation fulfill];
+    }];
+    
+    XCTestExpectation *canceledExpectation = [[XCTestExpectation alloc] initWithDescription:@"Waiting for canceled policy decision"];
+
+    WKNavigation* navigation = (WKNavigation *)([[NSObject alloc] init]);
+    [flowDialog webView:webView didStartProvisionalNavigation:navigation];
+    [flowDialog webView:webView didFinishNavigation:navigation];
+    
+    FakeWKNavigationAction *successAction = [[FakeWKNavigationAction alloc] init];
+    successAction.navigationType = WKNavigationTypeOther;
+    successAction.request = [NSURLRequest requestWithURL:successURL];
+    
+    [flowDialog webView:webView decidePolicyForNavigationAction:successAction decisionHandler:^(WKNavigationActionPolicy policy) {
+        XCTAssertTrue(policy == WKNavigationActionPolicyCancel);
+        [canceledExpectation fulfill];
+    }];
+    
+    [self waitForExpectations:@[policyExpectation, flowExpectation, canceledExpectation] timeout:20];
 }
 
 @end