@alipay/ams-checkout 0.0.1701393225-dev.14 → 0.0.1701393225-dev.16

package/esm/common/applepay/index.js

@@ -44,9 +44,7 @@ var ApplePayService = /*#__PURE__*/function () {
         merchantIdentifier: _this.merchantIdentifier,
         validationUrl: event.validationURL
       }).then(function (merchantSessionObjectString) {
-        console.log('merchantSessionObjectString', merchantSessionObjectString);
         var merchantSessionObject = JSON.parse(merchantSessionObjectString);
-        console.log('merchantSessionObject', merchantSessionObject);
         _this.session.completeMerchantValidation(merchantSessionObject);
         _this.applePayTrace('completeMerchantValidation');
       }).catch(function (error) {
@@ -56,7 +54,6 @@ var ApplePayService = /*#__PURE__*/function () {
     });
     _defineProperty(this, "onpaymentauthorized", function (event) {
       var _event$payment;
-      console.log('onpaymentauthorized', event);
       _this.applePayTrace('onpaymentauthorized');
       var _window = window,
         ApplePaySession = _window.ApplePaySession;
@@ -70,7 +67,6 @@ var ApplePayService = /*#__PURE__*/function () {
         _this.completePaymentAuthorized({
           paymentToken: JSON.stringify(event.payment.token)
         }).then(function (data) {
-          console.log('onpaymentauthorized then', data);
           _this.applePayTrace('completeApplePay');
           _this.session.completePayment(ApplePaySession.STATUS_SUCCESS);
           _this.completeApplePay(data);
@@ -97,14 +93,12 @@ var ApplePayService = /*#__PURE__*/function () {
         paymentAmount = paymentSessionFactor.paymentAmount,
         order = paymentSessionFactor.order;
       _this.merchantIdentifier = merchantInfo === null || merchantInfo === void 0 ? void 0 : merchantInfo.partnerId;
-      // TODO 参数判空处理
       var request = {
         merchantCapabilities: applePay === null || applePay === void 0 ? void 0 : applePay.merchantCapabilities,
         supportedNetworks: applePay === null || applePay === void 0 ? void 0 : applePay.supportedNetworks,
         countryCode: merchantInfo === null || merchantInfo === void 0 ? void 0 : merchantInfo.registeredCountry,
         currencyCode: paymentAmount === null || paymentAmount === void 0 ? void 0 : paymentAmount.currency,
         total: {
-          // todo 待确认
           type: 'final',
           label: order === null || order === void 0 ? void 0 : order.orderDescription,
           amount: paymentAmount === null || paymentAmount === void 0 ? void 0 : paymentAmount.value

package/esm/core/applepay/index.d.ts

@@ -14,6 +14,7 @@ declare class ApplePayComponent extends CoreInstance {
     private _applePayService;
     private _parseData;
     private _sessionData;
+    private _isFinish;
     constructor(options: IApplePayOptionsParams);
     private getDeviceIdAndLog;
     private logDeviceId;
@@ -25,6 +26,6 @@ declare class ApplePayComponent extends CoreInstance {
      * Submit Pay
      * @param paymentSessionData
      */
-    submitPay(paymentSessionData: string): Promise<never>;
+    submitPay(paymentSessionData: string): void;
 }
 export default ApplePayComponent;

package/esm/core/applepay/index.js

@@ -28,12 +28,13 @@ function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input ==
  * 1. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE; and
  * 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 { componentSignEnum, eventCodeEnum, productSceneEnum } from "../../types";
+import { componentSignEnum, environmentEnum, eventCodeEnum, productSceneEnum } from "../../types";
 import ApplePayService from "../../common/applepay";
 import { getComponentSign, parseSessionData } from "../component";
 import { getApplePayPaymentSession, submitPayInfo } from "../../service";
 import CoreInstance from "../instance";
-import { ERRORMESSAGE, EVENT } from "../../constant";
+import { EVENT } from "../../constant";
+
 /**
  * Apple pay Component
  */
@@ -43,13 +44,16 @@ var ApplePayComponent = /*#__PURE__*/function (_CoreInstance) {
   function ApplePayComponent(options) {
     var _this;
     _classCallCheck(this, ApplePayComponent);
-    var _options = Object.assign({}, options, {
+    var _options = Object.assign({
+      environment: environmentEnum.prod
+    }, options, {
       product: productSceneEnum.CARD_APPLE_PAY
     });
     _this = _super.call(this, _options);
     _defineProperty(_assertThisInitialized(_this), "_applePayService", void 0);
     _defineProperty(_assertThisInitialized(_this), "_parseData", void 0);
     _defineProperty(_assertThisInitialized(_this), "_sessionData", void 0);
+    _defineProperty(_assertThisInitialized(_this), "_isFinish", false);
     _this._applePayService = new ApplePayService();
     return _this;
   }
@@ -143,6 +147,7 @@ var ApplePayComponent = /*#__PURE__*/function (_CoreInstance) {
     key: "submitPay",
     value: function submitPay(paymentSessionData) {
       var _this3 = this;
+      this._isFinish = false;
       // parse session Data
       var _parseSessionData = parseSessionData(paymentSessionData),
         _parseSessionData2 = _slicedToArray(_parseSessionData, 2),
@@ -150,14 +155,43 @@ var ApplePayComponent = /*#__PURE__*/function (_CoreInstance) {
         sessionData = _parseSessionData2[1];
       this._parseData = parseData;
       this._sessionData = sessionData;
+      // parse data is null
+      if (Object.keys(parseData).length === 0) {
+        this._eventCenter.emit(EVENT.eventCallback.name, {
+          code: eventCodeEnum.SDK_PAYMENT_FAIL,
+          result: {
+            errorMsg: 'Abnormal response data is null'
+          }
+        });
+        this.logger.logError({
+          name: 'APPLE_PAY',
+          title: 'sessionDataNull',
+          msg: 'Abnormal response data is null'
+        }, {
+          type: 'error',
+          biz: 'sdk'
+        }).send();
+        return;
+      }
       // validate parse data
       var componentSign = getComponentSign(parseData);
       if (componentSign === componentSignEnum.NONE) {
         // eslint-disable-next-line prefer-promise-reject-errors
-        return Promise.reject({
-          code: ERRORMESSAGE.CREATEPAYMENT_PARAMETER_ERROR.code,
-          message: "Abnormal response data, interface failure, or unsupported payment method"
+        this._eventCenter.emit(EVENT.eventCallback.name, {
+          code: eventCodeEnum.SDK_PAYMENT_FAIL,
+          result: {
+            errorMsg: "Abnormal response data, interface failure, or unsupported payment method"
+          }
         });
+        this.logger.logError({
+          name: 'APPLE_PAY',
+          title: 'paymentMethodUnknown',
+          msg: 'Abnormal response data, interface failure, or unsupported payment method'
+        }, {
+          type: 'error',
+          biz: 'sdk'
+        }).send();
+        return;
       }
       /**
        * Get MerchantSession spi
@@ -174,18 +208,14 @@ var ApplePayComponent = /*#__PURE__*/function (_CoreInstance) {
                 requestParams = {
                   validateUrl: validationUrl,
                   paymentSessionData: _this3._sessionData
-                };
-                console.log('getMerchantSession validationUrl', validationUrl);
-                console.log('getMerchantSession _sessionData', _this3._sessionData);
-
-                // get deviceId
+                }; // get deviceId
                 _context2.t0 = getApplePayPaymentSession;
                 _context2.t1 = _this3._sessionData;
                 _context2.t2 = requestParams;
                 _context2.t3 = _this3.options.env.environment;
-                _context2.next = 10;
+                _context2.next = 8;
                 return _this3.getDeviceIdAndLog();
-              case 10:
+              case 8:
                 _context2.t4 = _context2.sent;
                 _context2.t5 = {
                   deviceId: _context2.t4
@@ -196,9 +226,7 @@ var ApplePayComponent = /*#__PURE__*/function (_CoreInstance) {
                 };
                 _context2.t7 = _this3.logger;
                 return _context2.abrupt("return", (0, _context2.t0)(_context2.t1, _context2.t2, _context2.t6, _context2.t7).then(function (res) {
-                  console.log('res', res);
                   if (res !== null && res !== void 0 && res.success && res.merchantSessionObject) {
-                    console.log('res.merchantSessionObject', res.merchantSessionObject);
                     return Promise.resolve(res.merchantSessionObject);
                   }
                   return Promise.reject({
@@ -208,7 +236,7 @@ var ApplePayComponent = /*#__PURE__*/function (_CoreInstance) {
                 }).catch(function (error) {
                   return Promise.reject(error);
                 }));
-              case 15:
+              case 13:
               case "end":
                 return _context2.stop();
             }
@@ -252,7 +280,13 @@ var ApplePayComponent = /*#__PURE__*/function (_CoreInstance) {
                 };
                 _context3.t6 = _this3.logger;
                 return _context3.abrupt("return", (0, _context3.t0)(_context3.t1, _context3.t5, _context3.t6).then(function (res) {
-                  console.log('completePaymentAuthorized then', res);
+                  _this3.logger.logInfo({
+                    name: 'APPLE_PAY',
+                    title: 'submitPayStatus',
+                    msg: res === null || res === void 0 ? void 0 : res.errorStatus
+                  }, {
+                    biz: 'sdk'
+                  }).send();
                   if (res !== null && res !== void 0 && res.success || (res === null || res === void 0 ? void 0 : res.errorStatus) === 'U') {
                     return Promise.resolve(res);
                   }
@@ -261,7 +295,6 @@ var ApplePayComponent = /*#__PURE__*/function (_CoreInstance) {
                     errorMessage: res.errorMessage
                   });
                 }).catch(function (error) {
-                  console.log('completePaymentAuthorized catch', error);
                   return Promise.reject(error);
                 }));
               case 12:
@@ -276,7 +309,7 @@ var ApplePayComponent = /*#__PURE__*/function (_CoreInstance) {
       }();
       var completeApplePay = function completeApplePay(data) {
         var _data$actionForm;
-        // TODO 处理redirectUrl
+        _this3._isFinish = true;
         _this3._eventCenter.emit(EVENT.eventCallback.name, {
           code: eventCodeEnum.SDK_PAYMENT_FINISH,
           result: {
@@ -285,14 +318,25 @@ var ApplePayComponent = /*#__PURE__*/function (_CoreInstance) {
         });
       };
       var logError = function logError(msg, error) {
-        // TODO 回抛错误给商户
-        console.error('logError', msg, error);
+        // log error
+        _this3.logger.logError({
+          name: 'APPLE_PAY',
+          title: msg,
+          label: msg,
+          msg: error
+        }, {
+          type: 'error',
+          biz: 'sdk'
+        }).send();
+        if (_this3._isFinish) {
+          return;
+        }
+        _this3._isFinish = true;
         if (msg === 'UserCancel') {
           _this3._eventCenter.emit(EVENT.eventCallback.name, {
             code: eventCodeEnum.SDK_PAYMENT_CANCEL
           });
         } else {
-          // this._eventCenter.emit(EVENT.error.name, error);
           _this3._eventCenter.emit(EVENT.eventCallback.name, {
             code: eventCodeEnum.SDK_PAYMENT_FAIL,
             result: {
@@ -302,12 +346,14 @@ var ApplePayComponent = /*#__PURE__*/function (_CoreInstance) {
         }
       };
       var applePayTrace = function applePayTrace(msg) {
-        // TODO 记录日志
-        console.log('applePayTrace', msg);
+        // set log funnel
         _this3.logger.logInfo({
-          title: 'APPLE_PAY'
+          name: 'APPLE_PAY',
+          title: msg,
+          label: msg
         }, {
-          msg: msg
+          type: 'funnel',
+          biz: 'sdk'
         }).send();
       };
 

package/package.json

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