@alipay/ams-checkout 0.0.1745808793-dev.2 → 0.0.1745808793-dev.4

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

@@ -196,37 +196,40 @@ export var EasySafePayProcessor = /*#__PURE__*/function () {
           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: getDefaultEasySafePayPageUrl(ESP_PAGE_NAME.DOUBLE_FA, _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,
-            queryResult: queryRes,
-            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: getDefaultEasySafePayPageUrl(ESP_PAGE_NAME.DOUBLE_FA, _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
-            })
-          }
+          data: data
         });
       }).catch(function (error) {
         _this.eventCenter.emit(EVENT.destroy.name, {});
@@ -468,14 +471,15 @@ export var EasySafePayProcessor = /*#__PURE__*/function () {
     key: "initSecuritySDK",
     value: function () {
       var _initSecuritySDK = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5() {
-        var _this$paymentContext$10, _this$paymentContext$11, productSceneVersion, nonCompliant, nonInitSecuritySDK, isFirstTimeToPay, shouldInitSecuritySDK;
+        var _this$paymentContext$10, _this$paymentContext$11, _this$paymentContext$12, _this$paymentContext$13, _this$paymentContext$14, _this$paymentContext$15, productSceneVersion, nonInitSecuritySDK, signButtonDisplay, userSignAgreement, isFirstTimeToPay, shouldInitSecuritySDK;
         return _regeneratorRuntime().wrap(function _callee5$(_context5) {
           while (1) switch (_context5.prev = _context5.next) {
             case 0:
               _context5.prev = 0;
               productSceneVersion = this.paymentContext.paymentSessionObj.paymentSessionConfig.productSceneVersion;
-              nonCompliant = (_this$paymentContext$10 = this.paymentContext.paymentSessionObj.action) === null || _this$paymentContext$10 === void 0 ? void 0 : _this$paymentContext$10.nonCompliant;
-              nonInitSecuritySDK = (_this$paymentContext$11 = this.paymentContext.paymentSessionObj.action) === null || _this$paymentContext$11 === void 0 ? void 0 : _this$paymentContext$11.nonInitSecuritySDK;
+              nonInitSecuritySDK = (_this$paymentContext$10 = (_this$paymentContext$11 = this.paymentContext.paymentSessionObj.action) === null || _this$paymentContext$11 === void 0 ? void 0 : _this$paymentContext$11.nonInitSecuritySDK) !== null && _this$paymentContext$10 !== void 0 ? _this$paymentContext$10 : false;
+              signButtonDisplay = (_this$paymentContext$12 = (_this$paymentContext$13 = this.paymentContext.paymentSessionObj.action) === null || _this$paymentContext$13 === void 0 ? void 0 : _this$paymentContext$13.signButtonDisplay) !== null && _this$paymentContext$12 !== void 0 ? _this$paymentContext$12 : false;
+              userSignAgreement = (_this$paymentContext$14 = (_this$paymentContext$15 = this.paymentContext.paymentSessionObj.action) === null || _this$paymentContext$15 === void 0 ? void 0 : _this$paymentContext$15.userSignAgreement) !== null && _this$paymentContext$14 !== void 0 ? _this$paymentContext$14 : false;
               isFirstTimeToPay = !this.paymentContext.paymentSessionObj.action.autoDebitWithToken;
               shouldInitSecuritySDK = false;
               if (nonInitSecuritySDK) {
@@ -488,44 +492,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) {
-                _context5.next = 10;
+                _context5.next = 11;
                 break;
               }
-              _context5.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
               });
-              _context5.next = 15;
+              _context5.next = 16;
               break;
-            case 13:
-              _context5.prev = 13;
+            case 14:
+              _context5.prev = 14;
               _context5.t0 = _context5["catch"](0);
-            case 15:
+            case 16:
             case "end":
               return _context5.stop();
           }
-        }, _callee5, this, [[0, 13]]);
+        }, _callee5, this, [[0, 14]]);
       }));
       function initSecuritySDK() {
         return _initSecuritySDK.apply(this, arguments);

package/esm/types/index.d.ts

@@ -243,6 +243,8 @@ export interface PaymentSessionActionData {
     requireFastSdk: boolean;
     nonCompliant?: boolean;
     nonInitSecuritySDK?: boolean;
+    signButtonDisplay?: boolean;
+    userSignAgreement?: boolean;
     skipSdkQueryForm?: {
         value: boolean;
         version: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@alipay/ams-checkout",
-  "version": "0.0.1745808793-dev.2",
+  "version": "0.0.1745808793-dev.4",
   "description": "",
   "author": "",
   "main": "esm/index.js",