fix(api-gateway-v1): probably missing query string value when multiple

H4ad · Jun 7, 2023 · 78b9f18 · 78b9f18
1 parent 70f7020
commit 78b9f18
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 6 deletions.
diff --git a/src/adapters/aws/api-gateway-v1.adapter.ts b/src/adapters/aws/api-gateway-v1.adapter.ts
@@ -224,7 +224,22 @@ export class ApiGatewayV1Adapter
    */
   protected getPathFromEvent(event: APIGatewayProxyEvent): string {
     const path = this.stripPathFn(event.path);
-    const queryParams = event.queryStringParameters || {};
+    const queryParams = event.multiValueQueryStringParameters || {};
+
+    if (event.queryStringParameters) {
+      for (const queryStringKey of Object.keys(event.queryStringParameters)) {
+        const queryStringValue = event.queryStringParameters[queryStringKey];
+
+        if (queryStringValue === undefined) continue;
+
+        if (!Array.isArray(queryParams[queryStringKey]))
+          queryParams[queryStringKey] = [];
+
+        if (queryParams[queryStringKey]!.includes(queryStringValue)) continue;
+
+        queryParams[queryStringKey]!.push(queryStringValue);
+      }
+    }
 
     return getPathWithQueryStringParams(path, queryParams);
   }

diff --git a/test/adapters/aws/api-gateway-v1.adapter.spec.ts b/test/adapters/aws/api-gateway-v1.adapter.spec.ts
@@ -37,14 +37,23 @@ describe(ApiGatewayV1Adapter.name, () => {
       const body = { name: 'H4ad Event' };
 
       const event = createApiGatewayV1(method, path, body);
+      event.queryStringParameters = {
+        potato: 'v1',
+        nanana: 'oh nanana',
+        unkown: 'oi',
+        ignore: undefined,
+      };
+      event.multiValueQueryStringParameters = {
+        potato: ['v1', 'v2'],
+        nanana: ['oh nanana'],
+      };
       const result = adapter.getRequest(event);
 
       const remoteAddress = event.requestContext.identity.sourceIp;
 
       expect(result).toHaveProperty('method', method);
       expect(result).toHaveProperty('headers');
-      expect(result.headers).not.toHaveProperty('Accept');
-      expect(result.headers).toHaveProperty('accept');
+      expect(result.headers).toHaveProperty('Accept');
 
       expect(result).toHaveProperty('body');
       expect(result.body).toBeInstanceOf(Buffer);
@@ -61,7 +70,7 @@ describe(ApiGatewayV1Adapter.name, () => {
 
       const resultPath = getPathWithQueryStringParams(
         path,
-        event.queryStringParameters,
+        event.multiValueQueryStringParameters,
       );
       expect(result).toHaveProperty('path', resultPath);
     });

diff --git a/test/adapters/aws/utils/api-gateway-v1.ts b/test/adapters/aws/utils/api-gateway-v1.ts
@@ -17,7 +17,7 @@ export function createApiGatewayV1(
     httpMethod,
     headers: {
       Accept: '*/*',
-      'Accept-Encoding': 'gzip, deflate, br',
+      'Accept-Encoding': 'gzip',
       'Accept-Language': 'en-US,en;q=0.9',
       'cache-control': 'no-cache',
       'CloudFront-Forwarded-Proto': 'https',
@@ -43,7 +43,7 @@ export function createApiGatewayV1(
     },
     multiValueHeaders: {
       Accept: ['*/*'],
-      'Accept-Encoding': ['gzip, deflate, br'],
+      'Accept-Encoding': ['gzip', 'deflate', 'br'],
       'Accept-Language': ['en-US,en;q=0.9'],
       'cache-control': ['no-cache'],
       'CloudFront-Forwarded-Proto': ['https'],