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

package/cjs/modules/customer.js

@@ -5,6 +5,7 @@ const tslib_1 = require("tslib");
 const jwt_decode_1 = tslib_1.__importDefault(require("jwt-decode"));
 const effector_1 = require("effector");
 const browser_1 = require("@simplewebauthn/browser");
+const AddWebauthnMutation_js_1 = tslib_1.__importDefault(require("../graphql/operations/AddWebauthnMutation.js"));
 const ApplyGiftCardMutation_js_1 = tslib_1.__importDefault(require("../graphql/operations/ApplyGiftCardMutation.js"));
 const CancelOrderMutation_js_1 = tslib_1.__importDefault(require("../graphql/operations/CancelOrderMutation.js"));
 const CancelSubscriptionMutation_js_1 = tslib_1.__importDefault(require("../graphql/operations/CancelSubscriptionMutation.js"));
@@ -14,6 +15,7 @@ const CreatePaymentSourceMutation_js_1 = tslib_1.__importDefault(require("../gra
 const CreateReturnMutation_js_1 = tslib_1.__importDefault(require("../graphql/operations/CreateReturnMutation.js"));
 const DeleteFavoriteMutation_js_1 = tslib_1.__importDefault(require("../graphql/operations/DeleteFavoriteMutation.js"));
 const DeletePaymentSourceMutation_js_1 = tslib_1.__importDefault(require("../graphql/operations/DeletePaymentSourceMutation.js"));
+const DeleteWebauthnMutation_js_1 = tslib_1.__importDefault(require("../graphql/operations/DeleteWebauthnMutation.js"));
 const DisconnectOAuth2Mutation_js_1 = tslib_1.__importDefault(require("../graphql/operations/DisconnectOAuth2Mutation.js"));
 const EditSubscriptionMutation_js_1 = tslib_1.__importDefault(require("../graphql/operations/EditSubscriptionMutation.js"));
 const GetCustomerAddressesPageDataQuery_js_1 = tslib_1.__importDefault(require("../graphql/operations/GetCustomerAddressesPageDataQuery.js"));
@@ -388,7 +390,7 @@ function createWebauthnSignupPageGraph(binding) {
         }
         catch (err) {
             console.error(err);
-            return { kind: "custom_error", text: "failure" };
+            return { kind: "custom_error", text: "webauthn failure" };
         }
         return (0, request_js_1.request)(SignUpMutation_js_1.default)({
             shopID,
@@ -1783,7 +1785,7 @@ function createSigninPageGraph(binding) {
         }
         catch (err) {
             console.error(err);
-            return { kind: "custom_error", text: "failure" };
+            return { kind: "custom_error", text: "webauthn failure" };
         }
         return (0, request_js_1.request)(SignInMutation_js_1.default)({
             shopID,
@@ -1875,10 +1877,7 @@ function createSigninPageGraph(binding) {
     });
     const webauthnClick = (0, effector_1.createEvent)();
     (0, effector_1.guard)({
-        source: (0, effector_1.sample)(binding.internalConfig, webauthnClick, (config, _data) => ({
-            config,
-            data: {},
-        })),
+        source: (0, effector_1.sample)(binding.internalConfig, webauthnClick, (config, data) => ({ config, data })),
         filter: binding.everythingIdle,
         target: signInViaWebauthnFx,
     });
@@ -2003,6 +2002,92 @@ function createOAuth2UtilsGraph(binding) {
         somethingIsPending: (0, combineSome_js_1.combineSome)(connectFx.pending, disconnectFx.pending),
     };
 }
+//--------------------------------------------------------------------------------------------------------------------
+//--------------------------------------------------------------------------------------------------------------------
+//--------------------------------------------------------------------------------------------------------------------
+// not really a part of any page, but somewhat follows page graph conventions, except it doesn't have init.
+function createWebauthnUtilsGraph(binding) {
+    const createWebauthn = (0, effector_1.createEvent)();
+    const deleteWebauthn = (0, effector_1.createEvent)();
+    const createFx = (0, effector_1.createEffect)((p) => tslib_1.__awaiter(this, void 0, void 0, function* () {
+        const { shopID, opts } = p.config;
+        if (!p.data) {
+            return { kind: "custom_error", text: "no customer info" };
+        }
+        const email = p.data.customer.email;
+        const name = p.data.customer.name;
+        const resp = yield (0, request_js_1.request)(InitWebauthnMutation_js_1.default)({ shopID, email, name }, opts);
+        if (resp.kind !== "data") {
+            return resp;
+        }
+        let sessionID;
+        let credential;
+        try {
+            sessionID = resp.data.session_id;
+            credential = yield (0, browser_1.startRegistration)({ optionsJSON: JSON.parse(resp.data.options).publicKey });
+        }
+        catch (err) {
+            console.error(err);
+            return { kind: "custom_error", text: "webauthn failure" };
+        }
+        return (0, request_js_1.request)(AddWebauthnMutation_js_1.default)({ shopID, data: { webauthn_credential: JSON.stringify(credential), webauthn_session_id: sessionID } }, opts);
+    }));
+    const deleteFx = (0, effector_1.createEffect)((p) => tslib_1.__awaiter(this, void 0, void 0, function* () {
+        const { shopID, opts } = p.config;
+        return (0, request_js_1.request)(DeleteWebauthnMutation_js_1.default)({ shopID }, opts);
+    }));
+    // create flow
+    {
+        (0, effector_1.guard)({
+            source: (0, effector_1.sample)((0, effector_1.combine)({ config: binding.internalConfig, customerInfo: binding.customerInfo }), createWebauthn, ({ config, customerInfo }, _data) => ({ config, data: customerInfo })),
+            filter: binding.everythingIdle,
+            target: createFx,
+        });
+        const { data: connectData, error: connectError } = (0, requestResponse_js_1.requestResponseSplit)(createFx.doneData);
+        // success
+        (0, effector_1.forward)({
+            from: connectData,
+            to: binding.fetchCustomerInfoNow,
+        });
+        (0, effector_1.forward)({
+            from: connectData.map(() => "webauthn_created"),
+            to: binding.message,
+        });
+        // failure
+        (0, effector_1.forward)({
+            from: connectError,
+            to: binding.unexpectedError,
+        });
+    }
+    // delete flow
+    {
+        (0, effector_1.guard)({
+            source: (0, effector_1.sample)(binding.internalConfig, deleteWebauthn, (config, data) => ({ config, data })),
+            filter: binding.everythingIdle,
+            target: deleteFx,
+        });
+        const { data: disconnectData, error: disconnectError } = (0, requestResponse_js_1.requestResponseSplit)(deleteFx.doneData);
+        // success
+        (0, effector_1.forward)({
+            from: disconnectData,
+            to: binding.fetchCustomerInfoNow,
+        });
+        (0, effector_1.forward)({
+            from: disconnectData.map(() => "webauthn_deleted"),
+            to: binding.message,
+        });
+        // failure
+        (0, effector_1.forward)({
+            from: disconnectError,
+            to: binding.unexpectedError,
+        });
+    }
+    return {
+        createWebauthn,
+        deleteWebauthn,
+        somethingIsPending: (0, combineSome_js_1.combineSome)(createFx.pending, deleteFx.pending),
+    };
+}
 function createCustomer(config, init) {
     var _a;
     const currency = config.currency || (0, effector_1.createStore)(config.shopCurrency);
@@ -2072,6 +2157,7 @@ function createCustomer(config, init) {
         message,
         fetchCustomerInfoNow,
         oauth2,
+        customerInfo,
     };
     config.jwt.on(setJWT, (_, v) => v);
     customerInfo.on(setFavorites, (pv, favorites) => {
@@ -2125,6 +2211,7 @@ function createCustomer(config, init) {
         paymentMethods: createPaymentMethodsPageGraph(binding),
     };
     const oauth2Utils = createOAuth2UtilsGraph(binding);
+    const webauthnUtils = createWebauthnUtilsGraph(binding);
     const currentPage = (0, effector_1.createStore)(null);
     const loadPage = (0, effector_1.createEvent)();
     const loadPageExt = (0, effector_1.sample)(currentPage, loadPage, (p, param) => ({
@@ -2188,7 +2275,7 @@ function createCustomer(config, init) {
         ],
         to: currentPage,
     });
-    const somethingPending = (0, combineSome_js_1.combineSome)(pages.signin.somethingIsPending, pages.signup.somethingIsPending, pages.webauthnSignup.somethingIsPending, pages.resetPassword.somethingIsPending, pages.addresses.somethingIsPending, pages.favorites.somethingIsPending, pages.orders.somethingIsPending, pages.subscriptions.somethingIsPending, pages.returns.somethingIsPending, pages.order.somethingIsPending, pages.subscription.somethingIsPending, pages.return.somethingIsPending, pages.createReturn.somethingIsPending, pages.storeCredit.somethingIsPending, pages.profile.somethingIsPending, pages.paymentMethods.somethingIsPending, oauth2Utils.somethingIsPending);
+    const somethingPending = (0, combineSome_js_1.combineSome)(pages.signin.somethingIsPending, pages.signup.somethingIsPending, pages.webauthnSignup.somethingIsPending, pages.resetPassword.somethingIsPending, pages.addresses.somethingIsPending, pages.favorites.somethingIsPending, pages.orders.somethingIsPending, pages.subscriptions.somethingIsPending, pages.returns.somethingIsPending, pages.order.somethingIsPending, pages.subscription.somethingIsPending, pages.return.somethingIsPending, pages.createReturn.somethingIsPending, pages.storeCredit.somethingIsPending, pages.profile.somethingIsPending, pages.paymentMethods.somethingIsPending, oauth2Utils.somethingIsPending, webauthnUtils.somethingIsPending);
     (0, effector_1.forward)({
         from: somethingPending.map((v) => !v),
         to: everythingIdle,
@@ -2292,6 +2379,10 @@ function createCustomer(config, init) {
             connect: oauth2Utils.connectOAuth2,
             disconnect: oauth2Utils.disconnectOAuth2,
         },
+        webauthn: {
+            create: webauthnUtils.createWebauthn,
+            delete: webauthnUtils.deleteWebauthn,
+        },
     };
 }
 exports.createCustomer = createCustomer;

package/esm/modules/customer.js

@@ -1,6 +1,7 @@
 import jwtDecode from "jwt-decode";
 import { combine, createEffect, createEvent, createStore, forward, guard, restore, sample, } from "effector";
 import { startAuthentication, startRegistration } from "@simplewebauthn/browser";
+import addWebauthnMutation from "../graphql/operations/AddWebauthnMutation.js";
 import applyGiftCardMutation from "../graphql/operations/ApplyGiftCardMutation.js";
 import cancelOrderMutation from "../graphql/operations/CancelOrderMutation.js";
 import cancelSubscriptionMutation from "../graphql/operations/CancelSubscriptionMutation.js";
@@ -10,6 +11,7 @@ import createPaymentSourceMutation from "../graphql/operations/CreatePaymentSour
 import createReturnMutation from "../graphql/operations/CreateReturnMutation.js";
 import deleteFavoriteMutation from "../graphql/operations/DeleteFavoriteMutation.js";
 import deletePaymentSourceMutation from "../graphql/operations/DeletePaymentSourceMutation.js";
+import deletedWebauthnMutation from "../graphql/operations/DeleteWebauthnMutation.js";
 import disconnectOAuth2Mutation from "../graphql/operations/DisconnectOAuth2Mutation.js";
 import editSubscriptionMutation from "../graphql/operations/EditSubscriptionMutation.js";
 import getCustomerAddressesPageDataQuery from "../graphql/operations/GetCustomerAddressesPageDataQuery.js";
@@ -389,7 +391,7 @@ function createWebauthnSignupPageGraph(binding) {
         }
         catch (err) {
             console.error(err);
-            return { kind: "custom_error", text: "failure" };
+            return { kind: "custom_error", text: "webauthn failure" };
         }
         return request(signUpMutation)({
             shopID,
@@ -1801,7 +1803,7 @@ function createSigninPageGraph(binding) {
         }
         catch (err) {
             console.error(err);
-            return { kind: "custom_error", text: "failure" };
+            return { kind: "custom_error", text: "webauthn failure" };
         }
         return request(signInMutation)({
             shopID,
@@ -1890,10 +1892,7 @@ function createSigninPageGraph(binding) {
     });
     const webauthnClick = createEvent();
     guard({
-        source: sample(binding.internalConfig, webauthnClick, (config, _data) => ({
-            config,
-            data: {},
-        })),
+        source: sample(binding.internalConfig, webauthnClick, (config, data) => ({ config, data })),
         filter: binding.everythingIdle,
         target: signInViaWebauthnFx,
     });
@@ -2017,6 +2016,92 @@ function createOAuth2UtilsGraph(binding) {
         somethingIsPending: combineSome(connectFx.pending, disconnectFx.pending),
     };
 }
+//--------------------------------------------------------------------------------------------------------------------
+//--------------------------------------------------------------------------------------------------------------------
+//--------------------------------------------------------------------------------------------------------------------
+// not really a part of any page, but somewhat follows page graph conventions, except it doesn't have init.
+function createWebauthnUtilsGraph(binding) {
+    const createWebauthn = createEvent();
+    const deleteWebauthn = createEvent();
+    const createFx = createEffect(async (p) => {
+        const { shopID, opts } = p.config;
+        if (!p.data) {
+            return { kind: "custom_error", text: "no customer info" };
+        }
+        const email = p.data.customer.email;
+        const name = p.data.customer.name;
+        const resp = await request(initWebauthnMutation)({ shopID, email, name }, opts);
+        if (resp.kind !== "data") {
+            return resp;
+        }
+        let sessionID;
+        let credential;
+        try {
+            sessionID = resp.data.session_id;
+            credential = await startRegistration({ optionsJSON: JSON.parse(resp.data.options).publicKey });
+        }
+        catch (err) {
+            console.error(err);
+            return { kind: "custom_error", text: "webauthn failure" };
+        }
+        return request(addWebauthnMutation)({ shopID, data: { webauthn_credential: JSON.stringify(credential), webauthn_session_id: sessionID } }, opts);
+    });
+    const deleteFx = createEffect(async (p) => {
+        const { shopID, opts } = p.config;
+        return request(deletedWebauthnMutation)({ shopID }, opts);
+    });
+    // create flow
+    {
+        guard({
+            source: sample(combine({ config: binding.internalConfig, customerInfo: binding.customerInfo }), createWebauthn, ({ config, customerInfo }, _data) => ({ config, data: customerInfo })),
+            filter: binding.everythingIdle,
+            target: createFx,
+        });
+        const { data: connectData, error: connectError } = requestResponseSplit(createFx.doneData);
+        // success
+        forward({
+            from: connectData,
+            to: binding.fetchCustomerInfoNow,
+        });
+        forward({
+            from: connectData.map(() => "webauthn_created"),
+            to: binding.message,
+        });
+        // failure
+        forward({
+            from: connectError,
+            to: binding.unexpectedError,
+        });
+    }
+    // delete flow
+    {
+        guard({
+            source: sample(binding.internalConfig, deleteWebauthn, (config, data) => ({ config, data })),
+            filter: binding.everythingIdle,
+            target: deleteFx,
+        });
+        const { data: disconnectData, error: disconnectError } = requestResponseSplit(deleteFx.doneData);
+        // success
+        forward({
+            from: disconnectData,
+            to: binding.fetchCustomerInfoNow,
+        });
+        forward({
+            from: disconnectData.map(() => "webauthn_deleted"),
+            to: binding.message,
+        });
+        // failure
+        forward({
+            from: disconnectError,
+            to: binding.unexpectedError,
+        });
+    }
+    return {
+        createWebauthn,
+        deleteWebauthn,
+        somethingIsPending: combineSome(createFx.pending, deleteFx.pending),
+    };
+}
 export function createCustomer(config, init) {
     const currency = config.currency || createStore(config.shopCurrency);
     const oauth2 = createOAuth2RequestGraph(config);
@@ -2088,6 +2173,7 @@ export function createCustomer(config, init) {
         message,
         fetchCustomerInfoNow,
         oauth2,
+        customerInfo,
     };
     config.jwt.on(setJWT, (_, v) => v);
     customerInfo.on(setFavorites, (pv, favorites) => {
@@ -2150,6 +2236,7 @@ export function createCustomer(config, init) {
         paymentMethods: createPaymentMethodsPageGraph(binding),
     };
     const oauth2Utils = createOAuth2UtilsGraph(binding);
+    const webauthnUtils = createWebauthnUtilsGraph(binding);
     const currentPage = createStore(null);
     const loadPage = createEvent();
     const loadPageExt = sample(currentPage, loadPage, (p, param) => ({
@@ -2213,7 +2300,7 @@ export function createCustomer(config, init) {
         ],
         to: currentPage,
     });
-    const somethingPending = combineSome(pages.signin.somethingIsPending, pages.signup.somethingIsPending, pages.webauthnSignup.somethingIsPending, pages.resetPassword.somethingIsPending, pages.addresses.somethingIsPending, pages.favorites.somethingIsPending, pages.orders.somethingIsPending, pages.subscriptions.somethingIsPending, pages.returns.somethingIsPending, pages.order.somethingIsPending, pages.subscription.somethingIsPending, pages.return.somethingIsPending, pages.createReturn.somethingIsPending, pages.storeCredit.somethingIsPending, pages.profile.somethingIsPending, pages.paymentMethods.somethingIsPending, oauth2Utils.somethingIsPending);
+    const somethingPending = combineSome(pages.signin.somethingIsPending, pages.signup.somethingIsPending, pages.webauthnSignup.somethingIsPending, pages.resetPassword.somethingIsPending, pages.addresses.somethingIsPending, pages.favorites.somethingIsPending, pages.orders.somethingIsPending, pages.subscriptions.somethingIsPending, pages.returns.somethingIsPending, pages.order.somethingIsPending, pages.subscription.somethingIsPending, pages.return.somethingIsPending, pages.createReturn.somethingIsPending, pages.storeCredit.somethingIsPending, pages.profile.somethingIsPending, pages.paymentMethods.somethingIsPending, oauth2Utils.somethingIsPending, webauthnUtils.somethingIsPending);
     forward({
         from: somethingPending.map((v) => !v),
         to: everythingIdle,
@@ -2317,5 +2404,9 @@ export function createCustomer(config, init) {
             connect: oauth2Utils.connectOAuth2,
             disconnect: oauth2Utils.disconnectOAuth2,
         },
+        webauthn: {
+            create: webauthnUtils.createWebauthn,
+            delete: webauthnUtils.deleteWebauthn,
+        },
     };
 }

package/package.json

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

package/types/modules/customer.d.ts

@@ -6,7 +6,7 @@ import { GraphQLOpts, RequestResponseError } from "../request.js";
 import { InvalidInputField } from "../mapInvalidInput.js";
 import { StripeCVCError, StripeExpiryError, StripeNumberError } from "../stripeError.js";
 import { Validator } from "../effector/validator.js";
-export type MessageType = "favorite_added" | "favorite_deleted" | "favorite_modified" | "oauth2_connected" | "oauth2_disconnected";
+export type MessageType = "favorite_added" | "favorite_deleted" | "favorite_modified" | "oauth2_connected" | "oauth2_disconnected" | "webauthn_created" | "webauthn_deleted";
 export interface CustomerInfo {
     customer: CustomerFragment;
     favorites: {
@@ -637,6 +637,10 @@ export declare function createCustomer(config: CustomerConfig, init: CustomerIni
         connect: Event<CustomerOAuthProviderKind>;
         disconnect: Event<void>;
     };
+    webauthn: {
+        create: Event<void>;
+        delete: Event<void>;
+    };
 };
 export type Customer = ReturnType<typeof createCustomer>;
 export {};