Merge pull request #2170 from graphcommerce-org/feature/GCOM-1317

fix(GCOM-1317): fix bug where inactive cached cart could be set as currentCartId
graphcommerce-org · Jan 18, 2024 · a8ca29a · a8ca29a
2 parents b095467 + f3e906f
commit a8ca29a
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 5 deletions.
diff --git a/.changeset/nasty-icons-knock.md b/.changeset/nasty-icons-knock.md
@@ -0,0 +1,6 @@
+---
+"@graphcommerce/magento-cart": patch
+"@graphcommerce/magento-customer": patch
+---
+
+fix(GCOM-1317): fix bug where inactive cached cart could be set as currentCartId
diff --git a/packages/magento-cart/hooks/useMergeCustomerCart.ts b/packages/magento-cart/hooks/useMergeCustomerCart.ts
@@ -15,7 +15,8 @@ export function useMergeCustomerCart() {
   const assignCurrentCartId = useAssignCurrentCartId()
   const [merge] = useMutation(UseMergeCustomerCartDocument, { errorPolicy: 'all' })
 
-  const destinationCartId = useCustomerQuery(CustomerCartDocument)?.data?.customerCart.id
+  const destinationCartId = useCustomerQuery(CustomerCartDocument, { fetchPolicy: 'network-only' })
+    ?.data?.customerCart.id
 
   useEffect(() => {
     // If we don't have a customer cart, we're done

diff --git a/packages/magento-customer/components/SignOutForm/signOut.ts b/packages/magento-customer/components/SignOutForm/signOut.ts
@@ -1,9 +1,9 @@
 import { ApolloClient } from '@graphcommerce/graphql'
 
 export function signOut(client: ApolloClient<object>) {
-  client.cache.evict({ fieldName: 'cart' })
-  client.cache.evict({ fieldName: 'customer' })
-  client.cache.evict({ fieldName: 'customerCart' })
-  client.cache.evict({ fieldName: 'currentCartId' })
+  client.cache.evict({ fieldName: 'currentCartId', broadcast: true })
+  client.cache.evict({ fieldName: 'cart', broadcast: true })
   client.cache.evict({ fieldName: 'customerToken', broadcast: true })
+  client.cache.evict({ fieldName: 'customer', broadcast: true })
+  client.cache.evict({ fieldName: 'customerCart', broadcast: true })
 }