@alipay/ams-checkout 0.0.1718085825-dev.3 → 0.0.1719907614-dev.0

package/esm/plugin/component/cashierApp.js

@@ -39,12 +39,12 @@ var getAppVersion = function getAppVersion(_extendInfo, productScene, mid) {
 
     // 没有匹配到版本，查询上次的加载版本
     if (!appVersion) {
-      appVersion = getLastAppVersion(productScene);
+      appVersion = getLastAppVersion(sdkVersion + productScene);
       return appVersion;
     }
     // 不为空时代表是有sessionData，因此要保存当前版本
     if (_extendInfo) {
-      setLastAppVersion(productScene, appVersion);
+      setLastAppVersion(sdkVersion + productScene, appVersion);
     }
     return appVersion;
   } catch (error) {

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

@@ -17,6 +17,7 @@ export default class ComponentApp {
     private _selector;
     private _appVersion;
     private _isRetention;
+    private _allowSubmitPayCallAhead;
     private _actionQueryPromise;
     private _actionSubmitPromise;
     private _renderParams;

package/esm/plugin/component/index.js

@@ -47,6 +47,7 @@ var ComponentApp = /*#__PURE__*/function () {
     _defineProperty(this, "_selector", void 0);
     _defineProperty(this, "_appVersion", void 0);
     _defineProperty(this, "_isRetention", void 0);
+    _defineProperty(this, "_allowSubmitPayCallAhead", void 0);
     _defineProperty(this, "_actionQueryPromise", null);
     _defineProperty(this, "_actionSubmitPromise", null);
     _defineProperty(this, "_renderParams", null);
@@ -56,7 +57,7 @@ var ComponentApp = /*#__PURE__*/function () {
     _defineProperty(this, "_multipleCallbackEvents", void 0);
     _defineProperty(this, "_merchantAppointParam", void 0);
     _defineProperty(this, "_webAppHeartBeatTimeoutFn", void 0);
-    this._appVersion = '1.16.0.0';
+    this._appVersion = '1.17.1';
     this._isInitComponent = false;
     this._selector = "#".concat(COMPONENT_SECTION_ID);
     this.createIframeNode = function () {
@@ -539,7 +540,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;
                 }
@@ -653,7 +654,7 @@ var ComponentApp = /*#__PURE__*/function () {
       this._actionSubmitPromise = new Promise( /*#__PURE__*/function () {
         var _ref10 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(resolve) {
           var _channelBehavior$buil, _this6$_renderParams$;
-          var shouldSkipSubmitPayInSDK, _this6$_renderParams, extParams;
+          var shouldSkipSubmitPayInSDK, _this6$_renderParams, _this6$_renderParams2, _ref11, _ref11$productSceneVe, productSceneVersion, _ref11$productScene, productScene, _ref12, _ref12$action, _ref12$action2, _ref12$action2$enable, enableSignAgreement, _ref12$action2$autoDe, autoDebitWithToken, extParams;
           return _regeneratorRuntime().wrap(function _callee3$(_context3) {
             while (1) switch (_context3.prev = _context3.next) {
               case 0:
@@ -664,15 +665,25 @@ 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) {
+                  _ref11 = params.paymentSessionConfig || {}, _ref11$productSceneVe = _ref11.productSceneVersion, productSceneVersion = _ref11$productSceneVe === void 0 ? '' : _ref11$productSceneVe, _ref11$productScene = _ref11.productScene, productScene = _ref11$productScene === void 0 ? '' : _ref11$productScene;
+                  _ref12 = ((_this6$_renderParams2 = _this6._renderParams) === null || _this6$_renderParams2 === void 0 ? void 0 : _this6$_renderParams2.paymentSessionMetaData) || {}, _ref12$action = _ref12.action, _ref12$action2 = _ref12$action === void 0 ? {} : _ref12$action, _ref12$action2$enable = _ref12$action2.enableSignAgreement, enableSignAgreement = _ref12$action2$enable === void 0 ? false : _ref12$action2$enable, _ref12$action2$autoDe = _ref12$action2.autoDebitWithToken, autoDebitWithToken = _ref12$action2$autoDe === void 0 ? false : _ref12$action2$autoDe;
+                  if (productScene === productSceneEnum.EASY_PAY && productSceneVersion === '2.0' && !autoDebitWithToken) {
+                    ///EasyPay 2.0 首次传signAgreement字段
+                    params['signAgreement'] = enableSignAgreement;
+                  }
+                }
+                // 带上标记告知WebCheckOut SDK已发送submitpay请求
+                _this6._allowSubmitPayCallAhead = !shouldSkipSubmitPayInSDK;
                 if (!shouldSkipSubmitPayInSDK) {
-                  _context3.next = 4;
+                  _context3.next = 6;
                   break;
                 }
                 return _context3.abrupt("return", resolve({
                   message: 'sdk no need to make submitPay request',
                   success: true
                 }));
-              case 4:
+              case 6:
                 _this6.AMSSDK.logger.logInfo({
                   title: 'sdk_event_submitPay'
                 }, {
@@ -691,9 +702,9 @@ var ComponentApp = /*#__PURE__*/function () {
                 _context3.t0 = submitPayInfo;
                 _context3.t1 = params;
                 _context3.t2 = _this6.AMSSDK.options.env.environment;
-                _context3.next = 12;
+                _context3.next = 14;
                 return _this6.getDeviceIdAndLog();
-              case 12:
+              case 14:
                 _context3.t3 = _context3.sent;
                 _context3.t4 = {
                   deviceId: _context3.t3
@@ -727,7 +738,7 @@ var ComponentApp = /*#__PURE__*/function () {
                     success: false
                   });
                 });
-              case 17:
+              case 19:
               case "end":
                 return _context3.stop();
             }
@@ -854,8 +865,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) {
@@ -870,7 +886,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);
@@ -1355,9 +1376,9 @@ var ComponentApp = /*#__PURE__*/function () {
     }
   }, {
     key: "handleDeclareInfo",
-    value: function handleDeclareInfo(_ref11) {
-      var _ref11$closeDialogDat = _ref11.closeDialogData,
-        closeDialogData = _ref11$closeDialogDat === void 0 ? {} : _ref11$closeDialogDat;
+    value: function handleDeclareInfo(_ref13) {
+      var _ref13$closeDialogDat = _ref13.closeDialogData,
+        closeDialogData = _ref13$closeDialogDat === void 0 ? {} : _ref13$closeDialogDat;
       _handleDeclareInfo({
         closeDialogData: closeDialogData
       });
@@ -1534,6 +1555,7 @@ var ComponentApp = /*#__PURE__*/function () {
                     appearance: (_this$_renderParams18 = this._renderParams) === null || _this$_renderParams18 === void 0 ? void 0 : _this$_renderParams18.appearance,
                     notRedirectAfterComplete: ((_this$_renderParams19 = this._renderParams) === null || _this$_renderParams19 === void 0 ? void 0 : _this$_renderParams19.notRedirectAfterComplete) === true,
                     merchantAppointParam: this._merchantAppointParam,
+                    allowSubmitPayCallAhead: this._allowSubmitPayCallAhead,
                     envInfo: {
                       screenHeight: screen.height,
                       screenWidth: screen.width

package/esm/types/index.d.ts

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

package/esm/util/upgrade.d.ts

@@ -27,13 +27,13 @@ export declare function isGreyscaleMatch(item: UpgradeItem, randomGreyscale: num
 export declare const getMatchAppVersion: (_extendInfo: string, sdkInfo: UpgradeSdkInfo) => string;
 /**
  * 获取保存的加载版本
- * @param productScene
+ * @param versionKey
  * @returns
  */
-export declare const getLastAppVersion: (productScene: string) => string;
+export declare const getLastAppVersion: (versionKey: string) => string;
 /**
  * 保存指定场景的加载版本供下次使用
- * @param productScene
+ * @param versionKey
  * @returns
  */
-export declare const setLastAppVersion: (productScene: string, appVersion: string) => boolean;
+export declare const setLastAppVersion: (versionKey: string, appVersion: string) => boolean;

package/esm/util/upgrade.js

@@ -89,12 +89,12 @@ export var getMatchAppVersion = function getMatchAppVersion(_extendInfo, sdkInfo
 
 /**
  * 获取保存的加载版本
- * @param productScene
+ * @param versionKey
  * @returns
  */
-export var getLastAppVersion = function getLastAppVersion(productScene) {
+export var getLastAppVersion = function getLastAppVersion(versionKey) {
   try {
-    var key = "Antom_".concat(productScene, "_LastAppVersion");
+    var key = "Antom_".concat(versionKey, "_LastAppVersion");
     return getStorageString(key, '');
   } catch (error) {
     return '';
@@ -102,12 +102,12 @@ export var getLastAppVersion = function getLastAppVersion(productScene) {
 };
 /**
  * 保存指定场景的加载版本供下次使用
- * @param productScene
+ * @param versionKey
  * @returns
  */
-export var setLastAppVersion = function setLastAppVersion(productScene, appVersion) {
+export var setLastAppVersion = function setLastAppVersion(versionKey, appVersion) {
   try {
-    var key = "Antom_".concat(productScene, "_LastAppVersion");
+    var key = "Antom_".concat(versionKey, "_LastAppVersion");
     return setStorageString(key, appVersion);
   } catch (error) {
     return false;

package/package.json

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