@lana-commerce/core 13.1.0-alpha.13 → 13.1.0-alpha.15

package/CHANGELOG.md

@@ -16,6 +16,7 @@ This project adheres to [Semantic Versioning][semantic versioning].
 - Propagate new "meta" field for invoice line item descriptions.
 - Add "webauthn" logic to "customer" module.
 - Add webauthn related fields to customer/shop fragments.
+- "Customer" modulde: now all signin forms share the custom error type. When custom error happens, it is set on all forms.
 
 ### Patch Changes
 

package/cjs/modules/customer.js

@@ -1736,6 +1736,11 @@ function createSigninPageGraph(binding) {
     const formOTPComplete = (0, form_js_1.createFormWithCustomError)({
         code: (0, form_js_1.createStringField)("code", "", [validator_js_1.validNonEmpty, validator_js_1.validMaxLength250]),
     }, null);
+    const setErrorOnAllForms = (0, effector_1.createEvent)();
+    (0, effector_1.forward)({
+        from: setErrorOnAllForms,
+        to: [form.setError, formOTPInit.setError, formOTPComplete.setError],
+    });
     (0, effector_1.forward)({
         from: init.event,
         to: [form.reset, formOTPInit.reset, formOTPComplete.reset],
@@ -1804,8 +1809,8 @@ function createSigninPageGraph(binding) {
             to: binding.setJWT,
         });
         // failure
-        (0, split_js_1.splitMap)(signinFx.done)
-            .map((e) => (e.result.kind !== "system_error" ? "unauthorized_webauthn" : undefined), form.setError)
+        (0, split_js_1.splitMap)(signInViaWebauthnFx.done)
+            .map((e) => (e.result.kind !== "system_error" ? "unauthorized_webauthn" : undefined), setErrorOnAllForms)
             .map((e) => (e.result.kind !== "data" ? e.result : undefined), handleFormFailure({ form, unexpectedError: binding.unexpectedError }));
     }
     // email/password form
@@ -1825,7 +1830,7 @@ function createSigninPageGraph(binding) {
                     ? "unauthorized"
                     : "unauthorized_oauth"
                 : undefined;
-        }, form.setError)
+        }, setErrorOnAllForms)
             .map((e) => (e.result.kind !== "data" ? e.result : undefined), handleFormFailure({ form, unexpectedError: binding.unexpectedError }));
     }
     // OTP init form
@@ -1838,7 +1843,7 @@ function createSigninPageGraph(binding) {
         });
         // failure
         (0, split_js_1.splitMap)(error)
-            .map((e) => { var _a; return e.kind === "error" && ((_a = e.error.apiError) === null || _a === void 0 ? void 0 : _a.code) === codes_js_1.ErrorCode.TryAgainLater ? "try_again_later" : undefined; }, formOTPInit.setError)
+            .map((e) => { var _a; return e.kind === "error" && ((_a = e.error.apiError) === null || _a === void 0 ? void 0 : _a.code) === codes_js_1.ErrorCode.TryAgainLater ? "try_again_later" : undefined; }, setErrorOnAllForms)
             .fallback(handleFormFailure({ form: formOTPInit, unexpectedError: binding.unexpectedError }));
     }
     // OTP complete form
@@ -1851,7 +1856,7 @@ function createSigninPageGraph(binding) {
         });
         // failure
         (0, split_js_1.splitMap)(error)
-            .map((e) => { var _a; return (e.kind === "error" && ((_a = e.error.apiError) === null || _a === void 0 ? void 0 : _a.code) === codes_js_1.ErrorCode.NotFound ? "unauthorized" : undefined); }, formOTPComplete.setError)
+            .map((e) => { var _a; return (e.kind === "error" && ((_a = e.error.apiError) === null || _a === void 0 ? void 0 : _a.code) === codes_js_1.ErrorCode.NotFound ? "unauthorized" : undefined); }, setErrorOnAllForms)
             .fallback(handleFormFailure({ form: formOTPComplete, unexpectedError: binding.unexpectedError }));
     }
     // oauth flow

package/cjs/script.js

@@ -45,6 +45,7 @@ function embedUI(config) {
             shopCurrencies: (0, arrayToDict_js_1.arrayToDict)(config.currencies, (c) => c.currency.code),
             tipsVariantID: config.shop.tips_enabled ? (_b = config.shop.tips_variant) === null || _b === void 0 ? void 0 : _b.id : undefined,
             oauth2Providers: config.shop.customer_oauth_providers,
+            customerWebauthn: config.shop.customer_webauthn,
             stripe: stripeGateway
                 ? {
                     accountID: stripeGateway.account_id,

package/esm/modules/customer.js

@@ -1754,6 +1754,11 @@ function createSigninPageGraph(binding) {
     const formOTPComplete = createFormWithCustomError({
         code: createStringField("code", "", [validNonEmpty, validMaxLength250]),
     }, null);
+    const setErrorOnAllForms = createEvent();
+    forward({
+        from: setErrorOnAllForms,
+        to: [form.setError, formOTPInit.setError, formOTPComplete.setError],
+    });
     forward({
         from: init.event,
         to: [form.reset, formOTPInit.reset, formOTPComplete.reset],
@@ -1822,8 +1827,8 @@ function createSigninPageGraph(binding) {
             to: binding.setJWT,
         });
         // failure
-        splitMap(signinFx.done)
-            .map((e) => (e.result.kind !== "system_error" ? "unauthorized_webauthn" : undefined), form.setError)
+        splitMap(signInViaWebauthnFx.done)
+            .map((e) => (e.result.kind !== "system_error" ? "unauthorized_webauthn" : undefined), setErrorOnAllForms)
             .map((e) => (e.result.kind !== "data" ? e.result : undefined), handleFormFailure({ form, unexpectedError: binding.unexpectedError }));
     }
     // email/password form
@@ -1840,7 +1845,7 @@ function createSigninPageGraph(binding) {
             ? e.params.data.email
                 ? "unauthorized"
                 : "unauthorized_oauth"
-            : undefined, form.setError)
+            : undefined, setErrorOnAllForms)
             .map((e) => (e.result.kind !== "data" ? e.result : undefined), handleFormFailure({ form, unexpectedError: binding.unexpectedError }));
     }
     // OTP init form
@@ -1853,7 +1858,7 @@ function createSigninPageGraph(binding) {
         });
         // failure
         splitMap(error)
-            .map((e) => e.kind === "error" && e.error.apiError?.code === ErrorCode.TryAgainLater ? "try_again_later" : undefined, formOTPInit.setError)
+            .map((e) => e.kind === "error" && e.error.apiError?.code === ErrorCode.TryAgainLater ? "try_again_later" : undefined, setErrorOnAllForms)
             .fallback(handleFormFailure({ form: formOTPInit, unexpectedError: binding.unexpectedError }));
     }
     // OTP complete form
@@ -1866,7 +1871,7 @@ function createSigninPageGraph(binding) {
         });
         // failure
         splitMap(error)
-            .map((e) => (e.kind === "error" && e.error.apiError?.code === ErrorCode.NotFound ? "unauthorized" : undefined), formOTPComplete.setError)
+            .map((e) => (e.kind === "error" && e.error.apiError?.code === ErrorCode.NotFound ? "unauthorized" : undefined), setErrorOnAllForms)
             .fallback(handleFormFailure({ form: formOTPComplete, unexpectedError: binding.unexpectedError }));
     }
     // oauth flow

package/esm/script.js

@@ -35,6 +35,7 @@ export async function embedUI(config) {
         shopCurrencies: arrayToDict(config.currencies, (c) => c.currency.code),
         tipsVariantID: config.shop.tips_enabled ? config.shop.tips_variant?.id : undefined,
         oauth2Providers: config.shop.customer_oauth_providers,
+        customerWebauthn: config.shop.customer_webauthn,
         stripe: stripeGateway
             ? {
                 accountID: stripeGateway.account_id,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lana-commerce/core",
-  "version": "13.1.0-alpha.13",
+  "version": "13.1.0-alpha.15",
   "description": "Lana JS Core",
   "scripts": {
     "test": "jest",

package/types/modules/customer.d.ts

@@ -188,7 +188,7 @@ export declare function createCustomer(config: CustomerConfig, init: CustomerIni
             } & {
                 email: import("../effector/form.js").StringField<[Validator<"invalid_non_empty">, Validator<"invalid_email">, Validator<"max_length_exceeded">], string>;
                 password: import("../effector/form.js").StringField<[Validator<"invalid_non_empty">], string>;
-            } & import("../effector/form.js").CustomFormError<"unauthorized" | "unauthorized_oauth" | "unauthorized_webauthn" | null>;
+            } & import("../effector/form.js").CustomFormError<"try_again_later" | "unauthorized" | "unauthorized_oauth" | "unauthorized_webauthn" | null>;
             formOTPInit: {
                 init: Event<Partial<{
                     email: string;
@@ -206,7 +206,7 @@ export declare function createCustomer(config: CustomerConfig, init: CustomerIni
                 errorPropagationFailed: Event<void>;
             } & {
                 email: import("../effector/form.js").StringField<[Validator<"invalid_non_empty">, Validator<"invalid_email">, Validator<"max_length_exceeded">], string>;
-            } & import("../effector/form.js").CustomFormError<"try_again_later" | null>;
+            } & import("../effector/form.js").CustomFormError<"try_again_later" | "unauthorized" | "unauthorized_oauth" | "unauthorized_webauthn" | null>;
             formOTPComplete: {
                 init: Event<Partial<{
                     code: string;
@@ -224,7 +224,7 @@ export declare function createCustomer(config: CustomerConfig, init: CustomerIni
                 errorPropagationFailed: Event<void>;
             } & {
                 code: import("../effector/form.js").StringField<[Validator<"invalid_non_empty">, Validator<"max_length_exceeded">], string>;
-            } & import("../effector/form.js").CustomFormError<"unauthorized" | null>;
+            } & import("../effector/form.js").CustomFormError<"try_again_later" | "unauthorized" | "unauthorized_oauth" | "unauthorized_webauthn" | null>;
             signInMode: Store<"email-otp-init" | "email-otp-complete" | "email-password">;
             setSignInMode: Event<"email-otp-init" | "email-otp-complete" | "email-password">;
             oauth2Click: Event<CustomerOAuthProviderKind>;