fix(ios): server is receiving two consecutive calls for the same url and cookies updated while reloading webview (#11427)

* fix(ios): server is receiving two consecutive calls for the same url * fix(ios): cookies updated while reloading webview Co-authored-by: ssekhri <ssekhri@axway.com>

Author: vijaysingh-axway

iphone/Classes/TiUIWebView.h

@@ -27,12 +27,16 @@
  UIActivityIndicatorView *_loadingIndicator;
 BOOL _isViewDetached;
 BOOL _tiCookieHandlerAdded;
+BOOL ignoreNextRequest;
+SEL reloadMethod;
 }
 
+@property (nonatomic, retain) id reloadData;
+
 // Used from the proxy
 - (void)setHtml_:(id)args;
 - (void)viewDidClose;
-
+- (void)reload;
 - (WKWebView *)webView;
 
 - (void)fireEvent:(id)listenerwithObject:(id)objremove:(BOOL)ynthisObject:(id)thisObject_;

iphone/Classes/TiUIWebView.m

@@ -44,6 +44,7 @@ - (void)dealloc
 {
 RELEASE_TO_NIL(_pageToken);
 RELEASE_TO_NIL(_loadingIndicator);
+RELEASE_TO_NIL(self.reloadData);
  [superdealloc];
 }
 
@@ -174,6 +175,10 @@ - (void)setWillHandleTouches_:(id)value
 
 - (void)setUrl_:(id)value
 {
+ ignoreNextRequest = YES;
+ self.reloadData = value;
+ reloadMethod = @selector(setUrl_:);
+
 ENSURE_TYPE(value, NSString);
  [[selfproxy] replaceValue:value forKey:@"url"notification:NO];
 
@@ -203,6 +208,10 @@ - (void)setBackgroundColor_:(id)value
 
 - (void)setData_:(id)value
 {
+ ignoreNextRequest = YES;
+ self.reloadData = value;
+ reloadMethod = @selector(setData_:);
+
  [[selfproxy] replaceValue:value forKey:@"data"notification:NO];
 
 if ([[selfwebView] isLoading]) {
@@ -243,6 +252,10 @@ - (void)setBlacklistedURLs_:(id)blacklistedURLs
 
 - (void)setHtml_:(id)args
 {
+ ignoreNextRequest = YES;
+ self.reloadData = args;
+ reloadMethod = @selector(setHtml_:);
+
 NSString *content = nil;
 NSDictionary *options = nil;
 
@@ -351,6 +364,18 @@ - (void)setKeyboardDisplayRequiresUserAction_:(id)value
  [[selfproxy] replaceValue:value forKey:@"keyboardDisplayRequiresUserAction"notification:NO];
 }
 
+- (void)reload
+{
+if (_webView == nil) {
+return;
+ }
+if (self.reloadData != nil) {
+ [selfperformSelector:reloadMethod withObject:self.reloadData];
+return;
+ }
+ [[selfwebView] reload];
+}
+
 #pragma mark Utilities
 
 - (void)loadRequestWithURL:(NSURL *)url
@@ -894,6 +919,7 @@ - (void)webView:(WKWebView *)webView didFinishNavigation:(WKNavigation *)navigat
 if ([[selfproxy] _hasListeners:@"load"]) {
  [[selfproxy] fireEvent:@"load"withObject:@{ @"url" : webView.URL.absoluteString, @"title" : webView.title }];
  }
+ ignoreNextRequest = NO;
 }
 
 - (void)webView:(WKWebView *)webViewdidFailNavigation:(WKNavigation *)navigationwithError:(NSError *)error
@@ -1058,27 +1084,20 @@ - (void)webView:(WKWebView *)webView decidePolicyForNavigationAction:(nonnull WK
  [[UIApplication sharedApplication] openURL:navigationAction.request.URL];
 decisionHandler(WKNavigationActionPolicyCancel);
  } else {
+BOOL valid = !ignoreNextRequest;
+if ([scheme hasPrefix:@"http"]) {
+//UIWebViewNavigationTypeOther means we are either in a META redirect
+//or it is a js request from within the page
+ valid = valid && (navigationAction.navigationType != WKNavigationTypeOther);
+ }
+if (valid) {
+ self.reloadData = navigationAction.request.URL.absoluteString;
+ reloadMethod = @selector(setUrl_:);
+ }
 decisionHandler(WKNavigationActionPolicyAllow);
  }
 }
 
-- (void)webView:(WKWebView *)webViewdecidePolicyForNavigationResponse:(WKNavigationResponse *)navigationResponsedecisionHandler:(void (^)(WKNavigationResponsePolicy))decisionHandler
-{
-NSDictionary<NSString *, id> *requestHeaders = [[selfproxy] valueForKey:@"requestHeaders"];
-NSURL *requestedURL = navigationResponse.response.URL;
-
-// If we have request headers set, we do a little hack to persist them across different URL's,
-// which is not officially supported by iOS.
-if (requestHeaders != nil && requestedURL != nil && ![requestedURL.absoluteString isEqualToString:_currentURL.absoluteString]) {
- _currentURL = requestedURL;
-decisionHandler(WKNavigationResponsePolicyCancel);
- [selfloadRequestWithURL:_currentURL];
-return;
- }
-
-decisionHandler(WKNavigationResponsePolicyAllow);
-}
-
 - (WKWebView *)webView:(WKWebView *)webViewcreateWebViewWithConfiguration:(WKWebViewConfiguration *)configurationforNavigationAction:(WKNavigationAction *)navigationActionwindowFeatures:(WKWindowFeatures *)windowFeatures
 {
 if (!navigationAction.targetFrame.isMainFrame) {

iphone/Classes/TiUIWebViewProxy.m

@@ -385,7 +385,11 @@ - (void)stopLoading:(id)unused
 
 - (void)reload:(id)unused
 {
- [[[selfwebView] webView] reload];
+TiThreadPerformOnMainThread(
+ ^{
+ [[selfwebView] reload];
+ },
+NO);
 }
 
 - (void)repaint:(id)unused

tests/Resources/ti.ui.webview.addontest.js

@@ -0,0 +1,63 @@
+/*
+ * Appcelerator Titanium Mobile
+ * Copyright (c) 2011-Present by Appcelerator, Inc. All Rights Reserved.
+ * Licensed under the terms of the Apache Public License
+ * Please see the LICENSE included with this distribution for details.
+ */
+/* eslint-env mocha */
+/* eslint no-unused-expressions: "off" */
+'use strict';
+
+describe('Titanium.UI.WebView',function(){
+varwin;
+this.slow(3000);
+this.timeout(30000);
+
+afterEach(function(done){
+if(win){
+// If `win` is already closed, we're done.
+lett=setTimeout(function(){
+if(win){
+win=null;
+done();
+}
+},3000);
+
+win.addEventListener('close',functionlistener(){
+clearTimeout(t);
+
+if(win){
+win.removeEventListener('close',listener);
+}
+win=null;
+done();
+});
+win.close();
+}else{
+win=null;
+done();
+}
+});
+
+it('requestHeaders with redirecting url should work properly',function(finish){
+letwebView;
+consturl='https://jira.appcelerator.org/';
+
+win=Ti.UI.createWindow();
+webView=Ti.UI.createWebView({
+url: url,
+requestHeaders: {'Custom-field1': 'value1'}
+});
+
+webView.addEventListener('load',function(){
+finish();
+});
+
+webView.addEventListener('error',function(e){
+finish(e);
+});
+
+win.add(webView);
+win.open();
+});
+});