From d09aff1745a96338dfeb33068213782d96adc50b Mon Sep 17 00:00:00 2001
From: Lorenzo Stramaccia <slackerzz@users.noreply.github.com>
Date: Mon, 28 Nov 2022 07:15:22 +0100
Subject: [PATCH 1/2] Fix 500 when a product is not found (#880)

---
 packages/commerce/src/api/utils/with-operation-callback.ts | 2 +-
 site/pages/product/[slug].tsx                              | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/packages/commerce/src/api/utils/with-operation-callback.ts b/packages/commerce/src/api/utils/with-operation-callback.ts
index b4f5a88ee..1167cd5c2 100644
--- a/packages/commerce/src/api/utils/with-operation-callback.ts
+++ b/packages/commerce/src/api/utils/with-operation-callback.ts
@@ -21,7 +21,7 @@ export const withOperationCallback =
 const parse = ({ name, data }: Operation) => {
   switch (name) {
     case 'getProduct':
-      productSchema.nullable().parse(data.product)
+      productSchema.optional().parse(data.product)
       break
     case 'getAllProducts':
       z.array(productSchema).parse(data.products)
diff --git a/site/pages/product/[slug].tsx b/site/pages/product/[slug].tsx
index 9d8d153e4..b49aa6398 100644
--- a/site/pages/product/[slug].tsx
+++ b/site/pages/product/[slug].tsx
@@ -34,7 +34,9 @@ export async function getStaticProps({
   const { products: relatedProducts } = await allProductsPromise
 
   if (!product) {
-    throw new Error(`Product with slug '${params!.slug}' not found`)
+    return {
+      notFound: true,
+    }
   }
 
   return {

From 6bc223adb3c995027c3f8d70af9d6eeb6ca57742 Mon Sep 17 00:00:00 2001
From: Catalin Pinte <catalin.pinte@vercel.com>
Date: Mon, 28 Nov 2022 08:17:43 +0200
Subject: [PATCH 2/2] Improve error handling (#886)

* Improve error handling

* Update fetch-graphql-api.ts
---
 packages/commerce/src/api/utils/errors.ts         |  4 +++-
 .../saleor/src/api/utils/fetch-graphql-api.ts     | 15 ++++++++++-----
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/packages/commerce/src/api/utils/errors.ts b/packages/commerce/src/api/utils/errors.ts
index 5d54f8a75..227090c14 100644
--- a/packages/commerce/src/api/utils/errors.ts
+++ b/packages/commerce/src/api/utils/errors.ts
@@ -42,7 +42,9 @@ export class CommerceNetworkError extends Error {
 }
 
 export const normalizeZodIssues = (issues: ZodError['issues']) =>
-  issues.map(({ path, message }) => `${message} at "${path.join('.')}" field`)
+  issues.map(({ path, message }) =>
+    path.length ? `${message} at "${path.join('.')}" field` : message
+  )
 
 export const getOperationError = (operation: string, error: unknown) => {
   if (error instanceof ZodError) {
diff --git a/packages/saleor/src/api/utils/fetch-graphql-api.ts b/packages/saleor/src/api/utils/fetch-graphql-api.ts
index 313b57a05..45f5326d5 100644
--- a/packages/saleor/src/api/utils/fetch-graphql-api.ts
+++ b/packages/saleor/src/api/utils/fetch-graphql-api.ts
@@ -2,7 +2,6 @@ import type { GraphQLFetcher } from '@vercel/commerce/api'
 
 import { API_URL } from '../../const'
 import { getError } from '../../utils/handle-fetch-response'
-import { getCommerceApi } from '..'
 import { getToken } from '../../utils/index'
 
 const fetchGraphqlApi: GraphQLFetcher = async (
@@ -10,7 +9,6 @@ const fetchGraphqlApi: GraphQLFetcher = async (
   { variables } = {},
   headers?: HeadersInit
 ) => {
-  const config = getCommerceApi().getConfig()
   const token = getToken()
 
   const res = await fetch(API_URL!, {
@@ -28,10 +26,17 @@ const fetchGraphqlApi: GraphQLFetcher = async (
     }),
   })
 
-  const { data, errors, status } = await res.json()
+  const { data, errors, message, type, status } = await res.json()
 
-  if (errors) {
-    throw getError(errors, status)
+  if (errors || res.status >= 400) {
+    throw getError(
+      errors || [
+        {
+          message: `${type ? `${type}, ` : ''}${message}`,
+        },
+      ],
+      status || res.status
+    )
   }
 
   return { data, res }