@alipay/ams-checkout 0.0.1745808793-dev.1 → 0.0.1745808793-dev.10

package/esm/foundation/service/container/index.d.ts

@@ -29,5 +29,6 @@ export declare class ContainerService implements Service {
     private handleAppHeartBeat;
     private changeCloseBtnVisibility;
     private handleMaskCloseBtnShow;
+    private handleCloseButtonTheme;
     getWebApp(): HTMLIFrameElement;
 }

package/esm/foundation/service/container/index.js

@@ -11,7 +11,7 @@ import { isEmpty } from "../../../util";
 import { addInlineLoading, createInlineBaseElement } from "../../../component/component.inline.style";
 import { addPopupLoading, createBaseElement } from "../../../component/component.popup.style";
 import { insertStyleSheet } from "../../../component/popupWindow.style";
-import { COMPONENT_CLOSE_BLOCK_ID, COMPONENT_CLOSE_MASK_BLOCK_ID, COMPONENT_CONTAINER_ID, ERRORMESSAGE, EVENT, LOADING_ID, MOCKUP_ID, TIMEOUT_WEB_APP_HEART_BEAT, TIME_DELAY_SEND_HEART_BEAT } from "../../../constant";
+import { COMPONENT_CLOSE_BLOCK_ID, COMPONENT_CLOSE_MASK_BLOCK_ID, COMPONENT_CONTAINER_ID, ERRORMESSAGE, EVENT, LOADING_ID, MOCKUP_ID, TIMEOUT_WEB_APP_HEART_BEAT, TIME_DELAY_SEND_HEART_BEAT, closeImg, closeImgLight } from "../../../constant";
 import { DisplayTypeEnum, ProductSceneEnum } from "../../../types";
 import { ServiceProvider } from "../index";
 import { PopupManager } from "./popup";
@@ -194,7 +194,8 @@ export var ContainerService = /*#__PURE__*/function () {
       this.eventCenter.listen(EVENT.sizeChanged.name, function (data) {
         _this.handleSizeChanged(_objectSpread({}, data));
       });
-      this.eventCenter.listen(EVENT.showCloseButton.name, function () {
+      this.eventCenter.listen(EVENT.showCloseButton.name, function (data) {
+        _this.handleCloseButtonTheme(data.theme);
         _this.changeCloseBtnVisibility(true);
       });
       this.eventCenter.listen(EVENT.hideCloseButton.name, function () {
@@ -323,6 +324,23 @@ export var ContainerService = /*#__PURE__*/function () {
         closeBlock === null || closeBlock === void 0 || closeBlock.classList.add("".concat(COMPONENT_CLOSE_MASK_BLOCK_ID, "-hidden"));
       }
     }
+  }, {
+    key: "handleCloseButtonTheme",
+    value: function handleCloseButtonTheme(theme) {
+      if (!theme) return;
+      var closeBlock = document.getElementById(COMPONENT_CLOSE_BLOCK_ID);
+      var closeButtonImg = closeBlock === null || closeBlock === void 0 ? void 0 : closeBlock.querySelector('img');
+      var maskCloseBlock = document.getElementById(COMPONENT_CLOSE_MASK_BLOCK_ID);
+      if (theme === 'light') {
+        closeButtonImg === null || closeButtonImg === void 0 || closeButtonImg.setAttribute('src', closeImgLight);
+        closeBlock === null || closeBlock === void 0 || closeBlock.classList.add("".concat(COMPONENT_CLOSE_BLOCK_ID, "-light"));
+        maskCloseBlock === null || maskCloseBlock === void 0 || maskCloseBlock.classList.add("".concat(COMPONENT_CLOSE_MASK_BLOCK_ID, "-light"));
+      } else {
+        closeButtonImg === null || closeButtonImg === void 0 || closeButtonImg.setAttribute('src', closeImg);
+        closeBlock === null || closeBlock === void 0 || closeBlock.classList.remove("".concat(COMPONENT_CLOSE_BLOCK_ID, "-light"));
+        maskCloseBlock === null || maskCloseBlock === void 0 || maskCloseBlock.classList.remove("".concat(COMPONENT_CLOSE_MASK_BLOCK_ID, "-light"));
+      }
+    }
   }, {
     key: "getWebApp",
     value: function getWebApp() {

package/esm/foundation/utils/web_app_url_utils.d.ts

@@ -1,5 +1,6 @@
-import { DisplayTypeEnum, PaymentMethodCategoryTypeEnum, ProductSceneEnum } from '../../types';
+import { DisplayTypeEnum, PaymentMethodCategoryTypeEnum, ProductSceneEnum, IPaymentSessionMetaData } from '../../types';
 import { SDKMetaData } from '../index';
+import { ESP_PAGE_NAME } from "../../constant/easysafepay";
 /**
  * Tell the SDK which version of the Web App to load.
  * Sent by server inside paymentSession.
@@ -21,9 +22,10 @@ export interface WebAppMatchConfig {
  * Sent by server inside paymentSession.
  */
 export interface WebAppUrlMatchConfig {
-    version: string;
+    minSDKVersion: string;
     url: string;
-    mid?: string;
+    doubleFa: string;
+    mids?: string[];
 }
 export interface QueryParams {
     displayType: DisplayTypeEnum;
@@ -75,17 +77,40 @@ export declare const parseWebAppUrlMatchConfig: (extendInfo: string) => WebAppUr
  * @param productScene - The product scene for which the checkout URL should be saved.
  */
 export declare const saveLocalCheckoutUrl: (productScene: ProductSceneEnum, url: string) => void;
+/**
+ * 获取从外部动态下发的V2AppUrl.
+ *
+ * @param config - sessionData解析来的checkoutInfo列表.
+ */
+export declare const getMatchedWebAppV2Url: (productScene: ProductSceneEnum, mid: string, configs: WebAppUrlMatchConfig[], env: string) => string;
+/**
+ * 获取ESP从sessionData.checkoutInfo内动态下发的Url.
+ */
+export declare const matchEasySafePayV2Url: (params: {
+    configs: WebAppUrlMatchConfig[];
+    mid: string;
+    env: string;
+    pageName: ESP_PAGE_NAME;
+}) => string;
 /**
  * Retrieve the saved checkout URL from localStorage for the specified product scene.
  * If no url is found, a default checkout url string is returned.
  *
  * @param productScene - The product scene for which the checkout URL should be retrieved.
  */
-export declare const getLocalCheckoutUrl: (productScene: ProductSceneEnum) => string;
+export declare const getLocalCheckoutUrl: (productScene: ProductSceneEnum, environment: string) => string;
 /**
  * Provide default checkout URL for the specified product scene.
  * Return URL for 'EASY_PAY' product scene, while for other product scenes, it returns an empty string as they are not currently in use
  *
  * @param productScene - The product scene for which the default checkout URL should be provided.
  */
-export declare const defaultCheckoutUrl: (productScene: ProductSceneEnum) => string;
+export declare const defaultCheckoutUrl: (productScene: ProductSceneEnum, environment?: string) => string;
+/**
+ * V2应用EasySafePay 热更新兜底URL构建规则
+ * 1. 兜底URL版本与sdk版本保持一致
+ * 2. DEV环境下html新增版本前缀
+**/
+export declare const getDefaultEasySafePayPageUrl: (pageName: ESP_PAGE_NAME, env: string) => string;
+/**通过sessionData获取doubleFa,于createComponent时传递给WEB应用*/
+export declare const getDoubleFaUrlFromSession: (paymentSessionObj: IPaymentSessionMetaData, env?: string) => string;

package/esm/foundation/utils/web_app_url_utils.js

@@ -5,10 +5,11 @@ function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key i
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 import { ComponentSignEnum, ProductSceneEnum } from "../../types";
-import { marmotMap, v2AppMarmotMap } from "../../config";
+import { marmotMap, v2AppMarmotMap, sdkVersion } from "../../config";
 import { queryParse, serialize } from "../../util";
+import { compareVersion } from "../../util/versionCompare";
 import { isDebugLog } from "../../util/debug";
-
+import { ESP_PAGE_NAME } from "../../constant/easysafepay";
 /**
  * Tell the SDK which version of the Web App to load.
  * Sent by server inside paymentSession.
@@ -70,9 +71,10 @@ export var getWebAppV2Url = function getWebAppV2Url(params) {
   var productScene = params.productScene,
     isPreload = params.isPreload,
     mid = params.mid,
-    extendInfo = params.extendInfo;
+    extendInfo = params.extendInfo,
+    environment = params.environment;
   var webAppUrlMatchConfig = parseWebAppUrlMatchConfig(extendInfo);
-  var v2Url = isPreload ? getLocalCheckoutUrl(productScene) : getMatchedWebAppV2Url(productScene, mid, webAppUrlMatchConfig);
+  var v2Url = isPreload ? getLocalCheckoutUrl(productScene, environment) : getMatchedWebAppV2Url(productScene, mid, webAppUrlMatchConfig, environment);
   var info = getWebAppUrlInfo(_objectSpread(_objectSpread({}, params), {}, {
     v2Url: v2Url
   }));
@@ -117,7 +119,7 @@ var getAppPath = function getAppPath() {
   var webAppVersion = sdkMetaData.webAppVersion;
   switch (productScene) {
     case ProductSceneEnum.EASY_PAY:
-      return v2Url !== null && v2Url !== void 0 ? v2Url : defaultCheckoutUrl(productScene);
+      return v2Url !== null && v2Url !== void 0 ? v2Url : defaultCheckoutUrl(productScene, environment);
     default:
       return "".concat(marmotMap[environment], "/").concat(productSceneWithPaymentMethodCategoryType, "/").concat(validProductSceneVersion, "/index.").concat(webAppVersion, ".html");
   }
@@ -165,7 +167,7 @@ var KEY_CHECKOUT_URL = "web_url_";
 
 /**
  * Save the current checkout URL to localStorage for the specified product scene.
- * 
+ *
  * @param productScene - The product scene for which the checkout URL should be saved.
  */
 export var saveLocalCheckoutUrl = function saveLocalCheckoutUrl(productScene, url) {
@@ -173,62 +175,145 @@ export var saveLocalCheckoutUrl = function saveLocalCheckoutUrl(productScene, ur
   localStorage.setItem(key, url);
 };
 
+/**
+ * 获取从外部动态下发的V2AppUrl.
+ *
+ * @param config - sessionData解析来的checkoutInfo列表.
+ */
+export var getMatchedWebAppV2Url = function getMatchedWebAppV2Url(productScene) {
+  var mid = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : '';
+  var configs = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : [];
+  var env = arguments.length > 3 ? arguments[3] : undefined;
+  switch (productScene) {
+    case ProductSceneEnum.EASY_PAY:
+      return matchEasySafePayV2Url({
+        configs: configs,
+        mid: mid,
+        env: env,
+        pageName: ESP_PAGE_NAME.SDK_PORTAL
+      });
+    default:
+      return defaultCheckoutUrl(productScene, env);
+  }
+};
+
+/**
+ * 获取ESP从sessionData.checkoutInfo内动态下发的Url.
+ */
+export var matchEasySafePayV2Url = function matchEasySafePayV2Url(params) {
+  var _params$configs = params.configs,
+    configs = _params$configs === void 0 ? [] : _params$configs,
+    _params$mid = params.mid,
+    mid = _params$mid === void 0 ? '' : _params$mid,
+    env = params.env,
+    pageName = params.pageName;
+  var matchURLByMid = function matchURLByMid() {
+    var sortedConfigs = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
+    var targetConfigEntry = sortedConfigs.find(function (configEntry) {
+      var _configEntry$mids;
+      var isMatchMid = !!(configEntry !== null && configEntry !== void 0 && (_configEntry$mids = configEntry.mids) !== null && _configEntry$mids !== void 0 && _configEntry$mids.includes(mid));
+      var isMatchVersion = compareVersion(sdkVersion, configEntry.minSDKVersion) >= 0;
+      if (isMatchMid && isMatchVersion) {
+        return configEntry;
+      }
+    });
+    return targetConfigEntry;
+  };
+  var matchURLBySDKVersion = function matchURLBySDKVersion() {
+    var sortedConfigs = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
+    var targetConfigEntry = sortedConfigs.find(function (configEntry) {
+      var isCommonConfig = (configEntry === null || configEntry === void 0 ? void 0 : configEntry.mids) === undefined;
+      var isMatchVersion = compareVersion(sdkVersion, configEntry.minSDKVersion) >= 0;
+      if (isCommonConfig && isMatchVersion) {
+        return configEntry;
+      }
+    });
+    return targetConfigEntry;
+  };
+  var matchConfig = function matchConfig() {
+    // 按SDK版本降排序
+    var sortedConfig = configs.sort(function (a, b) {
+      return compareVersion(b.minSDKVersion, a.minSDKVersion);
+    });
+
+    // 匹配仅针对部分商户生效(mid),且符合版本号的URL
+    var matchedURLByMid = matchURLByMid(sortedConfig);
+    if (matchedURLByMid) return matchedURLByMid;
+
+    // 匹配对所有商户生效(无mid),且符合版本号的URL
+    var matchedURLBySDKVersion = matchURLBySDKVersion(sortedConfig);
+    if (matchedURLBySDKVersion) return matchedURLBySDKVersion;
+  };
+  var defaultEspUrl = getDefaultEasySafePayPageUrl(pageName, env);
+
+  // 匹配config
+  var config = matchConfig();
+  if (!config) return defaultEspUrl;
+
+  // 根据pageName匹配URL
+  if (pageName == ESP_PAGE_NAME.SDK_PORTAL) return (config === null || config === void 0 ? void 0 : config.url) || defaultEspUrl;
+  if (pageName == ESP_PAGE_NAME.DOUBLE_FA) return (config === null || config === void 0 ? void 0 : config.doubleFa) || defaultEspUrl;
+  return defaultEspUrl;
+};
+
 /**
  * Retrieve the saved checkout URL from localStorage for the specified product scene.
  * If no url is found, a default checkout url string is returned.
- * 
+ *
  * @param productScene - The product scene for which the checkout URL should be retrieved.
  */
-export var getLocalCheckoutUrl = function getLocalCheckoutUrl(productScene) {
+export var getLocalCheckoutUrl = function getLocalCheckoutUrl(productScene, environment) {
   var key = KEY_CHECKOUT_URL + productScene;
   var previousCheckoutUrl = localStorage.getItem(key);
-  return previousCheckoutUrl !== null && previousCheckoutUrl !== void 0 ? previousCheckoutUrl : defaultCheckoutUrl(productScene);
+  return previousCheckoutUrl !== null && previousCheckoutUrl !== void 0 ? previousCheckoutUrl : defaultCheckoutUrl(productScene, environment);
 };
 
 /**
  * Provide default checkout URL for the specified product scene.
  * Return URL for 'EASY_PAY' product scene, while for other product scenes, it returns an empty string as they are not currently in use
- * 
+ *
  * @param productScene - The product scene for which the default checkout URL should be provided.
  */
 export var defaultCheckoutUrl = function defaultCheckoutUrl(productScene) {
-  var defaultEnvironment = 'prod';
+  var environment = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : "prod";
   switch (productScene) {
     case ProductSceneEnum.EASY_PAY:
-      return "".concat(v2AppMarmotMap[defaultEnvironment], "/easysafepay/pages/sdk-portal/index.html");
+      return getDefaultEasySafePayPageUrl(ESP_PAGE_NAME.SDK_PORTAL, environment);
     default:
       return '';
   }
 };
-var getMatchedWebAppV2Url = function getMatchedWebAppV2Url(productScene) {
-  var mid = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : '';
-  var config = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : [];
-  if (config.length === 0) {
-    // Default checkout url
-    return defaultCheckoutUrl(productScene);
-  }
-  var sortedConfig = config.sort(function (a, b) {
-    return parseFloat(b.version) - parseFloat(a.version);
-  });
-  var targetConfigEntry = sortedConfig.find(function (configEntry) {
-    var _configEntry$mid;
-    var isMatchMid = (_configEntry$mid = configEntry.mid) !== null && _configEntry$mid !== void 0 && _configEntry$mid.trim() ? configEntry.mid.toUpperCase().includes(mid === null || mid === void 0 ? void 0 : mid.toUpperCase()) : true;
-    if (isMatchMid) {
-      return configEntry;
-    }
-  });
-  if (targetConfigEntry) {
-    // Match merchant ID
-    return targetConfigEntry === null || targetConfigEntry === void 0 ? void 0 : targetConfigEntry.url;
-  }
-  var sortedAllMerchantsConfig = sortedConfig.find(function (configEntry) {
-    return configEntry.mid === undefined || configEntry.mid === '';
-  });
-  if (sortedAllMerchantsConfig) {
-    // Match highest version without merchant ID
-    return sortedAllMerchantsConfig === null || sortedAllMerchantsConfig === void 0 ? void 0 : sortedAllMerchantsConfig.url;
-  }
 
-  // Default checkout url
-  return defaultCheckoutUrl(productScene);
+/**
+ * V2应用EasySafePay 热更新兜底URL构建规则
+ * 1. 兜底URL版本与sdk版本保持一致
+ * 2. DEV环境下html新增版本前缀
+**/
+export var getDefaultEasySafePayPageUrl = function getDefaultEasySafePayPageUrl(pageName, env) {
+  // 生成的URL EXAMPLE:
+  // const DEFAULT_DOUBLE_FA_URL_MAPPING = {
+  //   local: 'http://page.alipay.net/page/antom-web-checkout-v2/easysafepay/1.36.0/pages/double-fa/index-1.36.0.html',
+  //   dev: 'http://page.alipay.net/page/antom-web-checkout-v2/easysafepay/1.36.0/pages/double-fa/index-1.36.0.html',
+  //   sit: 'http://page.test.alipay.net/page/antom-web-checkout-v2/easysafepay/1.36.0/pages/double-fa/index.html',
+  //   pre: 'https://pre.ac.alipay.com/page/antom-web-checkout-v2/easysafepay/1.36.0/pages/double-fa/index.html',
+  //   prod: 'https://checkout.antom.com/easysafepay/1.36.0/pages/double-fa/index.html',
+  // };
+  var environment = env || "prod";
+  if (environment === "dev") return "".concat(v2AppMarmotMap[environment], "/easysafepay/").concat(sdkVersion, "/pages/").concat(pageName, "/index-").concat(sdkVersion, ".html");else return "".concat(v2AppMarmotMap[environment], "/easysafepay/").concat(sdkVersion, "/pages/").concat(pageName, "/index.html");
+};
+
+/**通过sessionData获取doubleFa,于createComponent时传递给WEB应用*/
+//TODO 后续需要构造一个类，专门用于构造&存储web应用url
+export var getDoubleFaUrlFromSession = function getDoubleFaUrlFromSession(paymentSessionObj) {
+  var env = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : "prod";
+  var mid = paymentSessionObj.clientId;
+  var extendInfo = paymentSessionObj.extendInfo;
+  var configs = parseWebAppUrlMatchConfig(extendInfo);
+  var url = matchEasySafePayV2Url({
+    configs: configs,
+    mid: mid,
+    env: env,
+    pageName: ESP_PAGE_NAME.DOUBLE_FA
+  });
+  return url;
 };

package/esm/plugin/component/channel.d.ts

@@ -11,12 +11,14 @@ export type IChannelBehavior = {
 type GetDoubleFaParams = {
     instanceId: string;
     paymentSessionData: string;
+    paymentSessionObj: IPaymentSessionMetaData;
     locale: string;
     paymentMethodType: string;
     env: string;
     sdkVersion: string;
+    notRedirectAfterComplete: boolean;
 };
-export declare function getChannelBehavior(paymentSessionMetaData?: IPaymentSessionMetaData): IChannelBehavior | undefined;
+export declare function getChannelBehavior(paymentSessionMetaData?: IPaymentSessionMetaData, notRedirectAfterComplete?: boolean): IChannelBehavior | undefined;
 export declare function getDoubleFaUrl(params: GetDoubleFaParams): string;
 export declare const handleGooglePay: (data: EventPayload) => Promise<unknown>;
 export declare class ApplePaySdk {

package/esm/plugin/component/channel.js

@@ -14,6 +14,8 @@ import { getApplePayPaymentSession, submitPayInfo } from "../../service";
 import { EnvironmentEnum } from "../../types";
 import { device, isEmpty } from "../../util";
 import { APPLE_PAY_RECURRING_VERSION, APPLE_PAY_VERSION } from "../applepay/interface";
+import { getDoubleFaUrlFromSession } from "../../foundation/utils/web_app_url_utils";
+import { MODE } from "../../constant/easysafepay";
 var APPLEPAYERRORENUM = /*#__PURE__*/function (APPLEPAYERRORENUM) {
   APPLEPAYERRORENUM["APPLE_PAY_MISSING_DATA"] = "APPLE_PAY_MISSING_DATA";
   APPLEPAYERRORENUM["APPLE_PAY_NOT_SUPPORTED"] = "APPLE_PAY_NOT_SUPPORTED";
@@ -27,7 +29,7 @@ var PAYMENT_STATUS = /*#__PURE__*/function (PAYMENT_STATUS) {
   PAYMENT_STATUS["NORMAL"] = "NORMAL";
   return PAYMENT_STATUS;
 }(PAYMENT_STATUS || {});
-export function getChannelBehavior(paymentSessionMetaData) {
+export function getChannelBehavior(paymentSessionMetaData, notRedirectAfterComplete) {
   var _paymentSessionMetaDa, _paymentSessionMetaDa2, _paymentSessionMetaDa3, _paymentSessionMetaDa4, _paymentSessionMetaDa5, _paymentSessionMetaDa6, _paymentSessionMetaDa7, _paymentSessionMetaDa8;
   // TOSS EASYPAY 2.0
   if ('BANKTRANSFER_QUICKPAY' === (paymentSessionMetaData === null || paymentSessionMetaData === void 0 || (_paymentSessionMetaDa = paymentSessionMetaData.paymentMethodInfoView) === null || _paymentSessionMetaDa === void 0 ? void 0 : _paymentSessionMetaDa.paymentMethodType) && (paymentSessionMetaData === null || paymentSessionMetaData === void 0 || (_paymentSessionMetaDa2 = paymentSessionMetaData.paymentSessionConfig) === null || _paymentSessionMetaDa2 === void 0 ? void 0 : _paymentSessionMetaDa2.productScene) === 'EASY_PAY' && (paymentSessionMetaData === null || paymentSessionMetaData === void 0 || (_paymentSessionMetaDa3 = paymentSessionMetaData.paymentSessionConfig) === null || _paymentSessionMetaDa3 === void 0 ? void 0 : _paymentSessionMetaDa3.paymentMethodCategoryType) === 'APM' && (paymentSessionMetaData === null || paymentSessionMetaData === void 0 || (_paymentSessionMetaDa4 = paymentSessionMetaData.paymentSessionConfig) === null || _paymentSessionMetaDa4 === void 0 ? void 0 : _paymentSessionMetaDa4.productSceneVersion) === '2.0') {
@@ -40,7 +42,8 @@ export function getChannelBehavior(paymentSessionMetaData) {
       buildSubmitPayExtParams: function buildSubmitPayExtParams(params) {
         var callBackUrl = getDoubleFaUrl(params);
         return {
-          callBackUrl: callBackUrl
+          callBackUrl: callBackUrl,
+          notRedirectAfterComplete: notRedirectAfterComplete === true
         };
       }
     };
@@ -65,20 +68,15 @@ export function getDoubleFaUrl(params) {
   var instanceId = params.instanceId,
     paymentMethodType = params.paymentMethodType,
     paymentSessionData = params.paymentSessionData,
+    paymentSessionObj = params.paymentSessionObj,
     locale = params.locale,
     env = params.env,
-    sdkVersion = params.sdkVersion;
+    sdkVersion = params.sdkVersion,
+    notRedirectAfterComplete = params.notRedirectAfterComplete;
   var isLandscapeOrientation = false; // Web 不含横屏
 
-  var DOUBLE_FA_URL_MAPPING = {
-    local: 'http://page.alipay.net/page/antom-web-checkout-v2/easysafepay/pages/double-fa/index-1.0.1.html',
-    dev: 'http://page.alipay.net/page/antom-web-checkout-v2/easysafepay/pages/double-fa/index-1.0.1.html',
-    sit: 'http://page.test.alipay.net/page/antom-web-checkout-v2/easysafepay/pages/double-fa/index.html',
-    pre: 'https://pre.ac.alipay.com/page/antom-web-checkout-v2/easysafepay/pages/double-fa/index.html',
-    prod: 'https://checkout.antom.com/easysafepay/pages/double-fa/index.html'
-  };
-  var doubleFaBaseUrl = DOUBLE_FA_URL_MAPPING[env] || DOUBLE_FA_URL_MAPPING.prod;
-  return "".concat(doubleFaBaseUrl, "?scene=cashierResultPage&instanceId=").concat(instanceId, "&paymentSessionData=").concat(encodeURIComponent(paymentSessionData), "&isLandscape=").concat(isLandscapeOrientation ? 'true' : '', "&pmt=").concat(paymentMethodType, "&locale=").concat(locale, "&sdkVersion=").concat(sdkVersion);
+  var baseDoubleFaUrl = getDoubleFaUrlFromSession(paymentSessionObj, env);
+  return "".concat(baseDoubleFaUrl) + '?' + "scene=cashierResultPage" + '&' + "instanceId=".concat(instanceId) + '&' + "paymentSessionData=".concat(encodeURIComponent(paymentSessionData)) + '&' + "isLandscape=".concat(isLandscapeOrientation ? 'true' : '') + '&' + "pmt=".concat(paymentMethodType) + '&' + "locale=".concat(locale) + '&' + "mode=".concat(MODE.SDK) + '&' + "sdkVersion=".concat(sdkVersion) + '&' + "&notRedirectAfterComplete=".concat(notRedirectAfterComplete);
 }
 export var handleGooglePay = function handleGooglePay(data) {
   return new Promise(function (resolve, reject) {