Do not set it 500 by default

dotansimha · Jul 30, 2022 · 079c14e · 079c14e
1 parent 784420a
commit 079c14e
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 10 deletions.
diff --git a/packages/graphql-yoga/__tests__/node.spec.ts b/packages/graphql-yoga/__tests__/node.spec.ts
@@ -265,7 +265,6 @@ describe('Context error', () => {
         "data": null,
         "errors": Array [
           Object {
-            "extensions": Object {},
             "message": "Unexpected error.",
           },
         ],

diff --git a/packages/graphql-yoga/src/server.ts b/packages/graphql-yoga/src/server.ts
@@ -540,7 +540,7 @@ export class YogaServer<
       return response
     } catch (error: unknown) {
       const finalResponseInit = {
-        status: 200,
+        status: 0,
         headers: {
           'Content-Type': 'application/json',
         },
@@ -551,7 +551,8 @@ export class YogaServer<
         if (error.extensions?.http) {
           if (
             error.extensions.http.status &&
-            error.extensions?.http.status > finalResponseInit.status
+            (!finalResponseInit.status ||
+              error.extensions.http.status > finalResponseInit.status)
           ) {
             finalResponseInit.status = error.extensions.http.status
           }
@@ -566,6 +567,10 @@ export class YogaServer<
         }
       }
 
+      if (!finalResponseInit.status) {
+        finalResponseInit.status = 500
+      }
+
       const payload: ExecutionResult = {
         data: null,
         errors,

diff --git a/packages/graphql-yoga/src/utils/yogaDefaultFormatError.ts b/packages/graphql-yoga/src/utils/yogaDefaultFormatError.ts
@@ -32,11 +32,5 @@ export const yogaDefaultFormatError: FormatErrorHandler = (
     }
     return err
   }
-  return createGraphQLError(message, {
-    extensions: {
-      http: {
-        status: 500,
-      },
-    },
-  })
+  return createGraphQLError(message)
 }