@paykka/card-checkout-ui 0.13.1 → 0.13.5

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

@@ -21,6 +21,8 @@ var EFieldType = /* @__PURE__ */ ((EFieldType2) => {
 const SECURED_FILED_ATTR = "data-sf";
 const SECURED_IFRAME_CLASS_NAME = "secured-iframe";
 const HIDDEN_IFRAME_NAME = "hidden-pay-iframe";
+const FIELD_IFRAME_NAME = "field-pay-iframe";
+const THREE_DS_IFRAME_NAME = "three-ds-iframe";
 const getFieldElements = (rootNode) => {
   return rootNode ? Array.prototype.slice.call(rootNode.querySelectorAll(`[${SECURED_FILED_ATTR}]`)) : [];
 };
@@ -35,11 +37,12 @@ class SecuredField {
   }
   /** 初始化表单区域iframe */
   init() {
-    const { iframeSrc, iframeClassName, fieldNode } = this.config;
+    const { iframeSrc, iframeClassName, fieldNode, iframeName } = this.config;
     const iframeEl = createIframe(iframeSrc);
     iframeEl.width = "100%";
     iframeEl.height = "100%";
     iframeEl.style.border = "none";
+    iframeEl.name = iframeName;
     fieldNode.appendChild(iframeEl);
     const iframe = fieldNode.querySelector(`.${iframeClassName}`);
     if (!iframe) {
@@ -51,10 +54,12 @@ class SecuredField {
   /** 表单区域iframe加载回调 */
   onFieldIframeLoad() {
     this.iframeWindow = this.iframe.contentWindow;
-    const { fieldType, placeholder, style, hiddenIframeName, supportedCardBrands } = this.config;
+    const { fieldType, placeholder, style, hiddenIframeName, supportedCardBrands, checkoutId } = this.config;
     const data = {
       action: MessageAction.INIT,
+      checkoutId,
       config: {
+        checkoutId,
         fieldType,
         placeholder,
         style,
@@ -68,12 +73,13 @@ class SecuredField {
   }
 }
 const SecuredFieldsProvider = w((props, ref) => {
-  const { sessionMode, i18n, targetElement } = props;
+  const { sessionMode, i18n, targetElement, checkoutId } = props;
   const rootNodeRef = A(null);
   const hiddenIframe = A(null);
   const payment = (formData, extraParams) => {
     const data = {
       action: MessageAction.PAYMENT,
+      checkoutId,
       formData,
       extraParams,
       locale: props.i18n.locale
@@ -102,7 +108,8 @@ const SecuredFieldsProvider = w((props, ref) => {
     validate: () => {
       Object.values(securedFieldMap.current).forEach((field) => {
         const data = {
-          action: MessageAction.VALIDATE
+          action: MessageAction.VALIDATE,
+          checkoutId
         };
         postMessageToIframe(data, field.iframe.contentWindow, cdnOrigin);
       });
@@ -135,7 +142,7 @@ const SecuredFieldsProvider = w((props, ref) => {
   };
   const initHiddenIframe = async () => {
     const iframeEl = createIframe(`${cdnUrl}/secured-iframe.html`);
-    iframeEl.name = `${HIDDEN_IFRAME_NAME}-${Date.now()}`;
+    iframeEl.name = `${HIDDEN_IFRAME_NAME}-${checkoutId}-${Date.now()}`;
     iframeEl.width = "0";
     iframeEl.height = "0";
     iframeEl.style.border = "none";
@@ -143,6 +150,7 @@ const SecuredFieldsProvider = w((props, ref) => {
     const data = {
       action: MessageAction.INIT,
       hidden: true,
+      checkoutId,
       apiUrl,
       cdnUrl,
       apiPrefix
@@ -161,6 +169,7 @@ const SecuredFieldsProvider = w((props, ref) => {
         hiddenIframeName: hiddenIframe.current.name,
         rootNode: rootNodeRef.current,
         iframeSrc: `${cdnUrl}/secured-iframe.html`,
+        iframeName: `${FIELD_IFRAME_NAME}-${checkoutId}-${Date.now()}`,
         iframeClassName: SECURED_IFRAME_CLASS_NAME,
         fieldType,
         placeholder: securedFieldPlaceholderMap[fieldType],
@@ -171,7 +180,8 @@ const SecuredFieldsProvider = w((props, ref) => {
         onAfterPayment: props.onAfterPayment,
         onPaymentError: props.onPaymentError,
         onPaymentTimeout: props.onPaymentTimeout,
-        onValidStatusChanged: props.onValidStatusChanged
+        onValidStatusChanged: props.onValidStatusChanged,
+        checkoutId
       });
     });
   };
@@ -185,6 +195,10 @@ const SecuredFieldsProvider = w((props, ref) => {
     if (!Reflect.has(feedbackData, "action")) {
       return;
     }
+    console.log(feedbackData, checkoutId);
+    if (feedbackData.checkoutId !== checkoutId) {
+      return;
+    }
     switch (feedbackData.action) {
       case MessageAction.FOCUS:
         (_a = props.onFocus) == null ? void 0 : _a.call(props, feedbackData);
@@ -228,8 +242,10 @@ const SecuredFieldsProvider = w((props, ref) => {
 });
 export {
   EFieldType,
+  FIELD_IFRAME_NAME,
   HIDDEN_IFRAME_NAME,
   SECURED_FILED_ATTR,
   SECURED_IFRAME_CLASS_NAME,
-  SecuredFieldsProvider
+  SecuredFieldsProvider,
+  THREE_DS_IFRAME_NAME
 };

package/dist/es/components/SecuredIframe/index.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,14 +378,16 @@ const FieldIframe = (props) => {
     const validWithValueData = {
       action: MessageAction.VALID_WITH_VALUE,
       value: value.current,
-      fieldType: props.fieldType
+      fieldType: props.fieldType,
+      checkoutId
     };
     postMessageToIframe(validWithValueData, hiddenIframe, cdnOrigin);
   };
   const sendActivatedMessage = () => {
     const data = {
       action: MessageAction.ACTIVATED,
-      fieldType: props.fieldType
+      fieldType: props.fieldType,
+      checkoutId
     };
     postMessageToIframe(data, window.parent);
   };
@@ -384,6 +395,7 @@ const FieldIframe = (props) => {
     const data = {
       action: MessageAction.VALIDATED,
       fieldType: props.fieldType,
+      checkoutId,
       status
     };
     postMessageToIframe(data, window.parent);
@@ -399,7 +411,7 @@ const FieldIframe = (props) => {
     }
   );
 };
-const HiddenIframe = () => {
+const HiddenIframe = ({ checkoutId }) => {
   const formData = {
     expYear: "",
     expMonth: "",
@@ -409,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 {
@@ -471,8 +458,6 @@ const HiddenIframe = () => {
         console.log("error", error);
         sendCardEncryptionFailedMessage(error);
       }
-    } else if (parsedData.action === MessageAction.DEBUG_MODE) {
-      console.log("hidden iframe 开启测试模式");
     }
   };
   y(() => {
@@ -501,6 +486,7 @@ const HiddenIframe = () => {
   const sendAfterPaymentMessage = (response) => {
     const data = {
       action: MessageAction.AFTER_PAYMENT,
+      checkoutId,
       response
     };
     postMessageToIframe(data, window.parent);
@@ -508,6 +494,7 @@ const HiddenIframe = () => {
   const sendPaymentErrorMessage = (error) => {
     const data = {
       action: MessageAction.PAYMENT_ERROR,
+      checkoutId,
       error: {
         message: error.message,
         code: error.code
@@ -517,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);
@@ -537,6 +527,7 @@ const HiddenIframe = () => {
   const sendCardEncryptionFailedMessage = (error) => {
     const data = {
       action: MessageAction.CARD_ENCRYPTION_FAILED,
+      checkoutId,
       error
     };
     postMessageToIframe(data, window.parent);
@@ -544,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) {
@@ -591,7 +568,7 @@ const SecuredIframe = () => {
     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

@@ -3,7 +3,7 @@ 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 { getBrowserParams } from "../../api/modules/get-browser-params.js";
@@ -25,7 +25,7 @@ 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;
+  var _a, _b;
   const { session, core } = props;
   const addressCore = core.getAddressCore();
   let emailState = createEmailCore();
@@ -53,13 +53,6 @@ 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;
@@ -79,10 +72,13 @@ const Sepa = w((props, ref) => {
   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
-    }));
+    (_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(() => {
@@ -185,7 +181,7 @@ const Sepa = w((props, ref) => {
     };
   };
   async function pay(search = false, timeout) {
-    var _a2, _b2, _c2, _d2, _e2;
+    var _a2, _b2, _c, _d, _e;
     try {
       const requestOptions = { locale: i18n.locale, timeout };
       let res = null;
@@ -201,7 +197,7 @@ const Sepa = w((props, ref) => {
           requestOptions
         );
       } else {
-        const extraParams = (_d2 = (_c2 = core.config)._getExtraParams) == null ? void 0 : _d2.call(_c2, "payment", PaymentMethod.SEPA_DEBIT);
+        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);
@@ -216,14 +212,14 @@ const Sepa = w((props, ref) => {
       } else {
         const message = error.i18nKey ? i18n.get(error.i18nKey) : error.message;
         setErrorMsg(message);
-        (_e2 = props.onError) == null ? void 0 : _e2.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;
+    var _a2, _b2, _c;
     const { status, orderStatus, errorMessage, errorCode, sessionId } = res;
     sessionId && (session.sessionId = sessionId);
     if (status === "PROCESSING") {
@@ -253,7 +249,7 @@ const Sepa = w((props, ref) => {
       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");
@@ -267,7 +263,7 @@ const Sepa = w((props, ref) => {
         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,
           {
@@ -283,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()
-      ] }) })
+      ] }) }) })
     }
   );
 });