@paykka/card-checkout-ui 0.15.2 → 0.16.0

package/dist/es/api/http.js

@@ -6,8 +6,19 @@ import { getFetch } from "./fetch.js";
 import { PayKKaError, EPayKKaError } from "../core/error.js";
 import "../out/fraud-detection.js";
 import { getBrowserInfo } from "../utils/system-info/get-browser-info.js";
-const request = async (method, url, params, { timeout = 2e4, headers, locale } = {}) => {
+const request = async (method, url, params, { timeout = 2e4, headers, locale, signal } = {}) => {
   const abortController = new AbortController();
+  if (signal) {
+    if (signal.aborted) {
+      abortController.abort(signal.reason);
+    } else {
+      signal.addEventListener(
+        "abort",
+        () => abortController.abort(signal.reason),
+        { once: true }
+      );
+    }
+  }
   const timer = setTimeout(() => {
     abortController.abort();
   }, timeout);

package/dist/es/api/modules/apple-pay/index.js

@@ -1,20 +1,8 @@
 import { apiPrefix } from "../../../config.js";
 import { http } from "../../http.js";
-import { buildPaymentParams, buildQueryParams } from "../../utils/index.js";
-import { payResMap } from "../map.js";
 const getMerchantSession = async (options) => {
   return http.post(`${apiPrefix}/apple-pay/create-session`, options);
 };
-const applePay = async (params, extraParams, options) => {
-  const paymentParams = buildPaymentParams(params, extraParams);
-  return http.post(`${apiPrefix}/payments`, paymentParams, options).then(payResMap);
-};
-const getApplePayInfo = async (params, extraParams, options) => {
-  const queryParams = buildQueryParams(params, extraParams);
-  return http.post(`${apiPrefix}/payments/query`, queryParams, options).then(payResMap);
-};
 export {
-  applePay,
-  getApplePayInfo,
   getMerchantSession
 };

package/dist/es/api/modules/common/index.js

@@ -0,0 +1,29 @@
+import { apiPrefix } from "../../../config.js";
+import "../../../utils/card-brand/brands.js";
+import "../../../utils/system-info/get-browser-info.js";
+import { payWithCheckpoints } from "../../../utils/payment.js";
+import { http } from "../../http.js";
+import { buildPaymentParams, buildQueryParams } from "../../utils/index.js";
+import { payResMap } from "../map.js";
+const commonPayment = async (config) => {
+  const { params, extraParams, options: { request, query } = {} } = config;
+  if (query == null ? void 0 : query.enable) {
+    return payWithCheckpoints(
+      (signal) => doCommonPayment(params, extraParams, { ...request, signal }),
+      (timeout, signal) => commonPaymentQuery(query.params, query.extraParams, { ...request, timeout, signal })
+    );
+  }
+  return doCommonPayment(params, extraParams, request);
+};
+const doCommonPayment = async (params, extraParams, options) => {
+  const paymentParams = buildPaymentParams(params, extraParams);
+  return http.post(`${apiPrefix}/payments`, paymentParams, options).then(payResMap);
+};
+const commonPaymentQuery = async (params, extraParams, options) => {
+  const queryParams = buildQueryParams(params, extraParams);
+  return http.post(`${apiPrefix}/payments/query`, queryParams, options).then(payResMap);
+};
+export {
+  commonPayment,
+  commonPaymentQuery
+};

package/dist/es/api/modules/get-browser-params.js

@@ -35,7 +35,7 @@ const getBaseBrowserParams = async (params = {}) => {
     terminal_type: terminalType,
     fraud_detection_id: fraudDetectionId,
     // 当前组件库版本（构建时由 define 注入）
-    app_version: "0.15.2"
+    app_version: "0.16.0"
   };
 };
 const getBrowserParams = async (params = {}) => {

package/dist/es/api/modules/index.js

@@ -1,5 +1,5 @@
 import "../../utils/card-brand/brands.js";
 import "../../utils/system-info/get-browser-info.js";
-import "../../core.js";
 import "../../core/context.js";
+import "../../core.js";
 import "../../out/fraud-detection.js";

package/dist/es/api/modules/threeDS/index.js

@@ -1,7 +1,7 @@
 import "../../../utils/card-brand/brands.js";
 import "../../../utils/system-info/get-browser-info.js";
-import "../../../core.js";
 import { http } from "../../http.js";
+import "../../../core.js";
 var ThreeDSAuthOperate = /* @__PURE__ */ ((ThreeDSAuthOperate2) => {
   ThreeDSAuthOperate2["OPEN"] = "OPEN";
   ThreeDSAuthOperate2["CANCEL"] = "CANCEL";

package/dist/es/api/utils/index.js

@@ -1,6 +1,9 @@
 import "../../utils/card-brand/brands.js";
 import "../../utils/system-info/get-browser-info.js";
 import { deepMerge } from "../../utils/object.js";
+import "../../core.js";
+import "../../core/context.js";
+import "../../out/fraud-detection.js";
 const buildPaymentParams = (params, extraParams = {}) => {
   const { bill, payment, customer } = params;
   const mergedParams = deepMerge(

package/dist/es/components/AccountNameField/index.js

@@ -1,9 +1,9 @@
 import { u } from "../../core.js";
 import "../../utils/card-brand/brands.js";
 import "../../utils/system-info/get-browser-info.js";
-import { useI18n } from "../../hooks/useI18n.js";
-import "../../out/fraud-detection.js";
 import "../../core/context.js";
+import "../../out/fraud-detection.js";
+import { useI18n } from "../../hooks/useI18n.js";
 import "../internal/Form/type.js";
 import "../internal/Form/context.js";
 import { FormItem } from "../internal/Form/FormItem.js";

package/dist/es/components/AddressField/index.js

@@ -4,10 +4,10 @@ import { EAddressType } from "../../constant.js";
 import { isArray, isNil } from "../../utils/is.js";
 import "../../utils/card-brand/brands.js";
 import "../../utils/system-info/get-browser-info.js";
+import { CoreContext } from "../../core/context.js";
+import "../../out/fraud-detection.js";
 import { useBEM } from "../../hooks/useBEM.js";
 import { useI18n } from "../../hooks/useI18n.js";
-import "../../out/fraud-detection.js";
-import { CoreContext } from "../../core/context.js";
 import "../internal/Form/type.js";
 import "../internal/Form/context.js";
 import { FormItem } from "../internal/Form/FormItem.js";

package/dist/es/components/ApplePay/index.js

@@ -7,9 +7,10 @@ import { ApplePayEventType } from "../../types/event.js";
 import { PaymentMethod, SessionMode } from "../../constant.js";
 import { deepMerge } from "../../utils/object.js";
 import { processPaymentStatus, formatPaymentResult } from "../../utils/payment.js";
-import { buildPaymentParams } from "../../api/utils/index.js";
-import { getApplePayInfo, applePay, getMerchantSession } from "../../api/modules/apple-pay/index.js";
+import { getMerchantSession } from "../../api/modules/apple-pay/index.js";
+import { commonPaymentQuery, commonPayment } from "../../api/modules/common/index.js";
 import { getBrowserParams } from "../../api/modules/get-browser-params.js";
+import { buildPaymentParams } from "../../api/utils/index.js";
 import { useBEM } from "../../hooks/useBEM.js";
 import "../../core/context.js";
 import { PayKKaError } from "../../core/error.js";
@@ -222,7 +223,7 @@ const ApplePay = w((props) => {
     };
   };
   async function pay(search = false, timeout, token, billingContact, shippingContact) {
-    var _a, _b, _c, _d, _e, _f, _g;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _i;
     setErrorMsg("");
     try {
       core.payment.currPaymentMethod.value = CURR_PAYMENT_METHOD;
@@ -230,7 +231,7 @@ const ApplePay = w((props) => {
       let res = null;
       if (search) {
         const extraParams = (_b = (_a = core.config)._getExtraParams) == null ? void 0 : _b.call(_a, "query", CURR_PAYMENT_METHOD);
-        res = await getApplePayInfo(
+        res = await commonPaymentQuery(
           {
             sessionId: session.sessionId,
             clientKey: session.clientKey,
@@ -246,11 +247,26 @@ const ApplePay = w((props) => {
           await core.updateSessionId(buildPaymentParams(paymentParams, extraParams));
           session.sessionId && (paymentParams.sessionId = session.sessionId);
         }
-        res = await applePay(paymentParams, extraParams, requestOptions);
+        res = await commonPayment({
+          params: paymentParams,
+          extraParams,
+          options: {
+            request: requestOptions,
+            query: {
+              enable: true,
+              params: {
+                sessionId: session.sessionId,
+                clientKey: session.clientKey,
+                paymentMethod: CURR_PAYMENT_METHOD
+              },
+              extraParams: (_g = (_f = core.config)._getExtraParams) == null ? void 0 : _g.call(_f, "query", CURR_PAYMENT_METHOD)
+            }
+          }
+        });
       }
       const { errorMessage, errorCode, sessionId } = res;
       sessionId && (session.sessionId = sessionId);
-      !search && ((_f = props.onSubmitResponse) == null ? void 0 : _f.call(props, res, getPaymentMethodContext()));
+      !search && ((_h = props.onSubmitResponse) == null ? void 0 : _h.call(props, res, getPaymentMethodContext()));
       let end = true;
       await processPaymentStatus(res, {
         onProcessing: async () => {
@@ -299,7 +315,7 @@ const ApplePay = w((props) => {
       } else {
         const message = error.i18nKey ? i18n.get(error.i18nKey) : error.message;
         message && setErrorMsg(message);
-        (_g = props.onError) == null ? void 0 : _g.call(
+        (_i = props.onError) == null ? void 0 : _i.call(
           props,
           new PayKKaError("API_ERROR", message, { code: error.code, cause: error }),
           getPaymentMethodContext()
@@ -313,7 +329,7 @@ const ApplePay = w((props) => {
   const genApplePayRequest = () => {
     var _a, _b, _c, _d, _e, _f;
     const checkout = session == null ? void 0 : session.checkout;
-    const { applePay: applePay2 } = (checkout == null ? void 0 : checkout.channelParams) ?? {};
+    const { applePay } = (checkout == null ? void 0 : checkout.channelParams) ?? {};
     const requiredBillingContactFields = [
       ...((_a = applePayConfig.request) == null ? void 0 : _a.requiredBillingContactFields) || []
     ];
@@ -323,11 +339,11 @@ const ApplePay = w((props) => {
     const amount = (_c = core.payment) == null ? void 0 : _c.amount.value;
     return {
       merchantCapabilities: ["supports3DS"],
-      countryCode: (applePay2 == null ? void 0 : applePay2.countryCode) ?? "",
+      countryCode: (applePay == null ? void 0 : applePay.countryCode) ?? "",
       requiredBillingContactFields,
       requiredShippingContactFields: (_d = applePayConfig.request) == null ? void 0 : _d.requiredShippingContactFields,
       currencyCode: (amount == null ? void 0 : amount.currency) ?? "",
-      supportedNetworks: ((_f = (_e = applePay2 == null ? void 0 : applePay2.supportedNetworks) == null ? void 0 : _e.map) == null ? void 0 : _f.call(_e, (item) => underscoreToUpperCamelCase(item))) ?? [],
+      supportedNetworks: ((_f = (_e = applePay == null ? void 0 : applePay.supportedNetworks) == null ? void 0 : _e.map) == null ? void 0 : _f.call(_e, (item) => underscoreToUpperCamelCase(item))) ?? [],
       total: {
         label: (checkout == null ? void 0 : checkout.theme.merchantName) ?? "",
         type: "final",

package/dist/es/components/CPFField/index.js

@@ -3,9 +3,9 @@ import { isUndefined } from "../../utils/is.js";
 import "../../utils/card-brand/brands.js";
 import "../../utils/system-info/get-browser-info.js";
 import { EInternalFieldType } from "../SecuredFieldsProvider/index.js";
-import { useI18n } from "../../hooks/useI18n.js";
-import "../../out/fraud-detection.js";
 import "../../core/context.js";
+import "../../out/fraud-detection.js";
+import { useI18n } from "../../hooks/useI18n.js";
 import "../internal/Form/type.js";
 import "../internal/Form/context.js";
 import { FormItem } from "../internal/Form/FormItem.js";

package/dist/es/components/Card/index.js

@@ -1,10 +1,9 @@
 import { w, A, h, F, y, q, T, u, b } from "../../core.js";
 import { isTimeoutError } from "../../api/http.js";
-import { getCardPayInfo, cardPay } from "../../api/modules/card/index.js";
 import { safeParse, safeStringify } from "../../utils/index.js";
 import { defaultInputStyleConfig } from "../../types/index.js";
 import { PaymentMethod, PaymentType, SessionMode, COMMON_CLASS_NAME, CardPaymentMethods } from "../../constant.js";
-import { buildPaymentParams } from "../../api/utils/index.js";
+import { commonPaymentQuery, commonPayment } from "../../api/modules/common/index.js";
 import { getBrowserParams } from "../../api/modules/get-browser-params.js";
 import { CoreContext } from "../../core/context.js";
 import { PayKKaError } from "../../core/error.js";
@@ -13,6 +12,7 @@ import { createPromise } from "../../utils/create-promise.js";
 import { useBEM } from "../../hooks/useBEM.js";
 import { usePayState } from "../../hooks/usePayState.js";
 import { useRetry } from "../../hooks/useRetry.js";
+import { buildPaymentParams } from "../../api/utils/index.js";
 import { DEFAULT_ADDRESS, AddressField } from "../AddressField/index.js";
 import { CardBrands } from "../CardBrands/index.js";
 import { CardExpireDateField } from "../CardExpireDateField/index.js";
@@ -315,14 +315,14 @@ const Card = w((props, ref) => {
     };
   };
   async function pay(search = false, timeout) {
-    var _a2, _b2, _c, _d, _e, _f;
+    var _a2, _b2, _c, _d, _e, _f, _g, _h;
     try {
       core.payment.currPaymentMethod.value = CURR_PAYMENT_METHOD;
       const requestOptions = { locale: i18n.locale, timeout };
       let res = null;
       if (search) {
         const extraParams = (_b2 = (_a2 = core.config)._getExtraParams) == null ? void 0 : _b2.call(_a2, "query", CURR_PAYMENT_METHOD);
-        res = await getCardPayInfo(
+        res = await commonPaymentQuery(
           {
             sessionId: session.sessionId,
             clientKey: session.clientKey
@@ -341,7 +341,21 @@ const Card = w((props, ref) => {
           (_f = SFPRef.current) == null ? void 0 : _f.payment(paymentParams, extraParams);
           return { end: true };
         } else {
-          res = await cardPay(paymentParams, extraParams, requestOptions);
+          res = await commonPayment({
+            params: paymentParams,
+            extraParams,
+            options: {
+              request: requestOptions,
+              query: {
+                enable: false,
+                params: {
+                  sessionId: session.sessionId,
+                  clientKey: session.clientKey
+                },
+                extraParams: (_h = (_g = core.config)._getExtraParams) == null ? void 0 : _h.call(_g, "query", CURR_PAYMENT_METHOD)
+              }
+            }
+          });
         }
       }
       return processAfterPayment(res, search);
@@ -473,7 +487,7 @@ const Card = w((props, ref) => {
       return { end: true };
     try {
       const extraParams = (_b2 = (_a2 = core.config)._getExtraParams) == null ? void 0 : _b2.call(_a2, "query", CURR_PAYMENT_METHOD);
-      const res = await getCardPayInfo(
+      const res = await commonPaymentQuery(
         {
           sessionId: session.sessionId,
           clientKey: session.clientKey

package/dist/es/components/CardHolderNameField/index.js

@@ -1,9 +1,9 @@
 import { u } from "../../core.js";
 import "../../utils/card-brand/brands.js";
 import "../../utils/system-info/get-browser-info.js";
-import { useI18n } from "../../hooks/useI18n.js";
-import "../../out/fraud-detection.js";
 import "../../core/context.js";
+import "../../out/fraud-detection.js";
+import { useI18n } from "../../hooks/useI18n.js";
 import "../internal/Form/type.js";
 import "../internal/Form/context.js";
 import { FormItem } from "../internal/Form/FormItem.js";

package/dist/es/components/CardSecurityCodeField/index.js

@@ -4,9 +4,9 @@ import "../../utils/card-brand/brands.js";
 import "../../utils/system-info/get-browser-info.js";
 import { limitedToNumber } from "../../utils/format.js";
 import { EFieldType } from "../SecuredFieldsProvider/index.js";
-import { useI18n } from "../../hooks/useI18n.js";
-import "../../out/fraud-detection.js";
 import "../../core/context.js";
+import "../../out/fraud-detection.js";
+import { useI18n } from "../../hooks/useI18n.js";
 import "../internal/Form/type.js";
 import "../internal/Form/context.js";
 import { FormItem } from "../internal/Form/FormItem.js";

package/dist/es/components/CombinedCardInfo/index.js

@@ -9,11 +9,11 @@ import { EFieldType } from "../SecuredFieldsProvider/index.js";
 import { finCardBrandInfoByCode, findCardBrandInfo, getSupportedCardBrands } from "../../utils/card-brand/index.js";
 import "../../utils/system-info/get-browser-info.js";
 import { trimAll } from "../../utils/format.js";
-import { IconCardNo } from "../internal/icons/IconCardNo.js";
+import "../../core/context.js";
+import "../../out/fraud-detection.js";
 import { useBEM } from "../../hooks/useBEM.js";
 import { useI18n } from "../../hooks/useI18n.js";
-import "../../out/fraud-detection.js";
-import "../../core/context.js";
+import { IconCardNo } from "../internal/icons/IconCardNo.js";
 const { bem } = useBEM("combined-card-info");
 const CombinedCardInfo = w(
   (props, ref) => {

package/dist/es/components/EmailField/EmailField.js

@@ -9,9 +9,9 @@ import { isValuable } from "../../utils/is.js";
 import "../../utils/card-brand/brands.js";
 import "../../utils/system-info/get-browser-info.js";
 import { EMAIL_REG } from "../../utils/reg-exp.js";
-import { useI18n } from "../../hooks/useI18n.js";
-import "../../out/fraud-detection.js";
 import "../../core/context.js";
+import "../../out/fraud-detection.js";
+import { useI18n } from "../../hooks/useI18n.js";
 import "../internal/Form/type.js";
 import "../internal/Form/context.js";
 import { FormItem } from "../internal/Form/FormItem.js";

package/dist/es/components/EncryptedCard/index.js

@@ -11,8 +11,8 @@ import { createPromise } from "../../utils/create-promise.js";
 import { separateInputStyle, genComponentStyle, loadStyle } from "../../utils/style.js";
 import { EFieldType, SecuredFieldsProvider } from "../SecuredFieldsProvider/index.js";
 import { intersection } from "../../utils/array.js";
-import { genShortId } from "../../utils/string.js";
 import { defaultInputStyleConfig } from "../../types/index.js";
+import { genShortId } from "../../utils/string.js";
 import { CardNumberField } from "../CardNumberField/index.js";
 import { CardExpireDateField } from "../CardExpireDateField/index.js";
 import { CardSecurityCodeField } from "../CardSecurityCodeField/index.js";

package/dist/es/components/GooglePay/index.js

@@ -8,9 +8,9 @@ import { createUrlWithParams } from "../../utils/location.js";
 import { PaymentMethod, SessionMode } from "../../constant.js";
 import { deepMerge } from "../../utils/object.js";
 import { processPaymentStatus, formatPaymentResult } from "../../utils/payment.js";
-import { buildPaymentParams } from "../../api/utils/index.js";
-import { getGooglePayInfo, googlePay } from "../../api/modules/google-pay/index.js";
+import { commonPaymentQuery, commonPayment } from "../../api/modules/common/index.js";
 import { getBrowserParams } from "../../api/modules/get-browser-params.js";
+import { buildPaymentParams } from "../../api/utils/index.js";
 import { useBEM } from "../../hooks/useBEM.js";
 import "../../core/context.js";
 import { PayKKaError } from "../../core/error.js";
@@ -22,7 +22,7 @@ import { loadScript } from "../../utils/load.js";
 import { ThreeDSAuth } from "../ThreeDS/index.js";
 const createGooglePay = (core, checkout, googlePayConfig, pay, onClick, onCanUse, onCancel) => {
   const { theme: { merchantName } } = checkout;
-  const { googlePay: googlePay2 } = (checkout == null ? void 0 : checkout.channelParams) || {};
+  const { googlePay } = (checkout == null ? void 0 : checkout.channelParams) || {};
   let paymentsClient;
   const baseRequest = {
     apiVersion: 2,
@@ -32,12 +32,12 @@ const createGooglePay = (core, checkout, googlePayConfig, pay, onClick, onCanUse
     type: "PAYMENT_GATEWAY",
     // 固定
     parameters: {
-      gateway: googlePay2 == null ? void 0 : googlePay2.providerGatewayId,
-      gatewayMerchantId: googlePay2 == null ? void 0 : googlePay2.merchantGatewayId
+      gateway: googlePay == null ? void 0 : googlePay.providerGatewayId,
+      gatewayMerchantId: googlePay == null ? void 0 : googlePay.merchantGatewayId
     }
   };
-  const allowedCardNetworks = (googlePay2 == null ? void 0 : googlePay2.allowedCardNetworks) || [];
-  const allowedCardAuthMethods = (googlePay2 == null ? void 0 : googlePay2.allowedAuthMethods) || [];
+  const allowedCardNetworks = (googlePay == null ? void 0 : googlePay.allowedCardNetworks) || [];
+  const allowedCardAuthMethods = (googlePay == null ? void 0 : googlePay.allowedAuthMethods) || [];
   const baseCardPaymentMethod = {
     type: "CARD",
     parameters: {
@@ -62,7 +62,7 @@ const createGooglePay = (core, checkout, googlePayConfig, pay, onClick, onCanUse
   const getGoogleTransactionInfo = () => {
     var _a, _b, _c, _d;
     return {
-      countryCode: googlePay2 == null ? void 0 : googlePay2.countryCode,
+      countryCode: googlePay == null ? void 0 : googlePay.countryCode,
       currencyCode: ((_b = (_a = core.payment) == null ? void 0 : _a.amount.value) == null ? void 0 : _b.currency) || "",
       totalPriceStatus: "FINAL",
       totalPrice: String(((_d = (_c = core.payment) == null ? void 0 : _c.amount.value) == null ? void 0 : _d.amount) || 0),
@@ -76,7 +76,7 @@ const createGooglePay = (core, checkout, googlePayConfig, pay, onClick, onCanUse
       allowedPaymentMethods: [cardPaymentMethod],
       transactionInfo: getGoogleTransactionInfo(),
       merchantInfo: {
-        merchantId: googlePay2 == null ? void 0 : googlePay2.googlePayMerchantId,
+        merchantId: googlePay == null ? void 0 : googlePay.googlePayMerchantId,
         merchantName
       },
       callbackIntents: ["PAYMENT_AUTHORIZATION"]
@@ -85,7 +85,7 @@ const createGooglePay = (core, checkout, googlePayConfig, pay, onClick, onCanUse
   const getGooglePaymentsClient = () => {
     if (!paymentsClient) {
       paymentsClient = new google.payments.api.PaymentsClient({
-        environment: googlePay2 == null ? void 0 : googlePay2.environment,
+        environment: googlePay == null ? void 0 : googlePay.environment,
         paymentDataCallbacks: { onPaymentAuthorized }
       });
     }
@@ -331,7 +331,7 @@ const GooglePay = w((props, ref) => {
     };
   };
   async function pay(token, billAddress, search = false, timeout) {
-    var _a2, _b, _c, _d, _e, _f, _g, _h, _i;
+    var _a2, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k;
     setErrorMsg("");
     if (!search) {
       (_a2 = props.onSubmit) == null ? void 0 : _a2.call(props, void 0, getPaymentMethodContext());
@@ -342,7 +342,7 @@ const GooglePay = w((props, ref) => {
       let res = null;
       if (search) {
         const extraParams = (_c = (_b = core.config)._getExtraParams) == null ? void 0 : _c.call(_b, "query", CURR_PAYMENT_METHOD);
-        res = await getGooglePayInfo(
+        res = await commonPaymentQuery(
           {
             sessionId: session.sessionId,
             clientKey: session.clientKey,
@@ -358,12 +358,27 @@ const GooglePay = w((props, ref) => {
           await core.updateSessionId(buildPaymentParams(paymentParams, extraParams));
           session.sessionId && (paymentParams.sessionId = session.sessionId);
         }
-        res = await googlePay(paymentParams, extraParams, requestOptions);
+        res = await commonPayment({
+          params: paymentParams,
+          extraParams,
+          options: {
+            request: requestOptions,
+            query: {
+              enable: false,
+              params: {
+                sessionId: session.sessionId,
+                clientKey: session.clientKey,
+                paymentMethod: CURR_PAYMENT_METHOD
+              },
+              extraParams: (_h = (_g = core.config)._getExtraParams) == null ? void 0 : _h.call(_g, "query", CURR_PAYMENT_METHOD)
+            }
+          }
+        });
       }
       const { errorMessage, payInfo = {}, errorCode, sessionId } = res;
       const { threeDSUrl } = payInfo;
       sessionId && (session.sessionId = sessionId);
-      !search && ((_g = props.onSubmitResponse) == null ? void 0 : _g.call(props, res, getPaymentMethodContext()));
+      !search && ((_i = props.onSubmitResponse) == null ? void 0 : _i.call(props, res, getPaymentMethodContext()));
       let result = {
         end: true,
         res: { transactionState: "SUCCESS" }
@@ -444,10 +459,10 @@ const GooglePay = w((props, ref) => {
           };
         }
       } else {
-        (_h = core.payment) == null ? void 0 : _h.resetCurrPaymentMethod();
+        (_j = core.payment) == null ? void 0 : _j.resetCurrPaymentMethod();
         const message = error.i18nKey ? i18n.get(error.i18nKey) : error.message;
         setErrorMsg(message);
-        (_i = props.onError) == null ? void 0 : _i.call(
+        (_k = props.onError) == null ? void 0 : _k.call(
           props,
           new PayKKaError("API_ERROR", message, { code: error.code, cause: error }),
           getPaymentMethodContext()
@@ -479,15 +494,14 @@ const GooglePay = w((props, ref) => {
       return { end: true };
     try {
       const extraParams = (_b = (_a2 = core.config)._getExtraParams) == null ? void 0 : _b.call(_a2, "query", CURR_PAYMENT_METHOD);
-      const res = await getGooglePayInfo(
+      const res = await commonPaymentQuery(
         {
           sessionId: session.sessionId,
-          clientKey: session.clientKey
+          clientKey: session.clientKey,
+          paymentMethod: CURR_PAYMENT_METHOD
         },
         extraParams,
-        {
-          locale: i18n.locale
-        }
+        { locale: i18n.locale }
       );
       const { errorMessage } = res;
       let end = true;

package/dist/es/components/SecuredFieldsProvider/index.js

@@ -6,7 +6,9 @@ var __publicField = (obj, key, value) => {
 };
 import "../../utils/card-brand/brands.js";
 import "../../utils/system-info/get-browser-info.js";
+import "../../core/context.js";
 import { w, A, y, F, q, u } from "../../core.js";
+import "../../out/fraud-detection.js";
 import { SessionMode } from "../../constant.js";
 import { cdnUrl, cdnOrigin, apiUrl, apiPrefix } from "../../config.js";
 import { MessageAction } from "../../types/message.js";

package/dist/es/components/SecuredIframe/index.js

@@ -11,9 +11,8 @@ import { MessageAction } from "../../types/message.js";
 import { generateClassNameMap, style2String, createPlaceholderStyle, loadStyle } from "../../utils/style.js";
 import { postMessageToIframe } from "../../utils/iframe.js";
 import { isTimeoutError } from "../../api/http.js";
-import { cardPay } from "../../api/modules/card/index.js";
-import { PaymentMethod } from "../../constant.js";
-import { walletPay } from "../../api/modules/wallet/index.js";
+import { CardPaymentMethods } from "../../constant.js";
+import { commonPayment } from "../../api/modules/common/index.js";
 import { encryptCard } from "../../api/modules/encrypted-card/index.js";
 const useSecuredInput = () => {
   let fieldType;
@@ -478,12 +477,6 @@ const HiddenIframe = ({ checkoutId }) => {
       api: bkApi(`${apiPrefix}/payments`),
       startTime: performance.now()
     };
-    const paymentMethod = params.payment.paymentMethod;
-    const payMap = {
-      [PaymentMethod.PIX]: walletPay,
-      [PaymentMethod.PIC_PAY]: walletPay
-    };
-    const payFn = payMap[paymentMethod] || cardPay;
     const data = {
       ...params,
       payment: {
@@ -497,7 +490,23 @@ const HiddenIframe = ({ checkoutId }) => {
         document: formData.cpf
       }
     };
-    payFn(data, extraParams, { locale }).then((res) => {
+    commonPayment({
+      params: data,
+      extraParams,
+      options: {
+        request: { locale },
+        query: {
+          enable: true,
+          params: {
+            sessionId: params.sessionId,
+            clientKey: params.clientKey,
+            // 卡支付不需要 paymentMethod
+            paymentMethod: CardPaymentMethods.includes(params.payment.paymentMethod) ? void 0 : params.payment.paymentMethod
+          },
+          extraParams
+        }
+      }
+    }).then((res) => {
       sendAfterPaymentMessage(res, requestInfo);
     }).catch((error) => {
       if (isTimeoutError(error)) {