Changed the HttpStatusCode type and added test to throw a generic error

Author: sdangol

packages/event-handler/src/rest/Router.ts

@@ -4,7 +4,11 @@ import {
   isDevMode,
 } from '@aws-lambda-powertools/commons/utils/env';
 import type { APIGatewayProxyResult, Context } from 'aws-lambda';
-import type { HandlerResponse, ResolveOptions } from '../types/index.js';
+import type {
+  HandlerResponse,
+  HttpStatusCode,
+  ResolveOptions,
+} from '../types/index.js';
 import type {
   ErrorConstructor,
   ErrorHandler,
@@ -282,10 +286,7 @@ class Router {
       });
       const statusCode =
         result instanceof Response ? result.status : result.statusCode;
-      return handlerResultToProxyResult(
-        result,
-        statusCode as (typeof HttpErrorCodes)[keyof typeof HttpErrorCodes]
-      );
+      return handlerResultToProxyResult(result, statusCode as HttpStatusCode);
     }
   }
 

packages/event-handler/src/rest/converters.ts

@@ -1,5 +1,9 @@
 import type { APIGatewayProxyEvent, APIGatewayProxyResult } from 'aws-lambda';
-import type { CompressionOptions, HandlerResponse } from '../types/rest.js';
+import type {
+  CompressionOptions,
+  HandlerResponse,
+  HttpStatusCode,
+} from '../types/rest.js';
 import { COMPRESSION_ENCODING_TYPES, HttpErrorCodes } from './constants.js';
 import { isAPIGatewayProxyResult } from './utils.js';
 
@@ -186,7 +190,7 @@ export const handlerResultToWebResponse = (
  */
 export const handlerResultToProxyResult = async (
   response: HandlerResponse,
-  statusCode: (typeof HttpErrorCodes)[keyof typeof HttpErrorCodes] = HttpErrorCodes.OK
+  statusCode: HttpStatusCode = HttpErrorCodes.OK
 ): Promise<APIGatewayProxyResult> => {
   if (isAPIGatewayProxyResult(response)) {
     return response;

packages/event-handler/tests/unit/rest/Router/error-handling.test.ts

@@ -539,4 +539,32 @@ describe('Class: Router - Error Handling', () => {
       isBase64Encoded: false,
     });
   });
+
+  it('handles throwing a generic error from the error handler', async () => {
+    // Prepare
+    const app = new Router();
+
+    app.errorHandler(BadRequestError, async () => {
+      throw new Error('This error is thrown from the error handler');
+    });
+
+    app.get('/test', () => {
+      throw new BadRequestError('test error');
+    });
+
+    // Act
+    const result = await app.resolve(createTestEvent('/test', 'GET'), context);
+
+    // Assess
+    expect(result).toEqual({
+      statusCode: HttpErrorCodes.INTERNAL_SERVER_ERROR,
+      body: JSON.stringify({
+        statusCode: HttpErrorCodes.INTERNAL_SERVER_ERROR,
+        error: 'Internal Server Error',
+        message: 'Internal Server Error',
+      }),
+      headers: { 'content-type': 'application/json' },
+      isBase64Encoded: false,
+    });
+  });
 });