banking_dcb_sdk_react_native 1.0.7 → 1.0.9

package/src/helpers/webview.tsx

@@ -1,4 +1,7 @@
-import { WebView as RNWebView } from 'react-native-webview';
+import {
+  WebView as RNWebView,
+  type WebViewMessageEvent,
+} from 'react-native-webview';
 import {
   BackHandler,
   Platform,
@@ -30,7 +33,7 @@ import FileViewer from 'react-native-file-viewer';
 import RNFS from 'react-native-fs';
 import CookieManager from '@react-native-cookies/cookies';
 import { AnalyticsLogger } from './analytics/analytics_logger';
-import IntentLauncher, { IntentConstant } from 'react-native-intent-launcher';
+import SendIntentAndroid from 'react-native-send-intent';
 
 interface ExtendedWebViewProps extends WebViewProps {
   onPermissionRequest?: (event: any) => void;
@@ -51,69 +54,70 @@ interface WebViewCustomProps {
 
 type MailApp = 'gmail' | 'outlook' | 'yahoo';
 
-const PKG = {
+const PKG: Record<MailApp, string> = {
   gmail: 'com.google.android.gm',
   outlook: 'com.microsoft.office.outlook',
   yahoo: 'com.yahoo.mobile.client.android.mail',
-} as const;
-
-const YAHOO_CLASS =
-  'com.yahoo.mobile.client.android.mail.activity.MainActivity';
+};
 
-const SCHEME = {
+const SCHEME: Record<MailApp, string> = {
   gmail: 'googlegmail://',
   outlook: 'ms-outlook://',
   yahoo: 'ymail://',
-} as const;
+};
 
+/**
+ * Try to open a specific mail app, like Gmail.
+ * Returns true if something was opened, false otherwise.
+ *
+ * Order of attempts:
+ *   1. openApp(<package>) via react-native-send-intent
+ *   2. Linking.openURL(<custom scheme>) as fallback
+ */
 export async function openMailAppIntent(app: MailApp): Promise<boolean> {
-  console.log('new changes deployed');
-  if (Platform.OS !== 'android') return false;
+  if (Platform.OS !== 'android') {
+    // iOS? We don't do anything special here. Just say "not handled".
+    return false;
+  }
+
+  const pkg = PKG[app];
+  const scheme = SCHEME[app];
 
+  // Step 1: Try launching the package directly.
   try {
-    if (app === 'yahoo') {
-      // Yahoo needed explicit component in Flutter, keep that
-      await IntentLauncher.startActivity({
-        action: 'android.intent.action.MAIN',
-        category: 'android.intent.category.LAUNCHER',
-        packageName: PKG.yahoo,
-        className: YAHOO_CLASS,
-        flags: [IntentConstant.FLAG_ACTIVITY_NEW_TASK],
-      });
-    } else {
-      // Gmail & Outlook: let Android resolve launcher Activity
-      await IntentLauncher.startActivity({
-        action: 'android.intent.action.MAIN',
-        category: 'android.intent.category.LAUNCHER',
-        packageName: PKG[app],
-        flags: [IntentConstant.FLAG_ACTIVITY_NEW_TASK],
-      });
+    // openApp(packageName) resolves to boolean: wasOpened
+    // according to the lib docs. :contentReference[oaicite:3]{index=3}
+    const wasOpened = await SendIntentAndroid.openApp(pkg, {});
+    if (wasOpened) {
+      return true;
     }
-    return true;
-  } catch (e) {
-    console.log('IntentLauncher.startActivity failed for', app, e);
+  } catch (err) {
+    console.log(`SDK:LOG: [mailIntent] openApp(${pkg}) failed:`, err);
   }
 
-  // Fallback to scheme like in previous step
+  // Step 2: Fallback to the custom scheme.
   try {
-    const scheme = SCHEME[app];
     const canOpen = await Linking.canOpenURL(scheme);
     if (canOpen) {
       await Linking.openURL(scheme);
       return true;
     }
-  } catch (e2) {
-    console.log('Linking fallback failed for', app, e2);
+  } catch (err2) {
+    console.log(
+      `SDK:LOG: [mailIntent] Linking fallback (${scheme}) failed:`,
+      err2
+    );
   }
 
   return false;
 }
+
 const clearAllCookies = async () => {
   try {
     await CookieManager.clearAll(true);
-    console.log('clearing cookies');
+    console.log('SDK:LOG: clearing cookies');
   } catch (e) {
-    console.error('Failed to clear cookies:', e);
+    console.error('SDK:LOG: Failed to clear cookies:', e);
   }
 };
 
@@ -127,7 +131,9 @@ export const WebView = ({
 }: WebViewCustomProps) => {
   const webviewRef = useRef<RNWebView | null>(null);
   const [canGoBack, setCanGoBack] = useState(false);
-  const _analyticsLogger = new AnalyticsLogger();
+  const canGoBackRef = useRef(false);
+  const hasUserClosedRef = useRef(false);
+
   // const [hasRedirected, setHasRedirected] = useState(false);
   const [, setToast] = useState<{ visible: boolean; message: string } | null>(
     null
@@ -145,7 +151,7 @@ export const WebView = ({
           ToastAndroid.LONG
         );
       }
-      console.log('Application not found to open link');
+      console.log('SDK:LOG: Application not found to open link');
     }
   };
   const showToast_with_code_message = (syntheticEvent: any) => {
@@ -186,7 +192,7 @@ export const WebView = ({
 
   const downloadAndOpenFile = async (fileUrl: string) => {
     try {
-      console.log('Starting file download...', fileUrl);
+      console.log('SDK:LOG: Starting file download...', fileUrl);
 
       // Get cookies using CookieManager
       let cookieString = '';
@@ -196,7 +202,7 @@ export const WebView = ({
           .map((key) => `${key}=${cookies[key]?.value ?? ''}`)
           .join('; ');
       } catch (e) {
-        console.error('Failed to get cookies:', e);
+        console.error('SDK:LOG: Failed to get cookies:', e);
       }
 
       // Create a clean filename from the URL
@@ -216,7 +222,7 @@ export const WebView = ({
         throw new Error('Could not determine download path');
       }
 
-      console.log('Downloading to:', downloadPath);
+      console.log('SDK:LOG: Downloading to:', downloadPath);
 
       const options = {
         fromUrl: fileUrl,
@@ -228,14 +234,14 @@ export const WebView = ({
         },
         background: true,
         begin: (res: any) => {
-          console.log('Download started with headers:', res);
+          console.log('SDK:LOG: Download started with headers:', res);
         },
       };
 
       const response = await RNFS.downloadFile(options).promise;
 
       if (response.statusCode === 200) {
-        console.log('File downloaded to:', downloadPath);
+        console.log('SDK:LOG: File downloaded to:', downloadPath);
 
         if (Platform.OS === 'android') {
           ToastAndroid.show('File downloaded successfully', ToastAndroid.SHORT);
@@ -253,20 +259,21 @@ export const WebView = ({
         throw new Error(`Download failed with status ${response.statusCode}`);
       }
     } catch (error) {
-      console.error('File download/open error:', error);
+      console.error('SDK:LOG: File download/open error:', error);
     }
   };
 
   const handleOnShouldStartLoadWithRequest = (event: WebViewNavigation) => {
     const { url } = event;
-    console.log('URL:', url);
-    if (url === 'about:blank' || url === 'about:srcdoc') {
+    console.log('SDK:LOG: WEBVIEW URL:', url);
+
+    if (!url || url === 'about:blank' || url === 'about:srcdoc') {
       return true;
     }
 
     if (Platform.OS === 'android' && url) {
       if (url.includes('ms-outlook://')) {
-        console.log('Intent to open Outlook detected');
+        console.log('SDK:LOG: Intent to open Outlook detected');
         openMailAppIntent('outlook').then(
           (ok) =>
             !ok &&
@@ -275,7 +282,7 @@ export const WebView = ({
         return false; // cancel WebView navigation
       }
       if (url.includes('googlegmail://')) {
-        console.log('Intent to open Gmail detected');
+        console.log('SDK:LOG: Intent to open Gmail detected');
         openMailAppIntent('gmail').then(
           (ok) =>
             !ok && ToastAndroid.show('Gmail app not found', ToastAndroid.SHORT)
@@ -283,7 +290,7 @@ export const WebView = ({
         return false;
       }
       if (url.includes('ymail://')) {
-        console.log('Intent to open Yahoo Mail detected');
+        console.log('SDK:LOG: Intent to open Yahoo Mail detected');
         openMailAppIntent('yahoo').then(
           (ok) =>
             !ok &&
@@ -297,10 +304,10 @@ export const WebView = ({
       url?.includes('/session-expired?status=') ||
       url?.includes('/redirect?status=')
     ) {
-      console.log('overriding url');
+      console.log('SDK:LOG: overriding url');
       const status = getQueryParam(url, 'status');
 
-      console.log('Status thrown from webview ', status);
+      console.log('SDK:LOG: Status thrown from webview ', status);
 
       StatusBar.setBackgroundColor('#7E7E7EFF');
       clearAllCookies();
@@ -308,7 +315,7 @@ export const WebView = ({
       return false;
     }
     if (url?.includes('/api/user/redirect')) {
-      console.log('overriding redirect url');
+      console.log('SDK:LOG: overriding redirect url');
 
       StatusBar.setBackgroundColor('#7E7E7EFF');
       clearAllCookies();
@@ -327,7 +334,7 @@ export const WebView = ({
       url !== 'about:blank' &&
       url !== 'about:srcdoc'
     ) {
-      console.log('External URL detected:', url);
+      console.log('SDK:LOG: External URL detected:', url);
       handleExternalUrl(url);
       return false;
     }
@@ -336,7 +343,7 @@ export const WebView = ({
       url.includes('/statements/') ||
       url.includes('/download_statements')
     ) {
-      console.log('File download URL detected:', url);
+      console.log('SDK:LOG: File download URL detected:', url);
       downloadAndOpenFile(url);
       return false;
     }
@@ -369,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 {
@@ -392,14 +426,14 @@ export const WebView = ({
 
       return result === RESULTS.GRANTED;
     } catch (error) {
-      console.error('Permission request failed:', error);
+      console.error('SDK:LOG: Permission request failed:', error);
       return false;
     }
   };
 
   const handlePermissionRequest = async (event: any) => {
     const { resources } = event.nativeEvent;
-    console.log('Permission requested:', resources);
+    console.log('SDK:LOG: Permission requested:', resources);
 
     const permissionsToRequest: Permission[] = [];
 
@@ -439,12 +473,52 @@ export const WebView = ({
         event.nativeEvent.deny();
       }
     } catch (error) {
-      console.error('Permission handling failed:', error);
+      console.error('SDK:LOG: Permission handling failed:', error);
       // @ts-ignore - deny exists on the event
       event.nativeEvent.deny();
     }
   };
 
+  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 (!canGoBackRef.current && !hasUserClosedRef.current) {
+          hasUserClosedRef.current = true;
+
+          console.log(
+            'SDK:LOG: No WebView history. Treating HISTORY_BACK as USER_CLOSED'
+          );
+
+          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;
 
@@ -480,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}
@@ -489,6 +565,7 @@ export const WebView = ({
         setSupportMultipleWindows={false}
         mixedContentMode="always"
         allowsLinkPreview={true}
+        onMessage={handleMessage}
       />
     </SafeAreaView>
   );

package/PartnerReactNativeSdk.podspec

@@ -1,31 +0,0 @@
-require "json"
-
-package = JSON.parse(File.read(File.join(__dir__, "package.json")))
-
-Pod::Spec.new do |s|
-  s.name         = "PartnerReactNativeSdk"
-  s.version      = package["version"]
-  s.summary      = package["description"]
-  s.homepage     = package["homepage"]
-  s.license      = package["license"]
-  s.authors      = package["author"]
-
-  s.platforms    = { :ios => min_ios_version_supported }
-  s.source       = { :git => "https://github.com/spense-fintech/partner-react-native-library.git.git", :tag => "#{s.version}" }
-
-  s.source_files = "ios/**/*.{h,m,mm,cpp}"
-  # s.private_header_files = "ios/**/*.h"
-  s.exclude_files = "ios/generated/**" 
-
-# Use install_modules_dependencies helper to install the dependencies if React Native version >=0.71.0.
-# See https://github.com/facebook/react-native/blob/febf6b7f33fdb4904669f99d795eba4c0f95d7bf/scripts/cocoapods/new_architecture.rb#L79.
-if respond_to?(:install_modules_dependencies, true)
-  install_modules_dependencies(s)
-else
-  s.dependency "React-Core"
-  s.dependency "React-Codegen"
-  s.dependency "RCTRequired"
-  s.dependency "RCTTypeSafety"
-  s.dependency "ReactCommon/turbomodule/core"
-end
-end