Merge pull request #7002 from vuestorefront/fix/main-resolving-apollo…

…-status-code fix: resolving apollo client status code
vuestorefront · Dec 21, 2023 · 1f3b710 · 1f3b710
2 parents 3e5e55c + 6c769c7
commit 1f3b710
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 1 deletion.
diff --git a/.changeset/eleven-games-wink.md b/.changeset/eleven-games-wink.md
@@ -0,0 +1,5 @@
+---
+"@vue-storefront/middleware": patch
+---
+
+Fix status code resolving for the apollo client
diff --git a/packages/middleware/src/errors/defaultErrorHandler.ts b/packages/middleware/src/errors/defaultErrorHandler.ts
@@ -17,7 +17,7 @@ export const defaultErrorHandler = (
   consola.error(error);
   const status = getAgnosticStatusCode(error);
   res.status(status);
-  if (status >= 400 && status < 500) {
+  if (status < 500) {
     /**
      * For all 4xx error codes or client error codes we wanted to send the error message
      */

diff --git a/packages/middleware/src/helpers/getAgnosticStatusCode.ts b/packages/middleware/src/helpers/getAgnosticStatusCode.ts
@@ -68,6 +68,11 @@ function getApolloStatusCode(error: ApolloError) {
   if (error.code) {
     return typeof error.code === "string" ? 400 : error.code;
   }
+
+  if (error?.graphQLErrors?.length > 0) {
+    return 200;
+  }
+
   return undefined;
 }
 

diff --git a/packages/middleware/src/types/base.ts b/packages/middleware/src/types/base.ts
@@ -49,6 +49,7 @@ export type AxiosError = {
 export type ApolloError = {
   networkError?: number;
   code?: string | number;
+  graphQLErrors: Array<any>;
 };
 
 export type StatusCode = number | null;