changes

framework/shopify/utils/customer-token.ts

@@ -1,5 +1,5 @@
 import Cookies from 'js-cookie'
-import { SHOPIFY_CUSTOMER_TOKEN_COOKIE } from '@framework/const'
+import { SHOPIFY_CUSTOMER_TOKEN_COOKIE } from '@framework/config'
 
 export const getCustomerToken = () => Cookies.get(SHOPIFY_CUSTOMER_TOKEN_COOKIE)
 

framework/shopify/utils/fetch-graphql-api.ts

@@ -1,49 +0,0 @@
-import type { GraphQLFetcher } from '@commerce/api'
-import { FetcherError } from '@commerce/utils/errors'
-import fetch from './fetch'
-
-import { STORE_DOMAIN, API_URL, API_TOKEN } from '../config'
-
-if (!STORE_DOMAIN) {
-  throw new Error(
-    `The environment variable NEXT_PUBLIC_SHOPIFY_STORE_DOMAIN is missing and it's required to access your store`
-  )
-}
-
-if (!API_TOKEN) {
-  throw new Error(
-    `The environment variable NEXT_PUBLIC_SHOPIFY_STOREFRONT_ACCESS_TOKEN is missing and it's required to access your store`
-  )
-}
-
-const fetchGraphqlApi: GraphQLFetcher = async (
-  query: string,
-  { variables } = {},
-  fetchOptions
-) => {
-  const res = await fetch(API_URL, {
-    ...fetchOptions,
-    method: 'POST',
-    headers: {
-      'X-Shopify-Storefront-Access-Token': API_TOKEN!,
-      ...fetchOptions?.headers,
-      'Content-Type': 'application/json',
-    },
-    body: JSON.stringify({
-      query,
-      variables,
-    }),
-  })
-
-  const json = await res.json()
-
-  if (json.errors) {
-    throw new FetcherError({
-      errors: json.errors ?? [{ message: 'Failed to fetch Shopify API' }],
-      status: res.status,
-    })
-  }
-
-  return { data: json.data, res }
-}
-export default fetchGraphqlApi

framework/shopify/utils/fetch.ts

@@ -1,3 +0,0 @@
-import zeitFetch from '@vercel/fetch'
-
-export default zeitFetch()

framework/shopify/utils/get-checkout-id.ts

@@ -1,5 +1,5 @@
 import Cookies from 'js-cookie'
-import { SHOPIFY_CHECKOUT_ID_COOKIE } from '../const'
+import { SHOPIFY_CHECKOUT_ID_COOKIE } from '../config'
 
 const getCheckoutId = (id?: string) => {
   return id ?? Cookies.get(SHOPIFY_CHECKOUT_ID_COOKIE)

framework/shopify/utils/handle-fetch-response.ts

@@ -0,0 +1,27 @@
+import { FetcherError } from '@commerce/utils/errors'
+
+export function getError(errors: any[], status: number) {
+  errors = errors ?? [{ message: 'Failed to fetch Shopify API' }]
+  return new FetcherError({ errors, status })
+}
+
+export async function getAsyncError(res: Response) {
+  const data = await res.json()
+  return getError(data.errors, res.status)
+}
+
+const handleFetchResponse = async (res: Response) => {
+  if (res.ok) {
+    const { data, errors } = await res.json()
+
+    if (errors && errors.length) {
+      throw getError(errors, res.status)
+    }
+
+    return data
+  }
+
+  throw await getAsyncError(res)
+}
+
+export default handleFetchResponse