Add http status to graphql errors

twentyhq · Jun 17, 2024 · 404212f · 404212f
1 parent d8034b1
commit 404212f
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 10 deletions.
diff --git a/packages/twenty-server/src/engine/utils/global-exception-handler.util.ts b/packages/twenty-server/src/engine/utils/global-exception-handler.util.ts
@@ -43,14 +43,15 @@ export const shouldFilterException = (exception: Error): boolean => {
   ) {
     return true;
   }
+
   if (exception instanceof HttpException && exception.getStatus() < 500) {
     return true;
   }
 
   return false;
 };
 
-export const handleException = (
+const handleException = (
   exception: Error,
   exceptionHandlerService: ExceptionHandlerService,
   user?: ExceptionHandlerUser,
@@ -72,7 +73,7 @@ export const convertExceptionToGraphQLError = (
   return convertExceptionToGraphql(exception);
 };
 
-export const convertHttpExceptionToGraphql = (exception: HttpException) => {
+const convertHttpExceptionToGraphql = (exception: HttpException) => {
   const status = exception.getStatus();
   let error: BaseGraphQLError;
 

diff --git a/packages/twenty-server/src/engine/utils/graphql-errors.util.ts b/packages/twenty-server/src/engine/utils/graphql-errors.util.ts
@@ -15,7 +15,7 @@ declare module 'graphql' {
   }
 }
 
-export class BaseGraphQLError extends Error implements GraphQLError {
+export class BaseGraphQLError extends GraphQLError {
   public extensions: Record<string, any>;
   override readonly name!: string;
   readonly locations: ReadonlyArray<SourceLocation> | undefined;
@@ -84,23 +84,23 @@ export class SyntaxError extends BaseGraphQLError {
 
 export class ValidationError extends BaseGraphQLError {
   constructor(message: string) {
-    super(message, 'GRAPHQL_VALIDATION_FAILED');
+    super(message, 'GRAPHQL_VALIDATION_FAILED', { http: { status: 400 } });
 
     Object.defineProperty(this, 'name', { value: 'ValidationError' });
   }
 }
 
 export class AuthenticationError extends BaseGraphQLError {
   constructor(message: string, extensions?: Record<string, any>) {
-    super(message, 'UNAUTHENTICATED', extensions);
+    super(message, 'UNAUTHENTICATED', { ...extensions, http: { status: 401 } });
 
     Object.defineProperty(this, 'name', { value: 'AuthenticationError' });
   }
 }
 
 export class ForbiddenError extends BaseGraphQLError {
   constructor(message: string, extensions?: Record<string, any>) {
-    super(message, 'FORBIDDEN', extensions);
+    super(message, 'FORBIDDEN', { ...extensions, http: { status: 403 } });
 
     Object.defineProperty(this, 'name', { value: 'ForbiddenError' });
   }
@@ -136,31 +136,34 @@ export class UserInputError extends BaseGraphQLError {
 
 export class NotFoundError extends BaseGraphQLError {
   constructor(message: string, extensions?: Record<string, any>) {
-    super(message, 'NOT_FOUND', extensions);
+    super(message, 'NOT_FOUND', { ...extensions, http: { status: 404 } });
 
     Object.defineProperty(this, 'name', { value: 'NotFoundError' });
   }
 }
 
 export class MethodNotAllowedError extends BaseGraphQLError {
   constructor(message: string, extensions?: Record<string, any>) {
-    super(message, 'METHOD_NOT_ALLOWED', extensions);
+    super(message, 'METHOD_NOT_ALLOWED', {
+      ...extensions,
+      http: { status: 405 },
+    });
 
     Object.defineProperty(this, 'name', { value: 'MethodNotAllowedError' });
   }
 }
 
 export class ConflictError extends BaseGraphQLError {
   constructor(message: string, extensions?: Record<string, any>) {
-    super(message, 'CONFLICT', extensions);
+    super(message, 'CONFLICT', { ...extensions, http: { status: 409 } });
 
     Object.defineProperty(this, 'name', { value: 'ConflictError' });
   }
 }
 
 export class TimeoutError extends BaseGraphQLError {
   constructor(message: string, extensions?: Record<string, any>) {
-    super(message, 'TIMEOUT', extensions);
+    super(message, 'TIMEOUT', { ...extensions, http: { status: 408 } });
 
     Object.defineProperty(this, 'name', { value: 'TimeoutError' });
   }