From 2cb470b99edc2fac8d5c38e4eb16201e55fe8753 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karol=20S=C3=B3jko?= Date: Mon, 27 Jun 2022 12:26:43 +0200 Subject: [PATCH] fix: issue with NaN error code responses --- packages/api-gateway/src/Controller/AuthMiddleware.ts | 5 ++++- .../src/Controller/SubscriptionTokenAuthMiddleware.ts | 5 ++++- packages/api-gateway/src/Service/Http/HttpService.ts | 5 ++++- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/packages/api-gateway/src/Controller/AuthMiddleware.ts b/packages/api-gateway/src/Controller/AuthMiddleware.ts index 739ec3dfa..065cf31f6 100644 --- a/packages/api-gateway/src/Controller/AuthMiddleware.ts +++ b/packages/api-gateway/src/Controller/AuthMiddleware.ts @@ -99,7 +99,10 @@ export class AuthMiddleware extends BaseMiddleware { response.setHeader('content-type', (error as AxiosError).response?.headers['content-type'] as string) } - const errorCode = (error as AxiosError).isAxiosError ? +((error as AxiosError).code as string) : 500 + const errorCode = + (error as AxiosError).isAxiosError && !isNaN(+((error as AxiosError).code as string)) + ? +((error as AxiosError).code as string) + : 500 response.status(errorCode).send(errorMessage) diff --git a/packages/api-gateway/src/Controller/SubscriptionTokenAuthMiddleware.ts b/packages/api-gateway/src/Controller/SubscriptionTokenAuthMiddleware.ts index cba5e738d..7a081ff22 100644 --- a/packages/api-gateway/src/Controller/SubscriptionTokenAuthMiddleware.ts +++ b/packages/api-gateway/src/Controller/SubscriptionTokenAuthMiddleware.ts @@ -88,7 +88,10 @@ export class SubscriptionTokenAuthMiddleware extends BaseMiddleware { response.setHeader('content-type', (error as AxiosError).response?.headers['content-type'] as string) } - const errorCode = (error as AxiosError).isAxiosError ? +((error as AxiosError).code as string) : 500 + const errorCode = + (error as AxiosError).isAxiosError && !isNaN(+((error as AxiosError).code as string)) + ? +((error as AxiosError).code as string) + : 500 response.status(errorCode).send(errorMessage) diff --git a/packages/api-gateway/src/Service/Http/HttpService.ts b/packages/api-gateway/src/Service/Http/HttpService.ts index 4999a6ec8..32591fb39 100644 --- a/packages/api-gateway/src/Service/Http/HttpService.ts +++ b/packages/api-gateway/src/Service/Http/HttpService.ts @@ -133,7 +133,10 @@ export class HttpService implements HttpServiceInterface { response.setHeader('content-type', (error as AxiosError).response?.headers['content-type'] as string) } - const errorCode = (error as AxiosError).isAxiosError ? +((error as AxiosError).code as string) : 500 + const errorCode = + (error as AxiosError).isAxiosError && !isNaN(+((error as AxiosError).code as string)) + ? +((error as AxiosError).code as string) + : 500 response.status(errorCode).send(errorMessage) }