@alipay/ams-checkout 0.0.1781004142-dev.11 → 0.0.1781004142-dev.12

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -70,6 +70,10 @@ var PaymentProcessor = /*#__PURE__*/function (_BaseElementProcessor) {
70
70
  key: "setOnBeforeConfirm",
71
71
  value: function setOnBeforeConfirm(callback) {
72
72
  this._onBeforeConfirm = callback;
73
+ // 展码链路:同步设置 onBeforeConfirm 到 ApplePaySdk,确保 Chrome 展码支付时能调用商户回调
74
+ if (this.ApplePayService) {
75
+ this.ApplePayService.setOnBeforeConfirm(callback);
76
+ }
73
77
  }
74
78
  }, {
75
79
  key: "setMerchantAmountOverride",
@@ -166,6 +170,8 @@ var PaymentProcessor = /*#__PURE__*/function (_BaseElementProcessor) {
166
170
  merchantAmount: _this2._merchantAmount,
167
171
  merchantCurrency: _this2._merchantCurrency
168
172
  });
173
+ // Chrome 展码链路:同步 onBeforeConfirm 到当前 ApplePaySdk 实例
174
+ applePayService.setOnBeforeConfirm(_this2._onBeforeConfirm);
169
175
  applePayService.startPay().then(function (res) {
170
176
  _this2.eventCenter.dispatchToApp({
171
177
  event: 'getApplePayToken',
@@ -36,6 +36,7 @@ export declare class ApplePaySdk {
36
36
  private shipping?;
37
37
  private merchantAmount;
38
38
  private merchantCurrency;
39
+ private onBeforeConfirm?;
39
40
  constructor({ paymentSessionData, parseData, logger, env, shipping, merchantAmount, merchantCurrency, }: {
40
41
  paymentSessionData: string;
41
42
  parseData: IPaymentSessionMetaData;
@@ -45,6 +46,8 @@ export declare class ApplePaySdk {
45
46
  merchantAmount?: string | null;
46
47
  merchantCurrency?: string | null;
47
48
  });
49
+ /** 设置商户 onBeforeConfirm 回调(展码链路使用) */
50
+ setOnBeforeConfirm(callback: (() => Promise<boolean>) | null): void;
48
51
  startPay(): Promise<unknown>;
49
52
  begin(): Promise<unknown>;
50
53
  private submitPay;
@@ -1,4 +1,6 @@
1
1
  function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
2
+ function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
3
+ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
2
4
  function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return e; }; var t, e = {}, r = Object.prototype, n = r.hasOwnProperty, o = Object.defineProperty || function (t, e, r) { t[e] = r.value; }, i = "function" == typeof Symbol ? Symbol : {}, a = i.iterator || "@@iterator", c = i.asyncIterator || "@@asyncIterator", u = i.toStringTag || "@@toStringTag"; function define(t, e, r) { return Object.defineProperty(t, e, { value: r, enumerable: !0, configurable: !0, writable: !0 }), t[e]; } try { define({}, ""); } catch (t) { define = function define(t, e, r) { return t[e] = r; }; } function wrap(t, e, r, n) { var i = e && e.prototype instanceof Generator ? e : Generator, a = Object.create(i.prototype), c = new Context(n || []); return o(a, "_invoke", { value: makeInvokeMethod(t, r, c) }), a; } function tryCatch(t, e, r) { try { return { type: "normal", arg: t.call(e, r) }; } catch (t) { return { type: "throw", arg: t }; } } e.wrap = wrap; var h = "suspendedStart", l = "suspendedYield", f = "executing", s = "completed", y = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var p = {}; define(p, a, function () { return this; }); var d = Object.getPrototypeOf, v = d && d(d(values([]))); v && v !== r && n.call(v, a) && (p = v); var g = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(p); function defineIteratorMethods(t) { ["next", "throw", "return"].forEach(function (e) { define(t, e, function (t) { return this._invoke(e, t); }); }); } function AsyncIterator(t, e) { function invoke(r, o, i, a) { var c = tryCatch(t[r], t, o); if ("throw" !== c.type) { var u = c.arg, h = u.value; return h && "object" == _typeof(h) && n.call(h, "__await") ? e.resolve(h.__await).then(function (t) { invoke("next", t, i, a); }, function (t) { invoke("throw", t, i, a); }) : e.resolve(h).then(function (t) { u.value = t, i(u); }, function (t) { return invoke("throw", t, i, a); }); } a(c.arg); } var r; o(this, "_invoke", { value: function value(t, n) { function callInvokeWithMethodAndArg() { return new e(function (e, r) { invoke(t, n, e, r); }); } return r = r ? r.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(e, r, n) { var o = h; return function (i, a) { if (o === f) throw new Error("Generator is already running"); if (o === s) { if ("throw" === i) throw a; return { value: t, done: !0 }; } for (n.method = i, n.arg = a;;) { var c = n.delegate; if (c) { var u = maybeInvokeDelegate(c, n); if (u) { if (u === y) continue; return u; } } if ("next" === n.method) n.sent = n._sent = n.arg;else if ("throw" === n.method) { if (o === h) throw o = s, n.arg; n.dispatchException(n.arg); } else "return" === n.method && n.abrupt("return", n.arg); o = f; var p = tryCatch(e, r, n); if ("normal" === p.type) { if (o = n.done ? s : l, p.arg === y) continue; return { value: p.arg, done: n.done }; } "throw" === p.type && (o = s, n.method = "throw", n.arg = p.arg); } }; } function maybeInvokeDelegate(e, r) { var n = r.method, o = e.iterator[n]; if (o === t) return r.delegate = null, "throw" === n && e.iterator.return && (r.method = "return", r.arg = t, maybeInvokeDelegate(e, r), "throw" === r.method) || "return" !== n && (r.method = "throw", r.arg = new TypeError("The iterator does not provide a '" + n + "' method")), y; var i = tryCatch(o, e.iterator, r.arg); if ("throw" === i.type) return r.method = "throw", r.arg = i.arg, r.delegate = null, y; var a = i.arg; return a ? a.done ? (r[e.resultName] = a.value, r.next = e.nextLoc, "return" !== r.method && (r.method = "next", r.arg = t), r.delegate = null, y) : a : (r.method = "throw", r.arg = new TypeError("iterator result is not an object"), r.delegate = null, y); } function pushTryEntry(t) { var e = { tryLoc: t[0] }; 1 in t && (e.catchLoc = t[1]), 2 in t && (e.finallyLoc = t[2], e.afterLoc = t[3]), this.tryEntries.push(e); } function resetTryEntry(t) { var e = t.completion || {}; e.type = "normal", delete e.arg, t.completion = e; } function Context(t) { this.tryEntries = [{ tryLoc: "root" }], t.forEach(pushTryEntry, this), this.reset(!0); } function values(e) { if (e || "" === e) { var r = e[a]; if (r) return r.call(e); if ("function" == typeof e.next) return e; if (!isNaN(e.length)) { var o = -1, i = function next() { for (; ++o < e.length;) if (n.call(e, o)) return next.value = e[o], next.done = !1, next; return next.value = t, next.done = !0, next; }; return i.next = i; } } throw new TypeError(_typeof(e) + " is not iterable"); } return GeneratorFunction.prototype = GeneratorFunctionPrototype, o(g, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), o(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, u, "GeneratorFunction"), e.isGeneratorFunction = function (t) { var e = "function" == typeof t && t.constructor; return !!e && (e === GeneratorFunction || "GeneratorFunction" === (e.displayName || e.name)); }, e.mark = function (t) { return Object.setPrototypeOf ? Object.setPrototypeOf(t, GeneratorFunctionPrototype) : (t.__proto__ = GeneratorFunctionPrototype, define(t, u, "GeneratorFunction")), t.prototype = Object.create(g), t; }, e.awrap = function (t) { return { __await: t }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, c, function () { return this; }), e.AsyncIterator = AsyncIterator, e.async = function (t, r, n, o, i) { void 0 === i && (i = Promise); var a = new AsyncIterator(wrap(t, r, n, o), i); return e.isGeneratorFunction(r) ? a : a.next().then(function (t) { return t.done ? t.value : a.next(); }); }, defineIteratorMethods(g), define(g, u, "Generator"), define(g, a, function () { return this; }), define(g, "toString", function () { return "[object Generator]"; }), e.keys = function (t) { var e = Object(t), r = []; for (var n in e) r.push(n); return r.reverse(), function next() { for (; r.length;) { var t = r.pop(); if (t in e) return next.value = t, next.done = !1, next; } return next.done = !0, next; }; }, e.values = values, Context.prototype = { constructor: Context, reset: function reset(e) { if (this.prev = 0, this.next = 0, this.sent = this._sent = t, this.done = !1, this.delegate = null, this.method = "next", this.arg = t, this.tryEntries.forEach(resetTryEntry), !e) for (var r in this) "t" === r.charAt(0) && n.call(this, r) && !isNaN(+r.slice(1)) && (this[r] = t); }, stop: function stop() { this.done = !0; var t = this.tryEntries[0].completion; if ("throw" === t.type) throw t.arg; return this.rval; }, dispatchException: function dispatchException(e) { if (this.done) throw e; var r = this; function handle(n, o) { return a.type = "throw", a.arg = e, r.next = n, o && (r.method = "next", r.arg = t), !!o; } for (var o = this.tryEntries.length - 1; o >= 0; --o) { var i = this.tryEntries[o], a = i.completion; if ("root" === i.tryLoc) return handle("end"); if (i.tryLoc <= this.prev) { var c = n.call(i, "catchLoc"), u = n.call(i, "finallyLoc"); if (c && u) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } else if (c) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); } else { if (!u) throw new Error("try statement without catch or finally"); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } } } }, abrupt: function abrupt(t, e) { for (var r = this.tryEntries.length - 1; r >= 0; --r) { var o = this.tryEntries[r]; if (o.tryLoc <= this.prev && n.call(o, "finallyLoc") && this.prev < o.finallyLoc) { var i = o; break; } } i && ("break" === t || "continue" === t) && i.tryLoc <= e && e <= i.finallyLoc && (i = null); var a = i ? i.completion : {}; return a.type = t, a.arg = e, i ? (this.method = "next", this.next = i.finallyLoc, y) : this.complete(a); }, complete: function complete(t, e) { if ("throw" === t.type) throw t.arg; return "break" === t.type || "continue" === t.type ? this.next = t.arg : "return" === t.type ? (this.rval = this.arg = t.arg, this.method = "return", this.next = "end") : "normal" === t.type && e && (this.next = e), y; }, finish: function finish(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.finallyLoc === t) return this.complete(r.completion, r.afterLoc), resetTryEntry(r), y; } }, catch: function _catch(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.tryLoc === t) { var n = r.completion; if ("throw" === n.type) { var o = n.arg; resetTryEntry(r); } return o; } } throw new Error("illegal catch attempt"); }, delegateYield: function delegateYield(e, r, n) { return this.delegate = { iterator: values(e), resultName: r, nextLoc: n }, "next" === this.method && (this.arg = t), y; } }, e; }
3
5
  function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
4
6
  function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
@@ -156,6 +158,7 @@ export var ApplePaySdk = /*#__PURE__*/function () {
156
158
  _defineProperty(this, "shipping", void 0);
157
159
  _defineProperty(this, "merchantAmount", void 0);
158
160
  _defineProperty(this, "merchantCurrency", void 0);
161
+ _defineProperty(this, "onBeforeConfirm", void 0);
159
162
  this.paymentSessionData = paymentSessionData;
160
163
  this.parseData = parseData;
161
164
  this.env = env;
@@ -164,7 +167,13 @@ export var ApplePaySdk = /*#__PURE__*/function () {
164
167
  this.merchantAmount = merchantAmount;
165
168
  this.merchantCurrency = merchantCurrency;
166
169
  }
170
+ /** 设置商户 onBeforeConfirm 回调(展码链路使用) */
167
171
  _createClass(ApplePaySdk, [{
172
+ key: "setOnBeforeConfirm",
173
+ value: function setOnBeforeConfirm(callback) {
174
+ this.onBeforeConfirm = callback;
175
+ }
176
+ }, {
168
177
  key: "startPay",
169
178
  value: function () {
170
179
  var _startPay = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
@@ -268,7 +277,7 @@ export var ApplePaySdk = /*#__PURE__*/function () {
268
277
  }();
269
278
  _this.session.onpaymentauthorized = /*#__PURE__*/function () {
270
279
  var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(event) {
271
- var exception, _event$payment, token, billingContact, shippingContact, _this$parseData, obj, _this$parseData$payme, requiredBillingContactFields, requiredShippingContactFields, res, _this$logger3;
280
+ var exception, _event$payment, token, billingContact, shippingContact, _this$parseData, obj, _this$parseData$payme, requiredBillingContactFields, requiredShippingContactFields, _this$logger3, _this$logger4, BEFORE_CONFIRM_TIMEOUT_MS, _this$logger6, timeoutPromise, startTime, shouldContinue, _this$logger5, _this$session2, _this$session2$comple, _this$session3, _this$session3$comple, isTimeout, _this$logger7, _this$logger8, res, _this$logger9;
272
281
  return _regeneratorRuntime().wrap(function _callee3$(_context3) {
273
282
  while (1) switch (_context3.prev = _context3.next) {
274
283
  case 0:
@@ -282,7 +291,7 @@ export var ApplePaySdk = /*#__PURE__*/function () {
282
291
  };
283
292
  _event$payment = event === null || event === void 0 ? void 0 : event.payment, token = _event$payment.token, billingContact = _event$payment.billingContact, shippingContact = _event$payment.shippingContact;
284
293
  if (!token) {
285
- _context3.next = 14;
294
+ _context3.next = 43;
286
295
  break;
287
296
  }
288
297
  obj = {
@@ -295,24 +304,107 @@ export var ApplePaySdk = /*#__PURE__*/function () {
295
304
  if (!isEmpty(requiredShippingContactFields) && shippingContact) {
296
305
  obj['applePayShippingContact'] = JSON.stringify(shippingContact);
297
306
  }
298
- _context3.next = 9;
307
+ // Chrome 展码链路:在 submitPay 之前调用商户的 onBeforeConfirm 回调,与 Safari 链路对齐
308
+ if (_this.onBeforeConfirm) {
309
+ _context3.next = 11;
310
+ break;
311
+ }
312
+ (_this$logger3 = _this.logger) === null || _this$logger3 === void 0 || _this$logger3.logInfo({
313
+ title: 'sdk_before_confirm_skip'
314
+ }, {
315
+ paymentMethodType: 'APPLEPAY',
316
+ path: 'applePay_chrome_sdk'
317
+ });
318
+ _context3.next = 36;
319
+ break;
320
+ case 11:
321
+ BEFORE_CONFIRM_TIMEOUT_MS = 15000;
322
+ (_this$logger4 = _this.logger) === null || _this$logger4 === void 0 || _this$logger4.logInfo({
323
+ title: 'sdk_before_confirm_start'
324
+ }, {
325
+ paymentMethodType: 'APPLEPAY',
326
+ path: 'applePay_chrome_sdk'
327
+ });
328
+ _context3.prev = 13;
329
+ timeoutPromise = new Promise(function (_, reject) {
330
+ return setTimeout(function () {
331
+ return reject(new Error('onBeforeConfirm timed out'));
332
+ }, BEFORE_CONFIRM_TIMEOUT_MS);
333
+ });
334
+ startTime = Date.now();
335
+ _context3.next = 18;
336
+ return Promise.race([_this.onBeforeConfirm(), timeoutPromise]);
337
+ case 18:
338
+ shouldContinue = _context3.sent;
339
+ if (Date.now() - startTime >= BEFORE_CONFIRM_TIMEOUT_MS) {
340
+ (_this$logger5 = _this.logger) === null || _this$logger5 === void 0 || _this$logger5.logError({
341
+ title: 'sdk_before_confirm_timeout'
342
+ });
343
+ shouldContinue = false;
344
+ }
345
+ (_this$logger6 = _this.logger) === null || _this$logger6 === void 0 || _this$logger6.logInfo({
346
+ title: 'sdk_element_beforeConfirm_callback_result'
347
+ }, {
348
+ shouldContinue: shouldContinue
349
+ });
350
+ if (shouldContinue) {
351
+ _context3.next = 26;
352
+ break;
353
+ }
354
+ (_this$session2 = _this.session) === null || _this$session2 === void 0 || (_this$session2$comple = _this$session2.completePayment) === null || _this$session2$comple === void 0 || _this$session2$comple.call(_this$session2, window.ApplePaySession.STATUS_FAILURE);
355
+ _this.abortSession();
356
+ reject({
357
+ errorCode: 'MERCHANT_CONFIRM_ABORT'
358
+ });
359
+ return _context3.abrupt("return");
360
+ case 26:
361
+ _context3.next = 36;
362
+ break;
363
+ case 28:
364
+ _context3.prev = 28;
365
+ _context3.t0 = _context3["catch"](13);
366
+ isTimeout = _context3.t0 instanceof Error && _context3.t0.message === 'onBeforeConfirm timed out';
367
+ if (isTimeout) {
368
+ (_this$logger7 = _this.logger) === null || _this$logger7 === void 0 || _this$logger7.logError({
369
+ title: 'sdk_before_confirm_timeout'
370
+ }, {
371
+ paymentMethodType: 'APPLEPAY',
372
+ path: 'applePay_chrome_sdk'
373
+ });
374
+ } else {
375
+ (_this$logger8 = _this.logger) === null || _this$logger8 === void 0 || _this$logger8.logError({
376
+ title: 'sdk_before_confirm_error'
377
+ }, {
378
+ paymentMethodType: 'APPLEPAY',
379
+ path: 'applePay_chrome_sdk',
380
+ errorMessage: String((_context3.t0 === null || _context3.t0 === void 0 ? void 0 : _context3.t0.message) || _context3.t0).slice(0, 200)
381
+ });
382
+ }
383
+ (_this$session3 = _this.session) === null || _this$session3 === void 0 || (_this$session3$comple = _this$session3.completePayment) === null || _this$session3$comple === void 0 || _this$session3$comple.call(_this$session3, window.ApplePaySession.STATUS_FAILURE);
384
+ _this.abortSession();
385
+ reject({
386
+ errorCode: 'MERCHANT_CONFIRM_ABORT'
387
+ });
388
+ return _context3.abrupt("return");
389
+ case 36:
390
+ _context3.next = 38;
299
391
  return _this.submitPay(obj);
300
- case 9:
392
+ case 38:
301
393
  res = _context3.sent;
302
394
  _this.setPayStatus(res);
303
395
  resolve(res);
304
- _context3.next = 16;
396
+ _context3.next = 45;
305
397
  break;
306
- case 14:
307
- (_this$logger3 = _this.logger) === null || _this$logger3 === void 0 || _this$logger3.logError({
398
+ case 43:
399
+ (_this$logger9 = _this.logger) === null || _this$logger9 === void 0 || _this$logger9.logError({
308
400
  title: 'a3753.b103030.c386485.d507486'
309
401
  });
310
402
  exception();
311
- case 16:
403
+ case 45:
312
404
  case "end":
313
405
  return _context3.stop();
314
406
  }
315
- }, _callee3);
407
+ }, _callee3, null, [[13, 28]]);
316
408
  }));
317
409
  return function (_x2) {
318
410
  return _ref3.apply(this, arguments);
@@ -320,13 +412,13 @@ export var ApplePaySdk = /*#__PURE__*/function () {
320
412
  }();
321
413
  _this.session.oncancel = function () {
322
414
  if (_this.paymentStatus === PAYMENT_STATUS.PENDING) {
323
- var _this$logger4;
324
- (_this$logger4 = _this.logger) === null || _this$logger4 === void 0 || _this$logger4.logError({
415
+ var _this$logger10;
416
+ (_this$logger10 = _this.logger) === null || _this$logger10 === void 0 || _this$logger10.logError({
325
417
  title: 'a3753.b103030.c386485.d507497'
326
418
  });
327
419
  } else {
328
- var _this$logger5;
329
- (_this$logger5 = _this.logger) === null || _this$logger5 === void 0 || _this$logger5.logInfo({
420
+ var _this$logger11;
421
+ (_this$logger11 = _this.logger) === null || _this$logger11 === void 0 || _this$logger11.logInfo({
330
422
  title: 'a3753.b103030.c386485.d507498'
331
423
  });
332
424
  }
@@ -345,25 +437,26 @@ export var ApplePaySdk = /*#__PURE__*/function () {
345
437
  key: "submitPay",
346
438
  value: function () {
347
439
  var _submitPay = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(params) {
348
- var _this$parseData2, _this$parseData3, _this$parseData4;
440
+ var _this$parseData2;
349
441
  return _regeneratorRuntime().wrap(function _callee4$(_context4) {
350
442
  while (1) switch (_context4.prev = _context4.next) {
351
443
  case 0:
352
444
  _context4.prev = 0;
353
445
  _context4.t0 = submitPayInfo;
354
- _context4.t1 = {
446
+ _context4.t1 = _objectSpread({
355
447
  paymentSessionConfig: (_this$parseData2 = this.parseData) === null || _this$parseData2 === void 0 ? void 0 : _this$parseData2.paymentSessionConfig,
356
448
  paymentSessionData: this.paymentSessionData,
357
449
  paymentFactors: params,
358
450
  paymentMethod: {
359
451
  paymentMethodType: 'APPLEPAY'
360
452
  },
361
- shipping: this.shipping,
453
+ shipping: this.shipping
454
+ }, this.merchantAmount && this.merchantCurrency ? {
362
455
  paymentAmount: {
363
- value: this.merchantAmount || ((_this$parseData3 = this.parseData) === null || _this$parseData3 === void 0 || (_this$parseData3 = _this$parseData3.paymentSessionFactor) === null || _this$parseData3 === void 0 || (_this$parseData3 = _this$parseData3.paymentAmount) === null || _this$parseData3 === void 0 ? void 0 : _this$parseData3.value),
364
- currency: this.merchantCurrency || ((_this$parseData4 = this.parseData) === null || _this$parseData4 === void 0 || (_this$parseData4 = _this$parseData4.paymentSessionFactor) === null || _this$parseData4 === void 0 || (_this$parseData4 = _this$parseData4.paymentAmount) === null || _this$parseData4 === void 0 ? void 0 : _this$parseData4.currency)
456
+ amount: this.merchantAmount,
457
+ currency: this.merchantCurrency
365
458
  }
366
- };
459
+ } : {});
367
460
  _context4.t2 = this.env;
368
461
  _context4.next = 6;
369
462
  return this.getDeviceId();
@@ -399,7 +492,7 @@ export var ApplePaySdk = /*#__PURE__*/function () {
399
492
  }, {
400
493
  key: "setPayStatus",
401
494
  value: function setPayStatus(result) {
402
- var _this$session2, _this$session2$comple;
495
+ var _this$session4, _this$session4$comple;
403
496
  var payStatus = {
404
497
  success: window.ApplePaySession.STATUS_SUCCESS,
405
498
  fail: window.ApplePaySession.STATUS_FAILURE
@@ -411,13 +504,13 @@ export var ApplePaySdk = /*#__PURE__*/function () {
411
504
  status = 'fail';
412
505
  }
413
506
  this.paymentStatus = PAYMENT_STATUS.NORMAL;
414
- (_this$session2 = this.session) === null || _this$session2 === void 0 || (_this$session2$comple = _this$session2.completePayment) === null || _this$session2$comple === void 0 || _this$session2$comple.call(_this$session2, payStatus[status]);
507
+ (_this$session4 = this.session) === null || _this$session4 === void 0 || (_this$session4$comple = _this$session4.completePayment) === null || _this$session4$comple === void 0 || _this$session4$comple.call(_this$session4, payStatus[status]);
415
508
  }
416
509
  }, {
417
510
  key: "initApplePaySession",
418
511
  value: function () {
419
512
  var _initApplePaySession = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5() {
420
- var _this$logger7, _this$parseData5, _this$logger6, _ref4, recurringInfo, version, _this$logger8;
513
+ var _this$logger13, _this$parseData3, _this$logger12, _ref4, recurringInfo, version, _this$logger14;
421
514
  return _regeneratorRuntime().wrap(function _callee5$(_context5) {
422
515
  while (1) switch (_context5.prev = _context5.next) {
423
516
  case 0:
@@ -432,7 +525,7 @@ export var ApplePaySdk = /*#__PURE__*/function () {
432
525
  _context5.next = 7;
433
526
  break;
434
527
  }
435
- (_this$logger6 = this.logger) === null || _this$logger6 === void 0 || _this$logger6.logError({
528
+ (_this$logger12 = this.logger) === null || _this$logger12 === void 0 || _this$logger12.logError({
436
529
  title: 'a3753.b103030.c386485.d507448'
437
530
  });
438
531
  this.paymentStatus = PAYMENT_STATUS.NORMAL;
@@ -440,7 +533,7 @@ export var ApplePaySdk = /*#__PURE__*/function () {
440
533
  errorCode: APPLEPAYERRORENUM.APPLE_PAY_MISSING_DATA
441
534
  }));
442
535
  case 7:
443
- (_this$logger7 = this.logger) === null || _this$logger7 === void 0 || _this$logger7.logInfo({
536
+ (_this$logger13 = this.logger) === null || _this$logger13 === void 0 || _this$logger13.logInfo({
444
537
  title: 'a3753.b103030.c386485.d507459'
445
538
  });
446
539
  _context5.next = 10;
@@ -452,7 +545,7 @@ export var ApplePaySdk = /*#__PURE__*/function () {
452
545
  }
453
546
  throw new Error('Apple Pay not supported');
454
547
  case 12:
455
- _ref4 = ((_this$parseData5 = this.parseData) === null || _this$parseData5 === void 0 ? void 0 : _this$parseData5.paymentSessionFactor) || {}, recurringInfo = _ref4.recurringInfo;
548
+ _ref4 = ((_this$parseData3 = this.parseData) === null || _this$parseData3 === void 0 ? void 0 : _this$parseData3.paymentSessionFactor) || {}, recurringInfo = _ref4.recurringInfo;
456
549
  version = recurringInfo ? APPLE_PAY_RECURRING_VERSION : APPLE_PAY_VERSION;
457
550
  if (this.isCanMakePayments(version)) {
458
551
  _context5.next = 16;
@@ -466,7 +559,7 @@ export var ApplePaySdk = /*#__PURE__*/function () {
466
559
  case 19:
467
560
  _context5.prev = 19;
468
561
  _context5.t0 = _context5["catch"](0);
469
- (_this$logger8 = this.logger) === null || _this$logger8 === void 0 || _this$logger8.logError({
562
+ (_this$logger14 = this.logger) === null || _this$logger14 === void 0 || _this$logger14.logError({
470
563
  title: 'a3753.b103030.c386485.d507471'
471
564
  });
472
565
  return _context5.abrupt("return", Promise.reject({
@@ -487,9 +580,9 @@ export var ApplePaySdk = /*#__PURE__*/function () {
487
580
  key: "abortSession",
488
581
  value: function abortSession() {
489
582
  try {
490
- var _this$session$abort, _this$session3;
583
+ var _this$session$abort, _this$session5;
491
584
  this.paymentStatus = PAYMENT_STATUS.NORMAL;
492
- this.session && ((_this$session$abort = (_this$session3 = this.session).abort) === null || _this$session$abort === void 0 ? void 0 : _this$session$abort.call(_this$session3));
585
+ this.session && ((_this$session$abort = (_this$session5 = this.session).abort) === null || _this$session$abort === void 0 ? void 0 : _this$session$abort.call(_this$session5));
493
586
  } catch (e) {
494
587
  console.error('abortPaySession error', e);
495
588
  } finally {
@@ -499,8 +592,8 @@ export var ApplePaySdk = /*#__PURE__*/function () {
499
592
  }, {
500
593
  key: "initSessionParams",
501
594
  get: function get() {
502
- var _this$parseData6;
503
- var _ref5 = ((_this$parseData6 = this.parseData) === null || _this$parseData6 === void 0 ? void 0 : _this$parseData6.paymentSessionFactor) || {},
595
+ var _this$parseData4;
596
+ var _ref5 = ((_this$parseData4 = this.parseData) === null || _this$parseData4 === void 0 ? void 0 : _this$parseData4.paymentSessionFactor) || {},
504
597
  merchantInfo = _ref5.merchantInfo,
505
598
  order = _ref5.order,
506
599
  paymentAmount = _ref5.paymentAmount,
@@ -550,8 +643,8 @@ export var ApplePaySdk = /*#__PURE__*/function () {
550
643
  }, {
551
644
  key: "isRequiredParameters",
552
645
  get: function get() {
553
- var _this$parseData7;
554
- var _ref6 = ((_this$parseData7 = this.parseData) === null || _this$parseData7 === void 0 ? void 0 : _this$parseData7.paymentSessionFactor) || {},
646
+ var _this$parseData5;
647
+ var _ref6 = ((_this$parseData5 = this.parseData) === null || _this$parseData5 === void 0 ? void 0 : _this$parseData5.paymentSessionFactor) || {},
555
648
  merchantInfo = _ref6.merchantInfo,
556
649
  extendInfo = _ref6.extendInfo,
557
650
  paymentAmount = _ref6.paymentAmount;
@@ -624,14 +717,14 @@ export var ApplePaySdk = /*#__PURE__*/function () {
624
717
  key: "getDeviceId",
625
718
  value: function () {
626
719
  var _getDeviceId = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6() {
627
- var _yield$BusManager$pub, _this$parseData8;
720
+ var _yield$BusManager$pub, _this$parseData6;
628
721
  return _regeneratorRuntime().wrap(function _callee6$(_context6) {
629
722
  while (1) switch (_context6.prev = _context6.next) {
630
723
  case 0:
631
724
  _context6.next = 2;
632
725
  return BusManager.publishForResult(new BusMessage(SecuritySDKActionEnum.getSecurityDeviceId, JSON.stringify({
633
726
  deviceIdParameter: {
634
- productScene: (_this$parseData8 = this.parseData) === null || _this$parseData8 === void 0 || (_this$parseData8 = _this$parseData8.paymentSessionConfig) === null || _this$parseData8 === void 0 ? void 0 : _this$parseData8.productScene
727
+ productScene: (_this$parseData6 = this.parseData) === null || _this$parseData6 === void 0 || (_this$parseData6 = _this$parseData6.paymentSessionConfig) === null || _this$parseData6 === void 0 ? void 0 : _this$parseData6.productScene
635
728
  }
636
729
  })), {
637
730
  fallback: ''
@@ -575,7 +575,7 @@ export interface CashierSubmitPayRequest {
575
575
  shipping?: import('../core/component/element/type').CKPShipping;
576
576
  extParams?: any;
577
577
  /** 支付金额 */
578
- paymentAmount?: Pick<IAmount, 'value' | 'currency'>;
578
+ paymentAmount?: Pick<IAmount, 'amount' | 'currency'>;
579
579
  }
580
580
  export interface CashierSdkActionQueryResult {
581
581
  supportedLanguages?: any[];
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@alipay/ams-checkout",
3
- "version": "0.0.1781004142-dev.11",
3
+ "version": "0.0.1781004142-dev.12",
4
4
  "description": "",
5
5
  "author": "",
6
6
  "exports": {