@alipay/ams-checkout 0.0.1724942009-dev.3 → 0.0.1724942009-dev.4

package/esm/plugin/component/index.d.ts

@@ -25,6 +25,7 @@ export default class ComponentApp {
     private _appLocationSearch;
     private _renderDisplayType;
     private _multipleCallbackEvents;
+    private _isAppWebview;
     _merchantAppointParam: IMerchantAppointParam;
     private _webAppHeartBeatTimeoutFn;
     constructor();

package/esm/plugin/component/index.js

@@ -22,7 +22,7 @@ import { sdkVersion } from "../../config";
 import { COMPONENTPLUGINID, COMPONENT_CLOSE_BLOCK_ID, COMPONENT_CONTAINER_ID, COMPONENT_RETENTION_ID, COMPONENT_SECTION_ID, ERRORMESSAGE, EVENT, LISTENER_PREFIX, LOADING_ID, LOADTIME_LIMIT, MOCKUP_ID, POPUP_LOADTIME_LOG_LIMIT, TIMEOUT_WEB_APP_HEART_BEAT, TIME_DELAY_SEND_HEART_BEAT } from "../../constant";
 import { queryPaymentInfo, submitPayInfo } from "../../service";
 import { componentSignEnum, eventCodeEnum, messageName, platformEnum, productSceneEnum, RedirectType, renderDisplayTypeEnum, targetEnum } from "../../types";
-import { getType, isJsonString, isPC, isWebView } from "../../util";
+import { getType, isJsonString, isPC } from "../../util";
 import { isLocalMock } from "../../util/mock";
 import { matchVersion } from "../../util/versionCompare";
 import { getBackScheme } from "../../util/getBackScheme";
@@ -57,6 +57,7 @@ var ComponentApp = /*#__PURE__*/function () {
     _defineProperty(this, "_appLocationSearch", void 0);
     _defineProperty(this, "_renderDisplayType", renderDisplayTypeEnum.popup);
     _defineProperty(this, "_multipleCallbackEvents", void 0);
+    _defineProperty(this, "_isAppWebview", void 0);
     _defineProperty(this, "_merchantAppointParam", void 0);
     _defineProperty(this, "_webAppHeartBeatTimeoutFn", void 0);
     this._appVersion = '1.22.0';
@@ -265,6 +266,7 @@ var ComponentApp = /*#__PURE__*/function () {
       this._componentSign = componentSign;
       if ((_renderParams = renderParams) !== null && _renderParams !== void 0 && _renderParams.selector) this._selector = renderParams.selector;
       this._renderDisplayType = renderParams.renderDisplayType;
+      this._isAppWebview = renderParams.isAppWebview;
       this._merchantAppointParam = renderParams.merchantAppointParam;
       var insertedNode = this._renderDisplayType === renderDisplayTypeEnum.inline ? "#".concat(COMPONENT_CONTAINER_ID) : this._selector;
       this.initLoggerMeta();
@@ -667,7 +669,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, _this6$_renderParams2, _this6$_renderParams3, _ref11, _ref11$productSceneVe, productSceneVersion, _ref11$productScene, productScene, _ref12, _ref12$action, _ref12$action2, _ref12$action2$enable, enableSignAgreement, _ref12$action2$autoDe, autoDebitWithToken, _ref13, _ref13$paymentMethodI, _ref13$paymentMethodI2, _ref13$paymentMethodI3, paymentMethodType, backScheme, extParams;
+          var shouldSkipSubmitPayInSDK, _this6$_renderParams, _this6$_renderParams2, _this6$_renderParams3, _ref11, _ref11$productSceneVe, productSceneVersion, _ref11$productScene, productScene, _ref12, _ref12$action, _ref12$action2, _ref12$action2$enable, enableSignAgreement, _ref12$action2$autoDe, autoDebitWithToken, _ref13, _ref13$paymentMethodI, _ref13$paymentMethodI2, _ref13$paymentMethodI3, paymentMethodType, isAppWebview, backScheme, extParams;
           return _regeneratorRuntime().wrap(function _callee3$(_context3) {
             while (1) switch (_context3.prev = _context3.next) {
               case 0:
@@ -683,11 +685,11 @@ var ComponentApp = /*#__PURE__*/function () {
                   _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;
                   _ref13 = ((_this6$_renderParams3 = _this6._renderParams) === null || _this6$_renderParams3 === void 0 ? void 0 : _this6$_renderParams3.paymentSessionMetaData) || {}, _ref13$paymentMethodI = _ref13.paymentMethodInfoView, _ref13$paymentMethodI2 = _ref13$paymentMethodI === void 0 ? {} : _ref13$paymentMethodI, _ref13$paymentMethodI3 = _ref13$paymentMethodI2.paymentMethodType, paymentMethodType = _ref13$paymentMethodI3 === void 0 ? '' : _ref13$paymentMethodI3;
                   if (productScene === productSceneEnum.EASY_PAY && productSceneVersion === '2.0' && !autoDebitWithToken) {
-                    ///EasyPay 2.0 首次传signAgreement字段
+                    isAppWebview = _this6._isAppWebview || false; ///EasyPay 2.0 首次传signAgreement字段
                     params['signAgreement'] = enableSignAgreement;
-                    if (paymentMethodType == 'ALIPAY_CN' && !isWebView()) {
+                    if (paymentMethodType == 'ALIPAY_CN' && !isAppWebview) {
                       backScheme = getBackScheme(undefined, _this6.AMSSDK.logger);
-                      if (backScheme) {
+                      if (backScheme && backScheme !== 'https') {
                         params['h5FromApp'] = encodeURIComponent(backScheme);
                       }
                     }
@@ -1625,6 +1627,7 @@ var ComponentApp = /*#__PURE__*/function () {
                     renderDisplayType: (_this$_renderParams17 = this._renderParams) === null || _this$_renderParams17 === void 0 ? void 0 : _this$_renderParams17.renderDisplayType,
                     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,
+                    isAppWebview: this._isAppWebview,
                     merchantAppointParam: this._merchantAppointParam,
                     allowSubmitPayCallAhead: this._allowSubmitPayCallAhead,
                     envInfo: {

package/esm/types/index.d.ts

@@ -81,6 +81,7 @@ export interface IcreateComponent {
     paymentSessionData?: string;
     notRedirectAfterComplete?: boolean;
     appearance?: Record<string, any>;
+    isAppWebview?: boolean;
     merchantAppointParam?: IMerchantAppointParam;
 }
 export interface IappendIframeNodesParams extends IcreateComponent {

package/esm/util/index.d.ts

@@ -29,7 +29,6 @@ declare const device: {
 };
 declare const safeJson: (data: any, obj: any) => any;
 declare const isPC: () => boolean;
-declare const isWebView: (mockUA?: string) => boolean;
 declare const queryParse: (url?: string) => Record<string, any>;
 declare const getDesignFontSize: () => number;
 declare const amsSetSize: (event?: any, dom?: any) => void;
@@ -47,4 +46,4 @@ declare function loadSDKScript({ src, attrOptions, timeOut, loadCallback }: {
     timeOut?: number;
     loadCallback?: any;
 }, logger: any): Promise<unknown>;
-export { getType, EventCenter, getViewPort, getOrigin, serialize, isJsonString, isDom, isFunction, device, safeJson, isPC, isWebView, queryParse, getDesignFontSize, amsSetSize, addSetFontSizeEvent, getOrSetStorageId, checkTimeElapsed, parseBase64ToString, loadSDKScript, };
+export { getType, EventCenter, getViewPort, getOrigin, serialize, isJsonString, isDom, isFunction, device, safeJson, isPC, queryParse, getDesignFontSize, amsSetSize, addSetFontSizeEvent, getOrSetStorageId, checkTimeElapsed, parseBase64ToString, loadSDKScript, };

package/esm/util/index.js

@@ -171,10 +171,6 @@ var isPC = function isPC() {
     return userAgentInfo.includes(agent);
   });
 };
-var isWebView = function isWebView(mockUA) {
-  var ua = mockUA || navigator.userAgent;
-  return /webview|wv|ip((?!.*safari)|(?=.*like safari))/i.test(ua);
-};
 var queryParse = function queryParse(url) {
   var qs = {};
   if (!url) {
@@ -336,4 +332,4 @@ function loadSDKScript(_ref, logger) {
     document.head.appendChild(script);
   });
 }
-export { getType, EventCenter, getViewPort, getOrigin, serialize, isJsonString, isDom, isFunction, device, safeJson, isPC, isWebView, queryParse, getDesignFontSize, amsSetSize, addSetFontSizeEvent, getOrSetStorageId, checkTimeElapsed, parseBase64ToString, loadSDKScript };
+export { getType, EventCenter, getViewPort, getOrigin, serialize, isJsonString, isDom, isFunction, device, safeJson, isPC, queryParse, getDesignFontSize, amsSetSize, addSetFontSizeEvent, getOrSetStorageId, checkTimeElapsed, parseBase64ToString, loadSDKScript };

package/package.json

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