banking_dcb_sdk_react_native 1.0.77 → 1.0.81

package/src/helpers/webview.tsx

@@ -131,8 +131,9 @@ export const WebView = ({
 }: WebViewCustomProps) => {
   const webviewRef = useRef<RNWebView | null>(null);
   const [canGoBack, setCanGoBack] = useState(false);
-  const [waitingForUserClosedRedirect, setWaitingForUserClosedRedirect] =
-    useState(false);
+  const canGoBackRef = useRef(false);
+  const hasUserClosedRef = useRef(false);
+
   // const [hasRedirected, setHasRedirected] = useState(false);
   const [, setToast] = useState<{ visible: boolean; message: string } | null>(
     null
@@ -265,27 +266,11 @@ export const WebView = ({
   const handleOnShouldStartLoadWithRequest = (event: WebViewNavigation) => {
     const { url } = event;
     console.log('SDK:LOG: WEBVIEW URL:', url);
-    if (url === 'about:blank' || url === 'about:srcdoc') {
+
+    if (!url || url === 'about:blank' || url === 'about:srcdoc') {
       return true;
     }
-    if (
-      waitingForUserClosedRedirect &&
-      (url?.includes('/session-expired?status=') ||
-        url?.includes('/redirect?status=') ||
-        url?.includes('/api/user/redirect'))
-    ) {
-      console.log('SDK:LOG: waitingForUserClosedRedirect overriding url');
-      const status = getQueryParam(url, 'status');
 
-      setWaitingForUserClosedRedirect(false);
-
-      console.log('SDK:LOG: Status thrown from webview ', status);
-
-      StatusBar.setBackgroundColor('#7E7E7EFF');
-      clearAllCookies();
-      onCallback?.(WebViewCallback.redirect(status ?? 'USER_CLOSED'));
-      return false;
-    }
     if (Platform.OS === 'android' && url) {
       if (url.includes('ms-outlook://')) {
         console.log('SDK:LOG: Intent to open Outlook detected');
@@ -391,17 +376,44 @@ export const WebView = ({
   );
 
   // Cookie injection script
-
   const injectedJavaScript = `
+  (function() {
+    function safePost(msg) {
+      try {
+        if (window.ReactNativeWebView) {
+          window.ReactNativeWebView.postMessage(JSON.stringify(msg));
+        }
+      } catch (e) {}
+    }
+
+    // Preserve any existing window.onerror
+    var previousOnError = window.onerror || null;
     window.onerror = function(message, source, lineno, colno, error) {
-      if (message.includes('RATE_LIMIT_USER')) {
-        window.ReactNativeWebView.postMessage(JSON.stringify({
-          type: 'RATE_LIMIT_ERROR'
-        }));
+      try {
+        if (String(message || '').indexOf('RATE_LIMIT_USER') !== -1 &&
+            window.ReactNativeWebView) {
+          safePost({ type: 'RATE_LIMIT_ERROR' });
+        }
+      } catch (e) {}
+      if (typeof previousOnError === 'function') {
+        try { return previousOnError.apply(this, arguments); } catch (e) {}
       }
     };
-    true;
-  `;
+
+    // Patch history.back() to notify the app
+    if (window.history && typeof window.history.back === 'function') {
+      var originalBack = window.history.back;
+      window.history.back = function() {
+        safePost({
+          type: 'HISTORY_BACK_CALLED',
+          href: window.location.href
+        });
+        return originalBack.apply(this, arguments);
+      };
+    }
+  })();
+  true;
+`;
 
   const requestPermission = async (permission: Permission) => {
     try {
@@ -470,16 +482,43 @@ export const WebView = ({
   const handleMessage = (event: WebViewMessageEvent) => {
     try {
       const data = JSON.parse(event.nativeEvent.data);
+      console.log('SDK:LOG: onMessage data =');
+
+      // 1) history.back() from a "root" page → treat as USER_CLOSED
+      if (data?.type === 'HISTORY_BACK_CALLED') {
+        console.log('SDK:LOG: HISTORY_BACK_CALLED at', data.href);
 
-      if (data?.method === 'CLOSE_CLICKED') {
-        console.log('SDK:LOG: Received CLOSE_CLICKED from web');
+        if (!canGoBackRef.current && !hasUserClosedRef.current) {
+          hasUserClosedRef.current = true;
+
+          console.log(
+            'SDK:LOG: No WebView history. Treating HISTORY_BACK as USER_CLOSED'
+          );
 
-        setWaitingForUserClosedRedirect(true);
+          StatusBar.setBackgroundColor('#7E7E7EFF');
+          clearAllCookies();
+          onCallback?.(WebViewCallback.redirect('USER_CLOSED'));
+        }
+
+        return;
+      }
+
+      if (data?.type === 'RATE_LIMIT_ERROR') {
+        console.log('SDK:LOG: RATE_LIMIT_ERROR received from web');
+        ToastAndroid.show(
+          'Too many requests. Please try after 1 minute',
+          ToastAndroid.LONG
+        );
+        // StatusBar.setBackgroundColor('#7E7E7EFF');
+        // clearAllCookies();
+        // onCallback?.(WebViewCallback.redirect('RATE_LIMIT_ERROR'));
+        // return;
       }
     } catch (e) {
       console.warn('SDK:LOG: Error parsing WebView message', e);
     }
   };
+
   const handleWebViewLoadEnd = (syntheticEvent: any) => {
     const loadedUrl = syntheticEvent?.nativeEvent?.url || url;
 
@@ -515,7 +554,9 @@ export const WebView = ({
         allowsInlineMediaPlayback={true}
         onShouldStartLoadWithRequest={handleOnShouldStartLoadWithRequest}
         onNavigationStateChange={(navState) => {
+          console.log('SDK:LOG: NAV STATE URL:', navState.url);
           setCanGoBack(navState.canGoBack);
+          canGoBackRef.current = navState.canGoBack;
         }}
         injectedJavaScript={injectedJavaScript}
         decelerationRate={Platform.OS === 'ios' ? 'normal' : 0.9}