@riosst100/pwa-marketplace 1.2.6 → 1.2.7

package/src/overwrites/peregrine/lib/talons/SignIn/signIn.gql.js

@@ -1,56 +1,56 @@
-import { gql } from '@apollo/client';
-import { CheckoutPageFragment } from '@magento/peregrine/lib/talons/CheckoutPage/checkoutPageFragments.gql';
-
-export const GET_CUSTOMER = gql`
-    query GetCustomerAfterSignIn {
-        # eslint-disable-next-line @graphql-eslint/require-id-when-available
-        customer {
-            email
-            firstname
-            lastname
-            is_subscribed
-            is_seller
-        }
-    }
-`;
-
-export const SIGN_IN = gql`
-    mutation SignIn($email: String!, $password: String!) {
-        generateCustomerToken(email: $email, password: $password) {
-            token
-        }
-    }
-`;
-
-export const CREATE_CART = gql`
-    mutation CreateCartAfterSignIn {
-        cartId: createEmptyCart
-    }
-`;
-
-export const MERGE_CARTS = gql`
-    mutation MergeCartsAfterSignIn(
-        $sourceCartId: String!
-        $destinationCartId: String!
-    ) {
-        mergeCarts(
-            source_cart_id: $sourceCartId
-            destination_cart_id: $destinationCartId
-        ) {
-            id
-            # eslint-disable-next-line @graphql-eslint/require-id-when-available
-            items {
-                uid
-            }
-            ...CheckoutPageFragment
-        }
-    }
-    ${CheckoutPageFragment}
-`;
-
-export default {
-    createCartMutation: CREATE_CART,
-    getCustomerQuery: GET_CUSTOMER,
-    mergeCartsMutation: MERGE_CARTS,
-    signInMutation: SIGN_IN
-};
+import { gql } from '@apollo/client';
+import { CheckoutPageFragment } from '@magento/peregrine/lib/talons/CheckoutPage/checkoutPageFragments.gql';
+
+export const GET_CUSTOMER = gql`
+    query GetCustomerAfterSignIn {
+        # eslint-disable-next-line @graphql-eslint/require-id-when-available
+        customer {
+            email
+            firstname
+            lastname
+            is_subscribed
+            is_seller
+        }
+    }
+`;
+
+export const SIGN_IN = gql`
+    mutation SignIn($email: String!, $password: String!) {
+        generateCustomerToken(email: $email, password: $password) {
+            token
+        }
+    }
+`;
+
+export const CREATE_CART = gql`
+    mutation CreateCartAfterSignIn {
+        cartId: createEmptyCart
+    }
+`;
+
+export const MERGE_CARTS = gql`
+    mutation MergeCartsAfterSignIn(
+        $sourceCartId: String!
+        $destinationCartId: String!
+    ) {
+        mergeCarts(
+            source_cart_id: $sourceCartId
+            destination_cart_id: $destinationCartId
+        ) {
+            id
+            # eslint-disable-next-line @graphql-eslint/require-id-when-available
+            items {
+                uid
+            }
+            ...CheckoutPageFragment
+        }
+    }
+    ${CheckoutPageFragment}
+`;
+
+export default {
+    createCartMutation: CREATE_CART,
+    getCustomerQuery: GET_CUSTOMER,
+    mergeCartsMutation: MERGE_CARTS,
+    signInMutation: SIGN_IN
+};

package/src/overwrites/peregrine/lib/talons/SignIn/useSignIn.js

@@ -1,226 +1,226 @@
-import { useCallback, useRef, useState, useMemo } from 'react';
-import { useApolloClient, useMutation } from '@apollo/client';
-
-import { useGoogleReCaptcha } from '@magento/peregrine/lib/hooks/useGoogleReCaptcha/useGoogleReCaptcha';
-import mergeOperations from '@magento/peregrine/lib/util/shallowMerge';
-import { useCartContext } from '@magento/peregrine/lib/context/cart';
-import { useUserContext } from '@magento/peregrine/lib/context/user';
-import { useAwaitQuery } from '@magento/peregrine/lib/hooks/useAwaitQuery';
-import { retrieveCartId } from '@magento/peregrine/lib/store/actions/cart';
-
-import DEFAULT_OPERATIONS from '@magento/peregrine/lib/talons/SignIn/signIn.gql';
-import { useEventingContext } from '@magento/peregrine/lib/context/eventing';
-import { BrowserPersistence } from '@magento/peregrine/lib/util';
-
-const storage = new BrowserPersistence();
-
-export const useSignIn = props => {
-    const {
-        handleTriggerClick,
-        getCartDetailsQuery,
-        setDefaultUsername,
-        showCreateAccount,
-        showForgotPassword
-    } = props;
-
-    const operations = mergeOperations(DEFAULT_OPERATIONS, props.operations);
-    const {
-        createCartMutation,
-        getCustomerQuery,
-        mergeCartsMutation,
-        signInMutation
-    } = operations;
-
-    const apolloClient = useApolloClient();
-    const [isSigningIn, setIsSigningIn] = useState(false);
-
-    const [
-        { cartId },
-        { createCart, removeCart, getCartDetails }
-    ] = useCartContext();
-
-    const [
-        { isGettingDetails, getDetailsError },
-        { getUserDetails, setToken }
-    ] = useUserContext();
-
-    const [, { dispatch }] = useEventingContext();
-
-    const [signIn, { error: signInError }] = useMutation(signInMutation, {
-        fetchPolicy: 'no-cache'
-    });
-
-    const {
-        generateReCaptchaData,
-        recaptchaLoading,
-        recaptchaWidgetProps
-    } = useGoogleReCaptcha({
-        currentForm: 'CUSTOMER_LOGIN',
-        formAction: 'signIn'
-    });
-
-    const [fetchCartId] = useMutation(createCartMutation);
-    const [mergeCarts] = useMutation(mergeCartsMutation);
-    const fetchUserDetails = useAwaitQuery(getCustomerQuery);
-    const fetchCartDetails = useAwaitQuery(getCartDetailsQuery);
-
-    const formApiRef = useRef(null);
-    const setFormApi = useCallback(api => (formApiRef.current = api), []);
-
-    const handleSubmit = useCallback(
-        async ({ email, password }) => {
-            setIsSigningIn(true);
-            // handleTriggerClick();
-            try {
-                // Get source cart id (guest cart id).
-                const sourceCartId = cartId;
-
-                // Get recaptchaV3 data for login
-                const recaptchaData = await generateReCaptchaData();
-
-                // Sign in and set the token.
-                const signInResponse = await signIn({
-                    variables: {
-                        email,
-                        password
-                    },
-                    ...recaptchaData
-                });
-
-                const token = signInResponse.data.generateCustomerToken.token;
-                await setToken(token);
-
-                await getUserDetails({ fetchUserDetails });
-
-                // Clear all cart/customer data from cache and redux.
-                await apolloClient.clearCacheData(apolloClient, 'cart');
-                await apolloClient.clearCacheData(apolloClient, 'customer');
-                await removeCart();
-
-                // Create and get the customer's cart id.
-                await createCart({
-                    fetchCartId
-                });
-                const destinationCartId = await retrieveCartId();
-
-                // Merge the guest cart into the customer cart.
-                await mergeCarts({
-                    variables: {
-                        destinationCartId,
-                        sourceCartId
-                    }
-                });
-
-                // Ensure old stores are updated with any new data.
-
-                
-
-                const { data } = await fetchUserDetails({
-                    fetchPolicy: 'cache-only'
-                });
-
-                if (data.customer.is_seller) {
-                    storage.setItem('is_seller', true);
-                }
-
-                dispatch({
-                    type: 'USER_SIGN_IN',
-                    payload: {
-                        ...data.customer
-                    }
-                });
-
-                getCartDetails({ fetchCartId, fetchCartDetails });
-            } catch (error) {
-                if (process.env.NODE_ENV !== 'production') {
-                    console.error(error);
-                }
-
-                setIsSigningIn(false);
-            }
-        },
-        [
-            cartId,
-            generateReCaptchaData,
-            signIn,
-            setToken,
-            apolloClient,
-            removeCart,
-            createCart,
-            fetchCartId,
-            mergeCarts,
-            getUserDetails,
-            fetchUserDetails,
-            getCartDetails,
-            fetchCartDetails,
-            dispatch,
-            handleTriggerClick
-        ]
-    );
-
-    const handleForgotPassword = useCallback(() => {
-        const { current: formApi } = formApiRef;
-
-        if (formApi) {
-            setDefaultUsername(formApi.getValue('email'));
-        }
-
-        showForgotPassword();
-    }, [setDefaultUsername, showForgotPassword]);
-
-    const forgotPasswordHandleEnterKeyPress = useCallback(() => {
-        event => {
-            if (event.key === 'Enter') {
-                handleForgotPassword();
-            }
-        };
-    }, [handleForgotPassword]);
-
-    const handleCreateAccount = useCallback(() => {
-        const { current: formApi } = formApiRef;
-
-        if (formApi) {
-            setDefaultUsername(formApi.getValue('email'));
-        }
-
-        showCreateAccount();
-    }, [setDefaultUsername, showCreateAccount]);
-
-    const handleEnterKeyPress = useCallback(() => {
-        event => {
-            if (event.key === 'Enter') {
-                handleCreateAccount();
-            }
-        };
-    }, [handleCreateAccount]);
-
-    const signinHandleEnterKeyPress = useCallback(() => {
-        event => {
-            if (event.key === 'Enter') {
-                handleSubmit();
-            }
-        };
-    }, [handleSubmit]);
-
-    const errors = useMemo(
-        () =>
-            new Map([
-                ['getUserDetailsQuery', getDetailsError],
-                ['signInMutation', signInError]
-            ]),
-        [getDetailsError, signInError]
-    );
-
-    return {
-        errors,
-        handleCreateAccount,
-        handleEnterKeyPress,
-        signinHandleEnterKeyPress,
-        handleForgotPassword,
-        forgotPasswordHandleEnterKeyPress,
-        handleSubmit,
-        isBusy: isGettingDetails || isSigningIn || recaptchaLoading,
-        setFormApi,
-        recaptchaWidgetProps
-    };
-};
+import { useCallback, useRef, useState, useMemo } from 'react';
+import { useApolloClient, useMutation } from '@apollo/client';
+
+import { useGoogleReCaptcha } from '@magento/peregrine/lib/hooks/useGoogleReCaptcha/useGoogleReCaptcha';
+import mergeOperations from '@magento/peregrine/lib/util/shallowMerge';
+import { useCartContext } from '@magento/peregrine/lib/context/cart';
+import { useUserContext } from '@magento/peregrine/lib/context/user';
+import { useAwaitQuery } from '@magento/peregrine/lib/hooks/useAwaitQuery';
+import { retrieveCartId } from '@magento/peregrine/lib/store/actions/cart';
+
+import DEFAULT_OPERATIONS from '@magento/peregrine/lib/talons/SignIn/signIn.gql';
+import { useEventingContext } from '@magento/peregrine/lib/context/eventing';
+import { BrowserPersistence } from '@magento/peregrine/lib/util';
+
+const storage = new BrowserPersistence();
+
+export const useSignIn = props => {
+    const {
+        handleTriggerClick,
+        getCartDetailsQuery,
+        setDefaultUsername,
+        showCreateAccount,
+        showForgotPassword
+    } = props;
+
+    const operations = mergeOperations(DEFAULT_OPERATIONS, props.operations);
+    const {
+        createCartMutation,
+        getCustomerQuery,
+        mergeCartsMutation,
+        signInMutation
+    } = operations;
+
+    const apolloClient = useApolloClient();
+    const [isSigningIn, setIsSigningIn] = useState(false);
+
+    const [
+        { cartId },
+        { createCart, removeCart, getCartDetails }
+    ] = useCartContext();
+
+    const [
+        { isGettingDetails, getDetailsError },
+        { getUserDetails, setToken }
+    ] = useUserContext();
+
+    const [, { dispatch }] = useEventingContext();
+
+    const [signIn, { error: signInError }] = useMutation(signInMutation, {
+        fetchPolicy: 'no-cache'
+    });
+
+    const {
+        generateReCaptchaData,
+        recaptchaLoading,
+        recaptchaWidgetProps
+    } = useGoogleReCaptcha({
+        currentForm: 'CUSTOMER_LOGIN',
+        formAction: 'signIn'
+    });
+
+    const [fetchCartId] = useMutation(createCartMutation);
+    const [mergeCarts] = useMutation(mergeCartsMutation);
+    const fetchUserDetails = useAwaitQuery(getCustomerQuery);
+    const fetchCartDetails = useAwaitQuery(getCartDetailsQuery);
+
+    const formApiRef = useRef(null);
+    const setFormApi = useCallback(api => (formApiRef.current = api), []);
+
+    const handleSubmit = useCallback(
+        async ({ email, password }) => {
+            setIsSigningIn(true);
+            // handleTriggerClick();
+            try {
+                // Get source cart id (guest cart id).
+                const sourceCartId = cartId;
+
+                // Get recaptchaV3 data for login
+                const recaptchaData = await generateReCaptchaData();
+
+                // Sign in and set the token.
+                const signInResponse = await signIn({
+                    variables: {
+                        email,
+                        password
+                    },
+                    ...recaptchaData
+                });
+
+                const token = signInResponse.data.generateCustomerToken.token;
+                await setToken(token);
+
+                await getUserDetails({ fetchUserDetails });
+
+                // Clear all cart/customer data from cache and redux.
+                await apolloClient.clearCacheData(apolloClient, 'cart');
+                await apolloClient.clearCacheData(apolloClient, 'customer');
+                await removeCart();
+
+                // Create and get the customer's cart id.
+                await createCart({
+                    fetchCartId
+                });
+                const destinationCartId = await retrieveCartId();
+
+                // Merge the guest cart into the customer cart.
+                await mergeCarts({
+                    variables: {
+                        destinationCartId,
+                        sourceCartId
+                    }
+                });
+
+                // Ensure old stores are updated with any new data.
+
+                
+
+                const { data } = await fetchUserDetails({
+                    fetchPolicy: 'cache-only'
+                });
+
+                if (data.customer.is_seller) {
+                    storage.setItem('is_seller', true);
+                }
+
+                dispatch({
+                    type: 'USER_SIGN_IN',
+                    payload: {
+                        ...data.customer
+                    }
+                });
+
+                getCartDetails({ fetchCartId, fetchCartDetails });
+            } catch (error) {
+                if (process.env.NODE_ENV !== 'production') {
+                    console.error(error);
+                }
+
+                setIsSigningIn(false);
+            }
+        },
+        [
+            cartId,
+            generateReCaptchaData,
+            signIn,
+            setToken,
+            apolloClient,
+            removeCart,
+            createCart,
+            fetchCartId,
+            mergeCarts,
+            getUserDetails,
+            fetchUserDetails,
+            getCartDetails,
+            fetchCartDetails,
+            dispatch,
+            handleTriggerClick
+        ]
+    );
+
+    const handleForgotPassword = useCallback(() => {
+        const { current: formApi } = formApiRef;
+
+        if (formApi) {
+            setDefaultUsername(formApi.getValue('email'));
+        }
+
+        showForgotPassword();
+    }, [setDefaultUsername, showForgotPassword]);
+
+    const forgotPasswordHandleEnterKeyPress = useCallback(() => {
+        event => {
+            if (event.key === 'Enter') {
+                handleForgotPassword();
+            }
+        };
+    }, [handleForgotPassword]);
+
+    const handleCreateAccount = useCallback(() => {
+        const { current: formApi } = formApiRef;
+
+        if (formApi) {
+            setDefaultUsername(formApi.getValue('email'));
+        }
+
+        showCreateAccount();
+    }, [setDefaultUsername, showCreateAccount]);
+
+    const handleEnterKeyPress = useCallback(() => {
+        event => {
+            if (event.key === 'Enter') {
+                handleCreateAccount();
+            }
+        };
+    }, [handleCreateAccount]);
+
+    const signinHandleEnterKeyPress = useCallback(() => {
+        event => {
+            if (event.key === 'Enter') {
+                handleSubmit();
+            }
+        };
+    }, [handleSubmit]);
+
+    const errors = useMemo(
+        () =>
+            new Map([
+                ['getUserDetailsQuery', getDetailsError],
+                ['signInMutation', signInError]
+            ]),
+        [getDetailsError, signInError]
+    );
+
+    return {
+        errors,
+        handleCreateAccount,
+        handleEnterKeyPress,
+        signinHandleEnterKeyPress,
+        handleForgotPassword,
+        forgotPasswordHandleEnterKeyPress,
+        handleSubmit,
+        isBusy: isGettingDetails || isSigningIn || recaptchaLoading,
+        setFormApi,
+        recaptchaWidgetProps
+    };
+};

package/src/overwrites/peregrine/lib/util/deriveErrorMessage.js

@@ -1,34 +1,34 @@
-/**
- * Maps an error to a string message
- *
- * @param {Error} error the error to map
- * @return {String} error message
- */
-
-const toString = (error, defaultErrorMessage) => {
-    const { graphQLErrors, message } = error;
-
-    if (graphQLErrors && graphQLErrors.length) {
-        return graphQLErrors.map(({ message }) => message).join(', ');
-    } else {
-        if (defaultErrorMessage) {
-            return defaultErrorMessage;
-        }
-    }
-
-    return message;
-};
-
-/**
- * A function to derive an error string from an array of errors.
- */
-export const deriveErrorMessage = (errors, defaultErrorMessage = '') => {
-    const errorCollection = [];
-    for (const error of errors) {
-        if (error) {
-            errorCollection.push(toString(error, defaultErrorMessage));
-        }
-    }
-
-    return errorCollection.join(', ');
-};
+/**
+ * Maps an error to a string message
+ *
+ * @param {Error} error the error to map
+ * @return {String} error message
+ */
+
+const toString = (error, defaultErrorMessage) => {
+    const { graphQLErrors, message } = error;
+
+    if (graphQLErrors && graphQLErrors.length) {
+        return graphQLErrors.map(({ message }) => message).join(', ');
+    } else {
+        if (defaultErrorMessage) {
+            return defaultErrorMessage;
+        }
+    }
+
+    return message;
+};
+
+/**
+ * A function to derive an error string from an array of errors.
+ */
+export const deriveErrorMessage = (errors, defaultErrorMessage = '') => {
+    const errorCollection = [];
+    for (const error of errors) {
+        if (error) {
+            errorCollection.push(toString(error, defaultErrorMessage));
+        }
+    }
+
+    return errorCollection.join(', ');
+};

package/src/overwrites/pwa-buildpack/lib/queries/getAvailableStoresConfigData.graphql

@@ -1,11 +1,11 @@
-query availableStoresConfigData {
-    availableStores {
-        store_code
-        id
-        secure_base_media_url
-        store_name
-        default_display_currency_code
-        website_code
-        is_default_store
-    }
-}
+query availableStoresConfigData {
+    availableStores {
+        store_code
+        id
+        secure_base_media_url
+        store_name
+        default_display_currency_code
+        website_code
+        is_default_store
+    }
+}