@deuna/react-native-sdk 2.0.0-rc.3 → 2.0.2

package/src/DeunaSDK.ts

@@ -13,11 +13,13 @@ import {
   PaymentWidgetCallbacks,
   RefetchOrder,
   SetCustomStyle,
+  SetOrderDataFn,
   State,
   Submit,
   SubmitResult,
   VoucherWidgetCallbacks,
 } from './types';
+import { InitFraudProvidersProps } from './types/fraudProviders';
 import {
   DeunaWebViewController,
   WebViewDelegate,
@@ -62,6 +64,7 @@ export class DeunaSDK extends BaseDeuna {
   onSubmitFn?: Submit | undefined;
   isValidFn?: IsValid | undefined;
   closeFn?: (() => void) | undefined;
+  setOrderDataFn?: SetOrderDataFn | undefined;
 
   private listeners: Set<() => void> = new Set();
 
@@ -125,6 +128,7 @@ export class DeunaSDK extends BaseDeuna {
   async initPaymentWidget(
     props: Omit<InitPaymentWidgetParams, 'callbacks'> & {
       mode?: Mode;
+      userAgent?: string;
       callbacks: PaymentWidgetCallbacks & OnDownloadFile;
     }
   ) {
@@ -144,7 +148,12 @@ export class DeunaSDK extends BaseDeuna {
    * @param props.mode - The mode for the widget
    */
   async initElements(
-    props: InitElementsWidgetParams & { mode?: Mode; sessionId?: string }
+    props: InitElementsWidgetParams & {
+      mode?: Mode;
+      sessionId?: string;
+      userAgent?: string;
+      fraudCredentials?: Partial<InitFraudProvidersProps>;
+    }
   ) {
     this.setWidgetController({
       controller: buildDeunaWidgetController(this.config, {
@@ -160,7 +169,13 @@ export class DeunaSDK extends BaseDeuna {
    * @param props - The parameters for the next action widget controller
    * @param props.mode - The mode for the widget
    */
-  async initNextAction(props: InitNextActionWidgetParams & { mode: Mode }) {
+  async initNextAction(
+    props: InitNextActionWidgetParams & {
+      mode: Mode;
+      userAgent?: string;
+      fraudCredentials?: Partial<InitFraudProvidersProps>;
+    }
+  ) {
     this.setWidgetController({
       controller: buildDeunaWidgetController(this.config, {
         widget: 'nextAction',
@@ -178,6 +193,8 @@ export class DeunaSDK extends BaseDeuna {
   async initVoucherWidget(
     props: Omit<InitVoucherWidgetParams, 'callbacks'> & {
       mode: Mode;
+      userAgent?: string;
+      fraudCredentials?: Partial<InitFraudProvidersProps>;
       callbacks: VoucherWidgetCallbacks & OnDownloadFile;
     }
   ) {
@@ -319,6 +336,13 @@ export class DeunaSDK extends BaseDeuna {
             }
           }
 
+          if (
+            browser === ExternalUrlBrowser.IN_APP_BROWSER &&
+            !this.externalUrlHelper.canOpenInAppBrowserUrl(url)
+          ) {
+            return;
+          }
+
           this.externalUrlHelper.openUrl({
             url,
             browser,

package/src/components/DeunaWebView.tsx

@@ -4,6 +4,7 @@ import { WebViewLoader } from './WebViewLoader';
 
 interface DeunaWebViewProps {
   url: string;
+  userAgent?: string | null;
   onWebView?: (webView: WebView) => void;
   onMessage?: (event: any) => void;
   onLoad?: () => void;
@@ -21,6 +22,7 @@ export const DeunaWebView = (props: DeunaWebViewProps) => {
           }
         }}
         source={{ uri: props.url }}
+        userAgent={props.userAgent ?? undefined}
         onMessage={props.onMessage}
         onLoad={() => {
           props.onLoad?.();

package/src/components/DeunaWidget.tsx

@@ -104,6 +104,7 @@ const DeunaWidgetContainer = (props: DeunaWidgetProps) => {
             <View style={styles.container}>
               <DeunaWebView
                 url={controller?.url ?? ''}
+                userAgent={controller?.userAgent}
                 onWebView={controller?.setWebView}
                 onMessage={controller?.onMessage}
                 onLoad={controller?.onLoad}
@@ -123,6 +124,7 @@ const DeunaWidgetContainer = (props: DeunaWidgetProps) => {
       {isEmbedded && (
         <DeunaWebView
           url={controller?.url ?? ''}
+          userAgent={controller?.userAgent}
           onWebView={controller?.setWebView}
           onMessage={controller?.onMessage}
           onLoad={controller?.onLoad}

package/src/controllers/BaseWebViewController.ts

@@ -28,6 +28,7 @@ export enum WebViewEventType {
   openExternalUrl = 'openExternalUrl',
   redirect = 'redirect',
   closeExternalUrl = 'closeExternalUrl',
+  userAgentResolved = 'userAgentResolved',
 }
 
 const DOWNLOAD_FILE_REGEX =
@@ -116,9 +117,12 @@ export abstract class DeunaWebViewController extends BaseWebViewController {
   isWebViewInitialized = false;
 
   fraudId = '';
+  userAgent: string | null = null;
+  resolvedWebViewUserAgent: string | null = null;
 
   constructor(readonly widgetConfig: WidgetConfig) {
     super();
+    this.userAgent = widgetConfig.userAgent?.trim() || null;
     this.init();
   }
 
@@ -154,6 +158,15 @@ export abstract class DeunaWebViewController extends BaseWebViewController {
     return `window.getFraudId = function(){ return '${this.fraudId}';}`;
   }
 
+  protected buildSuccessPayload = (payload: Json): Json => {
+    const enrichedPayload: Record<string, any> = { ...payload };
+    const resolvedUserAgent =
+      this.userAgent ?? this.resolvedWebViewUserAgent ?? null;
+    enrichedPayload.user_agent = resolvedUserAgent;
+    enrichedPayload.fraud_id = this.fraudId || null;
+    return enrichedPayload;
+  };
+
   abstract onEventDispatch: (event: Record<string, any>) => void;
 
   onLoad = () => {
@@ -204,6 +217,13 @@ export abstract class DeunaWebViewController extends BaseWebViewController {
       [WebViewEventType.closeExternalUrl]: () => {
         this.delegate?.onCloseExternalUrl?.();
       },
+      [WebViewEventType.userAgentResolved]: () => {
+        const userAgent = eventData.userAgent;
+        this.resolvedWebViewUserAgent =
+          typeof userAgent === 'string' && userAgent.length > 0
+            ? userAgent
+            : null;
+      },
     };
 
     mapper[eventData.type as WebViewEventType]?.();
@@ -215,6 +235,10 @@ export abstract class DeunaWebViewController extends BaseWebViewController {
     window.open = function(url, target, features) {
       window.ReactNativeWebView.postMessage(JSON.stringify({ type: '${WebViewEventType.openExternalUrl}', url }));
     };
+    window.ReactNativeWebView.postMessage(JSON.stringify({
+      type: '${WebViewEventType.userAgentResolved}',
+      userAgent: navigator.userAgent || null
+    }));
     console.log = function(message) {
         window.ReactNativeWebView.postMessage(JSON.stringify({ type: '${WebViewEventType.consoleLog}', message }));
     };

package/src/controllers/ElementsWidgetController.ts

@@ -38,7 +38,7 @@ export class ElementsWidgetController extends DeunaWebViewController {
       },
       [ElementsEventType.vaultSaveSuccess]: () => {
         this.delegate?.onCloseExternalUrl?.();
-        this.callbacks.onSuccess?.(event.data);
+        this.callbacks.onSuccess?.(this.buildSuccessPayload(event.data));
       },
       [ElementsEventType.vaultSaveError]: () => {
         this.delegate?.onCloseExternalUrl?.();

package/src/controllers/PaymentWidgetController.ts

@@ -86,7 +86,9 @@ export class PaymentWidgetController extends DeunaWebViewController {
       },
       [CheckoutEventType.purchase]: () => {
         this.delegate?.onCloseExternalUrl?.();
-        this.callbacks.onSuccess?.(checkoutEvent.data.order);
+        this.callbacks.onSuccess?.(
+          this.buildSuccessPayload(checkoutEvent.data.order)
+        );
       },
       [CheckoutEventType.purchaseError]: () => {
         this.delegate?.onCloseExternalUrl?.();

package/src/helpers/ExternalUrlHelper.ts

@@ -30,8 +30,12 @@ export interface InAppBrowserManager
 }
 
 export class ExternalUrlHelper {
+  private static readonly IN_APP_BROWSER_REOPEN_GUARD_MS = 5000;
+
   private manager: ExternalUrlManager<ExternalUrlBrowser> | null = null;
   private completer: Completer<void> | null = null;
+  private lastInAppBrowserSignature: string | null = null;
+  private lastInAppBrowserClosedAt = 0;
 
   constructor(readonly inAppBrowserAdapter: InAppBrowserAdapter) {
     this.startCloseChecker();
@@ -64,11 +68,35 @@ export class ExternalUrlHelper {
         this.manager?.type === ExternalUrlBrowser.IN_APP_BROWSER
       ) {
         this.manager = null;
+        this.lastInAppBrowserClosedAt = Date.now();
         this.completeClose();
       }
     });
   }
 
+  private getUrlSignature(url: string): string {
+    try {
+      const parsed = new URL(url);
+      return `${parsed.host}${parsed.pathname}`;
+    } catch {
+      return url;
+    }
+  }
+
+  canOpenInAppBrowserUrl(url: string): boolean {
+    if (this.manager?.type === ExternalUrlBrowser.IN_APP_BROWSER) {
+      return false;
+    }
+
+    const signature = this.getUrlSignature(url);
+    const wasSameUrlOpenedRecently =
+      this.lastInAppBrowserSignature === signature &&
+      Date.now() - this.lastInAppBrowserClosedAt <
+        ExternalUrlHelper.IN_APP_BROWSER_REOPEN_GUARD_MS;
+
+    return !wasSameUrlOpenedRecently;
+  }
+
   /**
    * Opens the webview or cross platform browser
    */
@@ -85,6 +113,7 @@ export class ExternalUrlHelper {
         } as WebViewManager;
       },
       [ExternalUrlBrowser.IN_APP_BROWSER]: async () => {
+        this.lastInAppBrowserSignature = this.getUrlSignature(url);
         this.completer = new Completer<void>();
         this.manager = {
           type: ExternalUrlBrowser.IN_APP_BROWSER,

package/src/helpers/buildDeunaWidgetController.ts

@@ -47,6 +47,7 @@ interface BaseParams {
   mode: string;
   domain?: string;
   fraudCredentials?: Partial<InitFraudProvidersProps>;
+  userAgent?: string;
 }
 
 export const buildDeunaWidgetController = (
@@ -59,7 +60,22 @@ export const buildDeunaWidgetController = (
 ): DeunaWebViewController => {
   const { widget, mode, callbacks, sdkInstance, ...rest } = props;
 
-  const baseParams: BaseParams = {
+  const userAgent =
+    typeof (rest as { userAgent?: unknown }).userAgent === 'string'
+      ? (rest as { userAgent: string }).userAgent
+      : undefined;
+
+  const fraudCredentials =
+    typeof (rest as { fraudCredentials?: unknown }).fraudCredentials ===
+      'object' && (rest as { fraudCredentials?: unknown }).fraudCredentials !== null
+      ? (rest as { fraudCredentials: Partial<InitFraudProvidersProps> })
+        .fraudCredentials
+      : undefined;
+
+  const baseParams: BaseParams & {
+    userAgent?: string;
+    fraudCredentials?: Partial<InitFraudProvidersProps>;
+  } = {
     env: config.environment!,
     publicApiKey: config.publicApiKey,
     orderToken: rest.orderToken ?? '',
@@ -73,6 +89,8 @@ export const buildDeunaWidgetController = (
           ? `https://${rest.domain}`
           : rest.domain,
     }),
+    userAgent,
+    fraudCredentials,
   };
 
   const widgetMappers = {
@@ -91,29 +109,26 @@ export const buildDeunaWidgetController = (
         behavior: rest.behavior,
         paymentMethods: paymentWidgetProps.paymentMethods,
         styleFile: rest.styleFile,
-        fraudCredentials: paymentWidgetProps.fraudCredentials,
       };
     },
     nextAction: () => baseParams,
     voucher: () => baseParams,
   };
 
+  const widgetParams = widgetMappers[widget]();
   const widgetConfig = {
     orderToken: rest.orderToken,
     behavior: rest.behavior,
     userToken: rest.userToken,
+    userAgent: widgetParams.userAgent,
+    fraudCredentials: widgetParams.fraudCredentials,
+    sdkInstance,
   };
 
-  const widgetParams = widgetMappers[widget]();
-
   const controller =
     widget === 'elements'
-      ? new ElementsWidgetController(callbacks, widgetConfig)
-      : new PaymentWidgetController(callbacks, {
-          ...widgetConfig,
-          sdkInstance,
-          fraudCredentials: widgetParams.fraudCredentials,
-        });
+      ? new ElementsWidgetController(callbacks ?? {}, widgetConfig)
+      : new PaymentWidgetController(callbacks ?? {}, widgetConfig);
 
   controller.url = linkBuilders[widget](widgetParams);
   controller.hidePayButton = rest.hidePayButton ?? false;

package/src/interfaces/types.ts

@@ -6,6 +6,7 @@ export interface WidgetConfig {
   behavior?: BehaviorWidget;
   orderToken?: string;
   userToken?: string;
+  userAgent?: string;
   sdkInstance?: DeunaSDK;
   fraudCredentials?: Partial<InitFraudProvidersProps>;
 }

package/src/types/base.ts

@@ -54,10 +54,12 @@ export type SetCustomStyle = (customStyles: CustomStyles) => void;
 export type GetStateFn = () => Promise<State>;
 export type IsValid = () => Promise<boolean>;
 export type RefetchOrder = () => Promise<Order | null>;
+export type OrderData = { orderToken?: string; userToken?: string };
+export type SetOrderDataFn = (data: OrderData) => Promise<void>;
 
 export type InitPaymentWidgetParams = Omit<InitWidgetBase, 'callbacks'> & {
   orderToken: string;
-  callbacks: PaymentWidgetCallbacks;
+  callbacks?: PaymentWidgetCallbacks;
   paymentMethods?: {
     paymentMethod: string;
     processors: string[];
@@ -71,7 +73,7 @@ export type InitPaymentWidgetParams = Omit<InitWidgetBase, 'callbacks'> & {
 };
 
 export type InitElementsWidgetParams = Omit<InitWidgetBase, 'callbacks'> & {
-  callbacks: ElementsWidgetCallbacks;
+  callbacks?: ElementsWidgetCallbacks;
   types?: ElementWidgetType[];
 };
 
@@ -92,6 +94,7 @@ export abstract class BaseDeuna {
   abstract onSubmitFn?: Submit;
   abstract isValidFn?: IsValid;
   abstract closeFn?: () => void;
+  abstract setOrderDataFn?: SetOrderDataFn;
 
   abstract getSessionId(): Promise<string>;
   abstract submit(): Promise<SubmitResult>;

package/src/types/env.ts

@@ -41,7 +41,15 @@ export enum Env {
     [Env.Develop]: 'b267dfc8a5',
     [Env.Sandbox]: 'b267dfc8a5'
   };
-  
+
+  const PROD_URL = 'https://cdn.deuna.io/cdl/v1.1/index.js'
+  export const cdlUrls = {
+    [Env.Sandbox]: PROD_URL,
+    [Env.Production]: PROD_URL,
+    [Env.Staging]: 'https://cdn.stg.deuna.io/cdl/index.js',
+    [Env.Develop]: 'https://cdn.dev.deuna.io/cdl/index.js',
+  };
+
   export const proxyUrls = {
     URL: 'mimos.vendodeuna.com',
     FPJS_BEHAVIOR_PATH: 'thomas',

package/src/types/fraudProviders.ts

@@ -8,6 +8,7 @@ export type Providers =
   | "SIFT"
   | "SIGNIFYD"
   | "STRIPE"
+  | "KOIN"
   | "KOUNT"
   | "KONDUTO"
   | "OPENPAY"
@@ -65,8 +66,8 @@ export interface KountParams {
 }
 
 export interface KoinParams {
-  id: string;
   orgId: string;
+  sessionId?: string;
 }
 
 export interface KondutoParams {
@@ -95,4 +96,5 @@ export type InitFraudProvidersProps = {
   KOUNT: KountParams;
   KONDUTO: KondutoParams;
   RISKIFIED: RiskifiedParams;
+  KOIN: KoinParams;
 };

package/src/types/helpers/buildElementsLink.ts

@@ -4,7 +4,7 @@ import { getIntegrationType, UrlConfig } from "./urlConfig";
 import { PLATFORM_DEFAULT } from "./constants";
 import { addSearchParamWhen } from "../utils/addSearchParamWhen";
 
-const ELEMENTS_URLS: Record<Environment, string> = {
+export const ELEMENTS_URLS: Record<Environment, string> = {
   production: "https://elements.deuna.com",
   sandbox: "https://elements.sandbox.deuna.io",
   staging: "https://elements.stg.deuna.io",
@@ -32,6 +32,7 @@ export interface SearchParams {
   showDefaultCardFlow?: string;
   disableInstallments?: string;
   platform?: string;
+  isPreloaded?: string;
 }
 
 /**
@@ -70,6 +71,10 @@ const buildSearchParams = (config: UrlConfig): URLSearchParams => {
     searchParams.userToken = userToken;
   }
 
+  if (config.isPreloaded) {
+    searchParams.isPreloaded = 'true';
+  }
+
   const ux = widgetExperience?.userExperience;
 
   if (ux) {

package/src/types/helpers/buildPaymentLink.ts

@@ -57,8 +57,10 @@ export const buildPaymentLink = (config: UrlConfig): string => {
   //encode to base64
   searchParams.append("xpropsB64", btoa(JSON.stringify(xpropsB64)));
 
+  const token = orderToken || "preload";
+
   const url = new URL(
-    `${baseUrl}/now/${orderToken}?${searchParams.toString()}`
+    `${baseUrl}/now/${token}?${searchParams.toString()}`
   );
 
   return url.toString();

package/src/types/helpers/urlConfig.ts

@@ -73,6 +73,8 @@ export interface UrlConfig {
   types?: ElementWidgetType[];
 
   platform?: string;
+
+  isPreloaded?: boolean;
 }
 
 export interface ElementWidgetType {