@alipay/ams-checkout 0.0.1747907034-dev.0 → 0.0.1747907034-dev.2

package/esm/foundation/product-processor/easysafepay/index.js

@@ -18,6 +18,8 @@ function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol"
 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 PreloadHelper from "../../../foundation/utils/preload_helper";
 import { ChannelCustomize, DisplayTypeEnum, getBackScheme, isPC, PaymentMethodCategoryTypeEnum, ProductInfoCacheUtil, ProductSceneEnum, RiskSdkInfoEnum, ServiceProvider, uuid, WebAppUrlUtil, EVENT, eventCodeEnum } from "./deps";
+import { isEmpty } from "../../../util";
+import { getDoubleFaUrlFromSession } from "../../utils/web_app_url_utils";
 export var EasySafePayProcessor = /*#__PURE__*/function () {
   function EasySafePayProcessor() {
     _classCallCheck(this, EasySafePayProcessor);
@@ -29,10 +31,11 @@ export var EasySafePayProcessor = /*#__PURE__*/function () {
     _defineProperty(this, "instanceId", void 0);
     // 服务端接口区域信息，请求时决定API域名
     _defineProperty(this, "hostSign", void 0);
+    _defineProperty(this, "allowQueryCall", void 0);
     // 是否允许submitPay提前调用，在ESP非首次的性能优化场景使用
     _defineProperty(this, "allowSubmitPayCallAhead", void 0);
     _defineProperty(this, "channelBehavior", void 0);
-    _defineProperty(this, "SECURITY_SDK_INIT_TIMEOUT", 18000);
+    _defineProperty(this, "SECURITY_SDK_INIT_TIMEOUT", 1500);
     _defineProperty(this, "SDK_REQUEST_TIMEOUT", 15000);
     _defineProperty(this, "LOAD_APP_RESOURCES_TIMEOUT", 15000);
   }
@@ -46,13 +49,13 @@ export var EasySafePayProcessor = /*#__PURE__*/function () {
       this.eventCenter = ServiceProvider.getInstance(this.instanceId).getService('EventCenter');
 
       // preload web app
-      PreloadHelper.preloadWebApp(ProductSceneEnum.EASY_PAY, PaymentMethodCategoryTypeEnum.WALLET, this.initConfig.environment);
+      PreloadHelper.preloadWebApp(ProductSceneEnum.EASY_PAY, PaymentMethodCategoryTypeEnum.WALLET, this.initConfig.environment, true);
     }
   }, {
     key: "startBizFlow",
     value: function () {
       var _startBizFlow = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(paymentContext) {
-        var _paymentContext$payme2, _this$channelBehavior;
+        var _paymentContext$payme2, _paymentContext$start, _this$channelBehavior;
         var _paymentContext$payme, productSceneVersion, paymentMethodCategoryType, autoDebitWithToken, requireFastSdk, authUrlInfo, isFirstTimeToPay, webAppUrl, resultPayload;
         return _regeneratorRuntime().wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
@@ -60,9 +63,10 @@ export var EasySafePayProcessor = /*#__PURE__*/function () {
               // 放在最前面的逻辑
               // 在PC场景下，几乎所有渠道都是没有拉端的逻辑的，所以需要改成1.0， 这个是历史原因
               if (isPC()) {
-                // 非TOSS渠道，在PC场景需要改成1.0
+                // 非TOSS渠道，在PC场景需要改成1.0/needAccountConfirmPage=false
                 if ('BANKTRANSFER_QUICKPAY' !== ((_paymentContext$payme = paymentContext.paymentSessionObj) === null || _paymentContext$payme === void 0 || (_paymentContext$payme = _paymentContext$payme.paymentMethodInfoView) === null || _paymentContext$payme === void 0 ? void 0 : _paymentContext$payme.paymentMethodType)) {
                   paymentContext.paymentSessionObj.paymentSessionConfig.productSceneVersion = '1.0';
+                  paymentContext.paymentSessionObj.needAccountConfirmPage = false;
                 }
               }
               this.paymentContext = paymentContext;
@@ -72,17 +76,18 @@ export var EasySafePayProcessor = /*#__PURE__*/function () {
               autoDebitWithToken = paymentContext.paymentSessionObj.action.autoDebitWithToken;
               requireFastSdk = paymentContext.paymentSessionObj.action.requireFastSdk;
               authUrlInfo = ((_paymentContext$payme2 = paymentContext.paymentSessionObj) === null || _paymentContext$payme2 === void 0 ? void 0 : _paymentContext$payme2.authUrlInfo) || {};
-              this.channelBehavior = ChannelCustomize.getChannelBehavior(paymentContext.paymentSessionObj);
+              this.channelBehavior = ChannelCustomize.getChannelBehavior(((_paymentContext$start = paymentContext.startBizFlowOptions.submitPayRequestExtra) === null || _paymentContext$start === void 0 ? void 0 : _paymentContext$start.notRedirectAfterComplete) === true, paymentContext.paymentSessionObj);
+
               // 首次支付
-              isFirstTimeToPay = !autoDebitWithToken; // 处理ESP1.0极速外跳支付场景
-              if (!(productSceneVersion === '1.0' && isFirstTimeToPay && requireFastSdk)) {
+              isFirstTimeToPay = !autoDebitWithToken; // 处理ESP极速外跳支付场景
+              if (!(isFirstTimeToPay && requireFastSdk)) {
                 _context.next = 12;
                 break;
               }
               return _context.abrupt("return", this.buildRedirectResult(authUrlInfo));
             case 12:
               // 下面的场景是需要渲染UI的渠道, 打开WebUrl
-              webAppUrl = this.buildWebAppUrl(); // const webAppUrl = 'http://svc-9kvjxwjf68cptha8.cloudide.svc.et15-sqa.alipay.net:5173/src/component-app/index.html';
+              webAppUrl = this.buildWebAppUrl();
               resultPayload = {
                 url: webAppUrl,
                 allowClickPopupOutsideClose: (_this$channelBehavior = this.channelBehavior) === null || _this$channelBehavior === void 0 ? void 0 : _this$channelBehavior.allowClickOutsideClose
@@ -113,15 +118,19 @@ export var EasySafePayProcessor = /*#__PURE__*/function () {
   }, {
     key: "buildWebAppUrl",
     value: function buildWebAppUrl() {
-      var _paymentContext$payme3, _paymentContext$payme4, _this$initConfig$anal;
+      var _paymentContext$payme3, _paymentContext$payme4, _paymentContext$payme5, _this$initConfig$anal;
       var paymentContext = this.paymentContext;
       var paymentMethodCategoryType = (_paymentContext$payme3 = paymentContext.paymentSessionObj.paymentSessionConfig) === null || _paymentContext$payme3 === void 0 ? void 0 : _paymentContext$payme3.paymentMethodCategoryType;
-      var productSceneVersion = (_paymentContext$payme4 = paymentContext.paymentSessionObj.paymentSessionConfig) === null || _paymentContext$payme4 === void 0 ? void 0 : _paymentContext$payme4.productSceneVersion;
+      var productScene = (_paymentContext$payme4 = paymentContext.paymentSessionObj.paymentSessionConfig) === null || _paymentContext$payme4 === void 0 ? void 0 : _paymentContext$payme4.productScene;
+      var productSceneVersion = (_paymentContext$payme5 = paymentContext.paymentSessionObj.paymentSessionConfig) === null || _paymentContext$payme5 === void 0 ? void 0 : _paymentContext$payme5.productSceneVersion;
       var hostSign = this.hostSign;
-      var webAppUrl = WebAppUrlUtil.getWebAppUrl({
+      var mid = paymentContext.paymentSessionObj.clientId;
+      var extendInfo = paymentContext.paymentSessionObj.extendInfo;
+      var webAppUrl = WebAppUrlUtil.getWebAppV2Url({
         environment: this.initConfig.environment,
         paymentMethodCategoryType: paymentMethodCategoryType,
         sdkMetaData: paymentContext.sdkMetaData,
+        productScene: productScene,
         productSceneVersion: productSceneVersion,
         isPreload: false,
         query: {
@@ -130,7 +139,9 @@ export var EasySafePayProcessor = /*#__PURE__*/function () {
           instanceId: this.instanceId,
           locale: this.initConfig.locale,
           hostSign: hostSign
-        }
+        },
+        mid: mid,
+        extendInfo: extendInfo
       });
       return webAppUrl;
     }
@@ -177,42 +188,48 @@ export var EasySafePayProcessor = /*#__PURE__*/function () {
       });
 
       // 等请求和 Web启动都Ready之后，发送renderComponent
-      Promise.all([this.initSecuritySDK(), this.processSubmitPay(), webLaunchPromise]).then(function (_ref) {
-        var _this$paymentContext, _this$paymentContext2, _this$paymentContext$, _this$paymentContext$2, _this$paymentContext$3, _this$paymentContext$4;
-        var _ref2 = _slicedToArray(_ref, 3),
+      Promise.all([this.initSecuritySDK(), this.processQuery(), this.processSubmitPay(), webLaunchPromise]).then(function (_ref) {
+        var _this$paymentContext, _this$paymentContext2, _this$paymentContext$, _this$paymentContext$2, _this$paymentContext$3, _this$paymentContext3, _this$paymentContext$4;
+        var _ref2 = _slicedToArray(_ref, 4),
           _initSecurityRes = _ref2[0],
-          submitRes = _ref2[1],
-          _webLaunchRes = _ref2[2];
+          queryRes = _ref2[1],
+          submitRes = _ref2[2],
+          _webLaunchRes = _ref2[3];
         var logMetaData = _this.logger.getLogConfig().mdata;
+        var data = {
+          sessionResult: (_this$paymentContext = _this.paymentContext) === null || _this$paymentContext === void 0 ? void 0 : _this$paymentContext.paymentSessionObj,
+          submitResult: submitRes,
+          paymentSessionData: (_this$paymentContext2 = _this.paymentContext) === null || _this$paymentContext2 === void 0 ? void 0 : _this$paymentContext2.paymentSessionId,
+          heightOfVisible: Math.max(window.changingPageHeight, window.innerHeight),
+          renderDisplayType: _this.paymentContext.displayInfo.type,
+          appearance: (_this$paymentContext$ = _this.paymentContext.displayInfo) === null || _this$paymentContext$ === void 0 ? void 0 : _this$paymentContext$.appearance,
+          notRedirectAfterComplete: ((_this$paymentContext$2 = _this.paymentContext.startBizFlowOptions.submitPayRequestExtra) === null || _this$paymentContext$2 === void 0 ? void 0 : _this$paymentContext$2.notRedirectAfterComplete) === true,
+          isAppWebview: _this.paymentContext.startBizFlowOptions.isAppWebview,
+          merchantAppointParam: (_this$paymentContext$3 = _this.paymentContext.startBizFlowOptions.submitPayRequestExtra) === null || _this$paymentContext$3 === void 0 ? void 0 : _this$paymentContext$3.merchantAppointParam,
+          allowSubmitPayCallAhead: _this.allowSubmitPayCallAhead,
+          doubleFaUrl: getDoubleFaUrlFromSession((_this$paymentContext3 = _this.paymentContext) === null || _this$paymentContext3 === void 0 ? void 0 : _this$paymentContext3.paymentSessionObj, _this.initConfig.environment),
+          envInfo: {
+            screenHeight: screen.height,
+            screenWidth: screen.width
+          },
+          logMetaData: _objectSpread(_objectSpread({
+            trackId: logMetaData.requestSeq,
+            platform: logMetaData.platform,
+            firstLogTime: logMetaData.firstLogTime
+          }, ((_this$paymentContext$4 = _this.paymentContext.paymentSessionObj) === null || _this$paymentContext$4 === void 0 ? void 0 : _this$paymentContext$4.paymentSessionConfig) || {}), {}, {
+            renderDisplayType: logMetaData.renderDisplayType,
+            sdkVersion: logMetaData.sdkVersion,
+            merchantId: logMetaData.merchantId,
+            instanceId: logMetaData.instanceId,
+            paymentMethodType: logMetaData.paymentMethodType
+          })
+        };
+        if (queryRes) {
+          data.queryResult = queryRes;
+        }
         _this.eventCenter.dispatchToApp({
           event: 'renderComponent',
-          data: {
-            sessionResult: (_this$paymentContext = _this.paymentContext) === null || _this$paymentContext === void 0 ? void 0 : _this$paymentContext.paymentSessionObj,
-            submitResult: submitRes,
-            paymentSessionData: (_this$paymentContext2 = _this.paymentContext) === null || _this$paymentContext2 === void 0 ? void 0 : _this$paymentContext2.paymentSessionId,
-            heightOfVisible: Math.max(window.changingPageHeight, window.innerHeight),
-            renderDisplayType: _this.paymentContext.displayInfo.type,
-            appearance: (_this$paymentContext$ = _this.paymentContext.displayInfo) === null || _this$paymentContext$ === void 0 ? void 0 : _this$paymentContext$.appearance,
-            notRedirectAfterComplete: ((_this$paymentContext$2 = _this.paymentContext.startBizFlowOptions.submitPayRequestExtra) === null || _this$paymentContext$2 === void 0 ? void 0 : _this$paymentContext$2.notRedirectAfterComplete) === true,
-            isAppWebview: _this.paymentContext.startBizFlowOptions.isAppWebview,
-            merchantAppointParam: (_this$paymentContext$3 = _this.paymentContext.startBizFlowOptions.submitPayRequestExtra) === null || _this$paymentContext$3 === void 0 ? void 0 : _this$paymentContext$3.merchantAppointParam,
-            allowSubmitPayCallAhead: _this.allowSubmitPayCallAhead,
-            envInfo: {
-              screenHeight: screen.height,
-              screenWidth: screen.width
-            },
-            logMetaData: _objectSpread(_objectSpread({
-              trackId: logMetaData.requestSeq,
-              platform: logMetaData.platform,
-              firstLogTime: logMetaData.firstLogTime
-            }, ((_this$paymentContext$4 = _this.paymentContext.paymentSessionObj) === null || _this$paymentContext$4 === void 0 ? void 0 : _this$paymentContext$4.paymentSessionConfig) || {}), {}, {
-              renderDisplayType: logMetaData.renderDisplayType,
-              sdkVersion: logMetaData.sdkVersion,
-              merchantId: logMetaData.merchantId,
-              instanceId: logMetaData.instanceId,
-              paymentMethodType: logMetaData.paymentMethodType
-            })
-          }
+          data: data
         });
       }).catch(function (error) {
         _this.eventCenter.emit(EVENT.destroy.name, {});
@@ -225,24 +242,108 @@ export var EasySafePayProcessor = /*#__PURE__*/function () {
       });
     }
   }, {
-    key: "processSubmitPay",
+    key: "processQuery",
     value: function () {
-      var _processSubmitPay = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
-        var _this$paymentContext3, _this$paymentContext4, _this$paymentContext5, _this$channelBehavior2, _this$channelBehavior3, _this$paymentContext$6;
-        var submitParams, _ref3, _ref3$productSceneVer, productSceneVersion, _ref4, _ref4$action, _ref4$action2, _ref4$action2$enableS, enableSignAgreement, _ref4$action2$autoDeb, autoDebitWithToken, _this$paymentContext$5, paymentMethodType, isAppWebview, backScheme, requestBizId, extParams, requester, res;
+      var _processQuery = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
+        var _this$paymentContext4, _this$paymentContext5, _this$paymentContext6, _this$paymentContext$5, _this$paymentContext7, _this$paymentContext8;
+        var queryParams, extendInfo, needAccountConfirmPage, isFirstTimeToPay, needQueryRender, extendInfoData, requestBizId, requester, _this$paymentContext$6, res;
         return _regeneratorRuntime().wrap(function _callee2$(_context2) {
           while (1) switch (_context2.prev = _context2.next) {
+            case 0:
+              queryParams = {
+                paymentSessionData: ((_this$paymentContext4 = this.paymentContext) === null || _this$paymentContext4 === void 0 ? void 0 : _this$paymentContext4.paymentSessionId) || '',
+                paymentSessionConfig: (_this$paymentContext5 = this.paymentContext) === null || _this$paymentContext5 === void 0 || (_this$paymentContext5 = _this$paymentContext5.paymentSessionObj) === null || _this$paymentContext5 === void 0 ? void 0 : _this$paymentContext5.paymentSessionConfig
+              };
+              extendInfo = (_this$paymentContext6 = this.paymentContext) === null || _this$paymentContext6 === void 0 ? void 0 : _this$paymentContext6.paymentSessionObj.extendInfo;
+              needAccountConfirmPage = (_this$paymentContext$5 = (_this$paymentContext7 = this.paymentContext) === null || _this$paymentContext7 === void 0 ? void 0 : _this$paymentContext7.paymentSessionObj.needAccountConfirmPage) !== null && _this$paymentContext$5 !== void 0 ? _this$paymentContext$5 : true;
+              isFirstTimeToPay = !((_this$paymentContext8 = this.paymentContext) !== null && _this$paymentContext8 !== void 0 && (_this$paymentContext8 = _this$paymentContext8.paymentSessionObj.action) !== null && _this$paymentContext8 !== void 0 && _this$paymentContext8.autoDebitWithToken);
+              needQueryRender = true;
+              try {
+                extendInfoData = JSON.parse(extendInfo);
+                needQueryRender = isEmpty(extendInfoData.needQueryRender) || extendInfoData.needQueryRender === true;
+              } catch (error) {
+                console.log(error);
+              }
+              this.allowQueryCall = needQueryRender && isFirstTimeToPay && needAccountConfirmPage;
+              if (this.allowQueryCall) {
+                _context2.next = 9;
+                break;
+              }
+              return _context2.abrupt("return", null);
+            case 9:
+              requestBizId = uuid();
+              this.logger.logInfo({
+                title: 'sdk_event_sdkQuery'
+              }, {
+                config: JSON.stringify(queryParams.paymentSessionConfig),
+                requestId: requestBizId
+              });
+              requester = ServiceProvider.getInstance(this.instanceId).getService('Requester');
+              _context2.prev = 12;
+              _context2.next = 15;
+              return requester.request(_objectSpread(_objectSpread({}, queryParams), {}, {
+                actionType: 'init',
+                integrationType: 'SDK',
+                sdkVersion: (_this$paymentContext$6 = this.paymentContext.sdkMetaData.sdkVersion) !== null && _this$paymentContext$6 !== void 0 ? _this$paymentContext$6 : '1.0.0'
+              }), {
+                env: this.initConfig.environment,
+                timeout: this.SDK_REQUEST_TIMEOUT,
+                hostSign: this.hostSign,
+                needEnvInfo: true,
+                'Operation-Type': 'com.ipay.iexpcashier.sdkAction.query'
+              });
+            case 15:
+              res = _context2.sent;
+              this.logger.logInfo({
+                title: 'sdk_event_sdkQueryEnd'
+              }, {
+                config: JSON.stringify(queryParams.paymentSessionConfig),
+                requestId: requestBizId,
+                rpcTraceId: res.traceId
+              });
+              return _context2.abrupt("return", res);
+            case 20:
+              _context2.prev = 20;
+              _context2.t0 = _context2["catch"](12);
+              this.logger.logError({
+                title: 'sdk_event_sdkQuery_failed'
+              }, {
+                config: JSON.stringify(queryParams.paymentSessionConfig),
+                errorMessage: JSON.stringify(_context2.t0),
+                requestId: requestBizId,
+                rpcTraceId: _context2.t0 === null || _context2.t0 === void 0 ? void 0 : _context2.t0.traceId
+              });
+              return _context2.abrupt("return", null);
+            case 24:
+            case "end":
+              return _context2.stop();
+          }
+        }, _callee2, this, [[12, 20]]);
+      }));
+      function processQuery() {
+        return _processQuery.apply(this, arguments);
+      }
+      return processQuery;
+    }()
+  }, {
+    key: "processSubmitPay",
+    value: function () {
+      var _processSubmitPay = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
+        var _this$paymentContext9, _this$paymentContext10, _this$paymentContext11, _this$channelBehavior2, _this$channelBehavior3, _this$paymentContext$8, _this$paymentContext12;
+        var submitParams, _ref3, _ref3$productSceneVer, productSceneVersion, _ref4, _ref4$action, _ref4$action2, _ref4$action2$enableS, enableSignAgreement, _ref4$action2$autoDeb, autoDebitWithToken, _this$paymentContext$7, paymentMethodType, isAppWebview, backScheme, requestBizId, extParams, requester, _this$paymentContext$9, res;
+        return _regeneratorRuntime().wrap(function _callee3$(_context3) {
+          while (1) switch (_context3.prev = _context3.next) {
             case 0:
               submitParams = {
-                paymentSessionData: ((_this$paymentContext3 = this.paymentContext) === null || _this$paymentContext3 === void 0 ? void 0 : _this$paymentContext3.paymentSessionId) || '',
-                paymentSessionConfig: (_this$paymentContext4 = this.paymentContext) === null || _this$paymentContext4 === void 0 || (_this$paymentContext4 = _this$paymentContext4.paymentSessionObj) === null || _this$paymentContext4 === void 0 ? void 0 : _this$paymentContext4.paymentSessionConfig
+                paymentSessionData: ((_this$paymentContext9 = this.paymentContext) === null || _this$paymentContext9 === void 0 ? void 0 : _this$paymentContext9.paymentSessionId) || '',
+                paymentSessionConfig: (_this$paymentContext10 = this.paymentContext) === null || _this$paymentContext10 === void 0 || (_this$paymentContext10 = _this$paymentContext10.paymentSessionObj) === null || _this$paymentContext10 === void 0 ? void 0 : _this$paymentContext10.paymentSessionConfig
               };
               _ref3 = submitParams.paymentSessionConfig || {}, _ref3$productSceneVer = _ref3.productSceneVersion, productSceneVersion = _ref3$productSceneVer === void 0 ? '' : _ref3$productSceneVer;
-              _ref4 = ((_this$paymentContext5 = this.paymentContext) === null || _this$paymentContext5 === void 0 ? void 0 : _this$paymentContext5.paymentSessionObj) || {}, _ref4$action = _ref4.action, _ref4$action2 = _ref4$action === void 0 ? {} : _ref4$action, _ref4$action2$enableS = _ref4$action2.enableSignAgreement, enableSignAgreement = _ref4$action2$enableS === void 0 ? false : _ref4$action2$enableS, _ref4$action2$autoDeb = _ref4$action2.autoDebitWithToken, autoDebitWithToken = _ref4$action2$autoDeb === void 0 ? false : _ref4$action2$autoDeb;
+              _ref4 = ((_this$paymentContext11 = this.paymentContext) === null || _this$paymentContext11 === void 0 ? void 0 : _this$paymentContext11.paymentSessionObj) || {}, _ref4$action = _ref4.action, _ref4$action2 = _ref4$action === void 0 ? {} : _ref4$action, _ref4$action2$enableS = _ref4$action2.enableSignAgreement, enableSignAgreement = _ref4$action2$enableS === void 0 ? false : _ref4$action2$enableS, _ref4$action2$autoDeb = _ref4$action2.autoDebitWithToken, autoDebitWithToken = _ref4$action2$autoDeb === void 0 ? false : _ref4$action2$autoDeb;
               if (productSceneVersion === '2.0' && !autoDebitWithToken) {
                 ///EasyPay 2.0 首次传signAgreement字段
                 submitParams['signAgreement'] = enableSignAgreement;
-                paymentMethodType = (_this$paymentContext$5 = this.paymentContext.paymentSessionObj) === null || _this$paymentContext$5 === void 0 || (_this$paymentContext$5 = _this$paymentContext$5.paymentMethodInfoView) === null || _this$paymentContext$5 === void 0 ? void 0 : _this$paymentContext$5.paymentMethodType;
+                paymentMethodType = (_this$paymentContext$7 = this.paymentContext.paymentSessionObj) === null || _this$paymentContext$7 === void 0 || (_this$paymentContext$7 = _this$paymentContext$7.paymentMethodInfoView) === null || _this$paymentContext$7 === void 0 ? void 0 : _this$paymentContext$7.paymentMethodType;
                 isAppWebview = this.paymentContext.startBizFlowOptions.isAppWebview;
                 if (paymentMethodType == 'ALIPAY_CN' && !isAppWebview) {
                   backScheme = getBackScheme(undefined, this.logger);
@@ -254,10 +355,10 @@ export var EasySafePayProcessor = /*#__PURE__*/function () {
               this.allowSubmitPayCallAhead = this.channelBehavior.allowSubmitPayCallAhead;
               //console.log('[web-sdk] allowSubmitPayCallAhead =', this.allowSubmitPayCallAhead);
               if (this.allowSubmitPayCallAhead) {
-                _context2.next = 7;
+                _context3.next = 7;
                 break;
               }
-              return _context2.abrupt("return", {
+              return _context3.abrupt("return", {
                 message: 'sdk no need to make submitPay request',
                 success: true
               });
@@ -273,39 +374,46 @@ export var EasySafePayProcessor = /*#__PURE__*/function () {
               extParams = ((_this$channelBehavior2 = this.channelBehavior) === null || _this$channelBehavior2 === void 0 || (_this$channelBehavior3 = _this$channelBehavior2.buildSubmitPayExtParams) === null || _this$channelBehavior3 === void 0 ? void 0 : _this$channelBehavior3.call(_this$channelBehavior2, {
                 instanceId: this.instanceId,
                 locale: this.initConfig.locale,
-                paymentMethodType: (_this$paymentContext$6 = this.paymentContext.paymentSessionObj) === null || _this$paymentContext$6 === void 0 || (_this$paymentContext$6 = _this$paymentContext$6.paymentMethodInfoView) === null || _this$paymentContext$6 === void 0 ? void 0 : _this$paymentContext$6.paymentMethodType,
+                paymentMethodType: (_this$paymentContext$8 = this.paymentContext.paymentSessionObj) === null || _this$paymentContext$8 === void 0 || (_this$paymentContext$8 = _this$paymentContext$8.paymentMethodInfoView) === null || _this$paymentContext$8 === void 0 ? void 0 : _this$paymentContext$8.paymentMethodType,
                 paymentSessionData: this.paymentContext.paymentSessionId,
+                paymentSessionObj: this.paymentContext.paymentSessionObj,
                 env: this.initConfig.environment,
-                sdkVersion: this.paymentContext.sdkMetaData.sdkVersion
-              })) || {};
-              extParams.complianceSDK = true;
+                sdkVersion: this.paymentContext.sdkMetaData.sdkVersion,
+                notRedirectAfterComplete: ((_this$paymentContext12 = this.paymentContext) === null || _this$paymentContext12 === void 0 || (_this$paymentContext12 = _this$paymentContext12.startBizFlowOptions) === null || _this$paymentContext12 === void 0 || (_this$paymentContext12 = _this$paymentContext12.submitPayRequestExtra) === null || _this$paymentContext12 === void 0 ? void 0 : _this$paymentContext12.notRedirectAfterComplete) === true
+              })) || {}; // 二次支付不再需要该参数
+              if (!autoDebitWithToken) {
+                extParams.complianceSDK = true;
+              }
               submitParams.extParams = extParams;
               requester = ServiceProvider.getInstance(this.instanceId).getService('Requester');
-              _context2.prev = 13;
-              _context2.t0 = requester;
-              _context2.t1 = submitParams;
-              _context2.t2 = this.initConfig.environment;
-              _context2.t3 = this.SDK_REQUEST_TIMEOUT;
-              _context2.next = 20;
+              _context3.prev = 13;
+              _context3.t0 = requester;
+              _context3.t1 = _objectSpread(_objectSpread({}, submitParams), {}, {
+                integrationType: 'SDK',
+                sdkVersion: (_this$paymentContext$9 = this.paymentContext.sdkMetaData.sdkVersion) !== null && _this$paymentContext$9 !== void 0 ? _this$paymentContext$9 : '1.0.0'
+              });
+              _context3.t2 = this.initConfig.environment;
+              _context3.t3 = this.SDK_REQUEST_TIMEOUT;
+              _context3.next = 20;
               return this.acquireApdidToken();
             case 20:
-              _context2.t4 = _context2.sent;
-              _context2.t5 = {
-                deviceId: _context2.t4
+              _context3.t4 = _context3.sent;
+              _context3.t5 = {
+                deviceId: _context3.t4
               };
-              _context2.t6 = this.hostSign;
-              _context2.t7 = {
-                env: _context2.t2,
-                timeout: _context2.t3,
-                envInfo: _context2.t5,
-                hostSign: _context2.t6,
+              _context3.t6 = this.hostSign;
+              _context3.t7 = {
+                env: _context3.t2,
+                timeout: _context3.t3,
+                envInfo: _context3.t5,
+                hostSign: _context3.t6,
                 needEnvInfo: true,
                 'Operation-Type': 'com.ipay.iexpcashier.cashier.submitPayByPaymentSession'
               };
-              _context2.next = 26;
-              return _context2.t0.request.call(_context2.t0, _context2.t1, _context2.t7);
+              _context3.next = 26;
+              return _context3.t0.request.call(_context3.t0, _context3.t1, _context3.t7);
             case 26:
-              res = _context2.sent;
+              res = _context3.sent;
               this.logger.logInfo({
                 title: 'sdk_event_submitPayEnd'
               }, {
@@ -313,24 +421,24 @@ export var EasySafePayProcessor = /*#__PURE__*/function () {
                 requestId: requestBizId,
                 rpcTraceId: res.traceId
               });
-              return _context2.abrupt("return", res);
+              return _context3.abrupt("return", res);
             case 31:
-              _context2.prev = 31;
-              _context2.t8 = _context2["catch"](13);
+              _context3.prev = 31;
+              _context3.t8 = _context3["catch"](13);
               this.logger.logError({
                 title: 'sdk_event_submitPay_failed'
               }, {
                 config: JSON.stringify(submitParams.paymentSessionConfig),
-                errorMessage: JSON.stringify(_context2.t8),
+                errorMessage: JSON.stringify(_context3.t8),
                 requestId: requestBizId,
-                rpcTraceId: _context2.t8 === null || _context2.t8 === void 0 ? void 0 : _context2.t8.traceId
+                rpcTraceId: _context3.t8 === null || _context3.t8 === void 0 ? void 0 : _context3.t8.traceId
               });
-              return _context2.abrupt("return", null);
+              return _context3.abrupt("return", null);
             case 35:
             case "end":
-              return _context2.stop();
+              return _context3.stop();
           }
-        }, _callee2, this, [[13, 31]]);
+        }, _callee3, this, [[13, 31]]);
       }));
       function processSubmitPay() {
         return _processSubmitPay.apply(this, arguments);
@@ -340,23 +448,23 @@ export var EasySafePayProcessor = /*#__PURE__*/function () {
   }, {
     key: "acquireApdidToken",
     value: function () {
-      var _acquireApdidToken = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
-        var _this$paymentContext$7;
+      var _acquireApdidToken = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4() {
+        var _this$paymentContext$10;
         var securityService, productScene, deviceId;
-        return _regeneratorRuntime().wrap(function _callee3$(_context3) {
-          while (1) switch (_context3.prev = _context3.next) {
+        return _regeneratorRuntime().wrap(function _callee4$(_context4) {
+          while (1) switch (_context4.prev = _context4.next) {
             case 0:
               securityService = ServiceProvider.getInstance(this.instanceId).getService('Security');
-              productScene = (_this$paymentContext$7 = this.paymentContext.paymentSessionObj) === null || _this$paymentContext$7 === void 0 || (_this$paymentContext$7 = _this$paymentContext$7.paymentSessionConfig) === null || _this$paymentContext$7 === void 0 ? void 0 : _this$paymentContext$7.productScene;
+              productScene = (_this$paymentContext$10 = this.paymentContext.paymentSessionObj) === null || _this$paymentContext$10 === void 0 || (_this$paymentContext$10 = _this$paymentContext$10.paymentSessionConfig) === null || _this$paymentContext$10 === void 0 ? void 0 : _this$paymentContext$10.productScene;
               deviceId = securityService.getDeviceId({
                 productScene: productScene
               });
-              return _context3.abrupt("return", deviceId);
+              return _context4.abrupt("return", deviceId);
             case 4:
             case "end":
-              return _context3.stop();
+              return _context4.stop();
           }
-        }, _callee3, this);
+        }, _callee4, this);
       }));
       function acquireApdidToken() {
         return _acquireApdidToken.apply(this, arguments);
@@ -366,15 +474,16 @@ export var EasySafePayProcessor = /*#__PURE__*/function () {
   }, {
     key: "initSecuritySDK",
     value: function () {
-      var _initSecuritySDK = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4() {
-        var _this$paymentContext$8, _this$paymentContext$9, productSceneVersion, nonCompliant, nonInitSecuritySDK, isFirstTimeToPay, shouldInitSecuritySDK;
-        return _regeneratorRuntime().wrap(function _callee4$(_context4) {
-          while (1) switch (_context4.prev = _context4.next) {
+      var _initSecuritySDK = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5() {
+        var _this$paymentContext$11, _this$paymentContext$12, _this$paymentContext$13, _this$paymentContext$14, _this$paymentContext$15, _this$paymentContext$16, productSceneVersion, nonInitSecuritySDK, signButtonDisplay, userSignAgreement, isFirstTimeToPay, shouldInitSecuritySDK;
+        return _regeneratorRuntime().wrap(function _callee5$(_context5) {
+          while (1) switch (_context5.prev = _context5.next) {
             case 0:
-              _context4.prev = 0;
+              _context5.prev = 0;
               productSceneVersion = this.paymentContext.paymentSessionObj.paymentSessionConfig.productSceneVersion;
-              nonCompliant = (_this$paymentContext$8 = this.paymentContext.paymentSessionObj.action) === null || _this$paymentContext$8 === void 0 ? void 0 : _this$paymentContext$8.nonCompliant;
-              nonInitSecuritySDK = (_this$paymentContext$9 = this.paymentContext.paymentSessionObj.action) === null || _this$paymentContext$9 === void 0 ? void 0 : _this$paymentContext$9.nonInitSecuritySDK;
+              nonInitSecuritySDK = (_this$paymentContext$11 = (_this$paymentContext$12 = this.paymentContext.paymentSessionObj.action) === null || _this$paymentContext$12 === void 0 ? void 0 : _this$paymentContext$12.nonInitSecuritySDK) !== null && _this$paymentContext$11 !== void 0 ? _this$paymentContext$11 : false;
+              signButtonDisplay = (_this$paymentContext$13 = (_this$paymentContext$14 = this.paymentContext.paymentSessionObj.action) === null || _this$paymentContext$14 === void 0 ? void 0 : _this$paymentContext$14.signButtonDisplay) !== null && _this$paymentContext$13 !== void 0 ? _this$paymentContext$13 : false;
+              userSignAgreement = (_this$paymentContext$15 = (_this$paymentContext$16 = this.paymentContext.paymentSessionObj.action) === null || _this$paymentContext$16 === void 0 ? void 0 : _this$paymentContext$16.userSignAgreement) !== null && _this$paymentContext$15 !== void 0 ? _this$paymentContext$15 : false;
               isFirstTimeToPay = !this.paymentContext.paymentSessionObj.action.autoDebitWithToken;
               shouldInitSecuritySDK = false;
               if (nonInitSecuritySDK) {
@@ -387,44 +496,38 @@ export var EasySafePayProcessor = /*#__PURE__*/function () {
                   // console.log('[web-sdk][security-sdk] DO NOT init security sdk for easypay 1.0');
                   shouldInitSecuritySDK = false;
                 } else if (productSceneVersion === '2.0') {
-                  if (nonCompliant === true) {
-                    // 未切流「隐私合规」
-                    // console.log('[web-sdk][security-sdk] DO init security sdk for easypay 2.0 and nonCompliant is true');
-                    shouldInitSecuritySDK = true;
+                  if (isFirstTimeToPay) {
+                    // console.log((signButtonDisplay && userSignAgreement) ? '[web-sdk][security-sdk] DO init security sdk for easypay 2.0, first time to pay and user agreeement signing from merchant' : '[web-sdk][security-sdk] DO NOT init security sdk for easypay 2.0, first time to pay and user agreeement has not been signed from merchant');
+                    shouldInitSecuritySDK = signButtonDisplay && userSignAgreement;
                   } else {
-                    if (isFirstTimeToPay) {
-                      // console.log('[web-sdk][security-sdk] DO NOT init security sdk for easypay 2.0 and when first time to pay');
-                      shouldInitSecuritySDK = false;
-                    } else {
-                      // 切流「隐私合规」且非首次支付
-                      // console.log('[web-sdk][security-sdk] DO init security sdk for easypay 2.0 and when not first time to pay');
-                      shouldInitSecuritySDK = true;
-                    }
+                    // 切流「隐私合规」且非首次支付
+                    // console.log('[web-sdk][security-sdk] DO init security sdk for easypay 2.0 and when not first time to pay');
+                    shouldInitSecuritySDK = true;
                   }
                 }
               }
               if (!shouldInitSecuritySDK) {
-                _context4.next = 10;
+                _context5.next = 11;
                 break;
               }
-              _context4.next = 10;
+              _context5.next = 11;
               return this.securityService.initSecurity(this.SECURITY_SDK_INIT_TIMEOUT);
-            case 10:
+            case 11:
               this.logger.logInfo({
                 title: 'a3753.b101271.c388193.d514078'
               }, {
                 riskSdkInfo: shouldInitSecuritySDK ? RiskSdkInfoEnum.NEED : RiskSdkInfoEnum.NO_NEED
               });
-              _context4.next = 15;
+              _context5.next = 16;
               break;
-            case 13:
-              _context4.prev = 13;
-              _context4.t0 = _context4["catch"](0);
-            case 15:
+            case 14:
+              _context5.prev = 14;
+              _context5.t0 = _context5["catch"](0);
+            case 16:
             case "end":
-              return _context4.stop();
+              return _context5.stop();
           }
-        }, _callee4, this, [[0, 13]]);
+        }, _callee5, this, [[0, 14]]);
       }));
       function initSecuritySDK() {
         return _initSecuritySDK.apply(this, arguments);

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/preload_helper.d.ts

@@ -4,10 +4,10 @@ export default class PreloadHelper {
     static isWebAppPreloaded: boolean;
     static isSecuritySDKPreloaded: boolean;
     private static securitySdkMap;
-    static preloadWebApp(productScene: ProductSceneEnum, paymentMethodCategoryType: PaymentMethodCategoryTypeEnum, environment?: string): void;
+    static preloadWebApp(productScene: ProductSceneEnum, paymentMethodCategoryType: PaymentMethodCategoryTypeEnum, environment?: string, useV2?: boolean): void;
     static preloadSecuritySDK(product: ProductSceneEnum, securityRegion?: string): void;
     static getSecuritySdk(scene: any): Security;
-    static buildWebAppPreloadUrl(productScene: ProductSceneEnum, paymentMethodCategoryType: PaymentMethodCategoryTypeEnum, environment: string): {
+    static buildWebAppPreloadUrl(productScene: ProductSceneEnum, paymentMethodCategoryType: PaymentMethodCategoryTypeEnum, environment: string, useV2?: boolean): {
         preloadUrl: string;
         containerId: string;
     };