The open alternative to Salesforce, designed for AI.
TypeScript crmcrm-systemcustomergood-first-issuegraphqlhacktoberfestjavascriptmarketingmonoreponestjsopen-sourcepostgresqlreactreactjssalestypescriptweb
fix(server): handle network errors in RestApiService catch block (#20644)
Shubham Singh01535a3b3eb7
diff --git a/packages/twenty-server/src/engine/api/rest/rest-api.service.ts b/packages/twenty-server/src/engine/api/rest/rest-api.service.tsindex 5992aa217c4..b26c95ec499 100644--- a/packages/twenty-server/src/engine/api/rest/rest-api.service.ts+++ b/packages/twenty-server/src/engine/api/rest/rest-api.service.ts@@ -6,6 +6,7 @@ import { type Query } from 'src/engine/api/rest/core/types/query.type';import { RestApiException } from 'src/engine/api/rest/errors/RestApiException';import { type RequestContext } from 'src/engine/api/rest/types/RequestContext';import { SecureHttpClientService } from 'src/engine/core-modules/secure-http-client/secure-http-client.service';+import { isDefined } from 'twenty-shared/utils';export enum GraphqlApiType {CORE = 'core',@@ -41,10 +42,14 @@ export class RestApiService {},});} catch (err) {- throw new RestApiException(err.response.data.errors);+ if (isDefined(err.response?.data?.errors)) {+ throw new RestApiException(err.response.data.errors);+ }++ throw err;}- if (response.data.errors?.length) {+ if (isDefined(response.data.errors) && response.data.errors.length > 0) {throw new RestApiException(response.data.errors);}diff --git a/packages/twenty-server/src/filters/unhandled-exception.filter.ts b/packages/twenty-server/src/filters/unhandled-exception.filter.tsindex d92a7ce3210..d5ea7b8b7ac 100644--- a/packages/twenty-server/src/filters/unhandled-exception.filter.ts+++ b/packages/twenty-server/src/filters/unhandled-exception.filter.ts@@ -35,6 +35,6 @@ export class UnhandledExceptionFilter implements ExceptionFilter {const status =exception instanceof HttpException ? exception.getStatus() : 500;- response.status(status).json(exception.response);+ response.status(status).json(exception.response ?? exception.message);}}