fix(@whook/aws-lambda): fix query parameters parsing when AWS sets it…

… to null
nfroidure · Nov 6, 2020 · 89ebc66 · 89ebc66
1 parent d8318ad
commit 89ebc66
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/packages/whook-aws-lambda/package.json b/packages/whook-aws-lambda/package.json
@@ -51,6 +51,7 @@
   "dependencies": {
     "@whook/cli": "^5.1.6",
     "@whook/http-router": "^5.1.6",
+    "@whook/http-transaction": "^5.1.4",
     "@whook/whook": "^5.1.6",
     "ajv": "^6.12.6",
     "bytes": "^3.1.0",

diff --git a/packages/whook-aws-lambda/src/wrappers/awsHTTPLambda.ts b/packages/whook-aws-lambda/src/wrappers/awsHTTPLambda.ts
@@ -8,7 +8,7 @@ import {
   extractOperationSecurityParameters,
   castParameters,
 } from '@whook/http-router';
-import { reuseSpecialProps, alsoInject, HandlerInitializer } from 'knifecycle';
+import { reuseSpecialProps, alsoInject } from 'knifecycle';
 import Ajv from 'ajv';
 import bytes from 'bytes';
 import HTTPError from 'yhttperror';
@@ -30,7 +30,7 @@ import {
 import stream from 'stream';
 import qs from 'qs';
 import { noop, compose } from '@whook/whook';
-import type { ServiceInitializer } from 'knifecycle';
+import type { ServiceInitializer, HandlerInitializer } from 'knifecycle';
 import type {
   WhookRequest,
   WhookResponse,
@@ -42,6 +42,7 @@ import type {
 } from '@whook/whook';
 import type { TimeService, LogService } from 'common-services';
 import type { OpenAPIV3 } from 'openapi-types';
+import type { DereferencedParameterObject } from '@whook/http-transaction';
 
 type HTTPWrapperDependencies = {
   NODE_ENV: string;
@@ -269,7 +270,7 @@ async function handleForAWSHTTPLambda(
         ...(event.pathParameters || {}),
         ...filterQueryParameters(
           operationParameters,
-          event.multiValueQueryStringParameters,
+          event.multiValueQueryStringParameters || {},
         ),
         ...filterHeaders(operationParameters, request.headers),
       };
@@ -555,14 +556,14 @@ function obfuscateEventBody(obfuscator, rawBody) {
 }
 
 function filterQueryParameters(
-  parameters: OpenAPIV3.ParameterObject[],
+  parameters: DereferencedParameterObject[],
   queryParameters: { [name: string]: string[] },
 ): { [name: string]: string } {
   return (parameters || [])
     .filter((parameter) => 'query' === parameter.in)
     .reduce((filteredHeaders, parameter) => {
       if (queryParameters[parameter.name]) {
-        if ((parameter.schema as OpenAPIV3.SchemaObject).type === 'array') {
+        if (parameter.schema.type === 'array') {
           filteredHeaders[parameter.name] = queryParameters[parameter.name];
         } else {
           filteredHeaders[parameter.name] = queryParameters[parameter.name][0];