@alipay/ams-checkout 0.0.1716363774-dev.1 → 0.0.1717141544-dev.3

package/esm/plugin/component/channel.js

@@ -1,5 +1,6 @@
 export function getChannelBehavior(paymentSessionMetaData) {
-  var _paymentSessionMetaDa, _paymentSessionMetaDa2, _paymentSessionMetaDa3, _paymentSessionMetaDa4;
+  var _paymentSessionMetaDa, _paymentSessionMetaDa2, _paymentSessionMetaDa3, _paymentSessionMetaDa4, _paymentSessionMetaDa5, _paymentSessionMetaDa6, _paymentSessionMetaDa7, _paymentSessionMetaDa8;
+  // TOSS EASYPAY 2.0
   if ('BANKTRANSFER_QUICKPAY' === (paymentSessionMetaData === null || paymentSessionMetaData === void 0 || (_paymentSessionMetaDa = paymentSessionMetaData.paymentMethodInfoView) === null || _paymentSessionMetaDa === void 0 ? void 0 : _paymentSessionMetaDa.paymentMethodType) && (paymentSessionMetaData === null || paymentSessionMetaData === void 0 || (_paymentSessionMetaDa2 = paymentSessionMetaData.paymentSessionConfig) === null || _paymentSessionMetaDa2 === void 0 ? void 0 : _paymentSessionMetaDa2.productScene) === 'EASY_PAY' && (paymentSessionMetaData === null || paymentSessionMetaData === void 0 || (_paymentSessionMetaDa3 = paymentSessionMetaData.paymentSessionConfig) === null || _paymentSessionMetaDa3 === void 0 ? void 0 : _paymentSessionMetaDa3.paymentMethodCategoryType) === 'APM' && (paymentSessionMetaData === null || paymentSessionMetaData === void 0 || (_paymentSessionMetaDa4 = paymentSessionMetaData.paymentSessionConfig) === null || _paymentSessionMetaDa4 === void 0 ? void 0 : _paymentSessionMetaDa4.productSceneVersion) === '2.0') {
     return {
       usePaymentSessionAsQueryResult: true,
@@ -15,6 +16,19 @@ export function getChannelBehavior(paymentSessionMetaData) {
       }
     };
   }
+  // TNG EASYPAY 2.0
+  if ('TNG' === (paymentSessionMetaData === null || paymentSessionMetaData === void 0 || (_paymentSessionMetaDa5 = paymentSessionMetaData.paymentMethodInfoView) === null || _paymentSessionMetaDa5 === void 0 ? void 0 : _paymentSessionMetaDa5.paymentMethodType) && (paymentSessionMetaData === null || paymentSessionMetaData === void 0 || (_paymentSessionMetaDa6 = paymentSessionMetaData.paymentSessionConfig) === null || _paymentSessionMetaDa6 === void 0 ? void 0 : _paymentSessionMetaDa6.productScene) === 'EASY_PAY' && (paymentSessionMetaData === null || paymentSessionMetaData === void 0 || (_paymentSessionMetaDa7 = paymentSessionMetaData.paymentSessionConfig) === null || _paymentSessionMetaDa7 === void 0 ? void 0 : _paymentSessionMetaDa7.paymentMethodCategoryType) === 'WALLET' && (paymentSessionMetaData === null || paymentSessionMetaData === void 0 || (_paymentSessionMetaDa8 = paymentSessionMetaData.paymentSessionConfig) === null || _paymentSessionMetaDa8 === void 0 ? void 0 : _paymentSessionMetaDa8.productSceneVersion) === '2.0') {
+    return {
+      usePaymentSessionAsQueryResult: false,
+      submitPayInSdk: false,
+      createIframeNode: true,
+      loadApp: true,
+      allowClickOutsideClose: false,
+      buildSubmitPayExtParams: function buildSubmitPayExtParams(params) {
+        return {};
+      }
+    };
+  }
   return undefined;
 }
 export function getDoubleFaUrl(params) {

package/esm/plugin/component/index.js

@@ -56,7 +56,7 @@ var ComponentApp = /*#__PURE__*/function () {
     _defineProperty(this, "_multipleCallbackEvents", void 0);
     _defineProperty(this, "_merchantAppointParam", void 0);
     _defineProperty(this, "_webAppHeartBeatTimeoutFn", void 0);
-    this._appVersion = '1.15.0';
+    this._appVersion = '1.16.0';
     this._isInitComponent = false;
     this._selector = "#".concat(COMPONENT_SECTION_ID);
     this.createIframeNode = function () {
@@ -492,7 +492,7 @@ var ComponentApp = /*#__PURE__*/function () {
                   success: true
                 }));
               case 35:
-                if (!(productScene === productSceneEnum.EASY_PAY && productSceneVersion === '2.0' && !autoDebitWithToken)) {
+                if (!(productScene === productSceneEnum.EASY_PAY && productSceneVersion === '2.0')) {
                   _context2.next = 37;
                   break;
                 }
@@ -606,7 +606,7 @@ var ComponentApp = /*#__PURE__*/function () {
       this._actionSubmitPromise = new Promise( /*#__PURE__*/function () {
         var _ref7 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(resolve) {
           var _channelBehavior$buil, _this6$_renderParams$;
-          var shouldSkipSubmitPayInSDK, _this6$_renderParams, extParams;
+          var shouldSkipSubmitPayInSDK, _this6$_renderParams, _this6$_renderParams2, _ref8, _ref8$productSceneVer, productSceneVersion, _ref8$productScene, productScene, _ref9, _ref9$action, _ref9$action2, _ref9$action2$enableS, enableSignAgreement, extParams;
           return _regeneratorRuntime().wrap(function _callee3$(_context3) {
             while (1) switch (_context3.prev = _context3.next) {
               case 0:
@@ -617,15 +617,22 @@ var ComponentApp = /*#__PURE__*/function () {
                 } else {
                   shouldSkipSubmitPayInSDK = !((_this6$_renderParams = _this6._renderParams) !== null && _this6$_renderParams !== void 0 && (_this6$_renderParams = _this6$_renderParams.paymentSessionMetaData) !== null && _this6$_renderParams !== void 0 && (_this6$_renderParams = _this6$_renderParams.action) !== null && _this6$_renderParams !== void 0 && _this6$_renderParams.skipSdkQuery) || componentSignEnum.EASY_PAY_WALLET !== _this6._componentSign;
                 }
+                if (componentSignEnum.EASY_PAY_WALLET === _this6._componentSign) {
+                  _ref8 = params.paymentSessionConfig || {}, _ref8$productSceneVer = _ref8.productSceneVersion, productSceneVersion = _ref8$productSceneVer === void 0 ? '' : _ref8$productSceneVer, _ref8$productScene = _ref8.productScene, productScene = _ref8$productScene === void 0 ? '' : _ref8$productScene;
+                  _ref9 = ((_this6$_renderParams2 = _this6._renderParams) === null || _this6$_renderParams2 === void 0 ? void 0 : _this6$_renderParams2.paymentSessionMetaData) || {}, _ref9$action = _ref9.action, _ref9$action2 = _ref9$action === void 0 ? {} : _ref9$action, _ref9$action2$enableS = _ref9$action2.enableSignAgreement, enableSignAgreement = _ref9$action2$enableS === void 0 ? false : _ref9$action2$enableS;
+                  if (productScene === productSceneEnum.EASY_PAY && productSceneVersion === '2.0') {
+                    params['signAgreement'] = enableSignAgreement;
+                  }
+                }
                 if (!shouldSkipSubmitPayInSDK) {
-                  _context3.next = 4;
+                  _context3.next = 5;
                   break;
                 }
                 return _context3.abrupt("return", resolve({
                   message: 'sdk no need to make submitPay request',
                   success: true
                 }));
-              case 4:
+              case 5:
                 _this6.AMSSDK.logger.logInfo({
                   title: 'sdk_event_submitPay'
                 }, {
@@ -644,9 +651,9 @@ var ComponentApp = /*#__PURE__*/function () {
                 _context3.t0 = submitPayInfo;
                 _context3.t1 = params;
                 _context3.t2 = _this6.AMSSDK.options.env.environment;
-                _context3.next = 12;
+                _context3.next = 13;
                 return _this6.getDeviceIdAndLog();
-              case 12:
+              case 13:
                 _context3.t3 = _context3.sent;
                 _context3.t4 = {
                   deviceId: _context3.t3
@@ -680,7 +687,7 @@ var ComponentApp = /*#__PURE__*/function () {
                     success: false
                   });
                 });
-              case 17:
+              case 18:
               case "end":
                 return _context3.stop();
             }
@@ -807,8 +814,13 @@ var ComponentApp = /*#__PURE__*/function () {
           path = _getIframeUrl2.path,
           locationSearch = _getIframeUrl2.locationSearch;
         this._appLocationSearch = locationSearch;
-        this.app.src = "".concat(path, "?").concat(locationSearch);
-
+        // locationSearch 是一个序列化好的字符串
+        // 先判断path 是否有QueryParams，如果有需要扩展，否则直接拼?xx=xx
+        if (path.indexOf('?') !== -1) {
+          this.app.src = "".concat(path, "&").concat(locationSearch);
+        } else {
+          this.app.src = "".concat(path, "?").concat(locationSearch);
+        }
         // Subscribe to messages from iframe
         this.addEventListener();
       } catch (error) {
@@ -823,7 +835,12 @@ var ComponentApp = /*#__PURE__*/function () {
   }, {
     key: "listener",
     value: function listener(e) {
+      var _e$data;
       if (e.origin !== this.appDomain) return;
+      if (((_e$data = e.data) === null || _e$data === void 0 ? void 0 : _e$data.source) === 'react-devtools-content-script') {
+        // 防止 react 开发工具发的消息，非常频繁影响查看日志
+        return;
+      }
       var isJson = isJsonString(e.data);
       if (isJson) {
         var data = JSON.parse(e.data);
@@ -1286,9 +1303,9 @@ var ComponentApp = /*#__PURE__*/function () {
     }
   }, {
     key: "handleDeclareInfo",
-    value: function handleDeclareInfo(_ref8) {
-      var _ref8$closeDialogData = _ref8.closeDialogData,
-        closeDialogData = _ref8$closeDialogData === void 0 ? {} : _ref8$closeDialogData;
+    value: function handleDeclareInfo(_ref10) {
+      var _ref10$closeDialogDat = _ref10.closeDialogData,
+        closeDialogData = _ref10$closeDialogDat === void 0 ? {} : _ref10$closeDialogDat;
       _handleDeclareInfo({
         closeDialogData: closeDialogData
       });

package/esm/plugin/paypal/index.js

@@ -124,7 +124,7 @@ export var PaypalBusSubscriber = /*#__PURE__*/function (_BusSubscriber) {
         locale: locale,
         'client-id': channelMerchantAccountId
       });
-      var disableFundingArr = [];
+      var disableFundingArr = ['bancontact', 'blik', 'eps', 'giropay', 'ideal', 'mercadopago', 'mybank', 'p24', 'sepa', 'sofort'];
       if (blockPayPalCreditButton && !displayPayPalPayLaterButtonOnly) {
         disableFundingArr.push('card');
       }

package/esm/types/index.d.ts

@@ -147,6 +147,7 @@ export interface IpaymentSessionMetaData {
     action?: {
         amountConfirmRequired?: boolean;
         autoDebitWithToken: boolean;
+        enableSignAgreement?: boolean;
         skipSdkQuery: boolean;
         skipSdkQueryForm?: {
             value: boolean;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@alipay/ams-checkout",
-  "version": "0.0.1716363774-dev.1",
+  "version": "0.0.1717141544-dev.3",
   "description": "",
   "author": "",
   "main": "esm/index.js",