@alipay/ams-checkout 1.24.0 → 1.25.0

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

@@ -16,21 +16,21 @@ function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _d
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 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 { ChannelCustomize, DisplayTypeEnum, isLocalMock, isPC, ServiceProvider, WebAppUrlUtil } from "./deps";
-
-// 缓存上次产品信息
-var KEY_PREVIOUS_PRODUCT_INFO = 'antom_checkout_previous_ESP_ProductInfo';
+import { ChannelCustomize, DisplayTypeEnum, getBackScheme, isPC, ProductInfoCacheUtil, ProductSceneEnum, RiskSdkInfoEnum, ServiceProvider, uuid, WebAppUrlUtil } from "./deps";
 export var EasySafePayProcessor = /*#__PURE__*/function () {
   function EasySafePayProcessor() {
     _classCallCheck(this, EasySafePayProcessor);
     _defineProperty(this, "paymentContext", void 0);
     _defineProperty(this, "initConfig", void 0);
     _defineProperty(this, "logger", void 0);
+    _defineProperty(this, "securityService", void 0);
     _defineProperty(this, "instanceId", void 0);
+    // 服务端接口区域信息，请求时决定API域名
     _defineProperty(this, "hostSign", void 0);
     // 是否允许submitPay提前调用，在ESP非首次的性能优化场景使用
     _defineProperty(this, "allowSubmitPayCallAhead", void 0);
     _defineProperty(this, "channelBehavior", void 0);
+    _defineProperty(this, "SECURITY_SDK_INIT_TIMEOUT", 18000);
   }
   _createClass(EasySafePayProcessor, [{
     key: "init",
@@ -38,6 +38,7 @@ export var EasySafePayProcessor = /*#__PURE__*/function () {
       this.initConfig = config;
       this.instanceId = instanceId;
       this.logger = ServiceProvider.getInstance(this.instanceId).getService('Log');
+      this.securityService = ServiceProvider.getInstance(this.instanceId).getService('Security');
       this.preloadWebApp(config, this.instanceId, sdkMetaData);
     }
   }, {
@@ -74,17 +75,17 @@ export var EasySafePayProcessor = /*#__PURE__*/function () {
               return _context.abrupt("return", this.buildRedirectResult(authUrlInfo));
             case 12:
               // 下面的场景是需要渲染UI的渠道, 打开WebUrl
-              webAppUrl = this.buildWebAppUrl();
+              webAppUrl = this.buildWebAppUrl(); // const webAppUrl = 'http://svc-9kvjxwjf68cptha8.cloudide.svc.et15-sqa.alipay.net:5173/src/component-app/index.html';
               resultPayload = {
                 url: webAppUrl,
                 allowClickPopupOutsideClose: (_this$channelBehavior = this.channelBehavior) === null || _this$channelBehavior === void 0 ? void 0 : _this$channelBehavior.allowClickOutsideClose
               };
-              this.savePreviousProductInfo({
+              ProductInfoCacheUtil.savePreviousProductInfo(ProductSceneEnum.EASY_PAY, {
                 paymentMethodCategoryType: paymentMethodCategoryType,
                 hostSign: this.hostSign,
                 productSceneVersion: productSceneVersion
               });
-              // 返回结果之前，发送actionquery，并且等待Web应用启动的事件，内部是异步处理，不阻塞。
+              // 返回结果之前，发送 sessionData，并且等待Web应用启动的事件，内部是异步处理，不阻塞。
               this.sendRequestAndWaitWebLaunch();
               // 返回结果，RENDER，让外层去处理iframe加载等逻辑
               return _context.abrupt("return", {
@@ -107,40 +108,46 @@ export var EasySafePayProcessor = /*#__PURE__*/function () {
     value: function preloadWebApp(config, instanceId, sdkMetaData) {
       // trigger preload
       var containerService = ServiceProvider.getInstance(this.instanceId).getService('Container');
-      var productScene = this.paymentContext.paymentSessionObj.paymentSessionConfig.productScene;
-      var paymentMethodCategoryType = this.paymentContext.paymentSessionObj.paymentSessionConfig.paymentMethodCategoryType;
-      var containerId = "ams-checkout-component-".concat(productScene, "_").concat(paymentMethodCategoryType);
-      var webAppUrl = this.buildWebAppPreloadUrl(config, instanceId, sdkMetaData);
-      containerService.preload(containerId, webAppUrl);
+      var _this$buildWebAppPrel = this.buildWebAppPreloadUrl(config, instanceId, sdkMetaData),
+        taskId = _this$buildWebAppPrel.taskId,
+        webUrl = _this$buildWebAppPrel.webUrl;
+      containerService.preload(taskId, webUrl);
     }
   }, {
     key: "buildWebAppPreloadUrl",
     value: function buildWebAppPreloadUrl(initConfig, instanceId, sdkMetaData) {
-      var previousProductInfo = this.getPreviousProductInfo();
+      var _this = this;
+      var previousProductInfo = ProductInfoCacheUtil.getPreviousProductInfo(ProductSceneEnum.EASY_PAY, function (erorrMsg) {
+        if (erorrMsg) {
+          _this.logger.logError({
+            title: 'performance_optimization_get_previousChannel_error'
+          }, {
+            error: erorrMsg
+          });
+        }
+      });
       var paymentMethodCategoryType = previousProductInfo === null || previousProductInfo === void 0 ? void 0 : previousProductInfo.paymentMethodCategoryType;
-      var productSceneVersion = previousProductInfo === null || previousProductInfo === void 0 ? void 0 : previousProductInfo.productSceneVersion;
+      var productSceneVersion = (previousProductInfo === null || previousProductInfo === void 0 ? void 0 : previousProductInfo.productSceneVersion) || '2.0';
+      var taskId = "ams-checkout-component-".concat(sdkMetaData.productScene, "_").concat(paymentMethodCategoryType);
       var hostSign = previousProductInfo === null || previousProductInfo === void 0 ? void 0 : previousProductInfo.hostSign;
-      var webAppUrlInfo = WebAppUrlUtil.getWebAppUrl({
+      var webUrl = WebAppUrlUtil.getWebAppUrl({
         environment: initConfig.environment,
         paymentMethodCategoryType: paymentMethodCategoryType,
         sdkMetaData: sdkMetaData,
+        isPreload: true,
         productSceneVersion: productSceneVersion,
         query: {
           analyticsEnabled: initConfig.analytics.enabled,
-          displayType: DisplayTypeEnum.inline,
+          displayType: DisplayTypeEnum.popup,
           instanceId: instanceId,
-          isPreload: 'true',
           locale: initConfig.locale,
           hostSign: hostSign
         }
       });
-      var webAppUrl;
-      if (webAppUrlInfo.path.indexOf('?') !== -1) {
-        webAppUrl = "".concat(webAppUrlInfo.path, "&").concat(webAppUrlInfo.locationSearch);
-      } else {
-        webAppUrl = "".concat(webAppUrlInfo.path, "?").concat(webAppUrlInfo.locationSearch);
-      }
-      return webAppUrl;
+      return {
+        webUrl: webUrl,
+        taskId: taskId
+      };
     }
   }, {
     key: "buildWebAppUrl",
@@ -150,26 +157,20 @@ export var EasySafePayProcessor = /*#__PURE__*/function () {
       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 hostSign = this.hostSign;
-      var webAppUrlInfo = WebAppUrlUtil.getWebAppUrl({
+      var webAppUrl = WebAppUrlUtil.getWebAppUrl({
         environment: this.initConfig.environment,
         paymentMethodCategoryType: paymentMethodCategoryType,
         sdkMetaData: paymentContext.sdkMetaData,
         productSceneVersion: productSceneVersion,
+        isPreload: false,
         query: {
           analyticsEnabled: this.initConfig.analytics.enabled,
-          displayType: DisplayTypeEnum.inline,
+          displayType: DisplayTypeEnum.popup,
           instanceId: this.instanceId,
-          isPreload: 'true',
           locale: this.initConfig.locale,
           hostSign: hostSign
         }
       });
-      var webAppUrl;
-      if (webAppUrlInfo.path.indexOf('?') !== -1) {
-        webAppUrl = "".concat(webAppUrlInfo.path, "&").concat(webAppUrlInfo.locationSearch);
-      } else {
-        webAppUrl = "".concat(webAppUrlInfo.path, "?").concat(webAppUrlInfo.locationSearch);
-      }
       return webAppUrl;
     }
   }, {
@@ -203,43 +204,35 @@ export var EasySafePayProcessor = /*#__PURE__*/function () {
   }, {
     key: "sendRequestAndWaitWebLaunch",
     value: function sendRequestAndWaitWebLaunch() {
-      var _this = this;
+      var _this2 = this;
       var eventCenter = ServiceProvider.getInstance(this.instanceId).getService('EventCenter');
-      var requestPromise = Promise.all([this.processPaymentQuery(), this.processSubmitPay()]).then(function (_ref) {
-        var _ref2 = _slicedToArray(_ref, 2),
-          queryRes = _ref2[0],
-          submitRes = _ref2[1];
-        return {
-          queryRes: queryRes,
-          submitRes: submitRes
-        };
-      });
-      var webLaunchPromose = new Promise(function (resolve) {
-        eventCenter.listen('onlaunch', function (res) {
+      var webLaunchPromise = new Promise(function (resolve) {
+        eventCenter.listen('onLaunch', function (res) {
           resolve(res);
         });
       });
 
       // 等请求和 Web启动都Ready之后，发送renderComponent
-      Promise.all([requestPromise, webLaunchPromose]).then(function (_ref3) {
-        var _this$paymentContext, _this$paymentContext2, _this$paymentContext$, _this$paymentContext$2, _this$paymentContext$3, _this$paymentContext$4;
-        var _ref4 = _slicedToArray(_ref3, 2),
-          requestResult = _ref4[0],
-          launchRes = _ref4[1];
-        var logMetaData = _this.logger.getLogConfig().mdata;
+      Promise.all([this.initSecuritySDK(), this.processSubmitPay(), webLaunchPromise]).then(function (_ref) {
+        var _this2$paymentContext, _this2$paymentContext2, _this2$paymentContext3, _this2$paymentContext4, _this2$paymentContext5, _this2$paymentContext6;
+        var _ref2 = _slicedToArray(_ref, 3),
+          _initSecurityRes = _ref2[0],
+          submitRes = _ref2[1],
+          _webLaunchRes = _ref2[2];
+        var logMetaData = _this2.logger.getLogConfig().mdata;
         eventCenter.dispatchToApp({
           event: 'renderComponent',
           data: {
-            queryResult: requestResult.queryRes,
-            submitResult: requestResult.submitRes,
-            sessionResult: (_this$paymentContext = _this.paymentContext) === null || _this$paymentContext === void 0 ? void 0 : _this$paymentContext.paymentSessionObj,
-            paymentSessionData: (_this$paymentContext2 = _this.paymentContext) === null || _this$paymentContext2 === void 0 ? void 0 : _this$paymentContext2.paymentSession,
+            sessionResult: (_this2$paymentContext = _this2.paymentContext) === null || _this2$paymentContext === void 0 ? void 0 : _this2$paymentContext.paymentSessionObj,
+            submitResult: submitRes,
+            paymentSessionData: (_this2$paymentContext2 = _this2.paymentContext) === null || _this2$paymentContext2 === void 0 ? void 0 : _this2$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,
-            merchantAppointParam: (_this$paymentContext$3 = _this.paymentContext.startBizFlowOptions.submitPayRequestExtra) === null || _this$paymentContext$3 === void 0 ? void 0 : _this$paymentContext$3.merchantAppointParam,
-            allowSubmitPayCallAhead: _this.allowSubmitPayCallAhead,
+            renderDisplayType: _this2.paymentContext.displayInfo.type,
+            appearance: (_this2$paymentContext3 = _this2.paymentContext.displayInfo) === null || _this2$paymentContext3 === void 0 ? void 0 : _this2$paymentContext3.appearance,
+            notRedirectAfterComplete: ((_this2$paymentContext4 = _this2.paymentContext.startBizFlowOptions.submitPayRequestExtra) === null || _this2$paymentContext4 === void 0 ? void 0 : _this2$paymentContext4.notRedirectAfterComplete) === true,
+            isAppWebview: _this2.paymentContext.startBizFlowOptions.isAppWebview,
+            merchantAppointParam: (_this2$paymentContext5 = _this2.paymentContext.startBizFlowOptions.submitPayRequestExtra) === null || _this2$paymentContext5 === void 0 ? void 0 : _this2$paymentContext5.merchantAppointParam,
+            allowSubmitPayCallAhead: _this2.allowSubmitPayCallAhead,
             envInfo: {
               screenHeight: screen.height,
               screenWidth: screen.width
@@ -248,7 +241,7 @@ export var EasySafePayProcessor = /*#__PURE__*/function () {
               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) || {}), {}, {
+            }, ((_this2$paymentContext6 = _this2.paymentContext.paymentSessionObj) === null || _this2$paymentContext6 === void 0 ? void 0 : _this2$paymentContext6.paymentSessionConfig) || {}), {}, {
               renderDisplayType: logMetaData.renderDisplayType,
               sdkVersion: logMetaData.sdkVersion,
               merchantId: logMetaData.merchantId,
@@ -260,244 +253,137 @@ export var EasySafePayProcessor = /*#__PURE__*/function () {
       });
     }
   }, {
-    key: "processPaymentQuery",
+    key: "processSubmitPay",
     value: function () {
-      var _processPaymentQuery = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
-        var _this$paymentContext3, _this$paymentContext4, _this$paymentContext5, _this$paymentContext6, _this$paymentContext7, _this$channelBehavior2;
-        var envInfo, requestData, extendInfo, actionData, enableEasypayApiOptimize, extendInfoData, productSceneVersion, requester, res;
+      var _processSubmitPay = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
+        var _this$paymentContext, _this$paymentContext2, _this$paymentContext3, _this$channelBehavior2, _this$channelBehavior3, _this$paymentContext$2;
+        var submitParams, _ref3, _ref3$productSceneVer, productSceneVersion, _ref4, _ref4$action, _ref4$action2, _ref4$action2$enableS, enableSignAgreement, _ref4$action2$autoDeb, autoDebitWithToken, _this$paymentContext$, paymentMethodType, isAppWebview, backScheme, requestBizId, extParams, requester, res;
         return _regeneratorRuntime().wrap(function _callee2$(_context2) {
           while (1) switch (_context2.prev = _context2.next) {
-            case 0:
-              envInfo = {
-                locale: this.initConfig.locale
-              }; //
-              requestData = {
-                paymentSessionData: ((_this$paymentContext3 = this.paymentContext) === null || _this$paymentContext3 === void 0 ? void 0 : _this$paymentContext3.paymentSession) || '',
-                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,
-                notRedirectAfterComplete: ((_this$paymentContext5 = this.paymentContext) === null || _this$paymentContext5 === void 0 ? void 0 : _this$paymentContext5.startBizFlowOptions.submitPayRequestExtra.notRedirectAfterComplete) === true
-                // merchantAppointParam: this._merchantAppointParam,
-              };
-              extendInfo = ((_this$paymentContext6 = this.paymentContext) === null || _this$paymentContext6 === void 0 || (_this$paymentContext6 = _this$paymentContext6.paymentSessionObj) === null || _this$paymentContext6 === void 0 ? void 0 : _this$paymentContext6.extendInfo) || '';
-              actionData = (_this$paymentContext7 = this.paymentContext) === null || _this$paymentContext7 === void 0 || (_this$paymentContext7 = _this$paymentContext7.paymentSessionObj) === null || _this$paymentContext7 === void 0 ? void 0 : _this$paymentContext7.action;
-              enableEasypayApiOptimize = false;
-              try {
-                extendInfoData = JSON.parse(extendInfo);
-                enableEasypayApiOptimize = extendInfoData.enableEasypayApiOptimize || false;
-              } catch (error) {
-                console.log(error);
-              }
-              if (!isLocalMock()) {
-                _context2.next = 8;
-                break;
-              }
-              return _context2.abrupt("return", {
-                message: 'sdk no need to make query request',
-                success: true
-              });
-            case 8:
-              if (!((_this$channelBehavior2 = this.channelBehavior) !== null && _this$channelBehavior2 !== void 0 && _this$channelBehavior2.usePaymentSessionAsQueryResult)) {
-                _context2.next = 10;
-                break;
-              }
-              return _context2.abrupt("return", {
-                autoDebitWithToken: actionData === null || actionData === void 0 ? void 0 : actionData.autoDebitWithToken,
-                amountConfirmRequired: actionData === null || actionData === void 0 ? void 0 : actionData.amountConfirmRequired,
-                success: true
-              });
-            case 10:
-              if (!(actionData.skipSdkQuery && enableEasypayApiOptimize)) {
-                _context2.next = 12;
-                break;
-              }
-              return _context2.abrupt("return", {
-                message: 'sdk no need to make query request',
-                success: true
-              });
-            case 12:
-              productSceneVersion = this.paymentContext.paymentSessionObj.paymentSessionConfig.productSceneVersion; // ESP 2.0 无需Query
-              if (!(productSceneVersion === '2.0')) {
-                _context2.next = 15;
-                break;
-              }
-              return _context2.abrupt("return", {
-                message: 'sdk no need to make query request',
-                success: true
-              });
-            case 15:
-              _context2.next = 17;
-              return this.acquireApdidToken();
-            case 17:
-              envInfo.deviceId = _context2.sent;
-              // 打日志
-              this.logger.logInfo({
-                title: 'sdk_event_sdkQuery'
-              }, {
-                paymentSessionConfig: JSON.stringify(requestData.paymentSessionConfig),
-                // TODO: 安全合规考虑
-                requestBody: requestData
-              });
-
-              // 真正发请求
-              requester = ServiceProvider.getInstance(this.instanceId).getService('Requester');
-              _context2.prev = 20;
-              _context2.next = 23;
-              return requester.request(requestData, {
-                env: this.initConfig.environment,
-                envInfo: envInfo,
-                hostSign: this.hostSign,
-                'Operation-Type': 'com.ipay.iexpcashier.sdkAction.query'
-              });
-            case 23:
-              res = _context2.sent;
-              this.logger.logInfo({
-                title: 'sdk_event_sdkQueryEnd'
-              }, {
-                paymentSessionConfig: JSON.stringify(requestData.paymentSessionConfig),
-                // TODO: 安全合规考虑
-                responseBody: res
-              });
-              _context2.next = 31;
-              break;
-            case 27:
-              _context2.prev = 27;
-              _context2.t0 = _context2["catch"](20);
-              this.logger.logError({
-                title: 'sdk_event_sdkQuery_failed'
-              }, {
-                paymentSessionConfig: JSON.stringify(requestData.paymentSessionConfig),
-                errorReason: _context2.t0
-              });
-              throw _context2.t0;
-            case 31:
-            case "end":
-              return _context2.stop();
-          }
-        }, _callee2, this, [[20, 27]]);
-      }));
-      function processPaymentQuery() {
-        return _processPaymentQuery.apply(this, arguments);
-      }
-      return processPaymentQuery;
-    }()
-  }, {
-    key: "processSubmitPay",
-    value: function () {
-      var _processSubmitPay = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
-        var _this$paymentContext8, _this$paymentContext9, _this$paymentContext11, _this$channelBehavior3, _this$channelBehavior4, _this$paymentContext$5;
-        var submitParams, shouldSkipSubmitPayInSDK, _this$paymentContext10, _ref5, _ref5$productSceneVer, productSceneVersion, _ref5$productScene, productScene, _ref6, _ref6$action, _ref6$action2, _ref6$action2$enableS, enableSignAgreement, _ref6$action2$autoDeb, autoDebitWithToken, extParams, requester, res;
-        return _regeneratorRuntime().wrap(function _callee3$(_context3) {
-          while (1) switch (_context3.prev = _context3.next) {
             case 0:
               submitParams = {
-                paymentSessionData: ((_this$paymentContext8 = this.paymentContext) === null || _this$paymentContext8 === void 0 ? void 0 : _this$paymentContext8.paymentSession) || '',
-                paymentSessionConfig: (_this$paymentContext9 = this.paymentContext) === null || _this$paymentContext9 === void 0 || (_this$paymentContext9 = _this$paymentContext9.paymentSessionObj) === null || _this$paymentContext9 === void 0 ? void 0 : _this$paymentContext9.paymentSessionConfig
+                paymentSessionData: ((_this$paymentContext = this.paymentContext) === null || _this$paymentContext === void 0 ? void 0 : _this$paymentContext.paymentSessionId) || '',
+                paymentSessionConfig: (_this$paymentContext2 = this.paymentContext) === null || _this$paymentContext2 === void 0 || (_this$paymentContext2 = _this$paymentContext2.paymentSessionObj) === null || _this$paymentContext2 === void 0 ? void 0 : _this$paymentContext2.paymentSessionConfig
               };
-              shouldSkipSubmitPayInSDK = false;
-              if (this.channelBehavior) {
-                // 新逻辑走 channelBehavior判断
-                shouldSkipSubmitPayInSDK = !this.channelBehavior.submitPayInSdk;
-              } else {
-                // TODO: 拉会找栎昂、甘颜一起对下
-                // 老逻辑，只要服务端标记不跳过sdkquery，就需要跳过submitpay
-                shouldSkipSubmitPayInSDK = !((_this$paymentContext10 = this.paymentContext) !== null && _this$paymentContext10 !== void 0 && (_this$paymentContext10 = _this$paymentContext10.paymentSessionObj) !== null && _this$paymentContext10 !== void 0 && (_this$paymentContext10 = _this$paymentContext10.action) !== null && _this$paymentContext10 !== void 0 && _this$paymentContext10.skipSdkQuery);
-              }
-              _ref5 = submitParams.paymentSessionConfig || {}, _ref5$productSceneVer = _ref5.productSceneVersion, productSceneVersion = _ref5$productSceneVer === void 0 ? '' : _ref5$productSceneVer, _ref5$productScene = _ref5.productScene, productScene = _ref5$productScene === void 0 ? '' : _ref5$productScene;
-              _ref6 = ((_this$paymentContext11 = this.paymentContext) === null || _this$paymentContext11 === void 0 ? void 0 : _this$paymentContext11.paymentSessionObj) || {}, _ref6$action = _ref6.action, _ref6$action2 = _ref6$action === void 0 ? {} : _ref6$action, _ref6$action2$enableS = _ref6$action2.enableSignAgreement, enableSignAgreement = _ref6$action2$enableS === void 0 ? false : _ref6$action2$enableS, _ref6$action2$autoDeb = _ref6$action2.autoDebitWithToken, autoDebitWithToken = _ref6$action2$autoDeb === void 0 ? false : _ref6$action2$autoDeb;
+              _ref3 = submitParams.paymentSessionConfig || {}, _ref3$productSceneVer = _ref3.productSceneVersion, productSceneVersion = _ref3$productSceneVer === void 0 ? '' : _ref3$productSceneVer;
+              _ref4 = ((_this$paymentContext3 = this.paymentContext) === null || _this$paymentContext3 === void 0 ? void 0 : _this$paymentContext3.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$ = this.paymentContext.paymentSessionObj) === null || _this$paymentContext$ === void 0 || (_this$paymentContext$ = _this$paymentContext$.paymentMethodInfoView) === null || _this$paymentContext$ === void 0 ? void 0 : _this$paymentContext$.paymentMethodType;
+                isAppWebview = this.paymentContext.startBizFlowOptions.isAppWebview;
+                if (paymentMethodType == 'ALIPAY_CN' && !isAppWebview) {
+                  backScheme = getBackScheme(undefined, this.logger);
+                  if (backScheme && backScheme !== 'https') {
+                    submitParams['h5FromApp'] = encodeURIComponent(backScheme);
+                  }
+                }
               }
-              // 带上标记告知WebCheckOut SDK已发送submitpay请求
-              this.allowSubmitPayCallAhead = !shouldSkipSubmitPayInSDK;
-              if (!shouldSkipSubmitPayInSDK) {
-                _context3.next = 9;
+              this.allowSubmitPayCallAhead = this.channelBehavior.allowSubmitPayCallAhead;
+              //console.log('[web-sdk] allowSubmitPayCallAhead =', this.allowSubmitPayCallAhead);
+              if (this.allowSubmitPayCallAhead) {
+                _context2.next = 7;
                 break;
               }
-              return _context3.abrupt("return", {
+              return _context2.abrupt("return", {
                 message: 'sdk no need to make submitPay request',
                 success: true
               });
-            case 9:
-              // 下面真实发请求
+            case 7:
+              requestBizId = uuid(); // 下面真实发请求
               this.logger.logInfo({
                 title: 'sdk_event_submitPay'
               }, {
                 paymentSessionConfig: JSON.stringify(submitParams.paymentSessionConfig),
-                // TODO: 安全合规考虑
-                responseBody: submitParams
+                requestBizId: requestBizId
               });
               // 由渠道定制点来构建额外参数
-              extParams = ((_this$channelBehavior3 = this.channelBehavior) === null || _this$channelBehavior3 === void 0 || (_this$channelBehavior4 = _this$channelBehavior3.buildSubmitPayExtParams) === null || _this$channelBehavior4 === void 0 ? void 0 : _this$channelBehavior4.call(_this$channelBehavior3, {
+              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$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,
-                paymentSessionData: this.paymentContext.paymentSession,
+                paymentMethodType: (_this$paymentContext$2 = this.paymentContext.paymentSessionObj) === null || _this$paymentContext$2 === void 0 || (_this$paymentContext$2 = _this$paymentContext$2.paymentMethodInfoView) === null || _this$paymentContext$2 === void 0 ? void 0 : _this$paymentContext$2.paymentMethodType,
+                paymentSessionData: this.paymentContext.paymentSessionId,
                 env: this.initConfig.environment,
                 sdkVersion: this.paymentContext.sdkMetaData.sdkVersion
               })) || {};
+              extParams.complianceSDK = true;
               submitParams.extParams = extParams;
               requester = ServiceProvider.getInstance(this.instanceId).getService('Requester');
-              _context3.t0 = requester;
-              _context3.t1 = submitParams;
-              _context3.t2 = this.initConfig.environment;
-              _context3.next = 18;
+              _context2.prev = 13;
+              _context2.t0 = requester;
+              _context2.t1 = submitParams;
+              _context2.t2 = this.initConfig.environment;
+              _context2.next = 19;
               return this.acquireApdidToken();
-            case 18:
-              _context3.t3 = _context3.sent;
-              _context3.t4 = {
-                deviceId: _context3.t3
+            case 19:
+              _context2.t3 = _context2.sent;
+              _context2.t4 = {
+                deviceId: _context2.t3
               };
-              _context3.t5 = this.hostSign;
-              _context3.t6 = {
-                env: _context3.t2,
+              _context2.t5 = this.hostSign;
+              _context2.t6 = {
+                env: _context2.t2,
                 timeout: 15000,
-                envInfo: _context3.t4,
-                hostSign: _context3.t5,
+                envInfo: _context2.t4,
+                hostSign: _context2.t5,
                 needEnvInfo: true,
                 'Operation-Type': 'com.ipay.iexpcashier.cashier.submitPayByPaymentSession'
               };
-              _context3.next = 24;
-              return _context3.t0.request.call(_context3.t0, _context3.t1, _context3.t6);
-            case 24:
-              res = _context3.sent;
+              _context2.next = 25;
+              return _context2.t0.request.call(_context2.t0, _context2.t1, _context2.t6);
+            case 25:
+              res = _context2.sent;
               this.logger.logInfo({
                 title: 'sdk_event_submitPayEnd'
               }, {
                 paymentSessionConfig: JSON.stringify(submitParams.paymentSessionConfig),
-                responseBody: res
+                requestBizId: requestBizId,
+                traceId: res.traceId
+              });
+              return _context2.abrupt("return", res);
+            case 30:
+              _context2.prev = 30;
+              _context2.t7 = _context2["catch"](13);
+              this.logger.logError({
+                title: 'sdk_event_submitPay_failed'
+              }, {
+                paymentSessionConfig: JSON.stringify(submitParams.paymentSessionConfig),
+                errorReason: _context2.t7,
+                requestBizId: requestBizId,
+                traceId: _context2.t7 === null || _context2.t7 === void 0 ? void 0 : _context2.t7.traceId
               });
-              return _context3.abrupt("return", res);
-            case 27:
+              throw _context2.t7;
+            case 34:
             case "end":
-              return _context3.stop();
+              return _context2.stop();
           }
-        }, _callee3, this);
+        }, _callee2, this, [[13, 30]]);
       }));
       function processSubmitPay() {
         return _processSubmitPay.apply(this, arguments);
       }
       return processSubmitPay;
-    }() // TOOD: 讨论下是否放到 requester里面
+    }()
   }, {
     key: "acquireApdidToken",
     value: function () {
-      var _acquireApdidToken = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4() {
-        var _this$paymentContext$6;
+      var _acquireApdidToken = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
+        var _this$paymentContext$3;
         var securityService, productScene, deviceId;
-        return _regeneratorRuntime().wrap(function _callee4$(_context4) {
-          while (1) switch (_context4.prev = _context4.next) {
+        return _regeneratorRuntime().wrap(function _callee3$(_context3) {
+          while (1) switch (_context3.prev = _context3.next) {
             case 0:
               securityService = ServiceProvider.getInstance(this.instanceId).getService('Security');
-              productScene = (_this$paymentContext$6 = this.paymentContext.paymentSessionObj) === null || _this$paymentContext$6 === void 0 || (_this$paymentContext$6 = _this$paymentContext$6.paymentSessionConfig) === null || _this$paymentContext$6 === void 0 ? void 0 : _this$paymentContext$6.productScene;
+              productScene = (_this$paymentContext$3 = this.paymentContext.paymentSessionObj) === null || _this$paymentContext$3 === void 0 || (_this$paymentContext$3 = _this$paymentContext$3.paymentSessionConfig) === null || _this$paymentContext$3 === void 0 ? void 0 : _this$paymentContext$3.productScene;
               deviceId = securityService.getDeviceId({
                 productScene: productScene
               });
-              return _context4.abrupt("return", deviceId);
+              return _context3.abrupt("return", deviceId);
             case 4:
             case "end":
-              return _context4.stop();
+              return _context3.stop();
           }
-        }, _callee4, this);
+        }, _callee3, this);
       }));
       function acquireApdidToken() {
         return _acquireApdidToken.apply(this, arguments);
@@ -505,32 +391,73 @@ export var EasySafePayProcessor = /*#__PURE__*/function () {
       return acquireApdidToken;
     }()
   }, {
-    key: "savePreviousProductInfo",
-    value: function savePreviousProductInfo(info) {
-      localStorage.setItem(KEY_PREVIOUS_PRODUCT_INFO, JSON.stringify({
-        productSceneVersion: info.productSceneVersion,
-        paymentMethodCategoryType: info.paymentMethodCategoryType,
-        hostSign: info.hostSign
+    key: "initSecuritySDK",
+    value: function () {
+      var _initSecuritySDK = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4() {
+        var _this$paymentContext$4, _this$paymentContext$5, productSceneVersion, nonCompliant, nonInitSecuritySDK, isFirstTimeToPay, shouldInitSecuritySDK;
+        return _regeneratorRuntime().wrap(function _callee4$(_context4) {
+          while (1) switch (_context4.prev = _context4.next) {
+            case 0:
+              _context4.prev = 0;
+              productSceneVersion = this.paymentContext.paymentSessionObj.paymentSessionConfig.productSceneVersion;
+              nonCompliant = (_this$paymentContext$4 = this.paymentContext.paymentSessionObj.action) === null || _this$paymentContext$4 === void 0 ? void 0 : _this$paymentContext$4.nonCompliant;
+              nonInitSecuritySDK = (_this$paymentContext$5 = this.paymentContext.paymentSessionObj.action) === null || _this$paymentContext$5 === void 0 ? void 0 : _this$paymentContext$5.nonInitSecuritySDK;
+              isFirstTimeToPay = !this.paymentContext.paymentSessionObj.action.autoDebitWithToken;
+              shouldInitSecuritySDK = false;
+              if (nonInitSecuritySDK) {
+                // 钱包不依赖风控
+                // console.log('[web-sdk][security-sdk] DO NOT init security sdk when nonInitSecuritySDK is true');
+                shouldInitSecuritySDK = false;
+              } else {
+                if (productSceneVersion === '1.0') {
+                  // 1.0 不初始化 SecuritySDK
+                  // 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;
+                  } 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;
+                    }
+                  }
+                }
+              }
+              if (!shouldInitSecuritySDK) {
+                _context4.next = 10;
+                break;
+              }
+              _context4.next = 10;
+              return this.securityService.initSecurity(this.SECURITY_SDK_INIT_TIMEOUT);
+            case 10:
+              this.logger.logInfo({
+                title: 'a3753.b101271.c388193.d514078'
+              }, {
+                riskSdkInfo: shouldInitSecuritySDK ? RiskSdkInfoEnum.NEED : RiskSdkInfoEnum.NO_NEED
+              });
+              _context4.next = 15;
+              break;
+            case 13:
+              _context4.prev = 13;
+              _context4.t0 = _context4["catch"](0);
+            case 15:
+            case "end":
+              return _context4.stop();
+          }
+        }, _callee4, this, [[0, 13]]);
       }));
-    }
-  }, {
-    key: "getPreviousProductInfo",
-    value: function getPreviousProductInfo() {
-      var previousProductInfo = localStorage.getItem(KEY_PREVIOUS_PRODUCT_INFO);
-      if (previousProductInfo) {
-        try {
-          return JSON.parse(previousProductInfo);
-        } catch (error) {
-          console.log(error);
-          this.logger.logError({
-            title: 'performance_optimization_get_previousChannel_error'
-          }, {
-            error: error
-          });
-        }
+      function initSecuritySDK() {
+        return _initSecuritySDK.apply(this, arguments);
       }
-      return null;
-    }
+      return initSecuritySDK;
+    }()
   }]);
   return EasySafePayProcessor;
 }();