Increase compatibility with openapi-factory.

Author: wparad

docs/async-example.md

@@ -62,16 +62,7 @@ class ModelValidator {
   }
 
   startValidation(request) {
-    const newRequest = {
-      method: request.httpMethod,
-      headers: request.headers,
-      query: request.queryStringParameters,
-      body: request.body,
-      path: request.pathParameters,
-      route: request.route
-    };
-
-    this.validationAsync = this.getValidator().then(validator => validator(newRequest));
+    this.validationAsync = this.getValidator().then(validator => validator(request));
     // Ensure validation may never be called, and in those cases, we want to avoid an uncaught exception
     this.validationAsync.catch(() => {});
   }

src/framework/types.ts

@@ -420,14 +420,16 @@ export interface OpenAPIFrameworkAPIContext {
 }
 
 export interface OpenApiRequest {
-  route: string,
-  method: string,
-  query?: Record<string, string>,
-  headers?: Record<string, string>,
-  body?: string,
-  signedCookies?: Record<string, string>,
-  cookies?: Record<string, string>,
-  path?: Record<string, unknown>
+  route: string;
+  method?: string;
+  httpMethod?: string
+  query?: Record<string, string>;
+  queryStringParameters?: Record<string, string>;
+  headers?: Record<string, string>;
+  body?: string;
+  cookies?: Record<string, string>;
+  path?: Record<string, unknown>;
+  pathParameters?: Record<string, unknown>;
 }
 
 export type OpenApiRequestHandler = (

src/middlewares/openapi.request.validator.ts

@@ -68,13 +68,13 @@ export class RequestValidator {
     // cache middleware by combining method, path, and contentType
     const contentType = ContentType.from(req);
     const contentTypeKey = contentType.equivalents()[0] ?? 'not_provided';
-    const key = `${req.method}-${route}-${contentTypeKey}`.toLocaleLowerCase();
+    const key = `${req.method || req.httpMethod}-${route}-${contentTypeKey}`.toLocaleLowerCase();
 
     if (!this.middlewareCache[key]) {
       if (this.validationModule[key]) {
         this.middlewareCache[key] = this.buildMiddlewareFromModule(key);
       } else {
-        this.middlewareCache[key] = this.buildMiddleware(key, route, req.method, contentType);
+        this.middlewareCache[key] = this.buildMiddleware(key, route, req.method || req.httpMethod, contentType);
       }
     }
 
@@ -147,18 +147,11 @@ export class RequestValidator {
 
   private buildMiddlewareFromModule(validationId: string): OpenApiRequestHandler {
     return (req: OpenApiRequest): void => {
-      const cookies = req.cookies
-        ? {
-          ...req.cookies,
-          ...req.signedCookies
-        }
-        : undefined;
-
       const data = {
-        query: req.query ?? {},
-        headers: req.headers || {},
-        path: req.path || {},
-        cookies,
+        query: req.query ?? req.queryStringParameters ?? {},
+        headers: req.headers ?? {},
+        path: req.path ?? req.pathParameters ?? {},
+        cookies: req.cookies ?? {},
         body: req.body
       };
 
@@ -208,18 +201,11 @@ export class RequestValidator {
     const validator = this.ajv.compile(schemaGeneral);
 
     return (req: OpenApiRequest): void => {
-      const cookies = req.cookies
-        ? {
-          ...req.cookies,
-          ...req.signedCookies
-        }
-        : undefined;
-
       const data = {
-        query: req.query ?? {},
-        headers: req.headers || {},
-        path: req.path || {},
-        cookies,
+        query: req.query ?? req.queryStringParameters ?? {},
+        headers: req.headers ?? {},
+        path: req.path ?? req.pathParameters ?? {},
+        cookies: req.cookies ?? {},
         body: req.body
       };