react-native-webview-bootpay 11.22.87 → 11.26.19

package/apple/BPCWebView.h

@@ -37,7 +37,6 @@ shouldStartLoadForRequest:(NSMutableDictionary<NSString *, id> *_Nonnull)request
 
 @interface BPCWebView : RCTView
 
-@property NSString* beforeUrl;
 @property (nonatomic, weak) id<BPCWebViewDelegate> _Nullable delegate;
 @property (nonatomic, copy) NSDictionary * _Nullable source;
 @property (nonatomic, assign) BOOL messagingEnabled;
@@ -102,6 +101,8 @@ shouldStartLoadForRequest:(NSMutableDictionary<NSString *, id> *_Nonnull)request
 @property (nonatomic, assign) BPCWebViewPermissionGrantType mediaCapturePermissionGrantType;
 #endif
 
+@property (nonatomic, copy) NSString * _Nullable beforeUrl;
+
 + (void)setClientAuthenticationCredential:(nullable NSURLCredential*)credential;
 + (void)setCustomCertificatesForHost:(nullable NSDictionary *)certificates;
 - (void)postMessage:(NSString *_Nullable)message;
@@ -116,6 +117,7 @@ shouldStartLoadForRequest:(NSMutableDictionary<NSString *, id> *_Nonnull)request
 - (void)pullToRefresh:(UIRefreshControl *_Nonnull)refreshControl;
 #endif
 
+
 - (void)                  webViewRN:(WKWebView *)webView
   decidePolicyForNavigationAction:(WKNavigationAction *)navigationAction
                     decisionHandler:(void (^)(WKNavigationActionPolicy))decisionHandler;

package/apple/BPCWebView.m

@@ -19,9 +19,7 @@
 
 static NSTimer *keyboardTimer;
 static NSString *const HistoryShimName = @"ReactNativeHistoryShim";
-// static NSString *const MessageHandlerName = @"ReactNativeWebView";
 static NSString *const MessageHandlerName = @"BootpayRNWebView";
-
 static NSURLCredential* clientAuthenticationCredential;
 static NSDictionary* customCertificatesForHost;
 
@@ -66,7 +64,7 @@ NSString *const BPCUSTOM_SELECTOR = @"_BPCUSTOM_SELECTOR_";
 @end
 #endif // TARGET_OS_OSX
 
-@interface BPCWebView () <WKUIDelegate, WKNavigationDelegate, WKScriptMessageHandler,
+@interface BPCWebView () <WKUIDelegate, WKNavigationDelegate, WKScriptMessageHandler, WKHTTPCookieStoreObserver,
 #if !TARGET_OS_OSX
 UIScrollViewDelegate,
 #endif // !TARGET_OS_OSX
@@ -236,6 +234,9 @@ RCTAutoInsetsProtocol>
 - (void)dealloc
 {
   [[NSNotificationCenter defaultCenter] removeObserver:self];
+  if (@available(iOS 11.0, *)) {
+    [self.webView.configuration.websiteDataStore.httpCookieStore removeObserver:self];
+  }
 }
 
 - (void)tappedMenuItem:(NSString *)eventType
@@ -311,26 +312,57 @@ RCTAutoInsetsProtocol>
  */
 - (WKWebView *)webView:(WKWebView *)webView createWebViewWithConfiguration:(WKWebViewConfiguration *)configuration forNavigationAction:(WKNavigationAction *)navigationAction windowFeatures:(WKWindowFeatures *)windowFeatures
 {
-//  if (!navigationAction.targetFrame.isMainFrame) {
-//    [webView loadRequest:navigationAction.request];
-//  }
-//  return nil;
-    
-    WKWebView *popupView = [[WKWebView alloc] initWithFrame:CGRectMake(0, 0, self.bounds.size.width, self.bounds.size.height) configuration:configuration];
-    
-    [popupView autoresizingMask];
-    popupView.navigationDelegate = self;
-    popupView.UIDelegate = self;
-    
-    [self addSubview:popupView];
+    /*
+  if (!navigationAction.targetFrame.isMainFrame) {
+    [webView loadRequest:navigationAction.request];
+  }
+  return nil;
+  */ 
+  NSString *url = navigationAction.request.URL.absoluteString;
+
+  if (!navigationAction.targetFrame.isMainFrame) {
     
-    return popupView;
+        if ([url hasPrefix:@"https://gw.bootpay.co.kr"] || [url hasPrefix:@"http://gw.bootpay.co.kr"]) {
+            // 팝업(새 창) 뜨는 경우 호출됨 (window.open 또는 target="_blank")
+            WKWebView *popupView = [[WKWebView alloc] initWithFrame:CGRectMake(0, 0, self.bounds.size.width, self.bounds.size.height) configuration:configuration];
+
+            [popupView autoresizingMask];
+            popupView.navigationDelegate = self;
+            popupView.UIDelegate = self;
+
+            [self addSubview:popupView];
+
+            return popupView;
+        } else {
+            [webView loadRequest:navigationAction.request];
+            return nil;
+        }
+    }
+  return nil;
 }
 
+
 - (void)webViewDidClose:(WKWebView *)webView {
     [webView removeFromSuperview];
 }
 
+/**
+ * Enables file input on macos, see https://developer.apple.com/documentation/webkit/wkuidelegate/1641952-webview
+ */
+#if TARGET_OS_OSX
+- (void)webView:(WKWebView *)webView runOpenPanelWithParameters:(WKOpenPanelParameters *)parameters initiatedByFrame:(WKFrameInfo *)frame completionHandler:(void (^)(NSArray<NSURL *> *URLs))completionHandler
+{
+  NSOpenPanel *openPanel = [NSOpenPanel openPanel];
+  openPanel.allowsMultipleSelection = parameters.allowsMultipleSelection;
+  [openPanel beginSheetModalForWindow:webView.window completionHandler:^(NSInteger result) {
+    if (result == NSModalResponseOK)
+      completionHandler(openPanel.URLs);
+    else
+      completionHandler(nil);
+  }];
+}
+#endif //Target_OS_OSX
+
 - (WKWebViewConfiguration *)setUpWkWebViewConfig
 {
   WKWebViewConfiguration *wkWebViewConfig = [WKWebViewConfiguration new];
@@ -827,7 +859,7 @@ RCTAutoInsetsProtocol>
   
   if(subview == nil) return;
   
-  NSString* name = [NSString stringWithFormat:@"%@_SwizzleHelperWK", subview.class.superclass];
+  NSString* name = [NSString stringWithFormat:@"%@_BPSwizzleHelperWK", subview.class.superclass];
   Class newClass = NSClassFromString(name);
   
   if(newClass == nil)
@@ -1013,7 +1045,7 @@ RCTAutoInsetsProtocol>
 {
 #if !TARGET_OS_OSX
   UIAlertController *alert = [UIAlertController alertControllerWithTitle:@"" message:message preferredStyle:UIAlertControllerStyleAlert];
-  [alert addAction:[UIAlertAction actionWithTitle:@"확인" style:UIAlertActionStyleDefault handler:^(UIAlertAction *action) {
+  [alert addAction:[UIAlertAction actionWithTitle:@"Ok" style:UIAlertActionStyleDefault handler:^(UIAlertAction *action) {
     completionHandler();
   }]];
   [[self topViewController] presentViewController:alert animated:YES completion:NULL];
@@ -1032,18 +1064,18 @@ RCTAutoInsetsProtocol>
 - (void)webView:(WKWebView *)webView runJavaScriptConfirmPanelWithMessage:(NSString *)message initiatedByFrame:(WKFrameInfo *)frame completionHandler:(void (^)(BOOL))completionHandler{
 #if !TARGET_OS_OSX
   UIAlertController *alert = [UIAlertController alertControllerWithTitle:@"" message:message preferredStyle:UIAlertControllerStyleAlert];
-  [alert addAction:[UIAlertAction actionWithTitle:@"확인" style:UIAlertActionStyleDefault handler:^(UIAlertAction *action) {
+  [alert addAction:[UIAlertAction actionWithTitle:@"Ok" style:UIAlertActionStyleDefault handler:^(UIAlertAction *action) {
     completionHandler(YES);
   }]];
-  [alert addAction:[UIAlertAction actionWithTitle:@"취소" style:UIAlertActionStyleCancel handler:^(UIAlertAction *action) {
+  [alert addAction:[UIAlertAction actionWithTitle:@"Cancel" style:UIAlertActionStyleCancel handler:^(UIAlertAction *action) {
     completionHandler(NO);
   }]];
   [[self topViewController] presentViewController:alert animated:YES completion:NULL];
 #else
   NSAlert *alert = [[NSAlert alloc] init];
   [alert setMessageText:message];
-  [alert addButtonWithTitle:NSLocalizedString(@"확인", @"OK button")];
-  [alert addButtonWithTitle:NSLocalizedString(@"취소", @"Cancel button")];
+  [alert addButtonWithTitle:NSLocalizedString(@"OK", @"OK button")];
+  [alert addButtonWithTitle:NSLocalizedString(@"Cancel", @"Cancel button")];
   void (^callbacksHandlers)(NSModalResponse response) = ^void(NSModalResponse response) {
     completionHandler(response == NSAlertFirstButtonReturn);
   };
@@ -1060,11 +1092,11 @@ RCTAutoInsetsProtocol>
   [alert addTextFieldWithConfigurationHandler:^(UITextField *textField) {
     textField.text = defaultText;
   }];
-  UIAlertAction *okAction = [UIAlertAction actionWithTitle:@"확인" style:UIAlertActionStyleDefault handler:^(UIAlertAction *action) {
+  UIAlertAction *okAction = [UIAlertAction actionWithTitle:@"Ok" style:UIAlertActionStyleDefault handler:^(UIAlertAction *action) {
     completionHandler([[alert.textFields lastObject] text]);
   }];
   [alert addAction:okAction];
-  UIAlertAction *cancelAction = [UIAlertAction actionWithTitle:@"취소" style:UIAlertActionStyleCancel handler:^(UIAlertAction *action) {
+  UIAlertAction *cancelAction = [UIAlertAction actionWithTitle:@"Cancel" style:UIAlertActionStyleCancel handler:^(UIAlertAction *action) {
     completionHandler(nil);
   }];
   [alert addAction:cancelAction];
@@ -1083,8 +1115,8 @@ RCTAutoInsetsProtocol>
   textField.stringValue = defaultText;
   [alert setAccessoryView:textField];
   
-  [alert addButtonWithTitle:NSLocalizedString(@"확인", @"OK button")];
-  [alert addButtonWithTitle:NSLocalizedString(@"취소", @"Cancel button")];
+  [alert addButtonWithTitle:NSLocalizedString(@"OK", @"OK button")];
+  [alert addButtonWithTitle:NSLocalizedString(@"Cancel", @"Cancel button")];
   [alert beginSheetModalForWindow:[NSApp keyWindow] completionHandler:^(NSModalResponse response) {
     if (response == NSAlertFirstButtonReturn) {
       completionHandler([textField stringValue]);
@@ -1131,36 +1163,36 @@ RCTAutoInsetsProtocol>
 
 #endif // !TARGET_OS_OSX
 
+/**
+ * Decides whether to allow or cancel a navigation.
+ * @see https://fburl.com/42r9fxob
+ */
 
+ - (void)                  webView:(WKWebView *)webView
+  decidePolicyForNavigationAction:(WKNavigationAction *)navigationAction
+                  decisionHandler:(void (^)(WKNavigationActionPolicy))decisionHandler
+ {
+     NSString *url = navigationAction.request.URL.absoluteString;
 
-- (void)                  webView:(WKWebView *)webView
- decidePolicyForNavigationAction:(WKNavigationAction *)navigationAction
-                 decisionHandler:(void (^)(WKNavigationActionPolicy))decisionHandler
-{
-    NSString *url = navigationAction.request.URL.absoluteString;
-     
-    _beforeUrl = url;
-    
-//    [self updateBlindViewIfNaverLogin:url];
-    
-    if([self isItunesURL:url]) {
-        [self startAppToApp:[NSURL URLWithString:url]];
-        decisionHandler(WKNavigationActionPolicyCancel);
-    } else if([url hasPrefix:@"about:blank"]) {
-        decisionHandler(WKNavigationActionPolicyAllow);
-    } else if(![url hasPrefix:@"http"]) {
-        [self startAppToApp:[NSURL URLWithString:url]];
-        decisionHandler(WKNavigationActionPolicyCancel);
-    } else {
+     _beforeUrl = url;
+
+ //    [self updateBlindViewIfNaverLogin:url];
+
+     if([self isItunesURL:url]) {
+         [self startAppToApp:[NSURL URLWithString:url]];
+         decisionHandler(WKNavigationActionPolicyCancel);
+     } else if([url hasPrefix:@"about:blank"]) {
         decisionHandler(WKNavigationActionPolicyAllow);
-    }
-}
+     } else if(![url hasPrefix:@"http"]) {
+         [self startAppToApp:[NSURL URLWithString:url]];
+         decisionHandler(WKNavigationActionPolicyCancel);
+     } else {
+        [self webViewRN:webView decidePolicyForNavigationAction:navigationAction decisionHandler:decisionHandler];
+      //decisionHandler(WKNavigationActionPolicyAllow);
+     }
+ }
 
 
-/**
- * Decides whether to allow or cancel a navigation.
- * @see https://fburl.com/42r9fxob
- */
 - (void)                  webViewRN:(WKWebView *)webView
   decidePolicyForNavigationAction:(WKNavigationAction *)navigationAction
                   decisionHandler:(void (^)(WKNavigationActionPolicy))decisionHandler
@@ -1185,9 +1217,13 @@ RCTAutoInsetsProtocol>
   
   if (_onShouldStartLoadWithRequest) {
     NSMutableDictionary<NSString *, id> *event = [self baseEvent];
+    if (request.mainDocumentURL) {
+      [event addEntriesFromDictionary: @{
+        @"mainDocumentURL": (request.mainDocumentURL).absoluteString,
+      }];
+    }
     [event addEntriesFromDictionary: @{
       @"url": (request.URL).absoluteString,
-      @"mainDocumentURL": (request.mainDocumentURL).absoluteString,
       @"navigationType": navigationTypes[@(navigationType)],
       @"isTopFrame": @(isTopFrame)
     }];
@@ -1364,23 +1400,26 @@ RCTAutoInsetsProtocol>
  */
 - (void)webView:(WKWebView *)webView
 didFinishNavigation:(WKNavigation *)navigation
+{
+  if (_ignoreSilentHardwareSwitch) {
+    [self forceIgnoreSilentHardwareSwitch:true];
+  }
+
+  if (_onLoadingFinish) {
+    _onLoadingFinish([self baseEvent]);
+  }
+}
+
+- (void)cookiesDidChangeInCookieStore:(WKHTTPCookieStore *)cookieStore
 {
   if(_sharedCookiesEnabled && @available(iOS 11.0, *)) {
     // Write all cookies from WKWebView back to sharedHTTPCookieStorage
-    [webView.configuration.websiteDataStore.httpCookieStore getAllCookies:^(NSArray* cookies) {
+    [cookieStore getAllCookies:^(NSArray* cookies) {
       for (NSHTTPCookie *cookie in cookies) {
         [[NSHTTPCookieStorage sharedHTTPCookieStorage] setCookie:cookie];
       }
     }];
   }
-  
-  if (_ignoreSilentHardwareSwitch) {
-    [self forceIgnoreSilentHardwareSwitch:true];
-  }
-  
-  if (_onLoadingFinish) {
-    _onLoadingFinish([self baseEvent]);
-  }
 }
 
 - (void)injectJavaScript:(NSString *)script
@@ -1597,7 +1636,9 @@ didFinishNavigation:(WKNavigation *)navigation
       if(!_incognito && !_cacheEnabled) {
         wkWebViewConfig.websiteDataStore = [WKWebsiteDataStore nonPersistentDataStore];
       }
-      [self syncCookiesToWebView:nil];
+      [self syncCookiesToWebView:^{
+        [wkWebViewConfig.websiteDataStore.httpCookieStore addObserver:self];
+      }];
     } else {
       NSMutableString *script = [NSMutableString string];
       
@@ -1684,7 +1725,7 @@ didFinishNavigation:(WKNavigation *)navigation
 }
 
 
-#pragma mark - WebVoew Javascript
+#pragma mark - WebView Javascript
 
 -(void) doJavascript:(NSString*) script {
     [_webView evaluateJavaScript:script completionHandler:nil];
@@ -1710,7 +1751,7 @@ didFinishNavigation:(WKNavigation *)navigation
 - (NSString*) getQueryStringParameter:(NSString*)url :(NSString*)param {
     NSMutableDictionary *queryStringDictionary = [[NSMutableDictionary alloc] init];
     NSArray *urlComponents = [url componentsSeparatedByString:@"&"];
-    
+
     for (NSString *keyValuePair in urlComponents)
     {
         NSArray *pairComponents = [keyValuePair componentsSeparatedByString:@"="];
@@ -1721,13 +1762,13 @@ didFinishNavigation:(WKNavigation *)navigation
             return value;
         }
     }
-    
+
     return @"";
 }
 
 - (void) startAppToApp:(NSURL*) url {
     UIApplication *application = [UIApplication sharedApplication];
-    
+
     if (@available(iOS 10.0, *)) {
         [application openURL:url options:@{} completionHandler: ^(BOOL success) {
             if(success == false) {
@@ -1743,7 +1784,7 @@ didFinishNavigation:(WKNavigation *)navigation
 - (void) startItunesToInstall:(NSURL*) url {
     NSString *sUrl = url.absoluteString;
     NSString *itunesUrl = @"";
-    
+
     if([sUrl hasPrefix: @"kfc-bankpay"]) {
         itunesUrl = @"https://apps.apple.com/kr/app/%EB%B1%85%ED%81%AC%ED%8E%98%EC%9D%B4-%EA%B8%88%EC%9C%B5%EA%B8%B0%EA%B4%80-%EA%B3%B5%EB%8F%99-%EA%B3%84%EC%A2%8C%EC%9D%B4%EC%B2%B4-%EA%B2%B0%EC%A0%9C-%EC%A0%9C%EB%A1%9C%ED%8E%98%EC%9D%B4/id398456030";
     } else if([sUrl hasPrefix: @"ispmobile"]) {
@@ -1803,7 +1844,7 @@ didFinishNavigation:(WKNavigation *)navigation
     } else if([sUrl hasPrefix: @"kbbank"]) {
         itunesUrl = @"https://apps.apple.com/kr/app/kb%EC%8A%A4%ED%83%80%EB%B1%85%ED%82%B9/id373742138";
     }
-    
+
     if(itunesUrl.length > 0) {
         NSURL *appstore = [NSURL URLWithString: itunesUrl];
         [self startAppToApp: appstore];
@@ -1831,4 +1872,7 @@ didFinishNavigation:(WKNavigation *)navigation
   [self.scriptDelegate userContentController:userContentController didReceiveScriptMessage:message];
 }
 
+
+
 @end
+