banking_dcb_sdk_react_native 1.0.77 → 1.0.91-beta

package/src/helpers/banking_dcb_react_native.tsx

@@ -1,15 +1,26 @@
 import { APICall } from './network/APICall';
 import { DeviceInfoManager } from './utils/deviceInfoManager';
 import { LibraryConstants } from './utils/LibraryConstants';
-import { type WebViewCallbackFunction } from './utils/webviewCallback';
+import {
+  SdkCallbackStatus,
+  WebViewCallback,
+  type WebViewCallbackFunction,
+} from './utils/webviewCallback';
 import { ServiceNames } from './ServiceNames';
 import { Constants } from './utils/Constants';
 import { WebView } from './webview';
 import { SafeAreaView } from 'react-native-safe-area-context';
-import { StatusBar } from 'react-native';
+import {
+  Alert,
+  PermissionsAndroid,
+  Platform,
+  StatusBar,
+  ToastAndroid,
+} from 'react-native';
 export type { WebViewCallbackFunction } from './utils/webviewCallback';
 import { AnalyticsLogger } from './analytics/analytics_logger';
 import * as base64js from 'base64-js';
+// import GetLocation, { type Location } from 'react-native-get-location';
 
 type InitOptions = {
   whitelistedDomains: string[];
@@ -28,7 +39,6 @@ export class BankingDcbReactNative {
 
   private _apiCall = new APICall();
   static webViewCallback: WebViewCallbackFunction;
-  private _analyticsLogger!: AnalyticsLogger;
   private constructor() {}
 
   static getInstance(): BankingDcbReactNative {
@@ -45,7 +55,7 @@ export class BankingDcbReactNative {
       deviceBindingEnabled: false,
     }
   ): Promise<void> {
-    //   console.log("PartnerLibrary.init - initialized:", PartnerLibrary.intialized);
+    console.log('SDK LOG: SDK INITIALIZED');
     if (BankingDcbReactNative.intialized) return;
 
     try {
@@ -82,7 +92,6 @@ export class BankingDcbReactNative {
       whitelistedDomains: whitelistedDomains,
       deviceBinding: deviceBindingEnabled,
     });
-    this._analyticsLogger = new AnalyticsLogger();
     // this._analyticsLogger.logEvent({ event: 'REACT_NATIVE_INTIALIZED' });
   }
 
@@ -90,7 +99,7 @@ export class BankingDcbReactNative {
     module: string,
     token: string,
     WebViewCallbackFunction: WebViewCallbackFunction
-  ): Promise<React.ReactElement> {
+  ): Promise<React.ReactElement | null> {
     // this._analyticsLogger.logEvent({ event: 'REACT_NATIVE_OPEN_FN_CALLED' });
 
     if (!BankingDcbReactNative.intialized) {
@@ -122,7 +131,7 @@ export class BankingDcbReactNative {
     bank: string,
     url: string,
     WebViewCallbackFunction: WebViewCallbackFunction
-  ): Promise<React.ReactElement> {
+  ): Promise<React.ReactElement | null> {
     // this._analyticsLogger.logEvent({
     //   event: 'REACT_NATIVE_DEVICE_BINDING_CALLED',
     // });
@@ -143,7 +152,7 @@ export class BankingDcbReactNative {
     bank: string,
     token: string,
     WebViewCallbackFunction: WebViewCallbackFunction
-  ): Promise<React.ReactElement> {
+  ): Promise<React.ReactElement | null> {
     // console.log("PartnerLibrary._loginAndNavigateToWebView - LibraryConstants.hostName:", LibraryConstants.hostName);
     try {
       // this._analyticsLogger.logEvent({ event: 'REACT_NATIVE_LOGIN_FN_CALLED' });
@@ -207,7 +216,7 @@ export class BankingDcbReactNative {
     bank: string,
     url: string,
     WebViewCallbackFunction: WebViewCallbackFunction
-  ): Promise<React.ReactElement> {
+  ): Promise<React.ReactElement | null> {
     try {
       console.log('SDK:LOG: in setup device session');
 
@@ -219,22 +228,38 @@ export class BankingDcbReactNative {
         console.log('App Version:', appVersion);
       }
       console.log('SDK:LOG device uuid is  ');
-
+      // const position = await this._getCurrentLocationIfPossible(
+      //   BankingDcbReactNative.webViewCallback
+      // );
+
+      // if (!position) {
+      //   console.log('SDK:LOG: location fetched is : ', position);
+      //   return null;
+      // }
+
+      // const latitude = String(position.latitude);
+      // const longitude = String(position.longitude);
+
+      const body: JSONMap = {
+        [Constants.MANUFACTURER]: deviceInfo[Constants.MANUFACTURER],
+        [Constants.MODEL]: deviceInfo[Constants.MODEL],
+        [Constants.DEVICE_UUID]: deviceInfo[Constants.DEVICE_UUID],
+        [Constants.OS]: deviceInfo[Constants.OS],
+        [Constants.OS_VERSION]: deviceInfo[Constants.OS_VERSION],
+        [Constants.APP_VERSION]: appVersion,
+        // [Constants.LATITUDE]: latitude,
+        // [Constants.LONGITUDE]: longitude,
+        // [Constants.ACCURACY]: String(position.accuracy),
+      };
+      console.log('SDK:LOG: body for device session is : ', body);
       const response = await this._apiCall.callAPI(
         'POST',
         ServiceNames.DEVICE_SESSION.params({ partner: bank }),
         {
-          body: {
-            [Constants.MANUFACTURER]: deviceInfo[Constants.MANUFACTURER],
-            [Constants.MODEL]: deviceInfo[Constants.MODEL],
-            [Constants.DEVICE_UUID]: deviceInfo[Constants.DEVICE_UUID],
-            [Constants.OS]: deviceInfo[Constants.OS],
-            [Constants.OS_VERSION]: deviceInfo[Constants.OS_VERSION],
-            [Constants.APP_VERSION]: appVersion,
-          },
+          body,
         }
       );
-      //console.log("response from setup device session is : ", response)
+      console.log('response from setup device session is : ', response);
       if (
         response &&
         response.data &&
@@ -380,7 +405,7 @@ export class BankingDcbReactNative {
               [Constants.MANUFACTURER]: deviceInfo[Constants.MANUFACTURER],
               [Constants.MODEL]: deviceInfo[Constants.MODEL],
               [Constants.DEVICE_UUID]: deviceInfo[Constants.DEVICE_UUID],
-              [Constants.OS]: deviceInfo[Constants.OS], // "Android"/"iOS" from your manager
+              [Constants.OS]: deviceInfo[Constants.OS],
               [Constants.OS_VERSION]: deviceInfo[Constants.OS_VERSION],
               [Constants.APP_VERSION]: appVersion,
             },
@@ -410,4 +435,97 @@ export class BankingDcbReactNative {
       };
     }
   }
+
+  // private async _getCurrentLocationIfPossible(
+  //   webViewCallback: WebViewCallbackFunction
+  // ): Promise<Location | null> {
+  //   try {
+  //     console.log('SDK:LOG: in get current location');
+
+  //     if (Platform.OS === 'android') {
+  //       const hasFineLocation = await PermissionsAndroid.check(
+  //         PermissionsAndroid.PERMISSIONS.ACCESS_FINE_LOCATION
+  //       );
+
+  //       let result: string;
+
+  //       if (!hasFineLocation) {
+  //         result = await PermissionsAndroid.request(
+  //           PermissionsAndroid.PERMISSIONS.ACCESS_FINE_LOCATION
+  //         );
+  //       } else {
+  //         result = PermissionsAndroid.RESULTS.GRANTED;
+  //       }
+
+  //       console.log('SDK:LOG: ANDROID LOCATION PERMISSION RESULT =>', result);
+
+  //       if (result === PermissionsAndroid.RESULTS.DENIED) {
+  //         webViewCallback(
+  //           WebViewCallback.sdkEvent(
+  //             SdkCallbackStatus.userLocationPermissionDenied
+  //           )
+  //         );
+  //         return null;
+  //       }
+
+  //       if (result === PermissionsAndroid.RESULTS.NEVER_ASK_AGAIN) {
+  //         ToastAndroid.show(
+  //           'Location permission denied. Please enable it from Settings.',
+  //           ToastAndroid.LONG
+  //         );
+  //         webViewCallback(
+  //           WebViewCallback.sdkEvent(
+  //             SdkCallbackStatus.userLocationPermissionPermanentlyDenied
+  //           )
+  //         );
+  //         return null;
+  //       }
+  //     }
+
+  //     const location = await GetLocation.getCurrentPosition({
+  //       enableHighAccuracy: true,
+  //       timeout: 15000,
+  //     });
+
+  //     console.log('SDK:LOG: 📍 Got position via GetLocation:', {
+  //       latitude: location.latitude,
+  //       longitude: location.longitude,
+  //       accuracy: location.accuracy,
+  //       time: location.time,
+  //     });
+
+  //     return location;
+  //   } catch (error: any) {
+  //     console.log(
+  //       'SDK:LOG: Error while fetching location (GetLocation):',
+  //       error
+  //     );
+
+  //     const code = error?.code as string | undefined;
+
+  //     if (code === 'UNAUTHORIZED') {
+  //       webViewCallback(
+  //         WebViewCallback.sdkEvent(
+  //           SdkCallbackStatus.userLocationPermissionDenied
+  //         )
+  //       );
+  //     } else if (code === 'UNAVAILABLE') {
+  //       webViewCallback(
+  //         WebViewCallback.sdkEvent(
+  //           SdkCallbackStatus.userLocationServiceDisabled
+  //         )
+  //       );
+  //     } else if (code === 'TIMEOUT') {
+  //       webViewCallback(
+  //         WebViewCallback.sdkEvent(SdkCallbackStatus.userLocationFetchError)
+  //       );
+  //     } else {
+  //       webViewCallback(
+  //         WebViewCallback.sdkEvent(SdkCallbackStatus.userLocationFetchError)
+  //       );
+  //     }
+
+  //     return null;
+  //   }
+  // }
 }

package/src/helpers/utils/Constants.tsx

@@ -1,10 +1,12 @@
 export const Constants = {
-
-    MANUFACTURER: "manufacturer",
-    MODEL: "model",
-    OS: "os",
-    OS_VERSION: "os_version",
-    APP_VERSION: "app_version",
-    DEVICE_UUID: "device_uuid",
-    PRIMARY_COLOR: "#3F51B5"
-} as const;
+  MANUFACTURER: 'manufacturer',
+  MODEL: 'model',
+  OS: 'os',
+  OS_VERSION: 'os_version',
+  APP_VERSION: 'app_version',
+  DEVICE_UUID: 'device_uuid',
+  PRIMARY_COLOR: '#3F51B5',
+  LATITUDE: 'latitude',
+  LONGITUDE: 'longitude',
+  ACCURACY: 'accuracy',
+} as const;

package/src/helpers/utils/webviewCallback.tsx

@@ -1,25 +1,41 @@
 export enum WebViewCallbackType {
-
-    Logout = "logout",
-    Redirect = "redirect"
+  Logout = 'logout',
+  Redirect = 'redirect',
+  SdkEvent = 'sdkEvent',
 }
 
 export class WebViewCallback {
-    type: WebViewCallbackType;
-    status?: string | null;
+  type: WebViewCallbackType;
+  status?: string | null;
+
+  private constructor(type: WebViewCallbackType, status?: string | null) {
+    this.type = type;
+    this.status = status;
+  }
 
-    private constructor(type: WebViewCallbackType, status?: string | null) {
-        this.type = type;
-        this.status = status;
-    }
+  static logout(): WebViewCallback {
+    return new WebViewCallback(WebViewCallbackType.Logout);
+  }
 
-    static logout(): WebViewCallback {
-        return new WebViewCallback(WebViewCallbackType.Logout);
-    }
+  static redirect(status?: string | null): WebViewCallback {
+    return new WebViewCallback(WebViewCallbackType.Redirect, status);
+  }
 
-    static redirect(status?: string | null): WebViewCallback {
-        return new WebViewCallback(WebViewCallbackType.Redirect, status);
-    }
+  static sdkEvent(status: string): WebViewCallback {
+    return new WebViewCallback(WebViewCallbackType.SdkEvent, status);
+  }
 }
 
-export type WebViewCallbackFunction = (callback: WebViewCallback) => void;
+export type WebViewCallbackFunction = (callback: WebViewCallback) => void;
+
+export class SdkCallbackStatus {
+  static readonly userLocationPermissionGranted =
+    'USER_LOCATION_PERMISSION_GRANTED';
+  static readonly userLocationPermissionDenied =
+    'USER_LOCATION_PERMISSION_DENIED';
+  static readonly userLocationPermissionPermanentlyDenied =
+    'USER_LOCATION_PERMISSION_PERMANENTLY_DENIED';
+  static readonly userLocationServiceDisabled =
+    'USER_LOCATION_SERVICE_DISABLED';
+  static readonly userLocationFetchError = 'USER_LOCATION_FETCH_ERROR';
+}

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}

package/ios/PartnerReactNativeSdk.h

@@ -1,6 +0,0 @@
-
-#import <PartnerReactNativeSdk/RNPartnerReactNativeSdkSpec.h>
-
-@interface PartnerReactNativeSdk : NSObject <NativePartnerReactNativeSdkSpec>
-
-@end