Move to Edge runtime

packages/bigcommerce/package.json

@@ -47,14 +47,13 @@
     }
   },
   "dependencies": {
+    "@cfworker/uuid": "^1.12.4",
+    "@tsndr/cloudflare-worker-jwt": "^2.1.0",
     "@vercel/commerce": "workspace:*",
-    "@vercel/fetch": "^6.2.0",
     "cookie": "^0.4.1",
     "immutability-helper": "^3.1.1",
-    "jsonwebtoken": "^8.5.1",
-    "lodash.debounce": "^4.0.8",
-    "uuidv4": "^6.2.12",
-    "node-fetch": "^2.6.7"
+    "js-cookie": "^3.0.1",
+    "lodash.debounce": "^4.0.8"
   },
   "peerDependencies": {
     "next": "^12",
@@ -66,11 +65,10 @@
     "@taskr/esnext": "^1.1.0",
     "@taskr/watch": "^1.1.0",
     "@types/cookie": "^0.4.1",
-    "@types/jsonwebtoken": "^8.5.7",
     "@types/lodash.debounce": "^4.0.6",
     "@types/node": "^17.0.8",
-    "@types/react": "^18.0.14",
     "@types/node-fetch": "^2.6.2",
+    "@types/react": "^18.0.14",
     "lint-staged": "^12.1.7",
     "next": "^12.0.8",
     "prettier": "^2.5.1",

packages/bigcommerce/src/api/endpoints/cart/add-item.ts

@@ -1,16 +1,14 @@
-// @ts-nocheck
+import type { CartEndpoint } from '.'
+import type { BigcommerceCart } from '../../../types'
+
 import { normalizeCart } from '../../../lib/normalize'
 import { parseCartItem } from '../../utils/parse-item'
 import getCartCookie from '../../utils/get-cart-cookie'
-import type { CartEndpoint } from '.'
 
 const addItem: CartEndpoint['handlers']['addItem'] = async ({
-  res,
   body: { cartId, item },
   config,
 }) => {
-  if (!item.quantity) item.quantity = 1
-
   const options = {
     method: 'POST',
     body: JSON.stringify({
@@ -20,22 +18,27 @@ const addItem: CartEndpoint['handlers']['addItem'] = async ({
         : {}),
     }),
   }
+
   const { data } = cartId
-    ? await config.storeApiFetch(
+    ? await config.storeApiFetch<{ data: BigcommerceCart }>(
         `/v3/carts/${cartId}/items?include=line_items.physical_items.options,line_items.digital_items.options`,
         options
       )
-    : await config.storeApiFetch(
+    : await config.storeApiFetch<{ data: BigcommerceCart }>(
         '/v3/carts?include=line_items.physical_items.options,line_items.digital_items.options',
         options
       )
 
-  // Create or update the cart cookie
-  res.setHeader(
-    'Set-Cookie',
-    getCartCookie(config.cartCookie, data.id, config.cartCookieMaxAge)
-  )
-  res.status(200).json({ data: data ? normalizeCart(data) : null })
+  return {
+    data: normalizeCart(data),
+    headers: {
+      'Set-Cookie': getCartCookie(
+        config.cartCookie,
+        data.id,
+        config.cartCookieMaxAge
+      ),
+    },
+  }
 }
 
 export default addItem

packages/bigcommerce/src/api/endpoints/cart/get-cart.ts

@@ -1,36 +1,41 @@
-// @ts-nocheck
+import type { CartEndpoint } from '.'
+import type { BigcommerceCart } from '../../../types'
+
+import getCartCookie from '../../utils/get-cart-cookie'
+
 import { normalizeCart } from '../../../lib/normalize'
 import { BigcommerceApiError } from '../../utils/errors'
-import getCartCookie from '../../utils/get-cart-cookie'
-import type { BigcommerceCart } from '../../../types'
-import type { CartEndpoint } from '.'
 
 // Return current cart info
 const getCart: CartEndpoint['handlers']['getCart'] = async ({
-  res,
   body: { cartId },
   config,
 }) => {
-  let result: { data?: BigcommerceCart } = {}
-
   if (cartId) {
     try {
-      result = await config.storeApiFetch(
+      const result = await config.storeApiFetch<{
+        data?: BigcommerceCart
+      } | null>(
         `/v3/carts/${cartId}?include=line_items.physical_items.options,line_items.digital_items.options`
       )
+
+      return {
+        data: result?.data ? normalizeCart(result.data) : null,
+      }
     } catch (error) {
       if (error instanceof BigcommerceApiError && error.status === 404) {
-        // Remove the cookie if it exists but the cart wasn't found
-        res.setHeader('Set-Cookie', getCartCookie(config.cartCookie))
+        return {
+          headers: { 'Set-Cookie': getCartCookie(config.cartCookie) },
+        }
       } else {
         throw error
       }
     }
   }
 
-  res.status(200).json({
-    data: result.data ? normalizeCart(result.data) : null,
-  })
+  return {
+    data: null,
+  }
 }
 
 export default getCart

packages/bigcommerce/src/api/endpoints/cart/index.ts

@@ -1,4 +1,4 @@
-import { GetAPISchema, createEndpoint } from '@vercel/commerce/api'
+import { type GetAPISchema, createEndpoint } from '@vercel/commerce/api'
 import cartEndpoint from '@vercel/commerce/api/endpoints/cart'
 import type { CartSchema } from '@vercel/commerce/types/cart'
 import type { BigcommerceAPI } from '../..'
@@ -19,7 +19,6 @@ export const handlers: CartEndpoint['handlers'] = {
 }
 
 const cartApi = createEndpoint<CartAPI>({
-  /* @ts-ignore */
   handler: cartEndpoint,
   handlers,
 })

packages/bigcommerce/src/api/endpoints/cart/remove-item.ts

@@ -1,9 +1,9 @@
-import { normalizeCart } from '../../../lib/normalize'
-import getCartCookie from '../../utils/get-cart-cookie'
 import type { CartEndpoint } from '.'
 
+import { normalizeCart } from '../../../lib/normalize'
+import getCartCookie from '../../utils/get-cart-cookie'
+
 const removeItem: CartEndpoint['handlers']['removeItem'] = async ({
-  res,
   body: { cartId, itemId },
   config,
 }) => {
@@ -11,18 +11,16 @@ const removeItem: CartEndpoint['handlers']['removeItem'] = async ({
     `/v3/carts/${cartId}/items/${itemId}?include=line_items.physical_items.options`,
     { method: 'DELETE' }
   )
-  const data = result?.data ?? null
-
-  res.setHeader(
-    'Set-Cookie',
-    data
-      ? // Update the cart cookie
-        getCartCookie(config.cartCookie, cartId, config.cartCookieMaxAge)
-      : // Remove the cart cookie if the cart was removed (empty items)
-        getCartCookie(config.cartCookie)
-  )
-
-  res.status(200).json({ data: data ? normalizeCart(data) : null })
+  return {
+    data: result?.data ? normalizeCart(result.data) : null,
+    headers: {
+      'Set-Cookie': result?.data
+        ? // Update the cart cookie
+          getCartCookie(config.cartCookie, cartId, config.cartCookieMaxAge)
+        : // Remove the cart cookie if the cart was removed (empty items)
+          getCartCookie(config.cartCookie),
+    },
+  }
 }
 
 export default removeItem

packages/bigcommerce/src/api/endpoints/cart/update-item.ts

@@ -1,14 +1,15 @@
+import type { CartEndpoint } from '.'
+import type { BigcommerceCart } from '../../../types'
+
 import { normalizeCart } from '../../../lib/normalize'
 import { parseCartItem } from '../../utils/parse-item'
 import getCartCookie from '../../utils/get-cart-cookie'
-import type { CartEndpoint } from '.'
 
 const updateItem: CartEndpoint['handlers']['updateItem'] = async ({
-  res,
   body: { cartId, itemId, item },
   config,
 }) => {
-  const { data } = await config.storeApiFetch<{ data?: any }>(
+  const { data } = await config.storeApiFetch<{ data: BigcommerceCart }>(
     `/v3/carts/${cartId}/items/${itemId}?include=line_items.physical_items.options`,
     {
       method: 'PUT',
@@ -18,12 +19,16 @@ const updateItem: CartEndpoint['handlers']['updateItem'] = async ({
     }
   )
 
-  // Update the cart cookie
-  res.setHeader(
-    'Set-Cookie',
-    getCartCookie(config.cartCookie, cartId, config.cartCookieMaxAge)
-  )
-  res.status(200).json({ data: normalizeCart(data) })
+  return {
+    data: normalizeCart(data),
+    headers: {
+      'Set-Cookie': getCartCookie(
+        config.cartCookie,
+        cartId,
+        config.cartCookieMaxAge
+      ),
+    },
+  }
 }
 
 export default updateItem

packages/bigcommerce/src/api/endpoints/catalog/products/get-products.ts

@@ -11,7 +11,6 @@ const LIMIT = 12
 
 // Return current cart info
 const getProducts: ProductsEndpoint['handlers']['getProducts'] = async ({
-  res,
   body: { search, categoryId, brandId, sort },
   config,
   commerce,
@@ -73,7 +72,7 @@ const getProducts: ProductsEndpoint['handlers']['getProducts'] = async ({
     if (product) products.push(product)
   })
 
-  res.status(200).json({ data: { products, found } })
+  return { data: { products, found } }
 }
 
 export default getProducts

packages/bigcommerce/src/api/endpoints/checkout/get-checkout.ts

@@ -1,22 +1,21 @@
 import type { CheckoutEndpoint } from '.'
 import getCustomerId from '../../utils/get-customer-id'
-import jwt from 'jsonwebtoken'
-import { uuid } from 'uuidv4'
+import jwt from '@tsndr/cloudflare-worker-jwt'
+import { uuid } from '@cfworker/uuid'
+import { NextResponse } from 'next/server'
 
 const fullCheckout = true
 
 const getCheckout: CheckoutEndpoint['handlers']['getCheckout'] = async ({
   req,
-  res,
   config,
 }) => {
   const { cookies } = req
-  const cartId = cookies[config.cartCookie]
-  const customerToken = cookies[config.customerCookie]
+  const cartId = cookies.get(config.cartCookie)
+  const customerToken = cookies.get(config.customerCookie)
 
   if (!cartId) {
-    res.redirect('/cart')
-    return
+    return { redirectTo: '/cart' }
   }
 
   const { data } = await config.storeApiFetch<any>(
@@ -31,8 +30,7 @@ const getCheckout: CheckoutEndpoint['handlers']['getCheckout'] = async ({
   //if there is a customer create a jwt token
   if (!customerId) {
     if (fullCheckout) {
-      res.redirect(data.checkout_url)
-      return
+      return { redirectTo: data.checkout_url }
     }
   } else {
     const dateCreated = Math.round(new Date().getTime() / 1000)
@@ -50,10 +48,9 @@ const getCheckout: CheckoutEndpoint['handlers']['getCheckout'] = async ({
       algorithm: 'HS256',
     })
     let checkouturl = `${config.storeUrl}/login/token/${token}`
-    console.log('checkouturl', checkouturl)
+
     if (fullCheckout) {
-      res.redirect(checkouturl)
-      return
+      return { redirectTo: checkouturl }
     }
   }
 
@@ -83,10 +80,11 @@ const getCheckout: CheckoutEndpoint['handlers']['getCheckout'] = async ({
        </html>
      `
 
-  res.status(200)
-  res.setHeader('Content-Type', 'text/html')
-  res.write(html)
-  res.end()
+  return new NextResponse(html, {
+    headers: {
+      'Content-Type': 'text/html',
+    },
+  })
 }
 
 export default getCheckout

packages/bigcommerce/src/api/endpoints/customer/get-logged-in-customer.ts

@@ -1,5 +1,6 @@
 import type { GetLoggedInCustomerQuery } from '../../../../schema'
 import type { CustomerEndpoint } from '.'
+import { CommerceAPIError } from '@vercel/commerce/api/utils/errors'
 
 export const getLoggedInCustomerQuery = /* GraphQL */ `
   query getLoggedInCustomer {
@@ -25,29 +26,26 @@ export const getLoggedInCustomerQuery = /* GraphQL */ `
 export type Customer = NonNullable<GetLoggedInCustomerQuery['customer']>
 
 const getLoggedInCustomer: CustomerEndpoint['handlers']['getLoggedInCustomer'] =
-  async ({ req, res, config }) => {
-    const token = req.cookies[config.customerCookie]
+  async ({ req, config }) => {
+    const token = req.cookies.get(config.customerCookie)
 
     if (token) {
       const { data } = await config.fetch<GetLoggedInCustomerQuery>(
         getLoggedInCustomerQuery,
         undefined,
         {
-          headers: {
-            cookie: `${config.customerCookie}=${token}`,
-          },
+          'Set-Cookie': `${config.customerCookie}=${token}`,
         }
       )
       const { customer } = data
 
       if (!customer) {
-        return res.status(400).json({
-          data: null,
-          errors: [{ message: 'Customer not found', code: 'not_found' }],
+        throw new CommerceAPIError('Customer not found', {
+          status: 404,
         })
       }
 
-      return res.status(200).json({
+      return {
         data: {
           customer: {
             id: String(customer.entityId),
@@ -59,10 +57,12 @@ const getLoggedInCustomer: CustomerEndpoint['handlers']['getLoggedInCustomer'] =
             notes: customer.notes,
           },
         },
-      })
+      }
     }
 
-    res.status(200).json({ data: null })
+    return {
+      data: null,
+    }
   }
 
 export default getLoggedInCustomer

packages/bigcommerce/src/api/endpoints/login/login.ts

@@ -1,49 +1,36 @@
-import { FetcherError } from '@vercel/commerce/utils/errors'
 import type { LoginEndpoint } from '.'
 
+import { NextResponse } from 'next/server'
+import { FetcherError } from '@vercel/commerce/utils/errors'
+import { CommerceAPIError } from '@vercel/commerce/api/utils/errors'
+
 const invalidCredentials = /invalid credentials/i
 
 const login: LoginEndpoint['handlers']['login'] = async ({
-  res,
   body: { email, password },
   config,
   commerce,
 }) => {
-  // TODO: Add proper validations with something like Ajv
-  if (!(email && password)) {
-    return res.status(400).json({
-      data: null,
-      errors: [{ message: 'Invalid request' }],
-    })
-  }
-  // TODO: validate the password and email
-  // Passwords must be at least 7 characters and contain both alphabetic
-  // and numeric characters.
-
   try {
+    const res = new NextResponse(null)
     await commerce.login({ variables: { email, password }, config, res })
+    return {
+      status: res.status,
+      headers: res.headers,
+    }
   } catch (error) {
     // Check if the email and password didn't match an existing account
-    if (
-      error instanceof FetcherError &&
-      invalidCredentials.test(error.message)
-    ) {
-      return res.status(401).json({
-        data: null,
-        errors: [
-          {
-            message:
-              'Cannot find an account that matches the provided credentials',
-            code: 'invalid_credentials',
-          },
-        ],
-      })
+    if (error instanceof FetcherError) {
+      throw new CommerceAPIError(
+        invalidCredentials.test(error.message)
+          ? 'Cannot find an account that matches the provided credentials'
+          : error.message,
+        { status: error.status || 401 }
+      )
+    } else {
+      throw error
     }
-
-    throw error
   }
-
-  res.status(200).json({ data: null })
 }
 
 export default login

packages/bigcommerce/src/api/endpoints/logout/logout.ts

@@ -2,22 +2,24 @@ import { serialize } from 'cookie'
 import type { LogoutEndpoint } from '.'
 
 const logout: LogoutEndpoint['handlers']['logout'] = async ({
-  res,
   body: { redirectTo },
   config,
 }) => {
-  // Remove the cookie
-  res.setHeader(
-    'Set-Cookie',
-    serialize(config.customerCookie, '', { maxAge: -1, path: '/' })
-  )
-
-  // Only allow redirects to a relative URL
-  if (redirectTo?.startsWith('/')) {
-    res.redirect(redirectTo)
-  } else {
-    res.status(200).json({ data: null })
+  const headers = {
+    'Set-Cookie': serialize(config.customerCookie, '', {
+      maxAge: -1,
+      path: '/',
+    }),
   }
+
+  return redirectTo
+    ? {
+        redirectTo,
+        headers,
+      }
+    : {
+        headers,
+      }
 }
 
 export default logout

packages/bigcommerce/src/api/endpoints/signup/signup.ts

@@ -1,23 +1,15 @@
-import { BigcommerceApiError } from '../../utils/errors'
 import type { SignupEndpoint } from '.'
 
+import { NextResponse } from 'next/server'
+import { CommerceAPIError } from '@vercel/commerce/api/utils/errors'
+
+import { BigcommerceApiError } from '../../utils/errors'
+
 const signup: SignupEndpoint['handlers']['signup'] = async ({
-  res,
   body: { firstName, lastName, email, password },
   config,
   commerce,
 }) => {
-  // TODO: Add proper validations with something like Ajv
-  if (!(firstName && lastName && email && password)) {
-    return res.status(400).json({
-      data: null,
-      errors: [{ message: 'Invalid request' }],
-    })
-  }
-  // TODO: validate the password and email
-  // Passwords must be at least 7 characters and contain both alphabetic
-  // and numeric characters.
-
   try {
     await config.storeApiFetch('/v3/customers', {
       method: 'POST',
@@ -35,28 +27,26 @@ const signup: SignupEndpoint['handlers']['signup'] = async ({
   } catch (error) {
     if (error instanceof BigcommerceApiError && error.status === 422) {
       const hasEmailError = '0.email' in error.data?.errors
-
       // If there's an error with the email, it most likely means it's duplicated
       if (hasEmailError) {
-        return res.status(400).json({
-          data: null,
-          errors: [
-            {
-              message: 'The email is already in use',
-              code: 'duplicated_email',
-            },
-          ],
+        throw new CommerceAPIError('Email already in use', {
+          status: 400,
+          code: 'duplicated_email',
         })
       }
+    } else {
+      throw error
     }
-
-    throw error
   }
 
+  const res = new NextResponse()
+
   // Login the customer right after creating it
   await commerce.login({ variables: { email, password }, res, config })
 
-  res.status(200).json({ data: null })
+  return {
+    headers: res.headers,
+  }
 }
 
 export default signup

packages/bigcommerce/src/api/endpoints/wishlist/add-item.ts

@@ -1,67 +1,53 @@
-import getCustomerWishlist from '../../operations/get-customer-wishlist'
 import { parseWishlistItem } from '../../utils/parse-item'
 import getCustomerId from '../../utils/get-customer-id'
 import type { WishlistEndpoint } from '.'
 
 const addItem: WishlistEndpoint['handlers']['addItem'] = async ({
-  res,
   body: { customerToken, item },
   config,
   commerce,
 }) => {
-  if (!item) {
-    return res.status(400).json({
-      data: null,
-      errors: [{ message: 'Missing item' }],
-    })
+  const customerId =
+    customerToken && (await getCustomerId({ customerToken, config }))
+
+  if (!customerId) {
+    throw new Error('Invalid request. No CustomerId')
   }
 
-  try {
-    const customerId =
-      customerToken && (await getCustomerId({ customerToken, config }))
+  let { wishlist } = await commerce.getCustomerWishlist({
+    variables: { customerId },
+    config,
+  })
 
-    if (!customerId) {
-      throw new Error('Invalid request. No CustomerId')
-    }
-
-    let { wishlist } = await commerce.getCustomerWishlist({
-      variables: { customerId },
-      config,
+  if (!wishlist) {
+    // If user has no wishlist, then let's create one with new item
+    const { data } = await config.storeApiFetch<any>('/v3/wishlists', {
+      method: 'POST',
+      body: JSON.stringify({
+        name: 'Next.js Commerce Wishlist',
+        is_public: false,
+        customer_id: Number(customerId),
+        items: [parseWishlistItem(item)],
+      }),
     })
-
-    if (!wishlist) {
-      // If user has no wishlist, then let's create one with new item
-      const { data } = await config.storeApiFetch('/v3/wishlists', {
-        method: 'POST',
-        body: JSON.stringify({
-          name: 'Next.js Commerce Wishlist',
-          is_public: false,
-          customer_id: Number(customerId),
-          items: [parseWishlistItem(item)],
-        }),
-      })
-      return res.status(200).json(data)
+    return {
+      data,
     }
-
-    // Existing Wishlist, let's add Item to Wishlist
-    const { data } = await config.storeApiFetch(
-      `/v3/wishlists/${wishlist.id}/items`,
-      {
-        method: 'POST',
-        body: JSON.stringify({
-          items: [parseWishlistItem(item)],
-        }),
-      }
-    )
-
-    // Returns Wishlist
-    return res.status(200).json(data)
-  } catch (err: any) {
-    res.status(500).json({
-      data: null,
-      errors: [{ message: err.message }],
-    })
   }
+
+  // Existing Wishlist, let's add Item to Wishlist
+  const { data } = await config.storeApiFetch<any>(
+    `/v3/wishlists/${wishlist.id}/items`,
+    {
+      method: 'POST',
+      body: JSON.stringify({
+        items: [parseWishlistItem(item)],
+      }),
+    }
+  )
+
+  // Returns Wishlist
+  return { data }
 }
 
 export default addItem

packages/bigcommerce/src/api/endpoints/wishlist/get-wishlist.ts

@@ -1,10 +1,10 @@
+import { CommerceAPIError } from '@vercel/commerce/api/utils/errors'
 import type { Wishlist } from '@vercel/commerce/types/wishlist'
 import type { WishlistEndpoint } from '.'
 import getCustomerId from '../../utils/get-customer-id'
 
 // Return wishlist info
 const getWishlist: WishlistEndpoint['handlers']['getWishlist'] = async ({
-  res,
   body: { customerToken, includeProducts },
   config,
   commerce,
@@ -16,11 +16,7 @@ const getWishlist: WishlistEndpoint['handlers']['getWishlist'] = async ({
       customerToken && (await getCustomerId({ customerToken, config }))
 
     if (!customerId) {
-      // If the customerToken is invalid, then this request is too
-      return res.status(404).json({
-        data: null,
-        errors: [{ message: 'Wishlist not found' }],
-      })
+      throw new CommerceAPIError('Wishlist not found', { status: 404 })
     }
 
     const { wishlist } = await commerce.getCustomerWishlist({
@@ -32,7 +28,7 @@ const getWishlist: WishlistEndpoint['handlers']['getWishlist'] = async ({
     result = { data: wishlist }
   }
 
-  res.status(200).json({ data: result.data ?? null })
+  return { data: result.data ?? null }
 }
 
 export default getWishlist

packages/bigcommerce/src/api/endpoints/wishlist/remove-item.ts

@@ -1,10 +1,10 @@
 import type { Wishlist } from '@vercel/commerce/types/wishlist'
 import getCustomerId from '../../utils/get-customer-id'
 import type { WishlistEndpoint } from '.'
+import { CommerceAPIError } from '@vercel/commerce/api/utils/errors'
 
 // Return wishlist info
 const removeItem: WishlistEndpoint['handlers']['removeItem'] = async ({
-  res,
   body: { customerToken, itemId },
   config,
   commerce,
@@ -20,10 +20,7 @@ const removeItem: WishlistEndpoint['handlers']['removeItem'] = async ({
     {}
 
   if (!wishlist || !itemId) {
-    return res.status(400).json({
-      data: null,
-      errors: [{ message: 'Invalid request' }],
-    })
+    throw new CommerceAPIError('Wishlist not found', { status: 400 })
   }
 
   const result = await config.storeApiFetch<{ data: Wishlist } | null>(
@@ -32,7 +29,7 @@ const removeItem: WishlistEndpoint['handlers']['removeItem'] = async ({
   )
   const data = result?.data ?? null
 
-  res.status(200).json({ data })
+  return { data }
 }
 
 export default removeItem

packages/bigcommerce/src/api/index.ts

@@ -1,4 +1,3 @@
-import type { RequestInit } from '@vercel/fetch'
 import {
   CommerceAPI,
   CommerceAPIConfig,
@@ -35,7 +34,14 @@ export interface BigcommerceConfig extends CommerceAPIConfig {
   storeUrl?: string
   storeApiClientSecret?: string
   storeHash?: string
-  storeApiFetch<T>(endpoint: string, options?: RequestInit): Promise<T>
+  storeApiFetch<T>(
+    endpoint: string,
+    options?: {
+      method?: string
+      body?: any
+      headers?: HeadersInit
+    }
+  ): Promise<T>
 }
 
 const API_URL = process.env.BIGCOMMERCE_STOREFRONT_API_URL // GraphAPI

packages/bigcommerce/src/api/operations/login.ts

@@ -1,4 +1,3 @@
-import type { ServerResponse } from 'http'
 import type {
   OperationContext,
   OperationOptions,
@@ -8,6 +7,7 @@ import type { LoginMutation } from '../../../schema'
 import type { RecursivePartial } from '../utils/types'
 import concatHeader from '../utils/concat-cookie'
 import type { BigcommerceConfig, Provider } from '..'
+import type { NextResponse } from 'next/server'
 
 export const loginMutation = /* GraphQL */ `
   mutation login($email: String!, $password: String!) {
@@ -23,14 +23,14 @@ export default function loginOperation({
   async function login<T extends LoginOperation>(opts: {
     variables: T['variables']
     config?: BigcommerceConfig
-    res: ServerResponse
+    res: NextResponse
   }): Promise<T['data']>
 
   async function login<T extends LoginOperation>(
     opts: {
       variables: T['variables']
       config?: BigcommerceConfig
-      res: ServerResponse
+      res: NextResponse
     } & OperationOptions
   ): Promise<T['data']>
 
@@ -42,7 +42,7 @@ export default function loginOperation({
   }: {
     query?: string
     variables: T['variables']
-    res: ServerResponse
+    res: NextResponse
     config?: BigcommerceConfig
   }): Promise<T['data']> {
     config = commerce.getConfig(config)
@@ -64,10 +64,15 @@ export default function loginOperation({
         cookie = cookie.replace(/; SameSite=none/gi, '; SameSite=lax')
       }
 
-      response.setHeader(
-        'Set-Cookie',
-        concatHeader(response.getHeader('Set-Cookie'), cookie)!
-      )
+      const prevCookie = response.headers.get('Set-Cookie')
+      const newCookie = concatHeader(prevCookie, cookie)
+
+      if (newCookie) {
+        res.headers.set(
+          'Set-Cookie',
+          String(Array.isArray(newCookie) ? newCookie.join(',') : newCookie)
+        )
+      }
     }
 
     return {

packages/bigcommerce/src/api/utils/concat-cookie.ts

@@ -1,4 +1,4 @@
-type Header = string | number | string[] | undefined
+type Header = string | number | string[] | undefined | null
 
 export default function concatHeader(prev: Header, val: Header) {
   if (!val) return prev

packages/bigcommerce/src/api/utils/errors.ts

@@ -1,5 +1,3 @@
-import type { Response } from '@vercel/fetch'
-
 // Used for GraphQL errors
 export class BigcommerceGraphQLError extends Error {}
 

packages/bigcommerce/src/api/utils/fetch-graphql-api.ts

@@ -1,19 +1,22 @@
 import { FetcherError } from '@vercel/commerce/utils/errors'
 import type { GraphQLFetcher } from '@vercel/commerce/api'
 import type { BigcommerceConfig } from '../index'
-import fetch from './fetch'
 
 const fetchGraphqlApi: (getConfig: () => BigcommerceConfig) => GraphQLFetcher =
   (getConfig) =>
-  async (query: string, { variables, preview } = {}, fetchOptions) => {
+  async (
+    query: string,
+    { variables, preview } = {},
+    options: { headers?: HeadersInit } = {}
+  ): Promise<any> => {
     // log.warn(query)
     const config = getConfig()
+
     const res = await fetch(config.commerceUrl + (preview ? '/preview' : ''), {
-      ...fetchOptions,
       method: 'POST',
       headers: {
         Authorization: `Bearer ${config.apiToken}`,
-        ...fetchOptions?.headers,
+        ...options.headers,
         'Content-Type': 'application/json',
       },
       body: JSON.stringify({

packages/bigcommerce/src/api/utils/fetch-store-api.ts

@@ -1,11 +1,16 @@
-import type { FetchOptions, Response } from '@vercel/fetch'
 import type { BigcommerceConfig } from '../index'
 import { BigcommerceApiError, BigcommerceNetworkError } from './errors'
-import fetch from './fetch'
 
 const fetchStoreApi =
   <T>(getConfig: () => BigcommerceConfig) =>
-  async (endpoint: string, options?: FetchOptions): Promise<T> => {
+  async (
+    endpoint: string,
+    options?: {
+      method?: string
+      body?: any
+      headers?: HeadersInit
+    }
+  ): Promise<T> => {
     const config = getConfig()
     let res: Response
 

packages/bigcommerce/src/api/utils/get-customer-id.ts

@@ -20,9 +20,7 @@ async function getCustomerId({
     getCustomerIdQuery,
     undefined,
     {
-      headers: {
-        cookie: `${config.customerCookie}=${customerToken}`,
-      },
+      'Set-Cookie': `${config.customerCookie}=${customerToken}`,
     }
   )
 

packages/bigcommerce/src/cart/use-add-item.tsx

@@ -33,7 +33,6 @@ export const handler: MutationHook<AddItemHook> = {
     ({ fetch }) =>
     () => {
       const { mutate } = useCart()
-
       return useCallback(
         async function addItem(input) {
           const data = await fetch({ input })

packages/bigcommerce/src/index.tsx

@@ -1,4 +1,7 @@
-import { getCommerceProvider, useCommerce as useCoreCommerce } from '@vercel/commerce'
+import {
+  getCommerceProvider,
+  useCommerce as useCoreCommerce,
+} from '@vercel/commerce'
 import { bigcommerceProvider, BigcommerceProvider } from './provider'
 
 export { bigcommerceProvider }

packages/bigcommerce/src/lib/normalize.ts

@@ -3,9 +3,9 @@ import type { Product } from '@vercel/commerce/types/product'
 import type { Cart, LineItem } from '@vercel/commerce/types/cart'
 import type { Category, Brand } from '@vercel/commerce/types/site'
 import type { BigcommerceCart, BCCategory, BCBrand } from '../types'
+import type { ProductNode } from '../api/operations/get-all-products'
+import type { definitions } from '../api/definitions/store-content'
 
-import { definitions } from '../api/definitions/store-content'
-import update from './immutability'
 import getSlug from './get-slug'
 
 function normalizeProductOption(productOption: any) {
@@ -20,55 +20,44 @@ function normalizeProductOption(productOption: any) {
   }
 }
 
-export function normalizeProduct(productNode: any): Product {
+export function normalizeProduct(productNode: ProductNode): Product {
   const {
     entityId: id,
     productOptions,
     prices,
     path,
-    id: _,
-    options: _0,
+    images,
+    variants,
   } = productNode
 
-  return update(productNode, {
-    id: { $set: String(id) },
-    images: {
-      $apply: ({ edges }: any) =>
-        edges?.map(({ node: { urlOriginal, altText, ...rest } }: any) => ({
-          url: urlOriginal,
-          alt: altText,
-          ...rest,
-        })),
-    },
-    variants: {
-      $apply: ({ edges }: any) =>
-        edges?.map(({ node: { entityId, productOptions, ...rest } }: any) => ({
+  return {
+    id: String(id),
+    name: productNode.name,
+    description: productNode.description,
+    images:
+      images.edges?.map(({ node: { urlOriginal, altText, ...rest } }: any) => ({
+        url: urlOriginal,
+        alt: altText,
+        ...rest,
+      })) || [],
+    path: `/${getSlug(path)}`,
+    variants:
+      variants.edges?.map(
+        ({ node: { entityId, productOptions, ...rest } }: any) => ({
           id: String(entityId),
           options: productOptions?.edges
             ? productOptions.edges.map(normalizeProductOption)
             : [],
           ...rest,
-        })),
-    },
-    options: {
-      $set: productOptions.edges
-        ? productOptions?.edges.map(normalizeProductOption)
-        : [],
-    },
-    brand: {
-      $apply: (brand: any) => (brand?.id ? brand.id : null),
-    },
-    slug: {
-      $set: path?.replace(/^\/+|\/+$/g, ''),
-    },
+        })
+      ) || [],
+    options: productOptions?.edges?.map(normalizeProductOption) || [],
+    slug: path?.replace(/^\/+|\/+$/g, ''),
     price: {
-      $set: {
-        value: prices?.price.value,
-        currencyCode: prices?.price.currencyCode,
-      },
+      value: prices?.price.value,
+      currencyCode: prices?.price.currencyCode,
     },
-    $unset: ['entityId'],
-  })
+  }
 }
 
 export function normalizePage(page: definitions['page_Full']): Page {
@@ -122,7 +111,7 @@ function normalizeLineItem(item: any): LineItem {
       listPrice: item.list_price,
     },
     options: item.options,
-    path: item.url.split('/')[3],
+    path: `/${item.url.split('/')[3]}`,
     discounts: item.discounts.map((discount: any) => ({
       value: discount.discounted_amount,
     })),

packages/commerce/package.json

@@ -47,11 +47,10 @@
     }
   },
   "dependencies": {
-    "@vercel/fetch": "^6.2.0",
+    "@vercel/edge": "^0.0.4",
     "deepmerge": "^4.2.2",
     "import-cwd": "^3.0.0",
     "js-cookie": "^3.0.1",
-    "node-fetch": "^2.6.7",
     "swr": "^1.3.0",
     "zod": "^3.19.1"
   },

packages/commerce/src/api/endpoints/cart.ts

@@ -1,54 +1,63 @@
 import type { GetAPISchema } from '..'
 import type { CartSchema } from '../../types/cart'
 
+import parse from '../utils/parse-output'
 import validateHandlers from '../utils/validate-handlers'
 
+import { getInput } from '../utils'
+
 import {
   getCartBodySchema,
   addItemBodySchema,
   updateItemBodySchema,
   removeItemBodySchema,
+  cartSchema,
 } from '../../schemas/cart'
 
 const cartEndpoint: GetAPISchema<
   any,
   CartSchema
 >['endpoint']['handler'] = async (ctx) => {
-  const { req, res, handlers, config } = ctx
+  const { req, handlers, config } = ctx
 
-  validateHandlers(req, res, {
+  validateHandlers(req, {
     GET: handlers['getCart'],
     POST: handlers['addItem'],
     PUT: handlers['updateItem'],
     DELETE: handlers['removeItem'],
   })
 
+  const input = await getInput(req)
+
+  let output
   const { cookies } = req
-  const cartId = cookies[config.cartCookie]
+  const cartId = cookies.get(config.cartCookie)
 
   // Return current cart info
   if (req.method === 'GET') {
     const body = getCartBodySchema.parse({ cartId })
-    return handlers['getCart']({ ...ctx, body })
+    output = await handlers['getCart']({ ...ctx, body })
   }
 
   // Create or add an item to the cart
   if (req.method === 'POST') {
-    const body = addItemBodySchema.parse({ ...req.body, cartId })
-    return handlers['addItem']({ ...ctx, body })
+    const body = addItemBodySchema.parse({ ...input, cartId })
+    output = await handlers['addItem']({ ...ctx, body })
   }
 
   // Update item in cart
   if (req.method === 'PUT') {
-    const body = updateItemBodySchema.parse({ ...req.body, cartId })
-    return handlers['updateItem']({ ...ctx, body })
+    const body = updateItemBodySchema.parse({ ...input, cartId })
+    output = await handlers['updateItem']({ ...ctx, body })
   }
 
   // Remove an item from the cart
   if (req.method === 'DELETE') {
-    const body = removeItemBodySchema.parse({ ...req.body, cartId })
-    return handlers['removeItem']({ ...ctx, body })
+    const body = removeItemBodySchema.parse({ ...input, cartId })
+    return await handlers['removeItem']({ ...ctx, body })
   }
+
+  return output ? parse(output, cartSchema.nullish()) : { status: 405 }
 }
 
 export default cartEndpoint

packages/commerce/src/api/endpoints/catalog/products.ts

@@ -1,25 +1,38 @@
-import { searchProductBodySchema } from '../../../schemas/product'
 import type { GetAPISchema } from '../..'
 import type { ProductsSchema } from '../../../types/product'
 
 import validateHandlers from '../../utils/validate-handlers'
+import {
+  searchProductBodySchema,
+  searchProductsSchema,
+} from '../../../schemas/product'
+import parse from '../../utils/parse-output'
 
 const productsEndpoint: GetAPISchema<
   any,
   ProductsSchema
->['endpoint']['handler'] = (ctx) => {
-  const { req, res, handlers } = ctx
+>['endpoint']['handler'] = async (ctx) => {
+  const { req, handlers } = ctx
 
-  validateHandlers(req, res, { GET: handlers['getProducts'] })
+  validateHandlers(req, { GET: handlers['getProducts'] })
+  const { searchParams } = new URL(req.url)
 
   const body = searchProductBodySchema.parse({
-    search: req.query.search,
-    categoryId: req.query.categoryId,
-    brandId: req.query.brandId,
-    sort: req.query.sort,
+    search: searchParams.get('search') ?? undefined,
+    categoryId: searchParams.get('categoryId') ?? undefined,
+    brandId: searchParams.get('brandId') ?? undefined,
+    sort: searchParams.get('sort') ?? undefined,
   })
 
-  return handlers['getProducts']({ ...ctx, body })
+  const res = await handlers['getProducts']({ ...ctx, body })
+
+  res.headers = {
+    'Cache-Control':
+      'max-age=0, s-maxage=3600, stale-while-revalidate=60, public',
+    ...res.headers,
+  }
+
+  return parse(res, searchProductsSchema)
 }
 
 export default productsEndpoint

packages/commerce/src/api/endpoints/checkout.ts

@@ -2,37 +2,46 @@ import type { GetAPISchema } from '..'
 import type { CheckoutSchema } from '../../types/checkout'
 
 import {
+  checkoutSchema,
   getCheckoutBodySchema,
   submitCheckoutBodySchema,
 } from '../../schemas/checkout'
 
 import validateHandlers from '../utils/validate-handlers'
+import parse from '../utils/parse-output'
+import { z } from 'zod'
+import { getInput } from '../utils'
 
 const checkoutEndpoint: GetAPISchema<
   any,
   CheckoutSchema
->['endpoint']['handler'] = (ctx) => {
-  const { req, res, handlers, config } = ctx
+>['endpoint']['handler'] = async (ctx) => {
+  const { req, handlers, config } = ctx
 
-  validateHandlers(req, res, {
+  validateHandlers(req, {
     GET: handlers['getCheckout'],
     POST: handlers['submitCheckout'],
   })
 
   const { cookies } = req
-  const cartId = cookies[config.cartCookie]
+  const cartId = cookies.get(config.cartCookie)!
+  const input = await getInput(req)
 
   // Get checkout
   if (req.method === 'GET') {
-    const body = getCheckoutBodySchema.parse({ ...req.body, cartId })
-    return handlers['getCheckout']({ ...ctx, body })
+    const body = getCheckoutBodySchema.parse({ ...input, cartId })
+    const res = await handlers['getCheckout']({ ...ctx, body })
+    return parse(res, checkoutSchema.optional().or(z.string()))
   }
 
   // Create checkout
   if (req.method === 'POST' && handlers['submitCheckout']) {
-    const body = submitCheckoutBodySchema.parse({ ...req.body, cartId })
-    return handlers['submitCheckout']({ ...ctx, body })
+    const body = submitCheckoutBodySchema.parse({ ...input, cartId })
+    const res = await handlers['submitCheckout']({ ...ctx, body })
+    return parse(res, checkoutSchema.optional())
   }
+
+  return { status: 405 }
 }
 
 export default checkoutEndpoint

packages/commerce/src/api/endpoints/customer/address.ts

@@ -1,55 +1,69 @@
 import type { CustomerAddressSchema } from '../../../types/customer/address'
 import type { GetAPISchema } from '../..'
 
+import parse from '../../utils/parse-output'
 import validateHandlers from '../../utils/validate-handlers'
+
 import {
   addAddressBodySchema,
+  addressSchema,
   deleteAddressBodySchema,
   updateAddressBodySchema,
 } from '../../../schemas/customer'
+
+import { getInput } from '../../utils'
 import { getCartBodySchema } from '../../../schemas/cart'
 
+// create a function that returns a function
+
 const customerShippingEndpoint: GetAPISchema<
   any,
   CustomerAddressSchema
->['endpoint']['handler'] = (ctx) => {
-  const { req, res, handlers, config } = ctx
+>['endpoint']['handler'] = async (ctx) => {
+  const { req, handlers, config } = ctx
 
-  validateHandlers(req, res, {
+  validateHandlers(req, {
     GET: handlers['getAddresses'],
     POST: handlers['addItem'],
     PUT: handlers['updateItem'],
     DELETE: handlers['removeItem'],
   })
 
+  let output
+  const input = await getInput(req)
   const { cookies } = req
 
   // Cart id might be usefull for anonymous shopping
-  const cartId = cookies[config.cartCookie]
+  const cartId = cookies.get(config.cartCookie)
 
   // Return customer addresses
   if (req.method === 'GET') {
     const body = getCartBodySchema.parse({ cartId })
-    return handlers['getAddresses']({ ...ctx, body })
+    return parse(
+      await handlers['getAddresses']({ ...ctx, body }),
+      addressSchema
+    )
   }
 
   // Create or add an item to customer addresses list
   if (req.method === 'POST') {
-    const body = addAddressBodySchema.parse({ ...req.body, cartId })
-    return handlers['addItem']({ ...ctx, body })
+    const body = addAddressBodySchema.parse({ ...input, cartId })
+    output = await handlers['addItem']({ ...ctx, body })
   }
 
   // Update item in customer addresses list
   if (req.method === 'PUT') {
-    const body = updateAddressBodySchema.parse({ ...req.body, cartId })
-    return handlers['updateItem']({ ...ctx, body })
+    const body = updateAddressBodySchema.parse({ ...input, cartId })
+    output = await handlers['updateItem']({ ...ctx, body })
   }
 
   // Remove an item from customer addresses list
   if (req.method === 'DELETE') {
-    const body = deleteAddressBodySchema.parse({ ...req.body, cartId })
-    return handlers['removeItem']({ ...ctx, body })
+    const body = deleteAddressBodySchema.parse({ ...input, cartId })
+    return await handlers['removeItem']({ ...ctx, body })
   }
+
+  return output ? parse(output, addressSchema) : { status: 405 }
 }
 
 export default customerShippingEndpoint

packages/commerce/src/api/endpoints/customer/card.ts

@@ -1,54 +1,68 @@
 import type { CustomerCardSchema } from '../../../types/customer/card'
 import type { GetAPISchema } from '../..'
 
+import { z } from 'zod'
+
+import parse from '../../utils/parse-output'
 import validateHandlers from '../../utils/validate-handlers'
 
 import {
+  cardSchema,
   addCardBodySchema,
   deleteCardBodySchema,
   updateCardBodySchema,
 } from '../../../schemas/customer'
+import { getInput } from '../../utils'
 
 const customerCardEndpoint: GetAPISchema<
   any,
   CustomerCardSchema
->['endpoint']['handler'] = (ctx) => {
-  const { req, res, handlers, config } = ctx
+>['endpoint']['handler'] = async (ctx) => {
+  const { req, handlers, config } = ctx
 
-  validateHandlers(req, res, {
+  validateHandlers(req, {
     GET: handlers['getCards'],
     POST: handlers['addItem'],
     PUT: handlers['updateItem'],
     DELETE: handlers['removeItem'],
   })
+
+  let output
+  const input = await getInput(req)
   const { cookies } = req
 
   // Cart id might be usefull for anonymous shopping
-  const cartId = cookies[config.cartCookie]
+  const cartId = cookies.get(config.cartCookie)
 
   // Create or add a card
   if (req.method === 'GET') {
-    const body = { ...req.body }
-    return handlers['getCards']({ ...ctx, body })
+    const body = { ...input }
+    return parse(
+      await handlers['getCards']({ ...ctx, body }),
+      z.array(cardSchema).optional()
+    )
   }
 
   // Create or add an item to customer cards
   if (req.method === 'POST') {
-    const body = addCardBodySchema.parse({ ...req.body, cartId })
-    return handlers['addItem']({ ...ctx, body })
+    const body = addCardBodySchema.parse({ ...input, cartId })
+    output = await handlers['addItem']({ ...ctx, body })
   }
 
   // Update item in customer cards
   if (req.method === 'PUT') {
-    const body = updateCardBodySchema.parse({ ...req.body, cartId })
-    return handlers['updateItem']({ ...ctx, body })
+    const body = updateCardBodySchema.parse({ ...input, cartId })
+    output = await handlers['updateItem']({ ...ctx, body })
   }
 
   // Remove an item from customer cards
   if (req.method === 'DELETE') {
-    const body = deleteCardBodySchema.parse({ ...req.body, cartId })
-    return handlers['removeItem']({ ...ctx, body })
+    const body = deleteCardBodySchema.parse({ ...input, cartId })
+
+    return await handlers['removeItem']({ ...ctx, body })
   }
+
+  return output ? parse(output, cardSchema.nullish()) : { status: 405 }
 }
 
 export default customerCardEndpoint

packages/commerce/src/api/endpoints/customer/index.ts

@@ -1,20 +1,25 @@
 import type { CustomerSchema } from '../../../types/customer'
 import type { GetAPISchema } from '../..'
 
+import parse from '../../utils/parse-output'
 import validateHandlers from '../../utils/validate-handlers'
 
+import { customerSchema } from '../../../schemas/customer'
+
 const customerEndpoint: GetAPISchema<
   any,
   CustomerSchema
->['endpoint']['handler'] = (ctx) => {
-  const { req, res, handlers } = ctx
+>['endpoint']['handler'] = async (ctx) => {
+  const { req, handlers } = ctx
 
-  validateHandlers(req, res, {
+  validateHandlers(req, {
     GET: handlers['getLoggedInCustomer'],
   })
 
   const body = null
-  return handlers['getLoggedInCustomer']({ ...ctx, body })
+  const output = await handlers['getLoggedInCustomer']({ ...ctx, body })
+
+  return output ? parse(output, customerSchema) : { status: 204 }
 }
 
 export default customerEndpoint

packages/commerce/src/api/endpoints/index.ts

@@ -1,74 +1,80 @@
-import type { NextApiHandler, NextApiRequest, NextApiResponse } from 'next'
-import type { APIProvider, CommerceAPI } from '..'
+import type { APIProvider, CommerceAPI, EndpointHandler } from '..'
 
-import { normalizeError } from '../utils/errors'
+import { NextRequest, NextResponse } from 'next/server'
+import { normalizeApiError } from '../utils/errors'
 
 /**
- * Handles the catch-all api endpoint for the Commerce API.
+ * Next.js Commerce API endpoints handler. Based on the path, it will call the corresponding endpoint handler,
+ * exported from the `endpoints` folder of the provider.
  * @param {CommerceAPI} commerce The Commerce API instance.
  * @param endpoints An object containing the handlers for each endpoint.
- * @returns JSON response with the data or error.
  */
 export default function createEndpoints<P extends APIProvider>(
   commerce: CommerceAPI<P>,
-  endpoints: {
-    [key: string]: (commerce: CommerceAPI<P>) => NextApiHandler
-  }
+  endpoints: Record<string, (commerce: CommerceAPI<P>) => EndpointHandler>
 ) {
-  const paths = Object.keys(endpoints)
-
-  const handlers = paths.reduce<Record<string, NextApiHandler>>(
-    (acc, path) =>
+  const endpointsKeys = Object.keys(endpoints)
+  const handlers = endpointsKeys.reduce<Record<string, EndpointHandler>>(
+    (acc, endpoint) =>
       Object.assign(acc, {
-        [path]: endpoints[path](commerce),
+        [endpoint]: endpoints[endpoint](commerce),
       }),
     {}
   )
 
-  return async (req: NextApiRequest, res: NextApiResponse) => {
+  return async (req: NextRequest) => {
     try {
-      if (!req.query.commerce) {
-        throw new Error(
-          'Invalid configuration. Please make sure that the /pages/api/commerce/[[...commerce]].ts route is configured correctly, and it passes the commerce instance.'
-        )
-      }
+      const { pathname } = new URL(req.url)
 
       /**
-       * Get the url path
+       * Get the current endpoint by removing the leading and trailing slash & base path.
+       * Csovers: /api/commerce/cart & /checkout
        */
-      const path = Array.isArray(req.query.commerce)
-        ? req.query.commerce.join('/')
-        : req.query.commerce
+      const endpoint = pathname
+        .replace('/api/commerce/', '')
+        .replace(/^\/|\/$/g, '')
 
       // Check if the handler for this path exists and return a 404 if it doesn't
-      if (!paths.includes(path)) {
+      if (!endpointsKeys.includes(endpoint)) {
         throw new Error(
-          `Endpoint handler not implemented. Please use one of the available api endpoints: ${paths.join(
+          `Endpoint "${endpoint}" not implemented. Please use one of the available api endpoints: ${endpointsKeys.join(
             ', '
           )}`
         )
       }
 
-      const data = await handlers[path](req, res)
-      // If the handler returns a value but the response hasn't been sent yet, send it
-      if (!res.headersSent && data) {
-        res.status(200).json({
-          data,
-        })
-      }
-    } catch (error) {
       /**
-       * Return the error as a JSON response only if the response hasn't been sent yet
-       * Eg. by the `isAllowedMethod` util returning a 405 status code
+       * Executes the handler for this endpoint, provided by the provider,
+       * parses the input body and returns the parsed output
        */
-      if (!res.headersSent) {
-        console.error(error)
-        const { status, data, errors } = normalizeError(error)
-        res.status(status).json({
-          data,
-          errors,
+      const output = await handlers[endpoint](req)
+
+      // If the output is a NextResponse, return it directly (E.g. checkout page & validateMethod util)
+      if (output instanceof NextResponse) {
+        return output
+      }
+
+      // If the output contains a redirectTo property, return a NextResponse with the redirect
+      if (output.redirectTo) {
+        return NextResponse.redirect(output.redirectTo, {
+          headers: output.headers,
         })
       }
+
+      const { data = null, errors, status, headers } = output
+
+      return NextResponse.json(
+        { data, errors },
+        {
+          status,
+          headers,
+        }
+      )
+    } catch (error) {
+      const output = normalizeApiError(error)
+      return output instanceof NextResponse
+        ? output
+        : NextResponse.json(output, { status: output.status ?? 500 })
     }
   }
 }

packages/commerce/src/api/endpoints/login.ts

@@ -2,20 +2,23 @@ import type { GetAPISchema } from '..'
 import type { LoginSchema } from '../../types/login'
 
 import validateHandlers from '../utils/validate-handlers'
+
+import { getInput } from '../utils'
 import { loginBodySchema } from '../../schemas/auth'
 
-const loginEndpoint: GetAPISchema<any, LoginSchema>['endpoint']['handler'] = (
-  ctx
-) => {
-  const { req, res, handlers } = ctx
+const loginEndpoint: GetAPISchema<
+  any,
+  LoginSchema
+>['endpoint']['handler'] = async (ctx) => {
+  const { req, handlers } = ctx
 
-  validateHandlers(req, res, {
+  validateHandlers(req, {
     POST: handlers['login'],
     GET: handlers['login'],
   })
-
-  const body = loginBodySchema.parse(req.body)
-  return handlers['login']({ ...ctx, body })
+  const input = await getInput(req)
+  const body = loginBodySchema.parse(input)
+  return await handlers['login']({ ...ctx, body })
 }
 
 export default loginEndpoint

packages/commerce/src/api/endpoints/logout.ts

@@ -3,23 +3,25 @@ import type { LogoutSchema } from '../../types/logout'
 
 import { logoutBodySchema } from '../../schemas/auth'
 import validateHandlers from '../utils/validate-handlers'
+import { normalizeApiError } from '../utils/errors'
 
-const logoutEndpoint: GetAPISchema<any, LogoutSchema>['endpoint']['handler'] = (
-  ctx
-) => {
-  const { req, res, handlers } = ctx
+const logoutEndpoint: GetAPISchema<
+  any,
+  LogoutSchema
+>['endpoint']['handler'] = async (ctx) => {
+  const { req, handlers } = ctx
 
-  validateHandlers(req, res, {
+  validateHandlers(req, {
     GET: handlers['logout'],
   })
 
-  const redirectTo = req.query.redirect_to
+  const redirectTo = new URL(req.url).searchParams.get('redirectTo')
 
   const body = logoutBodySchema.parse(
     typeof redirectTo === 'string' ? { redirectTo } : {}
   )
 
-  return handlers['logout']({ ...ctx, body })
+  return await handlers['logout']({ ...ctx, body })
 }
 
 export default logoutEndpoint

packages/commerce/src/api/endpoints/signup.ts

@@ -1,23 +1,27 @@
 import type { GetAPISchema } from '..'
 import type { SignupSchema } from '../../types/signup'
 
-import { signupBodySchema } from '../../schemas/auth'
-
 import validateHandlers from '../utils/validate-handlers'
 
-const signupEndpoint: GetAPISchema<any, SignupSchema>['endpoint']['handler'] = (
-  ctx
-) => {
-  const { req, res, handlers, config } = ctx
+import { getInput } from '../utils'
+import { signupBodySchema } from '../../schemas/auth'
 
-  validateHandlers(req, res, {
+const signupEndpoint: GetAPISchema<
+  any,
+  SignupSchema
+>['endpoint']['handler'] = async (ctx) => {
+  const { req, handlers, config } = ctx
+
+  validateHandlers(req, {
     POST: handlers['signup'],
   })
-  const { cookies } = req
-  const cartId = cookies[config.cartCookie]
 
-  const body = signupBodySchema.parse({ ...req.body, cartId })
-  return handlers['signup']({ ...ctx, body })
+  const input = await getInput(req)
+  const { cookies } = req
+  const cartId = cookies.get(config.cartCookie)
+
+  const body = signupBodySchema.parse({ ...input, cartId })
+  return await handlers['signup']({ ...ctx, body })
 }
 
 export default signupEndpoint

packages/commerce/src/api/endpoints/wishlist.ts

@@ -3,47 +3,57 @@ import type { WishlistSchema } from '../../types/wishlist'
 
 import validateHandlers from '../utils/validate-handlers'
 
+import { getInput } from '../utils'
 import {
-  getWishlistBodySchema,
+  wishlistSchema,
   addItemBodySchema,
   removeItemBodySchema,
+  getWishlistBodySchema,
 } from '../../schemas/whishlist'
 
+import parse from '../utils/parse-output'
+
 const wishlistEndpoint: GetAPISchema<
   any,
   WishlistSchema
->['endpoint']['handler'] = (ctx) => {
-  const { req, res, handlers, config } = ctx
+>['endpoint']['handler'] = async (ctx) => {
+  const { req, handlers, config } = ctx
 
-  validateHandlers(req, res, {
+  validateHandlers(req, {
     GET: handlers['getWishlist'],
     POST: handlers['addItem'],
     DELETE: handlers['removeItem'],
   })
 
+  let output
   const { cookies } = req
-  const customerToken = cookies[config.customerCookie]
+  const input = await getInput(req)
+
+  const customerToken = cookies.get(config.customerCookie)
+  const products = new URL(req.url).searchParams.get('products')
 
   // Return current wishlist info
   if (req.method === 'GET') {
     const body = getWishlistBodySchema.parse({
       customerToken,
-      includeProducts: !!req.query.products,
+      includeProducts: !!products,
     })
-    return handlers['getWishlist']({ ...ctx, body })
+    output = await handlers['getWishlist']({ ...ctx, body })
   }
 
   // Add an item to the wishlist
   if (req.method === 'POST') {
-    const body = addItemBodySchema.parse({ ...req.body, customerToken })
-    return handlers['addItem']({ ...ctx, body })
+    const body = addItemBodySchema.parse({ ...input, customerToken })
+    output = await handlers['addItem']({ ...ctx, body })
   }
 
   // Remove an item from the wishlist
   if (req.method === 'DELETE') {
-    const body = removeItemBodySchema.parse({ ...req.body, customerToken })
-    return handlers['removeItem']({ ...ctx, body })
+    const body = removeItemBodySchema.parse({ ...input, customerToken })
+    output = await handlers['removeItem']({ ...ctx, body })
   }
+
+  return output ? parse(output, wishlistSchema.optional()) : { status: 40 }
 }
 
 export default wishlistEndpoint

packages/commerce/src/api/index.ts

@@ -1,6 +1,6 @@
-import type { NextApiHandler } from 'next'
-import type { FetchOptions, Response } from '@vercel/fetch'
-import type { APIEndpoint, APIHandler } from './utils/types'
+import type { NextRequest } from 'next/server'
+
+import type { APIEndpoint, APIHandler, APIResponse } from './utils/types'
 import type { CartSchema } from '../types/cart'
 import type { CustomerSchema } from '../types/customer'
 import type { LoginSchema } from '../types/login'
@@ -12,6 +12,7 @@ import type { CheckoutSchema } from '../types/checkout'
 import type { CustomerCardSchema } from '../types/customer/card'
 import type { CustomerAddressSchema } from '../types/customer/address'
 
+import { geolocation } from '@vercel/edge'
 import { withOperationCallback } from './utils/with-operation-callback'
 
 import {
@@ -119,6 +120,8 @@ export function getCommerceApi<P extends APIProvider>(
   return commerce
 }
 
+export type EndpointHandler = (req: NextRequest) => Promise<APIResponse>
+
 export function getEndpoint<
   P extends APIProvider,
   T extends GetAPISchema<any, any>
@@ -128,17 +131,16 @@ export function getEndpoint<
     config?: P['config']
     options?: T['schema']['endpoint']['options']
   }
-): NextApiHandler {
+): EndpointHandler {
   const cfg = commerce.getConfig(context.config)
-
-  return function apiHandler(req, res) {
+  return function apiHandler(req) {
     return context.handler({
       req,
-      res,
       commerce,
       config: cfg,
       handlers: context.handlers,
       options: context.options ?? {},
+      geolocation: geolocation(req),
     })
   }
 }
@@ -151,7 +153,7 @@ export const createEndpoint =
       config?: P['config']
       options?: API['schema']['endpoint']['options']
     }
-  ): NextApiHandler => {
+  ): EndpointHandler => {
     return getEndpoint(commerce, { ...endpoint, ...context })
   }
 
@@ -166,7 +168,7 @@ export interface CommerceAPIConfig {
   fetch<Data = any, Variables = any>(
     query: string,
     queryData?: CommerceAPIFetchOptions<Variables>,
-    fetchOptions?: FetchOptions
+    headers?: HeadersInit
   ): Promise<GraphQLFetcherResult<Data>>
 }
 
@@ -175,8 +177,7 @@ export type GraphQLFetcher<
   Variables = any
 > = (
   query: string,
-  queryData?: CommerceAPIFetchOptions<Variables>,
-  fetchOptions?: FetchOptions
+  queryData?: CommerceAPIFetchOptions<Variables>
 ) => Promise<Data>
 
 export interface GraphQLFetcherResult<Data = any> {

packages/commerce/src/api/operations.ts

@@ -1,4 +1,3 @@
-import type { ServerResponse } from 'http'
 import type { LoginOperation } from '../types/login'
 import type { GetAllPagesOperation, GetPageOperation } from '../types/page'
 import type { GetSiteInfoOperation } from '../types/site'
@@ -9,6 +8,7 @@ import type {
   GetProductOperation,
 } from '../types/product'
 import type { APIProvider, CommerceAPI } from '.'
+import { NextResponse } from 'next/server'
 
 const noop = () => {
   throw new Error('Not implemented')
@@ -44,14 +44,14 @@ export type Operations<P extends APIProvider> = {
     <T extends LoginOperation>(opts: {
       variables: T['variables']
       config?: P['config']
-      res: ServerResponse
+      res: NextResponse
     }): Promise<T['data']>
 
     <T extends LoginOperation>(
       opts: {
         variables: T['variables']
         config?: P['config']
-        res: ServerResponse
+        res: NextResponse
       } & OperationOptions
     ): Promise<T['data']>
   }

packages/commerce/src/api/utils/errors.ts

@@ -1,14 +1,13 @@
-import type { Response } from '@vercel/fetch'
+import { NextRequest, NextResponse } from 'next/server'
 import { CommerceError } from '../../utils/errors'
-
 import { ZodError } from 'zod'
 
-export class CommerceAPIError extends Error {
+export class CommerceAPIResponseError extends Error {
   status: number
-  res: Response
+  res: NextResponse
   data: any
 
-  constructor(msg: string, res: Response, data?: any) {
+  constructor(msg: string, res: NextResponse, data?: any) {
     super(msg)
     this.name = 'CommerceApiError'
     this.status = res.status
@@ -17,6 +16,23 @@ export class CommerceAPIError extends Error {
   }
 }
 
+export class CommerceAPIError extends Error {
+  status: number
+  code: string
+  constructor(
+    msg: string,
+    options?: {
+      status?: number
+      code?: string
+    }
+  ) {
+    super(msg)
+    this.name = 'CommerceApiError'
+    this.status = options?.status || 500
+    this.code = options?.code || 'api_error'
+  }
+}
+
 export class CommerceNetworkError extends Error {
   constructor(msg: string) {
     super(msg)
@@ -25,7 +41,7 @@ export class CommerceNetworkError extends Error {
 }
 
 export const normalizeZodIssues = (issues: ZodError['issues']) =>
-  issues.map(({ path, message }) => `${message} at "${path.join('.')}"`)
+  issues.map(({ path, message }) => `${message} at "${path.join('.')}" field`)
 
 export const getOperationError = (operation: string, error: unknown) => {
   if (error instanceof ZodError) {
@@ -41,29 +57,41 @@ export const getOperationError = (operation: string, error: unknown) => {
   return error
 }
 
-export const normalizeError = (error: unknown) => {
-  if (error instanceof CommerceAPIError) {
-    return {
-      status: error.status || 500,
-      data: error.data || null,
-      errors: [
-        { message: 'An unexpected error ocurred with the Commerce API' },
-      ],
-    }
+export const normalizeApiError = (error: unknown, req?: NextRequest) => {
+  if (error instanceof CommerceAPIResponseError && error.res) {
+    return error.res
   }
 
+  req?.url && console.log(req.url)
+
   if (error instanceof ZodError) {
+    const message = 'Validation error, please check the input data!'
+    const errors = normalizeZodIssues(error.issues).map((message) => ({
+      message,
+    }))
+    console.error(`${message}\n${errors.map((e) => e.message).join('\n')}`)
     return {
       status: 400,
       data: null,
-      message:
-        'Validation error, please check the input data check errors property for more info',
-      errors: normalizeZodIssues(error.issues).map((message) => ({ message })),
+      errors,
+    }
+  }
+
+  console.error(error)
+
+  if (error instanceof CommerceAPIError) {
+    return {
+      errors: [
+        {
+          message: error.message,
+          code: error.code,
+        },
+      ],
+      status: error.status,
     }
   }
 
   return {
-    status: 500,
     data: null,
     errors: [{ message: 'An unexpected error ocurred' }],
   }

packages/commerce/src/api/utils/index.ts

@@ -0,0 +1,3 @@
+import { NextRequest } from 'next/server'
+
+export const getInput = (req: NextRequest) => req.json().catch(() => ({}))

packages/commerce/src/api/utils/is-allowed-method.ts

@@ -1,40 +0,0 @@
-import type { NextApiRequest, NextApiResponse } from 'next'
-
-export type HTTP_METHODS = 'OPTIONS' | 'GET' | 'POST' | 'PUT' | 'DELETE'
-
-export default function isAllowedMethod(
-  req: NextApiRequest,
-  res: NextApiResponse,
-  allowedMethods: HTTP_METHODS[]
-) {
-  const methods = allowedMethods.includes('OPTIONS')
-    ? allowedMethods
-    : [...allowedMethods, 'OPTIONS']
-
-  if (!req.method || !methods.includes(req.method)) {
-    res.status(405)
-    res.setHeader('Allow', methods.join(', '))
-    res.json({
-      errors: [
-        {
-          message: `You are not allowed to use the ${
-            req.method
-          } method for this route, please use one of the following methods: ${methods.join(
-            ', '
-          )}`,
-        },
-      ],
-    })
-    return false
-  }
-
-  if (req.method === 'OPTIONS') {
-    res.status(200)
-    res.setHeader('Allow', methods.join(', '))
-    res.setHeader('Content-Length', '0')
-    res.end()
-    return false
-  }
-
-  return true
-}

packages/commerce/src/api/utils/parse-output.ts

@@ -0,0 +1,11 @@
+import type { ZodSchema } from 'zod'
+import { APIResponse } from './types'
+
+export const parseOutput = <T>(res: APIResponse<T>, parser: ZodSchema) => {
+  if (res.data) {
+    res.data = parser.parse(res.data)
+  }
+  return res
+}
+
+export default parseOutput

packages/commerce/src/api/utils/types.ts

@@ -1,14 +1,20 @@
-import type { NextApiRequest, NextApiResponse } from 'next'
+import { NextRequest } from 'next/server'
+import type { Geo } from '@vercel/edge'
 import type { CommerceAPI } from '..'
 
 export type ErrorData = { message: string; code?: string }
 
-export type APIResponse<Data = any> =
-  | { data: Data; errors?: ErrorData[] }
-  // If `data` doesn't include `null`, then `null` is only allowed on errors
-  | (Data extends null
-      ? { data: null; errors?: ErrorData[] }
-      : { data: null; errors: ErrorData[] })
+export type APIResponse<Data = any> = {
+  data?: Data
+  errors?: ErrorData[]
+  status?: number
+  headers?: HeadersInit
+  /**
+   *  @type {string}
+   *  @example redirectTo: '/cart'
+   */
+  redirectTo?: string
+}
 
 export type APIHandlerContext<
   C extends CommerceAPI,
@@ -16,15 +22,12 @@ export type APIHandlerContext<
   Data = any,
   Options extends {} = {}
 > = {
-  req: NextApiRequest
-  res: NextApiResponse<APIResponse<Data>>
+  req: NextRequest
   commerce: C
   config: C['provider']['config']
   handlers: H
-  /**
-   * Custom configs that may be used by a particular handler
-   */
   options: Options
+  geolocation: Geo
 }
 
 export type APIHandler<
@@ -35,7 +38,7 @@ export type APIHandler<
   Options extends {} = {}
 > = (
   context: APIHandlerContext<C, H, Data, Options> & { body: Body }
-) => void | Promise<void>
+) => Promise<APIResponse<Data>>
 
 export type APIHandlers<C extends CommerceAPI> = {
   [k: string]: APIHandler<C, any, any, any, any>
@@ -46,4 +49,6 @@ export type APIEndpoint<
   H extends APIHandlers<C> = {},
   Data = any,
   Options extends {} = {}
-> = (context: APIHandlerContext<C, H, Data, Options>) => void | Promise<void>
+> = (
+  context: APIHandlerContext<C, H, Data, Options>
+) => Promise<APIResponse<Data>>

packages/commerce/src/api/utils/validate-handlers.ts

@@ -1,5 +1,6 @@
-import type { NextApiRequest, NextApiResponse } from 'next'
-import isAllowedMethod, { HTTP_METHODS } from './is-allowed-method'
+import type { NextRequest } from 'next/server'
+
+import validateMethod, { HTTP_METHODS } from './validate-method'
 import { APIHandler } from './types'
 
 /**
@@ -11,8 +12,7 @@ import { APIHandler } from './types'
  * @throws Error when the method is not allowed or the handler is not implemented.
  */
 export default function validateHandlers(
-  req: NextApiRequest,
-  res: NextApiResponse,
+  req: NextRequest,
   allowedOperations: { [k in HTTP_METHODS]?: APIHandler<any, any> }
 ) {
   const methods = Object.keys(allowedOperations) as HTTP_METHODS[]
@@ -23,7 +23,5 @@ export default function validateHandlers(
     return arr
   }, [])
 
-  if (!isAllowedMethod(req, res, allowedMethods)) {
-    throw new Error(`Method ${req.method} Not Allowed for this url: ${req.url}`)
-  }
+  return validateMethod(req, allowedMethods)
 }

packages/commerce/src/api/utils/validate-method.ts

@@ -0,0 +1,48 @@
+import { NextRequest, NextResponse } from 'next/server'
+import { CommerceAPIResponseError } from './errors'
+
+export type HTTP_METHODS = 'OPTIONS' | 'GET' | 'POST' | 'PUT' | 'DELETE'
+
+export default function isAllowedMethod(
+  req: NextRequest,
+  allowedMethods: HTTP_METHODS[]
+) {
+  const methods = allowedMethods.includes('OPTIONS')
+    ? allowedMethods
+    : [...allowedMethods, 'OPTIONS']
+
+  if (!req.method || !methods.includes(req.method)) {
+    throw new CommerceAPIResponseError(
+      `The HTTP ${req.method} method is not supported at this route.`,
+      NextResponse.json(
+        {
+          errors: [
+            {
+              code: 'invalid_method',
+              message: `The HTTP ${req.method} method is not supported at this route.`,
+            },
+          ],
+        },
+        {
+          status: 405,
+          headers: {
+            Allow: methods.join(', '),
+          },
+        }
+      )
+    )
+  }
+
+  if (req.method === 'OPTIONS') {
+    throw new CommerceAPIResponseError(
+      'This is a CORS preflight request.',
+      new NextResponse(null, {
+        status: 204,
+        headers: {
+          Allow: methods.join(', '),
+          'Content-Length': '0',
+        },
+      })
+    )
+  }
+}

packages/commerce/src/schemas/auth.ts

@@ -3,7 +3,7 @@ import { z } from 'zod'
 export const loginBodySchema = z.object({
   redirectTo: z.string().optional(),
   email: z.string().email(),
-  password: z.string(),
+  password: z.string().min(7),
 })
 
 export const logoutBodySchema = z.object({
@@ -13,6 +13,6 @@ export const logoutBodySchema = z.object({
 export const signupBodySchema = z.object({
   firstName: z.string(),
   lastName: z.string(),
-  email: z.string(),
-  password: z.string(),
+  email: z.string().email(),
+  password: z.string().min(7),
 })

packages/commerce/src/schemas/cart.ts

@@ -25,3 +25,78 @@ export const removeItemBodySchema = z.object({
   cartId: z.string(),
   itemId: z.string(),
 })
+
+export const discountSchema = z.object({
+  value: z.number(),
+})
+
+export const optionsSchema = z.object({
+  id: z.string().optional(),
+  name: z.string(),
+  value: z.string(),
+})
+
+export const cartProductVariantSchema = z.object({
+  id: z.string(),
+  sku: z.string().optional(),
+  name: z.string(),
+  price: z.number(),
+  listPrice: z.number(),
+  availableForSale: z.boolean().optional(),
+  requiresShipping: z.boolean().optional(),
+  image: z.object({
+    url: z.string(),
+    altText: z.string().optional(),
+  }),
+  weight: z
+    .object({
+      value: z.number(),
+      unit: z.string(),
+    })
+    .optional(),
+  height: z
+    .object({
+      value: z.number(),
+      unit: z.string(),
+    })
+    .optional(),
+  width: z
+    .object({
+      value: z.number(),
+      unit: z.string(),
+    })
+    .optional(),
+  depth: z
+    .object({
+      value: z.number(),
+      unit: z.string(),
+    })
+    .optional(),
+})
+
+export const cartLineItemSchema = z.object({
+  id: z.string(),
+  variantId: z.string(),
+  productId: z.string(),
+  name: z.string(),
+  quantity: z.number().min(1),
+  discounts: z.array(discountSchema).optional(),
+  path: z.string().startsWith('/').optional(),
+  variant: cartProductVariantSchema,
+  options: z.array(optionsSchema).optional(),
+})
+
+export const cartSchema = z.object({
+  id: z.string(),
+  customerId: z.string().optional(),
+  url: z.string().optional(),
+  email: z.string().optional(),
+  createdAt: z.string(),
+  currency: z.object({ code: z.string() }),
+  taxesIncluded: z.boolean(),
+  lineItems: z.array(cartLineItemSchema),
+  lineItemsSubtotalPrice: z.number(),
+  subtotalPrice: z.number(),
+  totalPrice: z.number(),
+  discounts: z.array(discountSchema).optional(),
+})

packages/commerce/src/schemas/checkout.ts

@@ -1,4 +1,5 @@
 import { z } from 'zod'
+import { cartLineItemSchema } from './cart'
 import { addressFieldsSchema, cardFieldsSchema } from './customer'
 
 export const getCheckoutBodySchema = z.object({
@@ -13,3 +14,12 @@ export const submitCheckoutBodySchema = z.object({
     address: addressFieldsSchema,
   }),
 })
+
+export const checkoutSchema = z.object({
+  hasPayment: z.boolean(),
+  hasShipping: z.boolean(),
+  addressId: z.string(),
+  payments: z.array(cardFieldsSchema).optional(),
+  cardId: z.string().optional(),
+  lineItems: z.array(cartLineItemSchema).optional(),
+})

packages/commerce/src/schemas/customer.ts

@@ -4,6 +4,22 @@ export const getCustomerAddressBodySchema = z.object({
   cartId: z.string(),
 })
 
+export const customerSchema = z.object({
+  id: z.string(),
+  firstName: z.string(),
+  lastName: z.string(),
+  email: z.string().optional(),
+  phone: z.string().optional(),
+  company: z.string().optional(),
+  notes: z.string().optional(),
+  acceptsMarketing: z.boolean().optional(),
+})
+
+export const addressSchema = z.object({
+  id: z.string(),
+  mask: z.string(),
+})
+
 export const addressFieldsSchema = z.object({
   type: z.string(),
   firstName: z.string(),
@@ -46,6 +62,11 @@ export const cardFieldsSchema = z.object({
   country: z.string(),
 })
 
+export const cardSchema = z.object({
+  id: z.string(),
+  mask: z.string(),
+})
+
 export const addCardBodySchema = z.object({
   cartId: z.string(),
   item: cardFieldsSchema,

packages/commerce/src/schemas/product.ts

@@ -1,4 +1,4 @@
-import { z } from 'zod'
+import { boolean, z } from 'zod'
 
 export const productPriceSchema = z.object({
   value: z.number(),
@@ -58,3 +58,8 @@ export const searchProductBodySchema = z.object({
   sort: z.string().optional(),
   locale: z.string().optional(),
 })
+
+export const searchProductsSchema = z.object({
+  products: z.array(productSchema),
+  found: z.boolean(),
+})

packages/commerce/src/schemas/whishlist.ts

@@ -1,4 +1,18 @@
 import { z } from 'zod'
+import { productSchema } from './product'
+
+export const wishlistSchemaItem = z.object({
+  id: z.string(),
+  productId: z.string(),
+  variantId: z.string(),
+  product: productSchema,
+})
+
+export const wishlistSchema = z.object({
+  id: z.string(),
+  items: z.array(wishlistSchemaItem),
+  token: z.string().optional(),
+})
 
 export const getWishlistBodySchema = z.object({
   customerAccessToken: z.string(),

packages/commerce/src/types/cart.ts

@@ -199,14 +199,14 @@ export type CartHooks = {
 }
 
 export type GetCartHook = {
-  data: Cart | null
+  data: Cart | null | undefined
   input: {}
   fetcherInput: { cartId?: string }
   swrState: { isEmpty: boolean }
 }
 
 export type AddItemHook = {
-  data: Cart
+  data: Cart | null | undefined
   input?: CartItemBody
   fetcherInput: CartItemBody
   body: { item: CartItemBody }
@@ -251,6 +251,7 @@ export type GetCartHandler = GetCartHook & {
 }
 
 export type AddItemHandler = AddItemHook & {
+  data: Cart | null | undefined
   body: { cartId?: string }
 }
 

packages/commerce/src/types/checkout.ts

@@ -48,7 +48,7 @@ export interface CheckoutBody {
 }
 
 export type SubmitCheckoutHook = {
-  data: Checkout
+  data: Checkout | null
   input?: CheckoutBody
   fetcherInput: CheckoutBody
   body: { item: CheckoutBody }

packages/commerce/src/types/customer/address.ts

@@ -61,7 +61,7 @@ export type GetAddressesHook = {
 }
 
 export type AddItemHook = {
-  data: Address
+  data: Address | null
   input?: AddressFields
   fetcherInput: AddressFields
   body: { item: AddressFields }
@@ -77,7 +77,7 @@ export type UpdateItemHook = {
 }
 
 export type RemoveItemHook = {
-  data: Address | null | undefined
+  data: Address | null
   input: { item?: Address }
   fetcherInput: { itemId: string }
   body: { itemId: string }
@@ -100,7 +100,6 @@ export type AddItemHandler = AddItemHook & {
 }
 
 export type UpdateItemHandler = UpdateItemHook & {
-  data: Address
   body: { cartId: string }
 }
 

packages/commerce/src/types/customer/card.ts

@@ -78,7 +78,7 @@ export type GetCardsHook = {
 }
 
 export type AddItemHook = {
-  data: Card
+  data: Card | null
   input?: CardFields
   fetcherInput: CardFields
   body: { item: CardFields }
@@ -86,7 +86,7 @@ export type AddItemHook = {
 }
 
 export type UpdateItemHook = {
-  data: Card | null | undefined
+  data: Card | null
   input: { item?: CardFields; wait?: number }
   fetcherInput: { itemId: string; item: CardFields }
   body: { itemId: string; item: CardFields }
@@ -94,7 +94,7 @@ export type UpdateItemHook = {
 }
 
 export type RemoveItemHook = {
-  data: Card | null | undefined
+  data: Card | null
   input: { item?: Card }
   fetcherInput: { itemId: string }
   body: { itemId: string }
@@ -116,7 +116,6 @@ export type AddItemHandler = AddItemHook & {
 }
 
 export type UpdateItemHandler = UpdateItemHook & {
-  data: Card
   body: { cartId: string }
 }
 

packages/commerce/src/utils/types.ts

@@ -55,7 +55,7 @@ export type HookFetcherOptions = { method?: string } & (
   | { query?: string; url: string }
 )
 
-export type HookInputValue = string | number | boolean | undefined
+export type HookInputValue = string | number | boolean | null | undefined
 
 export type HookSWRInput = [string, HookInputValue][]
 

packages/commercejs/package.json

@@ -51,7 +51,7 @@
     "@vercel/commerce": "workspace:*",
     "cookie": "^0.4.1",
     "js-cookie": "^3.0.1",
-    "jsonwebtoken": "^8.5.1",
+    "@tsndr/cloudflare-worker-jwt": "^2.1.0",
     "lodash.debounce": "^4.0.8"
   },
   "peerDependencies": {
@@ -66,7 +66,6 @@
     "@types/chec__commerce.js": "^2.8.4",
     "@types/cookie": "^0.4.1",
     "@types/js-cookie": "^3.0.2",
-    "@types/jsonwebtoken": "^8.5.7",
     "@types/lodash.debounce": "^4.0.6",
     "@types/node": "^17.0.8",
     "@types/react": "^18.0.14",

packages/commercejs/src/api/endpoints/checkout/get-checkout.ts

@@ -1 +1,3 @@
-export default function noopApi(...args: any[]): void {}
+export default function getCheckout(...args: any[]) {
+  return Promise.resolve({ data: null })
+}

packages/commercejs/src/api/endpoints/checkout/submit-checkout.ts

@@ -5,7 +5,6 @@ import sdkFetcherFunction from '../../utils/sdk-fetch'
 import { normalizeTestCheckout } from '../../../utils/normalize-checkout'
 
 const submitCheckout: CheckoutEndpoint['handlers']['submitCheckout'] = async ({
-  res,
   body: { item, cartId },
   config: { sdkFetch },
 }) => {
@@ -38,7 +37,7 @@ const submitCheckout: CheckoutEndpoint['handlers']['submitCheckout'] = async ({
   // Capture the order
   await sdkFetcher('checkout', 'capture', checkoutToken, checkoutData)
 
-  res.status(200).json({ data: null, errors: [] })
+  return { data: null }
 }
 
 export default submitCheckout

packages/commercejs/src/api/endpoints/login/login.ts

@@ -5,28 +5,31 @@ import type { LoginEndpoint } from '.'
 
 const login: LoginEndpoint['handlers']['login'] = async ({
   req,
-  res,
   config: { sdkFetch, customerCookie },
 }) => {
   const sdkFetcher: typeof sdkFetcherFunction = sdkFetch
   const redirectUrl = getDeploymentUrl()
+  const { searchParams } = new URL(req.url)
   try {
-    const loginToken = req.query?.token as string
+    const loginToken = searchParams.get('token')
+
     if (!loginToken) {
-      res.redirect(redirectUrl)
+      return { redirectTo: redirectUrl }
     }
     const { jwt } = await sdkFetcher('customer', 'getToken', loginToken, false)
-    res.setHeader(
-      'Set-Cookie',
-      serialize(customerCookie, jwt, {
-        secure: process.env.NODE_ENV === 'production',
-        maxAge: 60 * 60 * 24,
-        path: '/',
-      })
-    )
-    res.redirect(redirectUrl)
+
+    return {
+      redirectTo: redirectUrl,
+      headers: {
+        'Set-Cookie': serialize(customerCookie, jwt, {
+          secure: process.env.NODE_ENV === 'production',
+          maxAge: 60 * 60 * 24,
+          path: '/',
+        }),
+      },
+    }
   } catch {
-    res.redirect(redirectUrl)
+    return { redirectTo: redirectUrl }
   }
 }
 

packages/commercejs/src/customer/use-customer.tsx

@@ -1,5 +1,8 @@
 import Cookies from 'js-cookie'
-import { decode } from 'jsonwebtoken'
+import {
+  decode,
+  type JwtData as CoreJwtData,
+} from '@tsndr/cloudflare-worker-jwt'
 import { SWRHook } from '@vercel/commerce/utils/types'
 import useCustomer, {
   UseCustomer,
@@ -7,6 +10,10 @@ import useCustomer, {
 import { CUSTOMER_COOKIE, API_URL } from '../constants'
 import type { CustomerHook } from '@vercel/commerce/types/customer'
 
+type JwtData = CoreJwtData & {
+  cid: string
+}
+
 export default useCustomer as UseCustomer<typeof handler>
 export const handler: SWRHook<CustomerHook> = {
   fetchOptions: {
@@ -20,7 +27,8 @@ export const handler: SWRHook<CustomerHook> = {
       return null
     }
 
-    const decodedToken = decode(token) as { cid: string }
+    const decodedToken = decode(token) as JwtData
+
     const customer = await fetch<any>({
       query: options.query,
       method: options.method,

packages/commercejs/src/utils/product-search.ts

@@ -4,8 +4,8 @@ const getFilterVariables = ({
   search,
   categoryId,
 }: {
-  search?: string
-  categoryId?: string | number
+  search?: string | null
+  categoryId?: string | number | null
 }) => {
   let filterVariables: { [key: string]: any } = {}
   if (search) {
@@ -17,7 +17,7 @@ const getFilterVariables = ({
   return filterVariables
 }
 
-const getSortVariables = ({ sort }: { sort?: string }) => {
+const getSortVariables = ({ sort }: { sort?: string | null }) => {
   let sortVariables: { [key: string]: any } = {}
   switch (sort) {
     case 'trending-desc':

packages/kibocommerce/package.json

@@ -50,9 +50,7 @@
   },
   "dependencies": {
     "@vercel/commerce": "workspace:*",
-    "@vercel/fetch": "^6.2.0",
-    "lodash.debounce": "^4.0.8",
-    "node-fetch": "^2.6.7"
+    "lodash.debounce": "^4.0.8"
   },
   "peerDependencies": {
     "next": "^12",

packages/kibocommerce/src/api/endpoints/cart/add-item.ts

@@ -53,28 +53,19 @@ const buildAddToCartVariables = ({
 
 const addItem: CartEndpoint['handlers']['addItem'] = async ({
   req,
-  res,
-  body: { cartId, item },
+  body: { item },
   config,
 }) => {
-  if (!item) {
-    return res.status(400).json({
-      data: null,
-      errors: [{ message: 'Missing item' }],
-    })
-  }
-  if (!item.quantity) item.quantity = 1
-
   const productResponse = await config.fetch(getProductQuery, {
     variables: { productCode: item?.productId },
   })
 
-  const cookieHandler = new CookieHandler(config, req, res)
+  const cookieHandler = new CookieHandler(config, req)
   let accessToken = null
 
   if (!cookieHandler.getAccessToken()) {
     let anonymousShopperTokenResponse = await cookieHandler.getAnonymousToken()
-    accessToken = anonymousShopperTokenResponse.accessToken;
+    accessToken = anonymousShopperTokenResponse.accessToken
   } else {
     accessToken = cookieHandler.getAccessToken()
   }
@@ -95,7 +86,8 @@ const addItem: CartEndpoint['handlers']['addItem'] = async ({
     )
     currentCart = result?.data?.currentCart
   }
-  res.status(200).json({ data: normalizeCart(currentCart) })
+
+  return { data: normalizeCart(currentCart) }
 }
 
 export default addItem

packages/kibocommerce/src/api/endpoints/cart/get-cart.ts

@@ -6,17 +6,17 @@ import { getCartQuery } from '../../queries/get-cart-query'
 
 const getCart: CartEndpoint['handlers']['getCart'] = async ({
   req,
-  res,
-  body: { cartId },
   config,
 }) => {
   let currentCart: Cart = {}
+  let headers
   try {
-    const cookieHandler = new CookieHandler(config, req, res)
+    const cookieHandler = new CookieHandler(config, req)
     let accessToken = null
 
     if (!cookieHandler.getAccessToken()) {
-      let anonymousShopperTokenResponse = await cookieHandler.getAnonymousToken()
+      let anonymousShopperTokenResponse =
+        await cookieHandler.getAnonymousToken()
       const response = anonymousShopperTokenResponse.response
       accessToken = anonymousShopperTokenResponse.accessToken
       cookieHandler.setAnonymousShopperCookie(response)
@@ -30,12 +30,14 @@ const getCart: CartEndpoint['handlers']['getCart'] = async ({
       { headers: { 'x-vol-user-claims': accessToken } }
     )
     currentCart = result?.data?.currentCart
+    headers = cookieHandler.headers
   } catch (error) {
     throw error
   }
-  res.status(200).json({
+
+  return {
     data: currentCart ? normalizeCart(currentCart) : null,
-  })
+  }
 }
 
 export default getCart

packages/kibocommerce/src/api/endpoints/cart/index.ts

@@ -1,8 +1,8 @@
 import { GetAPISchema, createEndpoint } from '@vercel/commerce/api'
 import cartEndpoint from '@vercel/commerce/api/endpoints/cart'
 import type { KiboCommerceAPI } from '../..'
-import getCart from './get-cart';
-import addItem from './add-item';
+import getCart from './get-cart'
+import addItem from './add-item'
 import updateItem from './update-item'
 import removeItem from './remove-item'
 

packages/kibocommerce/src/api/endpoints/cart/remove-item.ts

@@ -5,17 +5,10 @@ import { getCartQuery } from '../../../api/queries/get-cart-query'
 
 const removeItem: CartEndpoint['handlers']['removeItem'] = async ({
   req,
-  res,
-  body: { cartId, itemId },
+  body: { itemId },
   config,
 }) => {
-  if (!itemId) {
-    return res.status(400).json({
-      data: null,
-      errors: [{ message: 'Invalid request' }],
-    })
-  }
-  const encodedToken = req.cookies[config.customerCookie]
+  const encodedToken = req.cookies.get(config.customerCookie)
   const token = encodedToken
     ? Buffer.from(encodedToken, 'base64').toString('ascii')
     : null
@@ -39,7 +32,10 @@ const removeItem: CartEndpoint['handlers']['removeItem'] = async ({
     )
     currentCart = result?.data?.currentCart
   }
-  res.status(200).json({ data: normalizeCart(currentCart) })
+
+  return {
+    data: normalizeCart(currentCart),
+  }
 }
 
 export default removeItem

packages/kibocommerce/src/api/endpoints/cart/update-item.ts

@@ -5,17 +5,10 @@ import updateCartItemQuantityMutation from '../../../api/mutations/updateCartIte
 
 const updateItem: CartEndpoint['handlers']['updateItem'] = async ({
   req,
-  res,
-  body: { cartId, itemId, item },
+  body: { itemId, item },
   config,
 }) => {
-  if (!itemId || !item) {
-    return res.status(400).json({
-      data: null,
-      errors: [{ message: 'Invalid request' }],
-    })
-  }
-  const encodedToken = req.cookies[config.customerCookie]
+  const encodedToken = req.cookies.get(config.cartCookie)
   const token = encodedToken
     ? Buffer.from(encodedToken, 'base64').toString('ascii')
     : null
@@ -39,7 +32,8 @@ const updateItem: CartEndpoint['handlers']['updateItem'] = async ({
     )
     currentCart = result?.data?.currentCart
   }
-  res.status(200).json({ data: normalizeCart(currentCart) })
+
+  return { data: normalizeCart(currentCart) }
 }
 
 export default updateItem

packages/kibocommerce/src/api/endpoints/catalog/products/products.ts

@@ -2,16 +2,15 @@ import { Product } from '@vercel/commerce/types/product'
 import { ProductsEndpoint } from '.'
 import productSearchQuery from '../../../queries/product-search-query'
 import { buildProductSearchVars } from '../../../../lib/product-search-vars'
-import {normalizeProduct} from '../../../../lib/normalize'
+import { normalizeProduct } from '../../../../lib/normalize'
 
 const getProducts: ProductsEndpoint['handlers']['getProducts'] = async ({
-  res,
   body: { search, categoryId, brandId, sort },
   config,
 }) => {
-  const pageSize = 100;
-  const filters = {};
-  const startIndex = 0;
+  const pageSize = 100
+  const filters = {}
+  const startIndex = 0
   const variables = buildProductSearchVars({
     categoryCode: categoryId,
     pageSize,
@@ -20,12 +19,14 @@ const getProducts: ProductsEndpoint['handlers']['getProducts'] = async ({
     filters,
     startIndex,
   })
-  const {data} = await config.fetch(productSearchQuery, { variables });
-  const found = data?.products?.items?.length > 0 ? true : false;
-  let productsResponse= data?.products?.items.map((item: any) =>normalizeProduct(item,config));
-  const products: Product[] = found ?  productsResponse : [];
+  const { data } = await config.fetch(productSearchQuery, { variables })
+  const found = data?.products?.items?.length > 0 ? true : false
+  let productsResponse = data?.products?.items.map((item: any) =>
+    normalizeProduct(item, config)
+  )
+  const products: Product[] = found ? productsResponse : []
 
-  res.status(200).json({ data: { products, found } });
+  return { data: { products, found } }
 }
 
 export default getProducts

packages/kibocommerce/src/api/endpoints/customer/customer.ts

@@ -2,35 +2,32 @@ import CookieHandler from '../../../api/utils/cookie-handler'
 import type { CustomerEndpoint } from '.'
 import { getCustomerAccountQuery } from '../../queries/get-customer-account-query'
 import { normalizeCustomer } from '../../../lib/normalize'
+import { CommerceAPIError } from '@vercel/commerce/api/utils/errors'
 
-const getLoggedInCustomer: CustomerEndpoint['handlers']['getLoggedInCustomer'] = async ({
-  req,
-  res,
-  config,
-}) => {
-  const cookieHandler = new CookieHandler(config, req, res)
-  let accessToken = cookieHandler.getAccessToken();
+const getLoggedInCustomer: CustomerEndpoint['handlers']['getLoggedInCustomer'] =
+  async ({ req, config }) => {
+    const cookieHandler = new CookieHandler(config, req)
+    let accessToken = cookieHandler.getAccessToken()
 
-  if (!cookieHandler.isShopperCookieAnonymous()) {
-    const { data } = await config.fetch(getCustomerAccountQuery, undefined, {
-      headers: {
-        'x-vol-user-claims': accessToken,
-      },
-    })
-
-    const customer = normalizeCustomer(data?.customerAccount)
-    
-    if (!customer.id) {
-      return res.status(400).json({
-        data: null,
-        errors: [{ message: 'Customer not found', code: 'not_found' }],
+    if (!cookieHandler.isShopperCookieAnonymous()) {
+      const { data } = await config.fetch(getCustomerAccountQuery, undefined, {
+        headers: {
+          'x-vol-user-claims': accessToken,
+        },
       })
+
+      const customer = normalizeCustomer(data?.customerAccount)
+
+      if (!customer.id) {
+        throw new CommerceAPIError('Customer not found', {
+          status: 404,
+        })
+      }
+
+      return { data: { customer } }
     }
 
-    return res.status(200).json({ data: { customer } })
+    return { data: null }
   }
 
-  res.status(200).json({ data: null })
-}
-
 export default getLoggedInCustomer

packages/kibocommerce/src/api/endpoints/login/login.ts

@@ -1,66 +1,53 @@
-import { FetcherError } from '@vercel/commerce/utils/errors'
 import type { LoginEndpoint } from '.'
+
+import { FetcherError } from '@vercel/commerce/utils/errors'
+import { CommerceAPIError } from '@vercel/commerce/api/utils/errors'
+
 import { loginMutation } from '../../mutations/login-mutation'
-import { prepareSetCookie } from '../../../lib/prepare-set-cookie';
-import { setCookies } from '../../../lib/set-cookie'
+import { prepareSetCookie } from '../../../lib/prepare-set-cookie'
 import { getCookieExpirationDate } from '../../../lib/get-cookie-expiration-date'
 
 const invalidCredentials = /invalid credentials/i
 
 const login: LoginEndpoint['handlers']['login'] = async ({
-  req,
-  res,
   body: { email, password },
   config,
-  commerce,
 }) => {
-
-  if (!(email && password)) {
-    return res.status(400).json({
-      data: null,
-      errors: [{ message: 'Invalid request' }],
-    })
-  }
-
-  let response;
+  let response
   try {
-
-    const variables = { loginInput : { username: email, password }};
-    response = await  config.fetch(loginMutation, { variables })
-    const { account: token }  = response.data;
+    const variables = { loginInput: { username: email, password } }
+    response = await config.fetch(loginMutation, { variables })
+    const { account: token } = response.data
 
     // Set Cookie
-    const cookieExpirationDate = getCookieExpirationDate(config.customerCookieMaxAgeInDays)
+    const cookieExpirationDate = getCookieExpirationDate(
+      config.customerCookieMaxAgeInDays
+    )
 
     const authCookie = prepareSetCookie(
       config.customerCookie,
       JSON.stringify(token),
-      token.accessTokenExpiration ? { expires: cookieExpirationDate }: {},
+      token.accessTokenExpiration ? { expires: cookieExpirationDate } : {}
     )
-    setCookies(res, [authCookie])
 
+    return { data: response, headers: { 'Set-Cookie': authCookie } }
   } catch (error) {
     // Check if the email and password didn't match an existing account
     if (
       error instanceof FetcherError &&
       invalidCredentials.test(error.message)
     ) {
-      return res.status(401).json({
-        data: null,
-        errors: [
-          {
-            message:
-              'Cannot find an account that matches the provided credentials',
-            code: 'invalid_credentials',
-          },
-        ],
-      })
+      throw new CommerceAPIError(
+        'Cannot find an account that matches the provided credentials',
+        {
+          status: 401,
+          code: 'invalid_credentials',
+        }
+      )
+    } else {
+      throw error
     }
-
-    throw error
   }
-
-  res.status(200).json({ data: response })
 }
 
 export default login

packages/kibocommerce/src/api/endpoints/logout/logout.ts

@@ -1,22 +1,22 @@
 import type { LogoutEndpoint } from '.'
-import {prepareSetCookie} from '../../../lib/prepare-set-cookie';
-import {setCookies} from '../../../lib/set-cookie'
+import { prepareSetCookie } from '../../../lib/prepare-set-cookie'
 
 const logout: LogoutEndpoint['handlers']['logout'] = async ({
-  res,
   body: { redirectTo },
   config,
 }) => {
   // Remove the cookie
-  const authCookie = prepareSetCookie(config.customerCookie,'',{ maxAge: -1, path: '/'  })
-  setCookies(res, [authCookie])   
+  const authCookie = prepareSetCookie(config.customerCookie, '', {
+    maxAge: -1,
+    path: '/',
+  })
+
+  const headers = {
+    'Set-Cookie': authCookie,
+  }
 
   // Only allow redirects to a relative URL
-  if (redirectTo?.startsWith('/')) {
-    res.redirect(redirectTo)
-  } else {
-    res.status(200).json({ data: null })
-  }
+  return redirectTo?.startsWith('/') ? { redirectTo, headers } : { headers }
 }
 
 export default logout

packages/kibocommerce/src/api/endpoints/signup/signup.ts

@@ -1,91 +1,89 @@
-import { FetcherError } from '@vercel/commerce/utils/errors'
 import type { SignupEndpoint } from '.'
-import { registerUserMutation, registerUserLoginMutation } from '../../mutations/signup-mutation'
-import { prepareSetCookie } from '../../../lib/prepare-set-cookie';
-import { setCookies } from '../../../lib/set-cookie'
+
+import { FetcherError } from '@vercel/commerce/utils/errors'
+import { CommerceAPIError } from '@vercel/commerce/api/utils/errors'
+
+import {
+  registerUserMutation,
+  registerUserLoginMutation,
+} from '../../mutations/signup-mutation'
+import { prepareSetCookie } from '../../../lib/prepare-set-cookie'
 import { getCookieExpirationDate } from '../../../lib/get-cookie-expiration-date'
 
 const invalidCredentials = /invalid credentials/i
 
 const signup: SignupEndpoint['handlers']['signup'] = async ({
-  req,
-  res,
   body: { email, password, firstName, lastName },
   config,
-  commerce,
 }) => {
-
-  if (!(email && password)) {
-    return res.status(400).json({
-      data: null,
-      errors: [{ message: 'Invalid request' }],
-    })
-  }
-
-  let response;
+  let response
   try {
-
     // Register user
     const registerUserVariables = {
       customerAccountInput: {
-          emailAddress: email,
-          firstName: firstName,
-          lastName: lastName,
-          acceptsMarketing: true,
-          id: 0
-        }
+        emailAddress: email,
+        firstName: firstName,
+        lastName: lastName,
+        acceptsMarketing: true,
+        id: 0,
+      },
     }
 
-    const registerUserResponse = await  config.fetch(registerUserMutation, { variables: registerUserVariables})
-    const accountId  = registerUserResponse.data?.account?.id;
+    const registerUserResponse = await config.fetch(registerUserMutation, {
+      variables: registerUserVariables,
+    })
+    const accountId = registerUserResponse.data?.account?.id
 
     // Login user
     const registerUserLoginVairables = {
       accountId: accountId,
       customerLoginInfoInput: {
-          emailAddress: email,
-          username: email,
-          password: password,
-          isImport: false
-      }
+        emailAddress: email,
+        username: email,
+        password: password,
+        isImport: false,
+      },
     }
 
-    response = await  config.fetch(registerUserLoginMutation, { variables: registerUserLoginVairables})
-    const { account: token }  = response.data;
+    response = await config.fetch(registerUserLoginMutation, {
+      variables: registerUserLoginVairables,
+    })
+    const { account: token } = response.data
 
     // Set Cookie
-    const cookieExpirationDate = getCookieExpirationDate(config.customerCookieMaxAgeInDays)
+    const cookieExpirationDate = getCookieExpirationDate(
+      config.customerCookieMaxAgeInDays
+    )
 
     const authCookie = prepareSetCookie(
       config.customerCookie,
       JSON.stringify(token),
-      token.accessTokenExpiration ? { expires: cookieExpirationDate }: {},
+      token.accessTokenExpiration ? { expires: cookieExpirationDate } : {}
     )
 
-    setCookies(res, [authCookie])
-
+    return {
+      data: response,
+      headers: {
+        'Set-Cookie': authCookie,
+      },
+    }
   } catch (error) {
     // Check if the email and password didn't match an existing account
     if (
       error instanceof FetcherError &&
       invalidCredentials.test(error.message)
     ) {
-      return res.status(401).json({
-        data: null,
-        errors: [
-          {
-            message:
-              'Cannot find an account that matches the provided credentials',
-            code: 'invalid_credentials',
-          },
-        ],
-      })
+      throw new CommerceAPIError(
+        'Cannot find an account that matches the provided credentials',
+        {
+          status: 401,
+          code: 'invalid_credentials',
+        }
+      )
+    } else {
+      throw error
     }
-
-    throw error
   }
-
-  res.status(200).json({ data: response })
 }
 
 export default signup

packages/kibocommerce/src/api/endpoints/wishlist/add-item.ts

@@ -1,17 +1,20 @@
-import getCustomerWishlist from '../../operations/get-customer-wishlist'
-import getCustomerId from '../../utils/get-customer-id'
 import type { WishlistEndpoint } from '.'
+
+import { CommerceAPIError } from '@vercel/commerce/api/utils/errors'
+
 import { normalizeWishlistItem } from '../../../lib/normalize'
 import { getProductQuery } from '../../../api/queries/get-product-query'
-import addItemToWishlistMutation from '../../mutations/addItemToWishlist-mutation'
+
+import getCustomerId from '../../utils/get-customer-id'
 import createWishlist from '../../mutations/create-wishlist-mutation'
+import addItemToWishlistMutation from '../../mutations/addItemToWishlist-mutation'
 
 // Return wishlist info
 const buildAddToWishlistVariables = ({
   productId,
   variantId,
   productResponse,
-  wishlist
+  wishlist,
 }: {
   productId: string
   variantId: string
@@ -23,7 +26,7 @@ const buildAddToWishlistVariables = ({
   const selectedOptions = product.variations?.find(
     (v: any) => v.productCode === variantId
   ).options
-  const quantity=1
+  const quantity = 1
   let options: any[] = []
   selectedOptions?.forEach((each: any) => {
     product?.options
@@ -47,53 +50,50 @@ const buildAddToWishlistVariables = ({
         productCode: productId,
         variationProductCode: variantId ? variantId : null,
         options,
-      }
       },
+    },
   }
 }
 
 const addItem: WishlistEndpoint['handlers']['addItem'] = async ({
-  res,
   body: { customerToken, item },
   config,
   commerce,
 }) => {
-  const token = customerToken ? Buffer.from(customerToken, 'base64').toString('ascii'): null;
-  const accessToken = token ? JSON.parse(token).accessToken : null;
+  const token = customerToken
+    ? Buffer.from(customerToken, 'base64').toString('ascii')
+    : null
+  const accessToken = token ? JSON.parse(token).accessToken : null
   let result: { data?: any } = {}
   let wishlist: any
 
-  if (!item) {
-    return res.status(400).json({
-      data: null,
-      errors: [{ message: 'Missing item' }],
-    })
-  }
-
-  const customerId = customerToken && (await getCustomerId({ customerToken, config }))
-  const wishlistName= config.defaultWishlistName
+  const customerId =
+    customerToken && (await getCustomerId({ customerToken, config }))
+  const wishlistName = config.defaultWishlistName
 
   if (!customerId) {
-    return res.status(400).json({
-      data: null,
-      errors: [{ message: 'Invalid request' }],
-    })
+    throw new CommerceAPIError('Customer not found', { status: 404 })
   }
 
   const wishlistResponse = await commerce.getCustomerWishlist({
     variables: { customerId, wishlistName },
     config,
   })
-  wishlist= wishlistResponse?.wishlist
-  if(Object.keys(wishlist).length === 0) {
-    const createWishlistResponse= await config.fetch(createWishlist, {variables: {
-      wishlistInput: {
-        customerAccountId: customerId,
-        name: wishlistName
-      }
-    }
-  }, {headers: { 'x-vol-user-claims': accessToken } })
-  wishlist= createWishlistResponse?.data?.createWishlist
+  wishlist = wishlistResponse?.wishlist
+  if (Object.keys(wishlist).length === 0) {
+    const createWishlistResponse = await config.fetch(
+      createWishlist,
+      {
+        variables: {
+          wishlistInput: {
+            customerAccountId: customerId,
+            name: wishlistName,
+          },
+        },
+      },
+      { headers: { 'x-vol-user-claims': accessToken } }
+    )
+    wishlist = createWishlistResponse?.data?.createWishlist
   }
 
   const productResponse = await config.fetch(getProductQuery, {
@@ -103,22 +103,33 @@ const addItem: WishlistEndpoint['handlers']['addItem'] = async ({
   const addItemToWishlistResponse = await config.fetch(
     addItemToWishlistMutation,
     {
-      variables: buildAddToWishlistVariables({ ...item, productResponse, wishlist }),
+      variables: buildAddToWishlistVariables({
+        ...item,
+        productResponse,
+        wishlist,
+      }),
     },
     { headers: { 'x-vol-user-claims': accessToken } }
   )
 
-  if(addItemToWishlistResponse?.data?.createWishlistItem){
-    const wishlistResponse= await commerce.getCustomerWishlist({
+  if (addItemToWishlistResponse?.data?.createWishlistItem) {
+    const wishlistResponse = await commerce.getCustomerWishlist({
       variables: { customerId, wishlistName },
       config,
     })
-    wishlist= wishlistResponse?.wishlist
+    wishlist = wishlistResponse?.wishlist
   }
 
-  result = { data: {...wishlist, items: wishlist?.items?.map((item:any) => normalizeWishlistItem(item, config))} }
+  result = {
+    data: {
+      ...wishlist,
+      items: wishlist?.items?.map((item: any) =>
+        normalizeWishlistItem(item, config)
+      ),
+    },
+  }
 
-  res.status(200).json({ data: result?.data })
+  return { data: result?.data }
 }
 
 export default addItem

packages/kibocommerce/src/api/endpoints/wishlist/get-wishlist.ts

@@ -1,35 +1,45 @@
 import type { WishlistEndpoint } from '.'
+
+import { CommerceAPIError } from '@vercel/commerce/api/utils/errors'
 import getCustomerId from '../../utils/get-customer-id'
 import { normalizeWishlistItem } from '../../../lib/normalize'
 
 // Return wishlist info
 const getWishlist: WishlistEndpoint['handlers']['getWishlist'] = async ({
-  res,
   body: { customerToken, includeProducts },
   config,
   commerce,
 }) => {
   let result: { data?: any } = {}
   if (customerToken) {
-    const customerId = customerToken && (await getCustomerId({ customerToken, config }))
-    const wishlistName= config.defaultWishlistName
+    const customerId =
+      customerToken && (await getCustomerId({ customerToken, config }))
+    const wishlistName = config.defaultWishlistName
+
     if (!customerId) {
-      // If the customerToken is invalid, then this request is too
-      return res.status(404).json({
-        data: null,
-        errors: [{ message: 'Wishlist not found' }],
+      throw new CommerceAPIError('Wishlist not found', {
+        status: 404,
+        code: 'not_found',
       })
     }
+
     const { wishlist } = await commerce.getCustomerWishlist({
       variables: { customerId, wishlistName },
       includeProducts,
       config,
     })
 
-    result = { data: {...wishlist, items: wishlist?.items?.map((item:any) => normalizeWishlistItem(item, config, includeProducts))} }
+    result = {
+      data: {
+        ...wishlist,
+        items: wishlist?.items?.map((item: any) =>
+          normalizeWishlistItem(item, config, includeProducts)
+        ),
+      },
+    }
   }
 
-  res.status(200).json({ data: result?.data ?? null })
+  return { data: result?.data ?? null }
 }
 
 export default getWishlist

packages/kibocommerce/src/api/endpoints/wishlist/remove-item.ts

@@ -1,60 +1,69 @@
-import getCustomerId from '../../utils/get-customer-id'
 import type { WishlistEndpoint } from '.'
+import { CommerceAPIError } from '@vercel/commerce/api/utils/errors'
 import { normalizeWishlistItem } from '../../../lib/normalize'
+import getCustomerId from '../../utils/get-customer-id'
 import removeItemFromWishlistMutation from '../../mutations/removeItemFromWishlist-mutation'
 
 // Return wishlist info
 const removeItem: WishlistEndpoint['handlers']['removeItem'] = async ({
-  res,
   body: { customerToken, itemId },
   config,
   commerce,
 }) => {
-  const token = customerToken ? Buffer.from(customerToken, 'base64').toString('ascii'): null;
-  const accessToken = token ? JSON.parse(token).accessToken : null;
+  const token = customerToken
+    ? Buffer.from(customerToken, 'base64').toString('ascii')
+    : null
+  const accessToken = token ? JSON.parse(token).accessToken : null
   let result: { data?: any } = {}
   let wishlist: any
 
-  const customerId = customerToken && (await getCustomerId({ customerToken, config }))
-  const wishlistName= config.defaultWishlistName
+  const customerId =
+    customerToken && (await getCustomerId({ customerToken, config }))
+  const wishlistName = config.defaultWishlistName
   const wishlistResponse = await commerce.getCustomerWishlist({
     variables: { customerId, wishlistName },
     config,
   })
-  wishlist= wishlistResponse?.wishlist 
+  wishlist = wishlistResponse?.wishlist
 
-  if (!wishlist || !itemId) {
-    return res.status(400).json({
-      data: null,
-      errors: [{ message: 'Invalid request' }],
-    })
+  if (!wishlist) {
+    throw new CommerceAPIError('Wishlist not found', { status: 404 })
   }
-  const removedItem = wishlist?.items?.find(
-    (item:any) => {
-      return item.product.productCode === itemId;
-    }
-  );
+
+  const removedItem = wishlist?.items?.find((item: any) => {
+    return item.product.productCode === itemId
+  })
 
   const removeItemFromWishlistResponse = await config.fetch(
     removeItemFromWishlistMutation,
     {
       variables: {
         wishlistId: wishlist?.id,
-        wishlistItemId: removedItem?.id
+        wishlistItemId: removedItem?.id,
       },
     },
     { headers: { 'x-vol-user-claims': accessToken } }
   )
 
-  if(removeItemFromWishlistResponse?.data?.deleteWishlistItem){
-    const wishlistResponse= await commerce.getCustomerWishlist({
+  if (removeItemFromWishlistResponse?.data?.deleteWishlistItem) {
+    const wishlistResponse = await commerce.getCustomerWishlist({
       variables: { customerId, wishlistName },
       config,
     })
-    wishlist= wishlistResponse?.wishlist
+    wishlist = wishlistResponse?.wishlist
+  }
+  result = {
+    data: {
+      ...wishlist,
+      items: wishlist?.items?.map((item: any) =>
+        normalizeWishlistItem(item, config)
+      ),
+    },
+  }
+
+  return {
+    data: result?.data,
   }
-  result = { data: {...wishlist, items: wishlist?.items?.map((item:any) => normalizeWishlistItem(item, config))} }
-  res.status(200).json({ data: result?.data })
 }
 
 export default removeItem

packages/kibocommerce/src/api/index.ts

@@ -9,16 +9,15 @@ import getCustomerWishlist from './operations/get-customer-wishlist'
 import getAllProductPaths from './operations/get-all-product-paths'
 import getAllProducts from './operations/get-all-products'
 import getProduct from './operations/get-product'
-import type { RequestInit } from '@vercel/fetch'
 
 export interface KiboCommerceConfig extends CommerceAPIConfig {
   apiHost?: string
   clientId?: string
   sharedSecret?: string
-  customerCookieMaxAgeInDays: number,
-  currencyCode: string,
-  documentListName: string,
-  defaultWishlistName: string,
+  customerCookieMaxAgeInDays: number
+  currencyCode: string
+  documentListName: string
+  defaultWishlistName: string
   authUrl?: string
 }
 
@@ -37,7 +36,7 @@ const config: KiboCommerceConfig = {
   sharedSecret: process.env.KIBO_SHARED_SECRET || '',
   customerCookieMaxAgeInDays: 30,
   currencyCode: 'USD',
-  defaultWishlistName: 'My Wishlist'
+  defaultWishlistName: 'My Wishlist',
 }
 
 const operations = {
@@ -55,7 +54,7 @@ export const provider = { config, operations }
 export type KiboCommerceProvider = typeof provider
 export type KiboCommerceAPI<
   P extends KiboCommerceProvider = KiboCommerceProvider
-  > = CommerceAPI<P | any>
+> = CommerceAPI<P | any>
 
 export function getCommerceApi<P extends KiboCommerceProvider>(
   customProvider: P = provider as any

packages/kibocommerce/src/api/utils/api-auth-helper.ts

@@ -1,6 +1,4 @@
 import type { KiboCommerceConfig } from '../index'
-import type { FetchOptions } from '@vercel/fetch'
-import fetch from './fetch'
 
 // This object is persisted during development
 const authCache: { kiboAuthTicket?: AppAuthTicket } = {}
@@ -41,11 +39,11 @@ export class APIAuthenticationHelper {
     this._clientId = clientId
     this._sharedSecret = sharedSecret
     this._authUrl = authUrl
-    if(!authTicketCache) {
-      this._authTicketCache = new RuntimeMemCache();
+    if (!authTicketCache) {
+      this._authTicketCache = new RuntimeMemCache()
     }
   }
-  private _buildFetchOptions(body: any = {}): FetchOptions {
+  private _buildFetchOptions(body: any = {}): any {
     return {
       method: 'POST',
       headers: {

packages/kibocommerce/src/api/utils/cookie-handler.ts

@@ -2,8 +2,9 @@ import { KiboCommerceConfig } from './../index'
 import { getCookieExpirationDate } from '../../lib/get-cookie-expiration-date'
 import { prepareSetCookie } from '../../lib/prepare-set-cookie'
 import { setCookies } from '../../lib/set-cookie'
-import { NextApiRequest } from 'next'
+
 import getAnonymousShopperToken from './get-anonymous-shopper-token'
+import { NextRequest, NextResponse } from 'next/server'
 
 const parseCookie = (cookieValue?: any) => {
   return cookieValue
@@ -12,14 +13,14 @@ const parseCookie = (cookieValue?: any) => {
 }
 export default class CookieHandler {
   config: KiboCommerceConfig
-  request: NextApiRequest
-  response: any
+  request: NextRequest
+  headers: HeadersInit | undefined
   accessToken: any
-  constructor(config: any, req: NextApiRequest, res: any) {
+  constructor(config: any, req: NextRequest) {
     this.config = config
     this.request = req
-    this.response = res
-    const encodedToken = req.cookies[config.customerCookie]
+
+    const encodedToken = req.cookies.get(config.customerCookie)
     const token = parseCookie(encodedToken)
     this.accessToken = token ? token.accessToken : null
   }
@@ -36,8 +37,8 @@ export default class CookieHandler {
   }
   isShopperCookieAnonymous() {
     const customerCookieKey = this.config.customerCookie
-    const shopperCookie = this.request.cookies[customerCookieKey]
-    const shopperSession = parseCookie(shopperCookie);
+    const shopperCookie = this.request.cookies.get(customerCookieKey)
+    const shopperSession = parseCookie(shopperCookie)
     const isAnonymous = shopperSession?.customerAccount ? false : true
     return isAnonymous
   }
@@ -53,7 +54,9 @@ export default class CookieHandler {
         ? { expires: cookieExpirationDate }
         : {}
     )
-    setCookies(this.response, [authCookie])
+    this.headers = {
+      'Set-Cookie': authCookie,
+    }
   }
   getAccessToken() {
     return this.accessToken

packages/kibocommerce/src/api/utils/fetch-graphql-api.ts

@@ -1,43 +1,46 @@
 import { FetcherError } from '@vercel/commerce/utils/errors'
 import type { GraphQLFetcher } from '@vercel/commerce/api'
 import type { KiboCommerceConfig } from '../index'
-import fetch from './fetch'
-import { APIAuthenticationHelper } from './api-auth-helper';
+
+import { APIAuthenticationHelper } from './api-auth-helper'
 
 const fetchGraphqlApi: (
   getConfig: () => KiboCommerceConfig
-) => GraphQLFetcher = (getConfig) => async (
-  query: string,
-  { variables, preview } = {},
-  fetchOptions
-) => {
-  const config = getConfig()
-  const authHelper = new APIAuthenticationHelper(config);
-  const apiToken = await authHelper.getAccessToken();
-  const res = await fetch(config.commerceUrl + (preview ? '/preview' : ''), {
-    ...fetchOptions,
-    method: 'POST',
-    headers: {
-      ...fetchOptions?.headers,
-      Authorization: `Bearer ${apiToken}`,
-      'Content-Type': 'application/json',
-    },
-    body: JSON.stringify({
-      query,
-      variables,
-    }),
-  })
-
-  const json = await res.json()
-  if (json.errors) {
-    console.warn(`Kibo API Request Correlation ID: ${res.headers.get('x-vol-correlation')}`);
-    throw new FetcherError({
-      errors: json.errors ?? [{ message: 'Failed to fetch KiboCommerce API' }],
-      status: res.status,
+) => GraphQLFetcher =
+  (getConfig) =>
+  async (query: string, { variables, preview } = {}, headers?: HeadersInit) => {
+    const config = getConfig()
+    const authHelper = new APIAuthenticationHelper(config)
+    const apiToken = await authHelper.getAccessToken()
+    const res = await fetch(config.commerceUrl + (preview ? '/preview' : ''), {
+      method: 'POST',
+      headers: {
+        ...headers,
+        Authorization: `Bearer ${apiToken}`,
+        'Content-Type': 'application/json',
+      },
+      body: JSON.stringify({
+        query,
+        variables,
+      }),
     })
+
+    const json = await res.json()
+    if (json.errors) {
+      console.warn(
+        `Kibo API Request Correlation ID: ${res.headers.get(
+          'x-vol-correlation'
+        )}`
+      )
+      throw new FetcherError({
+        errors: json.errors ?? [
+          { message: 'Failed to fetch KiboCommerce API' },
+        ],
+        status: res.status,
+      })
+    }
+
+    return { data: json.data, res }
   }
 
-  return { data: json.data, res }
-}
-
 export default fetchGraphqlApi

packages/kibocommerce/src/api/utils/fetch-local.ts

@@ -1,19 +1,19 @@
 import { FetcherError } from '@vercel/commerce/utils/errors'
 import type { GraphQLFetcher } from '@vercel/commerce/api'
 import type { KiboCommerceConfig } from '../index'
-import fetch from './fetch'
 
-const fetchGraphqlApi: (getConfig: () => KiboCommerceConfig) => GraphQLFetcher =
+const fetchGraphqlApi: (
+  getConfig: () => KiboCommerceConfig
+) => GraphQLFetcher =
   (getConfig) =>
-  async (query: string, { variables, preview } = {}, fetchOptions) => {
+  async (query: string, { variables, preview } = {}, headers?: HeadersInit) => {
     const config = getConfig()
     const res = await fetch(config.commerceUrl, {
-    //const res = await fetch(config.commerceUrl + (preview ? '/preview' : ''), {
-      ...fetchOptions,
+      //const res = await fetch(config.commerceUrl + (preview ? '/preview' : ''), {
       method: 'POST',
       headers: {
         Authorization: `Bearer ${config.apiToken}`,
-        ...fetchOptions?.headers,
+        ...headers,
         'Content-Type': 'application/json',
       },
       body: JSON.stringify({
@@ -25,7 +25,9 @@ const fetchGraphqlApi: (getConfig: () => KiboCommerceConfig) => GraphQLFetcher =
     const json = await res.json()
     if (json.errors) {
       throw new FetcherError({
-        errors: json.errors ?? [{ message: 'Failed to fetch KiboCommerce API' }],
+        errors: json.errors ?? [
+          { message: 'Failed to fetch KiboCommerce API' },
+        ],
         status: res.status,
       })
     }

packages/kibocommerce/src/api/utils/get-customer-id.ts

@@ -8,17 +8,13 @@ async function getCustomerId({
   customerToken: string
   config: KiboCommerceConfig
 }): Promise<string | undefined> {
-  const token = customerToken ? Buffer.from(customerToken, 'base64').toString('ascii'): null;
-  const accessToken = token ? JSON.parse(token).accessToken : null;
-  const { data } = await config.fetch(
-    getCustomerAccountQuery,
-    undefined,
-    {
-      headers: {
-        'x-vol-user-claims': accessToken,
-      },
-    }
-  )
+  const token = customerToken
+    ? Buffer.from(customerToken, 'base64').toString('ascii')
+    : null
+  const accessToken = token ? JSON.parse(token).accessToken : null
+  const { data } = await config.fetch(getCustomerAccountQuery, undefined, {
+    'x-vol-user-claims': accessToken,
+  })
 
   return data?.customerAccount?.id
 }

packages/kibocommerce/src/lib/set-cookie.ts

@@ -1,3 +1,3 @@
 export function setCookies(res: any, cookies: string[]): void {
-    res.setHeader('Set-Cookie', cookies);
+  res.setHeader('Set-Cookie', cookies)
 }

packages/local/package.json

@@ -47,9 +47,7 @@
     }
   },
   "dependencies": {
-    "@vercel/commerce": "workspace:*",
-    "@vercel/fetch": "^6.2.0",
-    "node-fetch": "^2.6.7"
+    "@vercel/commerce": "workspace:*"
   },
   "peerDependencies": {
     "next": "^12",

packages/local/src/api/utils/fetch-local.ts

@@ -1,17 +1,15 @@
 import { FetcherError } from '@vercel/commerce/utils/errors'
 import type { GraphQLFetcher } from '@vercel/commerce/api'
 import type { LocalConfig } from '../index'
-import fetch from './fetch'
 
 const fetchGraphqlApi: (getConfig: () => LocalConfig) => GraphQLFetcher =
   (getConfig) =>
-  async (query: string, { variables, preview } = {}, fetchOptions) => {
+  async (query: string, { variables, preview } = {}, headers?: HeadersInit) => {
     const config = getConfig()
     const res = await fetch(config.commerceUrl, {
-      ...fetchOptions,
       method: 'POST',
       headers: {
-        ...fetchOptions?.headers,
+        ...headers,
         'Content-Type': 'application/json',
       },
       body: JSON.stringify({

packages/ordercloud/package.json

@@ -48,10 +48,7 @@
   },
   "dependencies": {
     "@vercel/commerce": "workspace:*",
-    "@vercel/fetch": "^6.2.0",
-    "stripe": "^8.197.0",
     "lodash.debounce": "^4.0.8",
-    "node-fetch": "^2.6.7",
     "cookie": "^0.4.1"
   },
   "peerDependencies": {

packages/ordercloud/src/api/endpoints/cart/add-item.ts

@@ -1,64 +1,63 @@
 import type { CartEndpoint } from '.'
-import type { RawVariant } from '../../../types/product'
-import type { LineItem } from '@vercel/commerce/types/cart'
-
-import { serialize } from 'cookie'
+import type { RawVariantSpec } from '../../../types/product'
 
 import { formatCart } from '../../utils/cart'
+import { serialize } from 'cookie'
 
 const addItem: CartEndpoint['handlers']['addItem'] = async ({
-  res,
+  req,
   body: { cartId, item },
   config: { restBuyerFetch, cartCookie, tokenCookie },
 }) => {
-  // Store token
-  let token
-
-  // Set the quantity if not present
-  if (!item.quantity) item.quantity = 1
+  // Get token
+  let token = req.cookies.get(tokenCookie)
+  let headers = new Headers()
 
   // Create an order if it doesn't exist
   if (!cartId) {
     const { ID, meta } = await restBuyerFetch(
       'POST',
       `/orders/Outgoing`,
-      {}
-    ).then((response: { ID: string; meta: { token: string } }) => response)
+      {},
+      { token }
+    )
 
-    // Set the cart id and token
     cartId = ID
-    token = meta.token
 
-    // Set the cart and token cookie
-    res.setHeader('Set-Cookie', [
-      serialize(tokenCookie, meta.token, {
-        maxAge: 60 * 60 * 24 * 30,
-        expires: new Date(Date.now() + 60 * 60 * 24 * 30 * 1000),
-        secure: process.env.NODE_ENV === 'production',
-        path: '/',
-        sameSite: 'lax',
-      }),
+    headers.append(
+      'set-cookie',
       serialize(cartCookie, cartId!, {
         maxAge: 60 * 60 * 24 * 30,
         expires: new Date(Date.now() + 60 * 60 * 24 * 30 * 1000),
         secure: process.env.NODE_ENV === 'production',
         path: '/',
         sameSite: 'lax',
-      }),
-    ])
+      })
+    )
+
+    headers.append(
+      'set-cookie',
+      serialize(tokenCookie, meta.token.access_token, {
+        maxAge: meta.token.expires_in,
+        expires: new Date(Date.now() + meta.token.expires_in * 1000),
+        secure: process.env.NODE_ENV === 'production',
+        path: '/',
+        sameSite: 'lax',
+      })
+    )
   }
 
-  // Store specs
-  let specs: RawVariant['Specs'] = []
+  let specs: RawVariantSpec[] = []
 
   // If a variant is present, fetch its specs
-  if (item.variantId) {
-    specs = await restBuyerFetch(
+  if (item.variantId !== 'undefined') {
+    const { Specs } = await restBuyerFetch(
       'GET',
       `/me/products/${item.productId}/variants/${item.variantId}`,
       null,
       { token }
-    ).then((res: RawVariant) => res.Specs)
+    )
+    specs = Specs
   }
 
   // Add the item to the order
@@ -73,19 +72,19 @@ const addItem: CartEndpoint['handlers']['addItem'] = async ({
     { token }
   )
 
-  // Get cart
-  const [cart, lineItems] = await Promise.all([
+  // Get cart & line items
+  const [cart, { Items }] = await Promise.all([
     restBuyerFetch('GET', `/orders/Outgoing/${cartId}`, null, { token }),
     restBuyerFetch('GET', `/orders/Outgoing/${cartId}/lineitems`, null, {
       token,
-    }).then((response: { Items: LineItem[] }) => response.Items),
+    }),
   ])
 
   // Format cart
-  const formattedCart = formatCart(cart, lineItems)
+  const formattedCart = formatCart(cart, Items)
 
-  // Return cart and errors
-  res.status(200).json({ data: formattedCart, errors: [] })
+  // Return cart and headers
+  return { data: formattedCart, headers }
 }
 
 export default addItem

packages/ordercloud/src/api/endpoints/cart/get-cart.ts

@@ -1,64 +1,62 @@
-import type { OrdercloudLineItem } from '../../../types/cart'
 import type { CartEndpoint } from '.'
 
 import { serialize } from 'cookie'
-
 import { formatCart } from '../../utils/cart'
 
 // Return current cart info
 const getCart: CartEndpoint['handlers']['getCart'] = async ({
   req,
-  res,
   body: { cartId },
   config: { restBuyerFetch, cartCookie, tokenCookie },
 }) => {
+  // If no cartId is provided, return data null
   if (!cartId) {
-    return res.status(400).json({
-      data: null,
-      errors: [{ message: 'Invalid request' }],
-    })
+    return { data: null }
   }
 
   try {
-    // Get token from cookies
-    const token = req.cookies[tokenCookie]
+    // Get token
+    const token = req.cookies.get(tokenCookie)
 
-    // Get cart
-    const cart = await restBuyerFetch(
-      'GET',
-      `/orders/Outgoing/${cartId}`,
-      null,
-      { token }
-    )
-
-    // Get line items
-    const lineItems = await restBuyerFetch(
-      'GET',
-      `/orders/Outgoing/${cartId}/lineitems`,
-      null,
-      { token }
-    ).then((response: { Items: OrdercloudLineItem[] }) => response.Items)
-
-    // Format cart
-    const formattedCart = formatCart(cart, lineItems)
-
-    // Return cart and errors
-    res.status(200).json({ data: formattedCart, errors: [] })
-  } catch (error) {
-    // Reset cart and token cookie
-    res.setHeader('Set-Cookie', [
-      serialize(cartCookie, cartId, {
-        maxAge: -1,
-        path: '/',
-      }),
-      serialize(tokenCookie, cartId, {
-        maxAge: -1,
-        path: '/',
+    // Get cart & line items
+    const [cart, { Items, meta }] = await Promise.all([
+      restBuyerFetch('GET', `/orders/Outgoing/${cartId}`, null, { token }),
+      restBuyerFetch('GET', `/orders/Outgoing/${cartId}/lineitems`, null, {
+        token,
       }),
     ])
 
+    // Format cart
+    const formattedCart = formatCart(cart, Items)
+    // Return cart and errors
+    return {
+      data: formattedCart,
+    }
+  } catch (error) {
+    console.error(error)
+    const headers = new Headers()
+
+    headers.append(
+      'set-cookie',
+      serialize(cartCookie, '', {
+        maxAge: -1,
+        path: '/',
+      })
+    )
+
+    headers.append(
+      'set-cookie',
+      serialize(tokenCookie, '', {
+        maxAge: -1,
+        path: '/',
+      })
+    )
+
     // Return empty cart
-    res.status(200).json({ data: null, errors: [] })
+    return {
+      data: null,
+      headers,
+    }
   }
 }
 

packages/ordercloud/src/api/endpoints/cart/remove-item.ts

@@ -1,30 +1,22 @@
 import type { CartEndpoint } from '.'
-
 import { formatCart } from '../../utils/cart'
 import { OrdercloudLineItem } from '../../../types/cart'
 
 const removeItem: CartEndpoint['handlers']['removeItem'] = async ({
   req,
-  res,
   body: { cartId, itemId },
   config: { restBuyerFetch, tokenCookie },
 }) => {
-  if (!cartId || !itemId) {
-    return res.status(400).json({
-      data: null,
-      errors: [{ message: 'Invalid request' }],
-    })
-  }
-
-  // Get token from cookies
-  const token = req.cookies[tokenCookie]
+  const token = req.cookies.get(tokenCookie)
 
   // Remove the item to the order
   await restBuyerFetch(
     'DELETE',
     `/orders/Outgoing/${cartId}/lineitems/${itemId}`,
     null,
-    { token }
+    {
+      token,
+    }
   )
 
   // Get cart
@@ -39,7 +31,7 @@ const removeItem: CartEndpoint['handlers']['removeItem'] = async ({
   const formattedCart = formatCart(cart, lineItems)
 
   // Return cart and errors
-  res.status(200).json({ data: formattedCart, errors: [] })
+  return { data: formattedCart }
 }
 
 export default removeItem

packages/ordercloud/src/api/endpoints/cart/update-item.ts

@@ -6,19 +6,10 @@ import { formatCart } from '../../utils/cart'
 
 const updateItem: CartEndpoint['handlers']['updateItem'] = async ({
   req,
-  res,
   body: { cartId, itemId, item },
   config: { restBuyerFetch, tokenCookie },
 }) => {
-  if (!cartId || !itemId || !item) {
-    return res.status(400).json({
-      data: null,
-      errors: [{ message: 'Invalid request' }],
-    })
-  }
-
-  // Get token from cookies
-  const token = req.cookies[tokenCookie]
+  const token = req.cookies.get(tokenCookie)
 
   // Store specs
   let specs: RawVariant['Specs'] = []
@@ -27,9 +18,7 @@ const updateItem: CartEndpoint['handlers']['updateItem'] = async ({
   if (item.variantId) {
     specs = await restBuyerFetch(
       'GET',
-      `/me/products/${item.productId}/variants/${item.variantId}`,
-      null,
-      { token }
+      `/me/products/${item.productId}/variants/${item.variantId}`
     ).then((res: RawVariant) => res.Specs)
   }
 
@@ -42,7 +31,9 @@ const updateItem: CartEndpoint['handlers']['updateItem'] = async ({
       Quantity: item.quantity,
       Specs: specs,
     },
-    { token }
+    {
+      token,
+    }
   )
 
   // Get cart
@@ -57,7 +48,7 @@ const updateItem: CartEndpoint['handlers']['updateItem'] = async ({
   const formattedCart = formatCart(cart, lineItems)
 
   // Return cart and errors
-  res.status(200).json({ data: formattedCart, errors: [] })
+  return { data: formattedCart }
 }
 
 export default updateItem

packages/ordercloud/src/api/endpoints/catalog/products/get-products.ts

@@ -1,13 +1,14 @@
-import { normalize as normalizeProduct } from '../../../../utils/product'
 import { ProductsEndpoint } from '.'
+import { normalize as normalizeProduct } from '../../../../utils/product'
 
 // Get products for the product list page. Search and category filter implemented. Sort and brand filter not implemented.
 const getProducts: ProductsEndpoint['handlers']['getProducts'] = async ({
   req,
-  res,
-  body: { search, categoryId, brandId, sort },
-  config: { restBuyerFetch, cartCookie, tokenCookie },
+  body: { search, categoryId },
+  config: { restBuyerFetch, tokenCookie },
 }) => {
+  const token = req.cookies.get(tokenCookie)
+
   //Use a dummy base as we only care about the relative path
   const url = new URL('/me/products', 'http://a')
 
@@ -18,20 +19,19 @@ const getProducts: ProductsEndpoint['handlers']['getProducts'] = async ({
     url.searchParams.set('categoryID', String(categoryId))
   }
 
-  // Get token from cookies
-  const token = req.cookies[tokenCookie]
-
   var rawProducts = await restBuyerFetch(
     'GET',
     url.pathname + url.search,
     null,
     { token }
-  )
+  ).then((response: { Items: any[] }) => response.Items)
 
-  const products = rawProducts.Items.map(normalizeProduct)
-  const found = rawProducts?.Items?.length > 0
-
-  res.status(200).json({ data: { products, found } })
+  return {
+    data: {
+      products: rawProducts.map(normalizeProduct),
+      found: rawProducts?.length > 0,
+    },
+  }
 }
 
 export default getProducts

packages/ordercloud/src/api/endpoints/checkout/get-checkout.ts

@@ -2,27 +2,15 @@ import type { CheckoutEndpoint } from '.'
 
 const getCheckout: CheckoutEndpoint['handlers']['getCheckout'] = async ({
   req,
-  res,
   body: { cartId },
-  config: { restBuyerFetch, tokenCookie },
+  config: { restBuyerFetch },
 }) => {
-  // Return an error if no item is present
-  if (!cartId) {
-    return res.status(400).json({
-      data: null,
-      errors: [{ message: 'Missing cookie' }],
-    })
-  }
-
-  // Get token from cookies
-  const token = req.cookies[tokenCookie]
+  const token = req.cookies.get('token')
 
   // Register credit card
   const payments = await restBuyerFetch(
     'GET',
-    `/orders/Outgoing/${cartId}/payments`,
-    null,
-    { token }
+    `/orders/Outgoing/${cartId}/payments`
   ).then((response: { Items: unknown[] }) => response.Items)
 
   const address = await restBuyerFetch(
@@ -35,15 +23,15 @@ const getCheckout: CheckoutEndpoint['handlers']['getCheckout'] = async ({
   )
 
   // Return cart and errors
-  res.status(200).json({
+
+  return {
     data: {
       hasPayment: payments.length > 0,
       hasShipping: Boolean(address),
       addressId: address,
       cardId: payments[0]?.ID,
     },
-    errors: [],
-  })
+  }
 }
 
 export default getCheckout

packages/ordercloud/src/api/endpoints/checkout/submit-checkout.ts

@@ -2,31 +2,18 @@ import type { CheckoutEndpoint } from '.'
 
 const submitCheckout: CheckoutEndpoint['handlers']['submitCheckout'] = async ({
   req,
-  res,
   body: { cartId },
   config: { restBuyerFetch, tokenCookie },
 }) => {
-  // Return an error if no item is present
-  if (!cartId) {
-    return res.status(400).json({
-      data: null,
-      errors: [{ message: 'Missing item' }],
-    })
-  }
-
-  // Get token from cookies
-  const token = req.cookies[tokenCookie]
+  const token = req.cookies.get(tokenCookie)
 
   // Submit order
-  await restBuyerFetch(
-    'POST',
-    `/orders/Outgoing/${cartId}/submit`,
-    {},
-    { token }
-  )
+  await restBuyerFetch('POST', `/orders/Outgoing/${cartId}/submit`, null, {
+    token,
+  })
 
   // Return cart and errors
-  res.status(200).json({ data: null, errors: [] })
+  return { data: null }
 }
 
 export default submitCheckout

packages/ordercloud/src/api/endpoints/customer/address/add-item.ts

@@ -1,25 +1,11 @@
 import type { CustomerAddressEndpoint } from '.'
 
 const addItem: CustomerAddressEndpoint['handlers']['addItem'] = async ({
-  res,
+  req,
   body: { item, cartId },
-  config: { restBuyerFetch },
+  config: { restBuyerFetch, tokenCookie },
 }) => {
-  // Return an error if no item is present
-  if (!item) {
-    return res.status(400).json({
-      data: null,
-      errors: [{ message: 'Missing item' }],
-    })
-  }
-
-  // Return an error if no item is present
-  if (!cartId) {
-    return res.status(400).json({
-      data: null,
-      errors: [{ message: 'Cookie not found' }],
-    })
-  }
+  const token = req.cookies.get(tokenCookie)
 
   // Register address
   const address = await restBuyerFetch('POST', `/me/addresses`, {
@@ -37,11 +23,16 @@ const addItem: CustomerAddressEndpoint['handlers']['addItem'] = async ({
   }).then((response: { ID: string }) => response.ID)
 
   // Assign address to order
-  await restBuyerFetch('PATCH', `/orders/Outgoing/${cartId}`, {
-    ShippingAddressID: address,
-  })
+  await restBuyerFetch(
+    'PATCH',
+    `/orders/Outgoing/${cartId}`,
+    {
+      ShippingAddressID: address,
+    },
+    { token }
+  )
 
-  return res.status(200).json({ data: null, errors: [] })
+  return { data: null }
 }
 
 export default addItem

packages/ordercloud/src/api/endpoints/customer/address/get-addresses.ts

@@ -1,9 +1,8 @@
 import type { CustomerAddressEndpoint } from '.'
 
-const getCards: CustomerAddressEndpoint['handlers']['getAddresses'] = async ({
-  res,
-}) => {
-  return res.status(200).json({ data: null, errors: [] })
-}
+const getAddresses: CustomerAddressEndpoint['handlers']['getAddresses'] =
+  () => {
+    return Promise.resolve({ data: null })
+  }
 
-export default getCards
+export default getAddresses

packages/ordercloud/src/api/endpoints/customer/address/remove-item.ts

@@ -1,9 +1,7 @@
 import type { CustomerAddressEndpoint } from '.'
 
-const removeItem: CustomerAddressEndpoint['handlers']['removeItem'] = async ({
-  res,
-}) => {
-  return res.status(200).json({ data: null, errors: [] })
+const removeItem: CustomerAddressEndpoint['handlers']['removeItem'] = () => {
+  return Promise.resolve({ data: null })
 }
 
 export default removeItem

packages/ordercloud/src/api/endpoints/customer/address/update-item.ts

@@ -1,9 +1,7 @@
 import type { CustomerAddressEndpoint } from '.'
 
-const updateItem: CustomerAddressEndpoint['handlers']['updateItem'] = async ({
-  res,
-}) => {
-  return res.status(200).json({ data: null, errors: [] })
+const updateItem: CustomerAddressEndpoint['handlers']['updateItem'] = () => {
+  return Promise.resolve({ data: null })
 }
 
 export default updateItem

packages/ordercloud/src/api/endpoints/customer/card/add-item.ts

@@ -1,53 +1,47 @@
 import type { CustomerCardEndpoint } from '.'
 import type { OredercloudCreditCard } from '../../../../types/customer/card'
 
-import Stripe from 'stripe'
-
-const stripe = new Stripe(process.env.STRIPE_SECRET as string, {
-  apiVersion: '2020-08-27',
-})
-
 const addItem: CustomerCardEndpoint['handlers']['addItem'] = async ({
-  res,
+  req,
   body: { item, cartId },
-  config: { restBuyerFetch, restMiddlewareFetch },
+  config: { restBuyerFetch, tokenCookie },
 }) => {
-  // Return an error if no item is present
-  if (!item) {
-    return res.status(400).json({
-      data: null,
-      errors: [{ message: 'Missing item' }],
-    })
-  }
-
-  // Return an error if no item is present
-  if (!cartId) {
-    return res.status(400).json({
-      data: null,
-      errors: [{ message: 'Cookie not found' }],
-    })
-  }
-
   // Get token
-  const token = await stripe.tokens
-    .create({
+  const token = req.cookies.get(tokenCookie)
+
+  const [exp_month, exp_year] = item.cardExpireDate.split('/')
+  const stripeToken = await fetch('https://api.stripe.com/v1/tokens', {
+    method: 'POST',
+    headers: {
+      Authorization: `Bearer ${process.env.STRIPE_SECRET}`,
+    },
+    body: JSON.stringify({
       card: {
         number: item.cardNumber,
-        exp_month: item.cardExpireDate.split('/')[0],
-        exp_year: item.cardExpireDate.split('/')[1],
+        exp_month,
+        exp_year,
         cvc: item.cardCvc,
       },
-    })
-    .then((res: { id: string }) => res.id)
+    }),
+  })
+    .then((res) => res.json())
+    .then((res) => res.id)
 
   // Register credit card
-  const creditCard = await restBuyerFetch('POST', `/me/creditcards`, {
-    Token: token,
-    CardType: 'credit',
-    PartialAccountNumber: item.cardNumber.slice(-4),
-    CardholderName: item.cardHolder,
-    ExpirationDate: item.cardExpireDate,
-  }).then((response: OredercloudCreditCard) => response.ID)
+  const creditCard = await restBuyerFetch(
+    'POST',
+    `/me/creditcards`,
+    {
+      Token: stripeToken,
+      CardType: 'credit',
+      PartialAccountNumber: item.cardNumber.slice(-4),
+      CardholderName: item.cardHolder,
+      ExpirationDate: item.cardExpireDate,
+    },
+    {
+      token,
+    }
+  ).then((response: OredercloudCreditCard) => response.ID)
 
   // Assign payment to order
   const payment = await restBuyerFetch(
@@ -56,19 +50,18 @@ const addItem: CustomerCardEndpoint['handlers']['addItem'] = async ({
     {
       Type: 'CreditCard',
       CreditCardID: creditCard,
+    },
+    {
+      token,
     }
   ).then((response: { ID: string }) => response.ID)
 
   // Accept payment to order
-  await restMiddlewareFetch(
-    'PATCH',
-    `/orders/All/${cartId}/payments/${payment}`,
-    {
-      Accepted: true,
-    }
-  )
+  await restBuyerFetch('PATCH', `/orders/All/${cartId}/payments/${payment}`, {
+    Accepted: true,
+  })
 
-  return res.status(200).json({ data: null, errors: [] })
+  return { data: null }
 }
 
 export default addItem

packages/ordercloud/src/api/endpoints/customer/card/get-cards.ts

@@ -1,9 +1,7 @@
 import type { CustomerCardEndpoint } from '.'
 
-const getCards: CustomerCardEndpoint['handlers']['getCards'] = async ({
-  res,
-}) => {
-  return res.status(200).json({ data: null, errors: [] })
+const getCards: CustomerCardEndpoint['handlers']['getCards'] = () => {
+  return Promise.resolve({ data: null })
 }
 
 export default getCards