fix: don't execute unnecessary requests for anonymous cart on initial load

hooks/cart/useCart.js

@@ -1,5 +1,5 @@
 import { useEffect, useMemo, useCallback } from "react";
-import { useQuery, useMutation, useApolloClient } from "@apollo/client";
+import { useLazyQuery, useMutation, useApolloClient } from "@apollo/client";
 import useStores from "hooks/useStores";
 import useShop from "hooks/shop/useShop";
 import useViewer from "hooks/viewer/useViewer";
@@ -37,32 +37,43 @@ export default function useCart() {
   const shouldSkipAccountCartByAccountIdQuery = Boolean(!accountId || cartStore.hasAnonymousCartCredentials || isLoadingViewer || !shop || !shop._id);
   const shouldSkipAnonymousCartByCartIdQuery = Boolean(accountId || isLoadingViewer || !cartStore.anonymousCartId || !cartStore.anonymousCartToken);
 
-  const { loading: isLoading, data: cartData, fetchMore, refetch: refetchCart } = useQuery(accountCartByAccountIdQuery, {
-    skip: shouldSkipAccountCartByAccountIdQuery,
+  const [
+    fetchAccountCart,
+    { loading: isLoading, called: accountCartQueryCalled, data: cartData, fetchMore, refetch: refetchAccountCart }
+  ] = useLazyQuery(accountCartByAccountIdQuery, {
     variables: {
       accountId,
       shopId: shop && shop._id
     },
     pollInterval: shouldSkipAccountCartByAccountIdQuery ? 0 : 10000
   });
 
-  const { data: cartDataAnonymous, refetch: refetchCartAnonymous } = useQuery(anonymousCartByCartIdQuery, {
-    skip: shouldSkipAnonymousCartByCartIdQuery,
+
+  const [
+    fetchAnonymousCart,
+    { data: cartDataAnonymous, called: anonymousCartQueryCalled, refetch: refetchAnonymousCart }
+  ] = useLazyQuery(anonymousCartByCartIdQuery, {
     variables: {
       cartId: cartStore.anonymousCartId,
       cartToken: cartStore.anonymousCartToken
     },
     pollInterval: shouldSkipAnonymousCartByCartIdQuery ? 0 : 10000
   });
 
+  if (!accountCartQueryCalled && !shouldSkipAccountCartByAccountIdQuery) {
+    fetchAccountCart();
+  } else if (!anonymousCartQueryCalled && !shouldSkipAnonymousCartByCartIdQuery) {
+    fetchAnonymousCart();
+  }
+
   useEffect(() => {
-    if (!shouldSkipAccountCartByAccountIdQuery) {
-      refetchCart();
+    if (!shouldSkipAccountCartByAccountIdQuery && accountCartQueryCalled) {
+      refetchAccountCart();
     }
-    if (!shouldSkipAnonymousCartByCartIdQuery) {
-      refetchCartAnonymous();
+    if (!shouldSkipAnonymousCartByCartIdQuery && anonymousCartQueryCalled) {
+      refetchAnonymousCart();
     }
-  }, [viewer, refetchCart]);
+  }, [viewer, refetchAccountCart]);
 
   const cart = useMemo(() => {
     if (!shouldSkipAccountCartByAccountIdQuery && cartData) {
@@ -110,7 +121,13 @@ export default function useCart() {
         const { cart: cartPayload, token } = addOrCreateCartMutationData.createCart;
         cartStore.setAnonymousCartCredentials(cartPayload._id, token);
       }
-      refetchCart();
+
+      const { accountCartId, anonymousCartToken } = cartStore;
+      if (accountCartId) {
+        refetchAccountCart();
+      } else if (anonymousCartToken) {
+        refetchAnonymousCart();
+      }
     }
   });
 
@@ -209,7 +226,9 @@ export default function useCart() {
               });
 
               // Refetch cart
-              refetchCart && refetchCart();
+              if (accountCartQueryCalled) {
+                refetchAccountCart();
+              }
             }
           }
 
@@ -348,7 +367,7 @@ export default function useCart() {
         });
       }
     },
-    refetchCart,
+    refetchAccountCart,
     setEmailOnAnonymousCart: async ({ email }) => {
       await apolloClient.mutate({
         mutation: setEmailOnAnonymousCartMutation,

pages/[lang]/cart/login.js

@@ -85,7 +85,7 @@ const Login = ({ router }) => {
     isLoadingCart,
     setEmailOnAnonymousCart
   } = useCart();
-  const hasIdentity = !!((cart && cart.account !== null) || (cart && cart.email));
+  const hasIdentity = !!((cart && cart.account) || (cart && cart.email));
   const pageTitle = `Login | ${shop && shop.name}`;
 
   useEffect(() => {

pages/api/account/token.js

@@ -2,7 +2,7 @@ import passportMiddleware from "apiUtils/passportMiddleware";
 
 const token = async (req, res) => {
   req.session.redirectTo = req.headers.Referer;
-  if (req.session && req.session.passport) {
+  if (req.session && req.session.passport && req.session.passport.user) {
     try {
       const user = JSON.parse(req.session.passport.user);
       const { accessToken } = user;
@@ -17,7 +17,7 @@ const token = async (req, res) => {
     }
   }
 
-  return res.status(401).send(JSON.stringify({ error: "No authorization data present" }));
+  return res.status(200).send(JSON.stringify({ anonymous: true }));
 };
 
 export default passportMiddleware(token);