fix: types

Author: hoegertn

src/http/auth.ts

@@ -129,7 +129,7 @@ export abstract class CognitoAuthorizer {
 
 export class ApiGatewayv2CognitoAuthorizer extends CognitoAuthorizer {
 
-  constructor(protected event: AWSLambda.APIGatewayProxyEventV2, private _logger: logger.LambdaLog) {
+  constructor(protected event: AWSLambda.APIGatewayProxyEventV2WithJWTAuthorizer, private _logger: logger.LambdaLog) {
     super();
   }
 
@@ -143,7 +143,7 @@ export class ApiGatewayv2CognitoAuthorizer extends CognitoAuthorizer {
     if (!authHeader || !authHeader.startsWith('Bearer ')) {
       return;
     }
-    const token = authHeader.substr('Bearer '.length);
+    const token = authHeader.substring('Bearer '.length);
     try {
       const claims: { [name: string]: string } = await promisedVerify(token);
       this._logger.debug(JSON.stringify(claims));
@@ -153,6 +153,8 @@ export class ApiGatewayv2CognitoAuthorizer extends CognitoAuthorizer {
           claims,
           scopes: ['openid', 'email'],
         },
+        integrationLatency: 0,
+        principalId: 'toolbox',
       };
       this.claims = claims;
     } catch (err: any) {

src/http/handler.ts

@@ -36,7 +36,8 @@ export interface Operation {
   };
 }
 
-export type APIGatewayv2Handler = AWSLambda.Handler<AWSLambda.APIGatewayProxyEventV2, AWSLambda.APIGatewayProxyStructuredResultV2 | undefined>;
+export type APIGatewayv2Handler =
+  AWSLambda.Handler<AWSLambda.APIGatewayProxyEventV2WithJWTAuthorizer, AWSLambda.APIGatewayProxyStructuredResultV2 | undefined>;
 
 export interface OperationWithRequestBody extends Operation {
   requestBody: { content: { 'application/json': any } };

test/boom.test.ts

@@ -1,5 +1,5 @@
 import * as Boom from '@hapi/boom';
-import { createHttpHandler } from '../src/http/handler';
+import { createHttpHandler } from '../src/http/handler';
 
 test('Boom error support for createHttpHandler', async () => {
   const boomErr = Boom.notImplemented();
@@ -14,9 +14,9 @@ test('Boom error support for createHttpHandler', async () => {
     rawPath: '/raw/path',
     rawQueryString: '',
     isBase64Encoded: false,
-  } as AWSLambda.APIGatewayProxyEventV2;
+  } as AWSLambda.APIGatewayProxyEventV2WithJWTAuthorizer;
   const context = {} as AWSLambda.Context;
-  const result = await handler(event, context, () => {});
+  const result = await handler(event, context, () => { });
 
   if (!result) {
     throw new Error('handler is expected to return a result!');