@magento/peregrine 14.4.1-alpha.1 → 14.4.1-alpha.4

package/lib/store/actions/user/asyncActions.js

@@ -63,13 +63,17 @@ export const resetPassword = ({ email }) =>
         dispatch(actions.resetPassword.receive());
     };
 
-export const setToken = (token, customer_token_lifetime = 3600) =>
+export const setToken = (token, customerAccessTokenLifetime = 1) =>
     async function thunk(...args) {
         const [dispatch] = args;
 
         // Store token in local storage.
         // TODO: Get correct token expire time from API
-        storage.setItem('signin_token', token, customer_token_lifetime);
+        storage.setItem(
+            'signin_token',
+            token,
+            customerAccessTokenLifetime * 3600
+        );
 
         // Persist in store
         dispatch(actions.setToken(token));

package/lib/talons/CheckoutPage/OrderConfirmationPage/createAccount.gql.js

@@ -1,4 +1,5 @@
 import { gql } from '@apollo/client';
+import { GET_STORE_CONFIG_DATA } from '../../CreateAccount/createAccount.gql';
 
 export const CREATE_ACCOUNT = gql`
     mutation CreateAccountAfterCheckout(
@@ -44,7 +45,6 @@ export const SIGN_IN = gql`
     mutation SignInAfterCheckout($email: String!, $password: String!) {
         generateCustomerToken(email: $email, password: $password) {
             token
-            customer_token_lifetime
         }
     }
 `;
@@ -111,5 +111,6 @@ export default {
     createCartMutation: CREATE_CART,
     getCartDetailsQuery: GET_CART_DETAILS,
     getCustomerQuery: GET_CUSTOMER,
-    signInMutation: SIGN_IN
+    signInMutation: SIGN_IN,
+    getStoreConfigQuery: GET_STORE_CONFIG_DATA
 };

package/lib/talons/CheckoutPage/OrderConfirmationPage/useCreateAccount.js

@@ -1,5 +1,5 @@
 import { useCallback, useMemo, useState } from 'react';
-import { useMutation } from '@apollo/client';
+import { useMutation, useQuery } from '@apollo/client';
 
 import mergeOperations from '../../../util/shallowMerge';
 import { useUserContext } from '../../../context/user';
@@ -39,7 +39,8 @@ export const useCreateAccount = props => {
         createCartMutation,
         getCartDetailsQuery,
         getCustomerQuery,
-        signInMutation
+        signInMutation,
+        getStoreConfigQuery
     } = operations;
     const [isSubmitting, setIsSubmitting] = useState(false);
     const [, { createCart, getCartDetails, removeCart }] = useCartContext();
@@ -65,6 +66,23 @@ export const useCreateAccount = props => {
         fetchPolicy: 'no-cache'
     });
 
+    const { data: storeConfigData } = useQuery(getStoreConfigQuery, {
+        fetchPolicy: 'cache-and-network',
+        nextFetchPolicy: 'cache-first'
+    });
+
+    const {
+        minimumPasswordLength,
+        customerAccessTokenLifetime
+    } = useMemo(() => {
+        const storeConfig = storeConfigData?.storeConfig || {};
+
+        return {
+            minimumPasswordLength: storeConfig.minimum_password_length,
+            customerAccessTokenLifetime:
+                storeConfig.customer_access_token_lifetime
+        };
+    }, [storeConfigData]);
     const fetchUserDetails = useAwaitQuery(getCustomerQuery);
     const fetchCartDetails = useAwaitQuery(getCartDetailsQuery);
 
@@ -117,12 +135,8 @@ export const useCreateAccount = props => {
                     ...recaptchaDataForSignIn
                 });
                 const token = signInResponse.data.generateCustomerToken.token;
-                const customerTokenLifetime =
-                    signInResponse.data.generateCustomerToken
-                        .customer_token_lifetime;
-
-                await (customerTokenLifetime
-                    ? setToken(token, customerTokenLifetime)
+                await (customerAccessTokenLifetime
+                    ? setToken(token, customerAccessTokenLifetime)
                     : setToken(token));
 
                 // Clear guest cart from redux.
@@ -152,6 +166,7 @@ export const useCreateAccount = props => {
             }
         },
         [
+            customerAccessTokenLifetime,
             createAccount,
             createCart,
             fetchCartDetails,
@@ -200,6 +215,7 @@ export const useCreateAccount = props => {
         handleEnterKeyPress,
         isDisabled: isSubmitting || isGettingDetails || recaptchaLoading,
         initialValues: sanitizedInitialValues,
-        recaptchaWidgetProps
+        recaptchaWidgetProps,
+        minimumPasswordLength
     };
 };

package/lib/talons/CreateAccount/createAccount.gql.js

@@ -45,7 +45,6 @@ export const SIGN_IN = gql`
     mutation SignInAfterCreate($email: String!, $password: String!) {
         generateCustomerToken(email: $email, password: $password) {
             token
-            customer_token_lifetime
         }
     }
 `;
@@ -126,6 +125,16 @@ export const MERGE_CARTS = gql`
     }
     ${CheckoutPageFragment}
 `;
+export const GET_STORE_CONFIG_DATA = gql`
+    query GetStoreConfigData {
+        # eslint-disable-next-line @graphql-eslint/require-id-when-available
+        storeConfig {
+            store_code
+            minimum_password_length
+            customer_access_token_lifetime
+        }
+    }
+`;
 
 export default {
     createAccountMutation: CREATE_ACCOUNT,
@@ -133,5 +142,6 @@ export default {
     getCartDetailsQuery: GET_CART_DETAILS,
     getCustomerQuery: GET_CUSTOMER,
     mergeCartsMutation: MERGE_CARTS,
-    signInMutation: SIGN_IN
+    signInMutation: SIGN_IN,
+    getStoreConfigQuery: GET_STORE_CONFIG_DATA
 };

package/lib/talons/CreateAccount/useCreateAccount.js

@@ -1,5 +1,5 @@
 import { useCallback, useMemo, useState } from 'react';
-import { useApolloClient, useMutation } from '@apollo/client';
+import { useApolloClient, useMutation, useQuery } from '@apollo/client';
 
 import mergeOperations from '../../util/shallowMerge';
 import { useUserContext } from '../../context/user';
@@ -37,7 +37,8 @@ export const useCreateAccount = props => {
         getCartDetailsQuery,
         getCustomerQuery,
         mergeCartsMutation,
-        signInMutation
+        signInMutation,
+        getStoreConfigQuery
     } = operations;
     const apolloClient = useApolloClient();
     const [isSubmitting, setIsSubmitting] = useState(false);
@@ -69,6 +70,24 @@ export const useCreateAccount = props => {
         fetchPolicy: 'no-cache'
     });
 
+    const { data: storeConfigData } = useQuery(getStoreConfigQuery, {
+        fetchPolicy: 'cache-and-network',
+        nextFetchPolicy: 'cache-first'
+    });
+
+    const {
+        minimumPasswordLength,
+        customerAccessTokenLifetime
+    } = useMemo(() => {
+        const storeConfig = storeConfigData?.storeConfig || {};
+
+        return {
+            minimumPasswordLength: storeConfig.minimum_password_length,
+            customerAccessTokenLifetime:
+                storeConfig.customer_access_token_lifetime
+        };
+    }, [storeConfigData]);
+
     const fetchUserDetails = useAwaitQuery(getCustomerQuery);
     const fetchCartDetails = useAwaitQuery(getCartDetailsQuery);
 
@@ -136,11 +155,8 @@ export const useCreateAccount = props => {
                     ...recaptchaDataForSignIn
                 });
                 const token = signInResponse.data.generateCustomerToken.token;
-                const customerTokenLifetime =
-                    signInResponse.data.generateCustomerToken
-                        .customer_token_lifetime;
-                await (customerTokenLifetime
-                    ? setToken(token, customerTokenLifetime)
+                await (customerAccessTokenLifetime
+                    ? setToken(token, customerAccessTokenLifetime)
                     : setToken(token));
                 // Clear all cart/customer data from cache and redux.
                 await apolloClient.clearCacheData(apolloClient, 'cart');
@@ -181,6 +197,7 @@ export const useCreateAccount = props => {
         },
 
         [
+            customerAccessTokenLifetime,
             cartId,
             generateReCaptchaData,
             createAccount,
@@ -225,7 +242,8 @@ export const useCreateAccount = props => {
         handleCancelKeyPress,
         initialValues: sanitizedInitialValues,
         isDisabled: isSubmitting || isGettingDetails || recaptchaLoading,
-        recaptchaWidgetProps
+        recaptchaWidgetProps,
+        minimumPasswordLength
     };
 };
 
@@ -239,6 +257,7 @@ export const useCreateAccount = props => {
  *
  * @property {GraphQLAST} customerQuery query to fetch customer details
  * @property {GraphQLAST} getCartDetailsQuery query to get cart details
+ * @property {GraphQLAST} getStoreConfigQuery query to get store config
  */
 
 /**

package/lib/talons/SignIn/signIn.gql.js

@@ -1,5 +1,6 @@
 import { gql } from '@apollo/client';
 import { CheckoutPageFragment } from '../CheckoutPage/checkoutPageFragments.gql';
+import { GET_STORE_CONFIG_DATA } from '../CreateAccount/createAccount.gql';
 
 export const GET_CUSTOMER = gql`
     query GetCustomerAfterSignIn {
@@ -17,7 +18,6 @@ export const SIGN_IN = gql`
     mutation SignIn($email: String!, $password: String!) {
         generateCustomerToken(email: $email, password: $password) {
             token
-            customer_token_lifetime
         }
     }
 `;
@@ -52,5 +52,6 @@ export default {
     createCartMutation: CREATE_CART,
     getCustomerQuery: GET_CUSTOMER,
     mergeCartsMutation: MERGE_CARTS,
-    signInMutation: SIGN_IN
+    signInMutation: SIGN_IN,
+    getStoreConfigQuery: GET_STORE_CONFIG_DATA
 };

package/lib/talons/SignIn/useSignIn.js

@@ -1,5 +1,5 @@
 import { useCallback, useRef, useState, useMemo } from 'react';
-import { useApolloClient, useMutation } from '@apollo/client';
+import { useApolloClient, useMutation, useQuery } from '@apollo/client';
 
 import { useGoogleReCaptcha } from '../../hooks/useGoogleReCaptcha/useGoogleReCaptcha';
 import mergeOperations from '../../util/shallowMerge';
@@ -25,7 +25,8 @@ export const useSignIn = props => {
         createCartMutation,
         getCustomerQuery,
         mergeCartsMutation,
-        signInMutation
+        signInMutation,
+        getStoreConfigQuery
     } = operations;
 
     const apolloClient = useApolloClient();
@@ -61,6 +62,19 @@ export const useSignIn = props => {
         recaptchaWidgetProps
     } = googleReCaptcha;
 
+    const { data: storeConfigData } = useQuery(getStoreConfigQuery, {
+        fetchPolicy: 'cache-and-network',
+        nextFetchPolicy: 'cache-first'
+    });
+
+    const { customerAccessTokenLifetime } = useMemo(() => {
+        const storeConfig = storeConfigData?.storeConfig || {};
+
+        return {
+            customerAccessTokenLifetime:
+                storeConfig.customer_access_token_lifetime
+        };
+    }, [storeConfigData]);
     const [fetchCartId] = useMutation(createCartMutation);
     const [mergeCarts] = useMutation(mergeCartsMutation);
     const fetchUserDetails = useAwaitQuery(getCustomerQuery);
@@ -91,12 +105,8 @@ export const useSignIn = props => {
                 });
 
                 const token = signInResponse.data.generateCustomerToken.token;
-                const customerTokenLifetime =
-                    signInResponse.data.generateCustomerToken
-                        .customer_token_lifetime;
-
-                await (customerTokenLifetime
-                    ? setToken(token, customerTokenLifetime)
+                await (customerAccessTokenLifetime
+                    ? setToken(token, customerAccessTokenLifetime)
                     : setToken(token));
 
                 // Clear all cart/customer data from cache and redux.
@@ -143,6 +153,7 @@ export const useSignIn = props => {
             }
         },
         [
+            customerAccessTokenLifetime,
             cartId,
             generateReCaptchaData,
             signIn,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@magento/peregrine",
-  "version": "14.4.1-alpha.1",
+  "version": "14.4.1-alpha.4",
   "publishConfig": {
     "access": "public"
   },