@alipay/ams-checkout 0.0.1710212811-dev.1 → 0.0.1710212811-dev.11

package/esm/{common/applepay/index.d.ts → plugin/applepay/service.d.ts}

@@ -6,7 +6,7 @@
  * 2. If applicable, the use of the Software is also subject to the terms and conditions of any non-disclosure agreement signed by you and the relevant Ant Group entity.
  */
 import { IGetMerchantSession, ICompletePaymentAuthorized, ICompleteApplePay, ILogError, IApplePayTrace } from './interface';
-import { IpaymentSessionMetaData } from '../../types';
+import { ApplePaySubTypeEnum, IpaymentSessionMetaData } from '../../types';
 /**
  * Apple Pay Service
  */
@@ -19,7 +19,6 @@ declare class ApplePayService {
     private completeApplePay;
     private logError;
     private applePayTrace;
-    private onEventCallback;
     constructor();
     /**
      * set Apple Pay Params
@@ -31,9 +30,11 @@ declare class ApplePayService {
      */
     setApplePayParams(getMerchantSession: IGetMerchantSession, completePaymentAuthorized: ICompletePaymentAuthorized, completeApplePay: ICompleteApplePay, logError: ILogError, applePayTrace: IApplePayTrace): void;
     /**
-     * Apple Pay is enabled
+     * Is Apple Pay Enabled
+     * @param subTypeEnum
+     * @returns
      */
-    isEnabled: () => boolean;
+    static canMakePayments(subTypeEnum?: ApplePaySubTypeEnum): any;
     /**
      * has Active Card in Apple Pay
      * @param merchantIdentifier

package/esm/{common/applepay/index.js → plugin/applepay/service.js}

@@ -17,6 +17,8 @@ function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e
  */
 /* eslint-disable @typescript-eslint/no-explicit-any */
 import { APPLE_PAY_VERSION, APPLE_PAY_RECURRING_VERSION } from "./interface";
+import { ApplePaySubTypeEnum } from "../../types";
+
 /**
  * Apple Pay Service
  */
@@ -32,13 +34,6 @@ var ApplePayService = /*#__PURE__*/function () {
     _defineProperty(this, "completeApplePay", void 0);
     _defineProperty(this, "logError", void 0);
     _defineProperty(this, "applePayTrace", void 0);
-    _defineProperty(this, "onEventCallback", void 0);
-    /**
-     * Apple Pay is enabled
-     */
-    _defineProperty(this, "isEnabled", function () {
-      return window.ApplePaySession ? window.ApplePaySession.canMakePayments() : false;
-    });
     _defineProperty(this, "onvalidatemerchant", function (event) {
       _this.applePayTrace('onValidateMerchant');
       _this.getMerchantSession({
@@ -46,6 +41,7 @@ var ApplePayService = /*#__PURE__*/function () {
         merchantIdentifier: _this.merchantIdentifier,
         validationUrl: event.validationURL
       }).then(function (merchantSessionObjectString) {
+        console.log("onvalidatemerchant#merchantSessionObjectString", merchantSessionObjectString);
         var merchantSessionObject = JSON.parse(merchantSessionObjectString);
         _this.session.completeMerchantValidation(merchantSessionObject);
         _this.applePayTrace('completeMerchantValidation');
@@ -96,7 +92,7 @@ var ApplePayService = /*#__PURE__*/function () {
         order = paymentSessionFactor.order,
         recurringInfo = paymentSessionFactor.recurringInfo;
       _this.merchantIdentifier = merchantInfo === null || merchantInfo === void 0 ? void 0 : merchantInfo.partnerId;
-      if (!(extendInfo !== null && extendInfo !== void 0 && extendInfo.merchantCapabilities) || !(extendInfo !== null && extendInfo !== void 0 && extendInfo.supportedNetworks) || !(merchantInfo !== null && merchantInfo !== void 0 && merchantInfo.registeredCountry) || !(paymentAmount !== null && paymentAmount !== void 0 && paymentAmount.currency) || !(paymentAmount !== null && paymentAmount !== void 0 && paymentAmount.value)) {
+      if (!(extendInfo !== null && extendInfo !== void 0 && extendInfo.merchantCapabilities) || !(extendInfo !== null && extendInfo !== void 0 && extendInfo.supportedNetworks) || !(merchantInfo !== null && merchantInfo !== void 0 && merchantInfo.registeredCountry) || !(paymentAmount !== null && paymentAmount !== void 0 && paymentAmount.currency) || !(paymentAmount !== null && paymentAmount !== void 0 && paymentAmount.value) || !(merchantInfo !== null && merchantInfo !== void 0 && merchantInfo.merchantName)) {
         _this.logError("invalid session data");
         return;
       }
@@ -134,7 +130,7 @@ var ApplePayService = /*#__PURE__*/function () {
           currencyCode: paymentAmount === null || paymentAmount === void 0 ? void 0 : paymentAmount.currency,
           total: {
             type: 'final',
-            label: extendInfo === null || extendInfo === void 0 ? void 0 : extendInfo.merchantName,
+            label: merchantInfo === null || merchantInfo === void 0 ? void 0 : merchantInfo.merchantName,
             amount: paymentAmount === null || paymentAmount === void 0 ? void 0 : paymentAmount.value
           },
           recurringPaymentRequest: recurringRequest,
@@ -149,7 +145,7 @@ var ApplePayService = /*#__PURE__*/function () {
           currencyCode: paymentAmount === null || paymentAmount === void 0 ? void 0 : paymentAmount.currency,
           total: {
             type: 'final',
-            label: extendInfo === null || extendInfo === void 0 ? void 0 : extendInfo.merchantName,
+            label: merchantInfo === null || merchantInfo === void 0 ? void 0 : merchantInfo.merchantName,
             amount: paymentAmount === null || paymentAmount === void 0 ? void 0 : paymentAmount.value
           }
         };
@@ -159,7 +155,11 @@ var ApplePayService = /*#__PURE__*/function () {
       _this.session.onpaymentauthorized = _this.onpaymentauthorized;
       _this.session.oncancel = function () {
         _this.logError('UserCancel');
-        _this.session.abort();
+        try {
+          _this.session.abort();
+        } catch (error) {
+          console.log("session.abort() error");
+        }
       };
       _this.session.begin();
       _this.applePayTrace('sessionBegin');
@@ -183,6 +183,12 @@ var ApplePayService = /*#__PURE__*/function () {
       this.logError = logError;
       this.applePayTrace = applePayTrace;
     }
+
+    /**
+     * Is Apple Pay Enabled
+     * @param subTypeEnum 
+     * @returns 
+     */
   }, {
     key: "hasActiveCard",
     value: (
@@ -215,6 +221,14 @@ var ApplePayService = /*#__PURE__*/function () {
       }
       return hasActiveCard;
     }())
+  }], [{
+    key: "canMakePayments",
+    value: function canMakePayments(subTypeEnum) {
+      if (ApplePaySubTypeEnum.ApplePayRecurringPayment === subTypeEnum) {
+        return window.ApplePaySession ? window.ApplePaySession.canMakePayments() && window.ApplePaySession.supportsVersion(APPLE_PAY_RECURRING_VERSION) : false;
+      }
+      return window.ApplePaySession ? window.ApplePaySession.canMakePayments() && window.ApplePaySession.supportsVersion(APPLE_PAY_VERSION) : false;
+    }
   }]);
   return ApplePayService;
 }();

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

@@ -1,6 +1,6 @@
 import type AMSCheckout from '../../core/instance';
 import type { eventPayload, eventPayloadContext, IappendIframeNodesParams, IMerchantAppointParam, Iselector } from '../../types';
-import { componentSignEnum, platformEnum, renderDisplayTypeEnum } from '../../types';
+import { componentSignEnum, DeviceIdParameter, platformEnum, renderDisplayTypeEnum } from '../../types';
 type IrenderFuncParams = (context: ComponentApp, selector: Iselector, renderDisplayType: renderDisplayTypeEnum) => Promise<void>;
 export default class ComponentApp {
     app: null | HTMLIFrameElement;
@@ -44,7 +44,7 @@ export default class ComponentApp {
     setPreloadRender(renderFunc: any): void;
     private initSecurity;
     private logDeviceId;
-    private getDeviceIdAndLog;
+    getDeviceIdAndLog(deviceIdParameter?: DeviceIdParameter, isPolling?: boolean): Promise<string>;
     /**
      * @description render iframe content
      */

package/esm/plugin/component/index.js

@@ -364,7 +364,7 @@ var ComponentApp = /*#__PURE__*/function () {
       this._actionQueryPromise = new Promise( /*#__PURE__*/function () {
         var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(resolve, reject) {
           var _this5$_renderParams, _this5$_renderParams2, _this5$_renderParams3, _this5$_renderParams4, _this5$_renderParams5;
-          var envInfo, params, _this5$_renderParams$, extendInfo, enableVaultingApiOptimize, enableEasypayApiOptimize, extendInfoData, _this5$_renderParams6, _this5$_renderParams7, _ref3, _ref3$productSceneVer, productSceneVersion, _ref3$productScene, productScene, _ref4, _ref4$action, _ref4$action2, _ref4$action2$autoDeb, autoDebitWithToken, _this5$_renderParams8, _action$web, _action$wap, action, signType;
+          var envInfo, params, _ref3, extendInfo, enableVaultingApiOptimize, enableEasypayApiOptimize, extendInfoData, _this5$_renderParams6, _this5$_renderParams7, _ref4, _ref4$productSceneVer, productSceneVersion, _ref4$productScene, productScene, _ref5, _ref5$action, _ref5$action2, _ref5$action2$autoDeb, autoDebitWithToken, _this5$_renderParams8, _action$web, _action$wap, action, signType;
           return _regeneratorRuntime().wrap(function _callee2$(_context2) {
             while (1) switch (_context2.prev = _context2.next) {
               case 0:
@@ -380,7 +380,7 @@ var ComponentApp = /*#__PURE__*/function () {
                 /**
                  * @description Simulated or unnecessary scenarios
                  */
-                _this5$_renderParams$ = (_this5$_renderParams4 = _this5._renderParams) === null || _this5$_renderParams4 === void 0 ? void 0 : _this5$_renderParams4.paymentSessionMetaData, extendInfo = _this5$_renderParams$.extendInfo;
+                _ref3 = ((_this5$_renderParams4 = _this5._renderParams) === null || _this5$_renderParams4 === void 0 ? void 0 : _this5$_renderParams4.paymentSessionMetaData) || {}, extendInfo = _ref3.extendInfo;
                 enableVaultingApiOptimize = false;
                 enableEasypayApiOptimize = false;
                 try {
@@ -427,8 +427,8 @@ var ComponentApp = /*#__PURE__*/function () {
                   _context2.next = 26;
                   break;
                 }
-                _ref3 = params.paymentSessionConfig || {}, _ref3$productSceneVer = _ref3.productSceneVersion, productSceneVersion = _ref3$productSceneVer === void 0 ? '' : _ref3$productSceneVer, _ref3$productScene = _ref3.productScene, productScene = _ref3$productScene === void 0 ? '' : _ref3$productScene;
-                _ref4 = ((_this5$_renderParams6 = _this5._renderParams) === null || _this5$_renderParams6 === void 0 ? void 0 : _this5$_renderParams6.paymentSessionMetaData) || {}, _ref4$action = _ref4.action, _ref4$action2 = _ref4$action === void 0 ? {} : _ref4$action, _ref4$action2$autoDeb = _ref4$action2.autoDebitWithToken, autoDebitWithToken = _ref4$action2$autoDeb === void 0 ? false : _ref4$action2$autoDeb;
+                _ref4 = params.paymentSessionConfig || {}, _ref4$productSceneVer = _ref4.productSceneVersion, productSceneVersion = _ref4$productSceneVer === void 0 ? '' : _ref4$productSceneVer, _ref4$productScene = _ref4.productScene, productScene = _ref4$productScene === void 0 ? '' : _ref4$productScene;
+                _ref5 = ((_this5$_renderParams6 = _this5._renderParams) === null || _this5$_renderParams6 === void 0 ? void 0 : _this5$_renderParams6.paymentSessionMetaData) || {}, _ref5$action = _ref5.action, _ref5$action2 = _ref5$action === void 0 ? {} : _ref5$action, _ref5$action2$autoDeb = _ref5$action2.autoDebitWithToken, autoDebitWithToken = _ref5$action2$autoDeb === void 0 ? false : _ref5$action2$autoDeb;
                 if (!((_this5$_renderParams7 = _this5._renderParams) !== null && _this5$_renderParams7 !== void 0 && (_this5$_renderParams7 = _this5$_renderParams7.paymentSessionMetaData) !== null && _this5$_renderParams7 !== void 0 && (_this5$_renderParams7 = _this5$_renderParams7.action) !== null && _this5$_renderParams7 !== void 0 && _this5$_renderParams7.skipSdkQuery && enableEasypayApiOptimize)) {
                   _context2.next = 21;
                   break;
@@ -542,7 +542,7 @@ var ComponentApp = /*#__PURE__*/function () {
 
       // eslint-disable-next-line no-async-promise-executor
       this._actionSubmitPromise = new Promise( /*#__PURE__*/function () {
-        var _ref5 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(resolve) {
+        var _ref6 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(resolve) {
           var _this6$_renderParams;
           return _regeneratorRuntime().wrap(function _callee3$(_context3) {
             while (1) switch (_context3.prev = _context3.next) {
@@ -605,7 +605,7 @@ var ComponentApp = /*#__PURE__*/function () {
           }, _callee3);
         }));
         return function (_x3) {
-          return _ref5.apply(this, arguments);
+          return _ref6.apply(this, arguments);
         };
       }());
     }
@@ -1196,9 +1196,9 @@ var ComponentApp = /*#__PURE__*/function () {
     }
   }, {
     key: "handleDeclareInfo",
-    value: function handleDeclareInfo(_ref6) {
-      var _ref6$closeDialogData = _ref6.closeDialogData,
-        closeDialogData = _ref6$closeDialogData === void 0 ? {} : _ref6$closeDialogData;
+    value: function handleDeclareInfo(_ref7) {
+      var _ref7$closeDialogData = _ref7.closeDialogData,
+        closeDialogData = _ref7$closeDialogData === void 0 ? {} : _ref7$closeDialogData;
       _handleDeclareInfo({
         closeDialogData: closeDialogData
       });

package/esm/types/index.d.ts

@@ -138,11 +138,11 @@ export interface IpaymentSessionMetaData {
         extendInfo?: {
             merchantCapabilities?: string[];
             supportedNetworks?: string[];
-            merchantName?: string;
         };
         merchantInfo?: {
             registeredCountry?: string;
             partnerId?: string;
+            merchantName?: string;
         };
         order?: {
             orderDescription: string;
@@ -239,8 +239,8 @@ export declare enum platformEnum {
     desktop = "desktop",
     mobile = "mobile"
 }
-type EventCallbackResult = {
-    result: {
+export type EventCallbackResult = {
+    result?: {
         resultCode: string;
         resultStatus: string;
         resultMessage: string;

package/package.json

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