reconcile carts on add-item if needed

Signed-off-by: Loan Laux <loan@outgrow.io>

framework/reactioncommerce/api/cart/handlers/add-item.ts

@@ -4,6 +4,7 @@ import {
   createCartMutation,
 } from '@framework/utils/mutations'
 import getCartCookie from '@framework/api/utils/get-cart-cookie'
+import reconcileCarts from '@framework/api/utils/reconcile-carts'
 import {
   REACTION_ANONYMOUS_CART_TOKEN_COOKIE,
   REACTION_CART_ID_COOKIE,
@@ -11,13 +12,7 @@ import {
 } from '@framework/const'
 
 const addItem: CartHandlers['addItem'] = async ({
-  req: {
+  req: { cookies },
-    cookies: {
-      [REACTION_ANONYMOUS_CART_TOKEN_COOKIE]: anonymousCartToken,
-      [REACTION_CART_ID_COOKIE]: cartId,
-      [REACTION_CUSTOMER_TOKEN_COOKIE]: reactionCustomerToken,
-    },
-  },
   res,
   body: { item },
   config,
@@ -25,6 +20,13 @@ const addItem: CartHandlers['addItem'] = async ({
   console.log('add-item API', item.productId)
   console.log('variantId', item.variantId)
 
+  const {
+    [REACTION_ANONYMOUS_CART_TOKEN_COOKIE]: anonymousCartToken,
+    [REACTION_CUSTOMER_TOKEN_COOKIE]: reactionCustomerToken,
+  } = cookies
+
+  let { [REACTION_CART_ID_COOKIE]: cartId } = cookies
+
   if (!cartId) {
     return res.status(400).json({
       data: null,
@@ -74,6 +76,7 @@ const addItem: CartHandlers['addItem'] = async ({
         999
       ),
     ])
+
     return res.status(200).json(createdCart.data)
   }
 
@@ -90,6 +93,23 @@ const addItem: CartHandlers['addItem'] = async ({
     ] = `Bearer ${reactionCustomerToken}`
   }
 
+  if (anonymousCartToken && reactionCustomerToken) {
+    console.log('reconciliating carts')(
+      ({ _id: cartId } = await reconcileCarts({
+        config,
+        anonymousCartId: cartId,
+        cartToken: anonymousCartToken,
+        reactionCustomerToken,
+      }))
+    )
+
+    // Clear the anonymous cart token cookie and update cart ID cookie
+    res.setHeader('Set-Cookie', [
+      getCartCookie(config.anonymousCartTokenCookie),
+      getCartCookie(config.cartIdCookie, cartId, 999),
+    ])
+  }
+
   const updatedCart = await config.fetch(
     addCartItemsMutation,
     {

framework/reactioncommerce/api/cart/handlers/get-cart.ts

@@ -2,8 +2,8 @@ import type { Cart } from '../../../types'
 import type { CartHandlers } from '../'
 import getAnomymousCartQuery from '@framework/utils/queries/get-anonymous-cart'
 import accountCartByAccountIdQuery from '@framework/utils/queries/account-cart-by-account-id'
-import reconcileCartsMutation from '@framework/utils/mutations/reconcile-carts'
 import getCartCookie from '@framework/api/utils/get-cart-cookie'
+import reconcileCarts from '@framework/api/utils/reconcile-carts'
 import getViewerId from '@framework/customer/get-viewer-id'
 import {
   REACTION_ANONYMOUS_CART_TOKEN_COOKIE,
@@ -25,27 +25,12 @@ const getCart: CartHandlers['getCart'] = async ({ req, res, config }) => {
   let normalizedCart
 
   if (cartId && anonymousCartToken && reactionCustomerToken) {
-    const {
+    const rawReconciledCart = await reconcileCarts({
-      data: {
+      config,
-        reconcileCarts: { cart: rawReconciledCart },
+      anonymousCartId,
-      },
+      cartToken,
-    } = await config.fetch(
+      reactionCustomerToken,
-      reconcileCartsMutation,
+    })
-      {
-        variables: {
-          input: {
-            anonymousCartId: cartId,
-            cartToken: anonymousCartToken,
-            shopId: config.shopId,
-          },
-        },
-      },
-      {
-        headers: {
-          Authorization: `Bearer ${reactionCustomerToken}`,
-        },
-      }
-    )
 
     normalizedCart = normalizeCart(rawReconciledCart)
 

framework/reactioncommerce/api/utils/reconcile-carts.ts

@@ -0,0 +1,34 @@
+import reconcileCartsMutation from '@framework/utils/mutations/reconcile-carts'
+
+async function reconcileCarts({
+  config,
+  anonymousCartId,
+  cartToken,
+  reactionCustomerToken,
+}) {
+  const {
+    data: {
+      reconcileCarts: { cart: rawReconciledCart },
+    },
+  } = await config.fetch(
+    reconcileCartsMutation,
+    {
+      variables: {
+        input: {
+          anonymousCartId: cartId,
+          cartToken: anonymousCartToken,
+          shopId: config.shopId,
+        },
+      },
+    },
+    {
+      headers: {
+        Authorization: `Bearer ${reactionCustomerToken}`,
+      },
+    }
+  )
+
+  return rawReconciledCart
+}
+
+export default reconcileCarts