@paykka/card-checkout-ui 0.11.6 → 0.13.2

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

@@ -4,7 +4,7 @@ import { EFieldType } from "../SecuredFieldsProvider/index.js";
 import { getSupportedCardBrands, getSupportedCardBrandsLengths, findCardBrand } from "../../utils/card-brand/index.js";
 import { limitedToNumber, trimAll } from "../../utils/format.js";
 import { isUndefined, isNil } from "../../utils/is.js";
-import { cdnOrigin, setApiUrl, setCDNUrl } from "../../config.js";
+import { cdnOrigin, setApiUrl, setCDNUrl, setApiPrefix } from "../../config.js";
 import { MessageAction } from "../../types/message.js";
 import { generateClassNameMap, style2String, createPlaceholderStyle, loadStyle } from "../../utils/style.js";
 import { postMessageToIframe } from "../../utils/iframe.js";
@@ -192,6 +192,7 @@ const useSecuredInput = () => {
 };
 const inputClassNameMap = generateClassNameMap("input");
 const FieldIframe = (props) => {
+  const { checkoutId } = props;
   const hiddenIframe = window.parent.frames[props.hiddenIframeName];
   const inputRef = A(null);
   const { initSecuredInput, getConfigByFieldType, getCurrCardBrand, cardBin, value, brand } = useSecuredInput();
@@ -277,11 +278,15 @@ const FieldIframe = (props) => {
   }, []);
   const onReceiveMessage = (event) => {
     const { data } = event;
-    const parsedData = safeParse(data);
-    if (!Reflect.has(parsedData, "action")) {
+    const feedbackData = safeParse(data);
+    if (!Reflect.has(feedbackData, "action")) {
       return;
     }
-    if (parsedData.action === MessageAction.VALIDATE) {
+    console.log(feedbackData, checkoutId);
+    if (feedbackData.checkoutId !== checkoutId) {
+      return;
+    }
+    if (feedbackData.action === MessageAction.VALIDATE) {
       try {
         const inputConfig = getConfigByFieldType();
         inputConfig.validator();
@@ -317,6 +322,7 @@ const FieldIframe = (props) => {
     var _a;
     const data = {
       action: MessageAction.BIN_VALUE,
+      checkoutId,
       binValue,
       fieldType: props.fieldType,
       brand: (_a = getCurrCardBrand(binValue)) == null ? void 0 : _a.code
@@ -326,6 +332,7 @@ const FieldIframe = (props) => {
   const sendBrandMessage = (brand2) => {
     const data = {
       action: MessageAction.BRAND,
+      checkoutId,
       brand: brand2,
       fieldType: props.fieldType
     };
@@ -334,6 +341,7 @@ const FieldIframe = (props) => {
   const sendFocusMessage = (focus) => {
     const data = {
       action: MessageAction.FOCUS,
+      checkoutId,
       focus,
       fieldType: props.fieldType
     };
@@ -357,7 +365,8 @@ const FieldIframe = (props) => {
       action: MessageAction.VALID_STATUS_CHANGED,
       status,
       errorTip: err == null ? void 0 : err.message,
-      fieldType: props.fieldType
+      fieldType: props.fieldType,
+      checkoutId
     };
     postMessageToIframe(validData, window.parent);
     if (status !== "success") {
@@ -369,15 +378,16 @@ const FieldIframe = (props) => {
     const validWithValueData = {
       action: MessageAction.VALID_WITH_VALUE,
       value: value.current,
-      fieldType: props.fieldType
+      fieldType: props.fieldType,
+      checkoutId
     };
-    console.log(hiddenIframe, props.hiddenIframeName);
     postMessageToIframe(validWithValueData, hiddenIframe, cdnOrigin);
   };
   const sendActivatedMessage = () => {
     const data = {
       action: MessageAction.ACTIVATED,
-      fieldType: props.fieldType
+      fieldType: props.fieldType,
+      checkoutId
     };
     postMessageToIframe(data, window.parent);
   };
@@ -385,6 +395,7 @@ const FieldIframe = (props) => {
     const data = {
       action: MessageAction.VALIDATED,
       fieldType: props.fieldType,
+      checkoutId,
       status
     };
     postMessageToIframe(data, window.parent);
@@ -400,7 +411,7 @@ const FieldIframe = (props) => {
     }
   );
 };
-const HiddenIframe = () => {
+const HiddenIframe = ({ checkoutId }) => {
   const formData = {
     expYear: "",
     expMonth: "",
@@ -410,59 +421,34 @@ const HiddenIframe = () => {
   const onReceiveMessage = async (event) => {
     const { data } = event;
     const parsedData = safeParse(data);
-    console.log(parsedData);
     if (!Reflect.has(parsedData, "action")) {
       return;
     }
+    console.log(parsedData, checkoutId);
+    if (parsedData.checkoutId !== checkoutId) {
+      return;
+    }
     if (parsedData.action === MessageAction.VALID_WITH_VALUE) {
       const feedbackData = parsedData;
       switch (feedbackData.fieldType) {
         case EFieldType.CVV: {
           formData.cvv = feedbackData.value;
-          setMessageList([
-            ...messageList,
-            {
-              name: "CVV",
-              label: `收到值：${feedbackData.value}`
-            }
-          ]);
           break;
         }
         case EFieldType.CARD_NUMBER: {
           formData.cardNo = trimAll(feedbackData.value);
-          setMessageList([
-            ...messageList,
-            {
-              name: "卡号",
-              label: `收到值：${feedbackData.value}`
-            }
-          ]);
           break;
         }
         case EFieldType.EXPIRE_DATE: {
           const [expMonth, expYear] = feedbackData.value.split("/");
           formData.expMonth = expMonth;
           formData.expYear = `20${expYear}`;
-          setMessageList([
-            ...messageList,
-            {
-              name: "卡有效期",
-              label: `收到值：${feedbackData.value}`
-            }
-          ]);
           break;
         }
       }
     } else if (parsedData.action === MessageAction.PAYMENT) {
       const feedbackData = parsedData;
       pay(feedbackData.formData, feedbackData.locale, feedbackData.extraParams);
-      setMessageList([
-        ...messageList,
-        {
-          name: "表单组件",
-          label: `进行支付，${JSON.stringify(formData || {})}`
-        }
-      ]);
     } else if (parsedData.action === MessageAction.ENCRYPT_CARD) {
       const feedbackData = parsedData;
       try {
@@ -472,8 +458,6 @@ const HiddenIframe = () => {
         console.log("error", error);
         sendCardEncryptionFailedMessage(error);
       }
-    } else if (parsedData.action === MessageAction.DEBUG_MODE) {
-      console.log("hidden iframe 开启测试模式");
     }
   };
   y(() => {
@@ -502,6 +486,7 @@ const HiddenIframe = () => {
   const sendAfterPaymentMessage = (response) => {
     const data = {
       action: MessageAction.AFTER_PAYMENT,
+      checkoutId,
       response
     };
     postMessageToIframe(data, window.parent);
@@ -509,6 +494,7 @@ const HiddenIframe = () => {
   const sendPaymentErrorMessage = (error) => {
     const data = {
       action: MessageAction.PAYMENT_ERROR,
+      checkoutId,
       error: {
         message: error.message,
         code: error.code
@@ -518,19 +504,22 @@ const HiddenIframe = () => {
   };
   const sendPaymentTimeoutMessage = () => {
     const data = {
-      action: MessageAction.PAYMENT_TIMEOUT
+      action: MessageAction.PAYMENT_TIMEOUT,
+      checkoutId
     };
     postMessageToIframe(data, window.parent);
   };
   const sendHiddenIframeReadyMessage = () => {
     const data = {
-      action: MessageAction.HIDDEN_IFRAME_READY
+      action: MessageAction.HIDDEN_IFRAME_READY,
+      checkoutId
     };
     postMessageToIframe(data, window.parent);
   };
   const sendCardEncryptedMessage = (encryptedInfo) => {
     const data = {
       action: MessageAction.CARD_ENCRYPTED,
+      checkoutId,
       encryptedInfo
     };
     postMessageToIframe(data, window.parent);
@@ -538,6 +527,7 @@ const HiddenIframe = () => {
   const sendCardEncryptionFailedMessage = (error) => {
     const data = {
       action: MessageAction.CARD_ENCRYPTION_FAILED,
+      checkoutId,
       error
     };
     postMessageToIframe(data, window.parent);
@@ -545,36 +535,22 @@ const HiddenIframe = () => {
   y(() => {
     sendHiddenIframeReadyMessage();
   }, []);
-  const [messageList, setMessageList] = h([]);
-  const messageListRef = A(null);
-  y(() => {
-    if (messageListRef.current) {
-      messageListRef.current.scrollTop = messageListRef.current.scrollHeight;
-    }
-  }, [messageList]);
-  return /* @__PURE__ */ u(b, { children: /* @__PURE__ */ u("div", { style: "width: 100%; height: 100%; overflow-y: auto", ref: messageListRef, children: messageList.map((message) => /* @__PURE__ */ u("div", { style: { fontSize: "18px", marginBottom: "4px" }, children: [
-    /* @__PURE__ */ u("span", { style: { color: "#4f43df" }, children: [
-      "[",
-      message.name,
-      "]"
-    ] }),
-    /* @__PURE__ */ u("span", { children: [
-      ": ",
-      message.label
-    ] })
-  ] })) }) });
+  return /* @__PURE__ */ u(b, {});
 };
 const SecuredIframe = () => {
   const [fieldIframeConfig, setFieldIframeConfig] = h();
   const [hidden, setHidden] = h(false);
   const [hasInit, setHasInit] = h(false);
+  const checkoutId = A("");
   const onReceiveMessage = (event) => {
     const { data } = event;
     const feedbackData = safeParse(data);
     if (!Reflect.has(feedbackData, "action")) {
       return;
     }
+    console.log(feedbackData, checkoutId.current);
     if (feedbackData.action === MessageAction.INIT) {
+      checkoutId.current = feedbackData.checkoutId;
       setHidden(feedbackData.hidden);
       setFieldIframeConfig(feedbackData.config);
       if (feedbackData.apiUrl) {
@@ -583,13 +559,16 @@ const SecuredIframe = () => {
       if (feedbackData.cdnUrl) {
         setCDNUrl(feedbackData.cdnUrl);
       }
+      if (feedbackData.apiPrefix) {
+        setApiPrefix(feedbackData.apiPrefix);
+      }
       window.removeEventListener("message", onReceiveMessage);
       setHasInit(true);
     }
     return;
   };
   window.addEventListener("message", onReceiveMessage);
-  return /* @__PURE__ */ u(b, { children: hasInit && (hidden ? /* @__PURE__ */ u(HiddenIframe, {}) : /* @__PURE__ */ u(FieldIframe, { ...fieldIframeConfig })) });
+  return /* @__PURE__ */ u(b, { children: hasInit && (hidden ? /* @__PURE__ */ u(HiddenIframe, { checkoutId: checkoutId.current }) : /* @__PURE__ */ u(FieldIframe, { ...fieldIframeConfig, checkoutId: checkoutId.current })) });
 };
 export {
   SecuredIframe

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

@@ -1,13 +1,13 @@
 import { w, A, h, F, y, q, u } from "../../core.js";
-import { createAddressCore } from "../../core/Address.js";
 import { useBEM } from "../../hooks/useBEM.js";
 import { CoreContext } from "../../core/context.js";
 import "../../utils/card-brand/brands.js";
 import "../../utils/system-info/get-browser-info.js";
-import { cssVarPrefix, normalizedClass, formatAmount, trimAll } from "../../utils/format.js";
+import { normalizedClass, formatAmount, trimAll } from "../../utils/format.js";
+import { formatPaymentResult } from "../../utils/payment.js";
 import { isTimeoutError } from "../../api/http.js";
-import { COMMON_CLASS_NAME } from "../../constant.js";
 import { getBrowserParams } from "../../api/modules/get-browser-params.js";
+import { COMMON_CLASS_NAME, PaymentMethod } from "../../constant.js";
 import { getSepaPayInfo, sepaPay } from "../../api/modules/sepa/index.js";
 import { PayKKaError } from "../../core/error.js";
 import { usePayState } from "../../hooks/usePayState.js";
@@ -25,9 +25,9 @@ import { AccountNameField } from "../AccountNameField/index.js";
 const { bem } = useBEM("sepa");
 const fieldClassNames = bem("field");
 const Sepa = w((props, ref) => {
-  var _a, _b, _c, _d, _e, _f, _g, _h;
-  const { session } = props;
-  let addressState = createAddressCore();
+  var _a, _b;
+  const { session, core } = props;
+  const addressCore = core.getAddressCore();
   let emailState = createEmailCore();
   const { i18n, sessionReady } = usePayState(session, props.core);
   const addressFieldRef = A(null);
@@ -38,13 +38,13 @@ const Sepa = w((props, ref) => {
     iban: "",
     holderName: "",
     address: {
-      country: "",
-      province: "",
-      city: "",
-      area: "",
-      postCode: "",
-      address1: "",
-      address2: ""
+      country: void 0,
+      province: void 0,
+      city: void 0,
+      area: void 0,
+      postCode: void 0,
+      address1: void 0,
+      address2: void 0
     }
   });
   const [validated, setValidated] = h(false);
@@ -53,36 +53,43 @@ const Sepa = w((props, ref) => {
   const disabledEmail = A(false);
   const [requiredBill, setRequiredBill] = h(false);
   const [isCheckoutEnabled, setIsCheckoutEnabled] = h(false);
-  const formStyle = {
-    [cssVarPrefix("button-bg-color")]: (_a = session == null ? void 0 : session.colors) == null ? void 0 : _a.primary,
-    [cssVarPrefix("button-bg-color-hover")]: (_b = session == null ? void 0 : session.colors) == null ? void 0 : _b.primaryHover,
-    [cssVarPrefix("button-bg-color-active")]: (_c = session == null ? void 0 : session.colors) == null ? void 0 : _c.primaryActive,
-    [cssVarPrefix("button-text-color")]: (_e = (_d = session == null ? void 0 : session.checkout) == null ? void 0 : _d.theme) == null ? void 0 : _e.payButtonTextColor,
-    [cssVarPrefix("input-color")]: (_f = session == null ? void 0 : session.colors) == null ? void 0 : _f.primary
-  };
   F(ref, () => ({
     updateAddress: () => {
       var _a2;
       if (!requiredBill)
         return;
-      setForm(Object.assign(form, { address: addressState.getAddressState() }));
-      (_a2 = addressFieldRef.current) == null ? void 0 : _a2.update(addressState.getAddressState());
+      setForm(Object.assign(form, { address: addressCore.getAddressState() }));
+      (_a2 = addressFieldRef.current) == null ? void 0 : _a2.update(addressCore.getAddressState());
     },
     updateEmail: () => {
       var _a2;
       setForm(Object.assign(form, { email: emailState.email }));
+      form.email = emailState.email;
       (_a2 = emailFieldRef.current) == null ? void 0 : _a2.update(emailState.email);
+      validateForm();
     }
   }));
+  const processOnSuccess = (res) => {
+    var _a2, _b2;
+    setSubmitButtonStatus("success");
+    (_b2 = props.onSuccess) == null ? void 0 : _b2.call(
+      props,
+      formatPaymentResult({
+        ...res,
+        returnUrl: (_a2 = session == null ? void 0 : session.checkout) == null ? void 0 : _a2.returnUrl
+      })
+    );
+  };
   y(() => {
     session.ready().then(() => {
       setIsCheckoutEnabled(true);
-      const { bill, status } = session.checkout;
+      const { bill, status, country } = session.checkout;
+      country && addressCore.setCountry(country);
       form.email = bill.email ?? "";
+      form.address.country = country;
       disabledEmail.current = !!bill.email;
       setRequiredBill(bill.billingAddressCollection === "REQUIRED");
       if (status === "SUCCESS") {
-        setSubmitButtonStatus("success");
         processOnSuccess();
       }
     });
@@ -125,7 +132,7 @@ const Sepa = w((props, ref) => {
     setErrorMsg("");
     (_a2 = formRef.current) == null ? void 0 : _a2.validate(async (errors) => {
       var _a3;
-      requiredBill && addressState.setValidateAllFields(true);
+      requiredBill && addressCore.setValidateAllFields(true);
       (_a3 = props.onSubmit) == null ? void 0 : _a3.call(props, errors);
       if (errors) {
         setSubmitButtonStatus("unSubmit");
@@ -154,14 +161,19 @@ const Sepa = w((props, ref) => {
       sessionId: session.sessionId,
       clientKey: session.clientKey,
       payment: {
+        paymentMethod: PaymentMethod.SEPA_DEBIT,
         holderName: form.holderName,
         iban: trimAll(form.iban)
       },
       bill: requiredBill ? {
         email: form.email,
-        ...form.address,
-        province: addressState.getLabel(form.address.province, addressState.getProvinceOption()) ?? form.address.province,
-        city: addressState.getLabel(form.address.city, addressState.getCityOptions()) ?? form.address.city
+        addressLine1: form.address.address1,
+        addressLine2: form.address.address2,
+        postalCode: form.address.postCode,
+        country: form.address.country,
+        district: form.address.area,
+        state: form.address.province ? addressCore.getLabel(form.address.province, addressCore.getProvinceOption()) ?? form.address.province : void 0,
+        city: form.address.city ? addressCore.getLabel(form.address.city, addressCore.getCityOptions()) ?? form.address.city : void 0
       } : {
         email: form.email
       },
@@ -169,14 +181,25 @@ const Sepa = w((props, ref) => {
     };
   };
   async function pay(search = false, timeout) {
-    var _a2;
+    var _a2, _b2, _c, _d, _e;
     try {
-      const paymentParams = await getPaymentParams();
-      const options = { locale: i18n.locale, timeout };
-      const res = search ? await getSepaPayInfo(
-        { sessionId: session.sessionId, clientKey: session.clientKey },
-        options
-      ) : await sepaPay(paymentParams, props.core, options);
+      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", PaymentMethod.SEPA_DEBIT);
+        res = await getSepaPayInfo(
+          {
+            sessionId: session.sessionId,
+            clientKey: session.clientKey,
+            paymentMethod: PaymentMethod.SEPA_DEBIT
+          },
+          extraParams,
+          requestOptions
+        );
+      } else {
+        const extraParams = (_d = (_c = core.config)._getExtraParams) == null ? void 0 : _d.call(_c, "payment", PaymentMethod.SEPA_DEBIT);
+        res = await sepaPay(await getPaymentParams(), extraParams, requestOptions);
+      }
       return processAfterPayment(res, search);
     } catch (error) {
       if (isTimeoutError(error)) {
@@ -189,31 +212,31 @@ const Sepa = w((props, ref) => {
       } else {
         const message = error.i18nKey ? i18n.get(error.i18nKey) : error.message;
         setErrorMsg(message);
-        (_a2 = props.onError) == null ? void 0 : _a2.call(props, new PayKKaError("API_ERROR", message, { code: error.code, cause: error }));
+        (_e = props.onError) == null ? void 0 : _e.call(props, new PayKKaError("API_ERROR", message, { code: error.code, cause: error }));
         setSubmitButtonStatus("unSubmit");
         return { end: true };
       }
     }
   }
   const processAfterPayment = (res, search = false) => {
-    var _a2, _b2, _c2;
-    const { status, orderStatus, errorMessage, errorCode } = res;
+    var _a2, _b2, _c;
+    const { status, orderStatus, errorMessage, errorCode, sessionId } = res;
+    sessionId && (session.sessionId = sessionId);
     if (status === "PROCESSING") {
       if (!orderStatus) {
         setSubmitButtonStatus("unSubmit");
         return { end: true };
       } else if (orderStatus === "SUCCESS") {
-        setSubmitButtonStatus("success");
-        processOnSuccess();
+        processOnSuccess(res);
       } else if (orderStatus === "PROCESSING") {
         if (search) {
-          processOnSuccess();
+          processOnSuccess(res);
         } else {
           startReFetchPayInfo();
         }
         return { end: search };
       } else if (orderStatus === "FAILURE") {
-        setErrorMsg(errorMessage);
+        errorMessage && setErrorMsg(errorMessage);
         setSubmitButtonStatus("unSubmit");
         (_a2 = props.onError) == null ? void 0 : _a2.call(props, new PayKKaError("API_ERROR", errorMessage, { code: errorCode }));
       } else if (orderStatus === "AUTHORIZED") {
@@ -222,29 +245,25 @@ const Sepa = w((props, ref) => {
       }
       return { end: true };
     } else if (status === "SUCCESS") {
-      setSubmitButtonStatus("success");
-      processOnSuccess();
+      processOnSuccess(res);
       return { end: true };
     } else if (status === "EXPIRED") {
       setSubmitButtonStatus("unSubmit");
-      (_c2 = props.onExpired) == null ? void 0 : _c2.call(props);
+      (_c = props.onExpired) == null ? void 0 : _c.call(props);
       return { end: true };
     }
     setSubmitButtonStatus("unSubmit");
     return { end: true };
   };
-  const processOnSuccess = () => {
-    var _a2, _b2;
-    (_b2 = props.onSuccess) == null ? void 0 : _b2.call(props, (_a2 = session == null ? void 0 : session.checkout) == null ? void 0 : _a2.returnUrl);
-  };
   return /* @__PURE__ */ u(
     CoreContext.Provider,
     {
       value: {
         i18n,
-        session
+        session,
+        core
       },
-      children: sessionReady && isCheckoutEnabled && i18n.ready.value && /* @__PURE__ */ u(Form, { form, ref: setFormRef, onFormChange: (form2) => setForm(form2), children: /* @__PURE__ */ u("div", { className: normalizedClass(COMMON_CLASS_NAME, bem()), style: formStyle, children: [
+      children: sessionReady && isCheckoutEnabled && i18n.ready.value && /* @__PURE__ */ u("div", { className: core.theme.className, children: /* @__PURE__ */ u(Form, { form, ref: setFormRef, onFormChange: (form2) => setForm(form2), children: /* @__PURE__ */ u("div", { className: normalizedClass(COMMON_CLASS_NAME, bem()), children: [
         /* @__PURE__ */ u("div", { className: fieldClassNames, children: /* @__PURE__ */ u(
           EmailField,
           {
@@ -260,13 +279,13 @@ const Sepa = w((props, ref) => {
           {
             ref: addressFieldRef,
             value: form.address,
-            country: ((_g = session == null ? void 0 : session.checkout) == null ? void 0 : _g.country) || ((_h = session == null ? void 0 : session.checkout) == null ? void 0 : _h.bill.country),
+            country: ((_a = session == null ? void 0 : session.checkout) == null ? void 0 : _a.country) || ((_b = session == null ? void 0 : session.checkout) == null ? void 0 : _b.bill.country),
             onAddressChange: (value) => setForm(Object.assign(form, { address: value }))
           }
         ) }),
         !!errorMsg && /* @__PURE__ */ u(Info, { content: errorMsg, style: { marginTop: "12px" } }),
         Button()
-      ] }) })
+      ] }) }) })
     }
   );
 });