From 4547dc638424ec3b0959412d272a63a8f157c5dd Mon Sep 17 00:00:00 2001
From: Trevor Leach <trevor@MacBook-Pro.local>
Date: Sat, 20 Oct 2018 15:00:00 -0700
Subject: [PATCH] multi-valued headers and query string prarameters

---
 types/aws-lambda/aws-lambda-tests.ts | 13 +++++++++----
 types/aws-lambda/index.d.ts          |  5 +++++
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/types/aws-lambda/aws-lambda-tests.ts b/types/aws-lambda/aws-lambda-tests.ts
index 5fa225eafd..edd81b8da3 100644
--- a/types/aws-lambda/aws-lambda-tests.ts
+++ b/types/aws-lambda/aws-lambda-tests.ts
@@ -8,6 +8,7 @@ declare let error: Error;
 declare let bool: boolean;
 declare let boolOrUndefined: boolean | undefined;
 declare let apiGwEvtReqCtx: AWSLambda.APIGatewayEventRequestContext;
+declare let apiGwEvtReqCtxOpt: AWSLambda.APIGatewayEventRequestContext | null | undefined;
 declare let apiGwEvt: AWSLambda.APIGatewayEvent;
 declare let customAuthorizerEvt: AWSLambda.CustomAuthorizerEvent;
 declare let clientCtx: AWSLambda.ClientContext;
@@ -102,11 +103,13 @@ str = apiGwEvtReqCtx.resourcePath;
 /* API Gateway Event */
 strOrNull = apiGwEvt.body;
 str = apiGwEvt.headers["example"];
+str = apiGwEvt.multiValueHeaders["example"][0];
 str = apiGwEvt.httpMethod;
 bool = apiGwEvt.isBase64Encoded;
 str = apiGwEvt.path;
 str = apiGwEvt.pathParameters!["example"];
 str = apiGwEvt.queryStringParameters!["example"];
+str = apiGwEvt.multiValueQueryStringParameters!["example"][0];
 str = apiGwEvt.stageVariables!["example"];
 apiGwEvtReqCtx = apiGwEvt.requestContext;
 str = apiGwEvt.resource;
@@ -115,10 +118,12 @@ str = apiGwEvt.resource;
 str = customAuthorizerEvt.type;
 str = customAuthorizerEvt.methodArn;
 strOrUndefined = customAuthorizerEvt.authorizationToken;
-str = apiGwEvt.pathParameters!["example"];
-str = apiGwEvt.queryStringParameters!["example"];
-str = apiGwEvt.stageVariables!["example"];
-apiGwEvtReqCtx = apiGwEvt.requestContext;
+str = customAuthorizerEvt.headers!["example"];
+str = customAuthorizerEvt.multiValueHeaders!["example"][0];
+str = customAuthorizerEvt.pathParameters!["example"];
+str = customAuthorizerEvt.queryStringParameters!["example"];
+str = customAuthorizerEvt.multiValueQueryStringParameters!["example"][0];
+apiGwEvtReqCtxOpt = customAuthorizerEvt.requestContext;
 
 /* DynamoDB Stream Event */
 const dynamoDBStreamEvent: AWSLambda.DynamoDBStreamEvent = {
diff --git a/types/aws-lambda/index.d.ts b/types/aws-lambda/index.d.ts
index cce721e68c..756ad943be 100644
--- a/types/aws-lambda/index.d.ts
+++ b/types/aws-lambda/index.d.ts
@@ -22,6 +22,7 @@
 //                 Louis Larry <https://github.com/louislarry>
 //                 Daniel Papukchiev <https://github.com/dpapukchiev>
 //                 Oliver Hookins <https://github.com/ohookins>
+//                 Trevor Leach <https://github.com/trevor-leach>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
@@ -58,11 +59,13 @@ export interface APIGatewayEventRequestContext {
 export interface APIGatewayProxyEvent {
     body: string | null;
     headers: { [name: string]: string };
+    multiValueHeaders: { [name: string]: string };
     httpMethod: string;
     isBase64Encoded: boolean;
     path: string;
     pathParameters: { [name: string]: string } | null;
     queryStringParameters: { [name: string]: string } | null;
+    multiValueQueryStringParameters: { [name: string]: string[] } | null;
     stageVariables: { [name: string]: string } | null;
     requestContext: APIGatewayEventRequestContext;
     resource: string;
@@ -75,8 +78,10 @@ export interface CustomAuthorizerEvent {
     methodArn: string;
     authorizationToken?: string;
     headers?: { [name: string]: string };
+    multiValueHeaders?: { [name: string]: string[] };
     pathParameters?: { [name: string]: string } | null;
     queryStringParameters?: { [name: string]: string } | null;
+    multiValueQueryStringParameters?: { [name: string]: string[] } | null;
     requestContext?: APIGatewayEventRequestContext;
 }