fix: add in proper handling defaultHeaders

Fix how defaultHeaders were applied to multiValueHeaders Closes #1256
middyjs · Nov 10, 2024 · 09be515 · 09be515
1 parent f7b2841
commit 09be515
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 26 deletions.
diff --git a/package.json b/package.json
@@ -29,7 +29,7 @@
     "outdated": "npm outdated --workspaces",
     "audit": "npm audit fix --workspaces",
     "release:sync": "npm version $npm_package_version --workspaces && find ./packages -name \"package.json\" -exec sed -i '' -E \"s#\\\"@middy/(.*)\\\": ([^,]*)#\\\"@middy/\\1\\\": $(npm pkg get version)#g\" {} \\;",
-    "release:tag": "git tag $npm_package_version && git push --tags",
+    "release:tag": "git tag $npm_package_version",
     "release:publish": "npm publish --workspaces",
     "release:publish:next": "npm publish --tag next --workspaces"
   },

diff --git a/packages/http-header-normalizer/__tests__/index.js b/packages/http-header-normalizer/__tests__/index.js
@@ -105,7 +105,7 @@ test('It should normalize (lowercase) all the headers with defaults', async (t)
       httpHeaderNormalizer({
         defaultHeaders: {
           'Content-Type': 'application/json',
-          Accept: '*/*'
+          Accept: 'application/json,*/*'
         }
       })
     )
@@ -210,32 +210,32 @@ test('It should normalize (lowercase) all the multiValueHeaders with defaults',
     .use(
       httpHeaderNormalizer({
         defaultHeaders: {
-          'Content-Type': 'application/json',
-          Accept: '*/*'
+          'Content-Type': 'application/json,*/*',
+          Accept: ['application/json', '*/*']
         }
       })
     )
     .handler((event, context) => event)
 
   const event = {
     multiValueHeaders: {
-      'x-aPi-key': '123456',
-      tcn: 'abc',
-      te: 'cde',
-      DNS: 'd',
-      FOO: 'bar',
-      Accept: 'application/json'
+      'x-aPi-key': ['123456'],
+      tcn: ['abc'],
+      te: ['cde'],
+      DNS: ['d'],
+      FOO: ['bar'],
+      Accept: ['application/json']
     }
   }
 
   const expectedHeaders = {
-    'x-api-key': '123456',
-    tcn: 'abc',
-    te: 'cde',
-    dns: 'd',
-    foo: 'bar',
-    accept: 'application/json',
-    'content-type': 'application/json'
+    'x-api-key': ['123456'],
+    tcn: ['abc'],
+    te: ['cde'],
+    dns: ['d'],
+    foo: ['bar'],
+    accept: ['application/json'],
+    'content-type': ['application/json', '*/*']
   }
 
   const resultingEvent = await handler(event, context)

diff --git a/packages/http-header-normalizer/index.js b/packages/http-header-normalizer/index.js
@@ -60,38 +60,39 @@ const httpHeaderNormalizerMiddleware = (opts = {}) => {
   const options = { ...defaults, ...opts }
 
   const defaultHeaders = {}
+  const defaultMultiValueHeaders = {}
   for (const key of Object.keys(options.defaultHeaders)) {
-    defaultHeaders[options.normalizeHeaderKey(key, options.canonical)] =
-      options.defaultHeaders[key]
+    const newKey = options.normalizeHeaderKey(key, options.canonical)
+    const isArray = Array.isArray(options.defaultHeaders[key])
+    defaultHeaders[newKey] = isArray
+      ? options.defaultHeaders[key].join(',')
+      : options.defaultHeaders[key]
+    defaultMultiValueHeaders[newKey] = isArray
+      ? options.defaultHeaders[key]
+      : options.defaultHeaders[key].split(',')
   }
 
   const httpHeaderNormalizerMiddlewareBefore = async (request) => {
     if (request.event.headers) {
-      // const rawHeaders = {}
       const headers = { ...defaultHeaders }
 
       for (const key of Object.keys(request.event.headers)) {
-        // rawHeaders[key] = request.event.headers[key]
         headers[options.normalizeHeaderKey(key, options.canonical)] =
           request.event.headers[key]
       }
 
       request.event.headers = headers
-      // request.event.rawHeaders = rawHeaders
     }
 
     if (request.event.multiValueHeaders) {
-      // const rawHeaders = {}
-      const headers = { ...defaultHeaders }
+      const headers = { ...defaultMultiValueHeaders }
 
       for (const key of Object.keys(request.event.multiValueHeaders)) {
-        // rawHeaders[key] = request.event.multiValueHeaders[key]
         headers[options.normalizeHeaderKey(key, options.canonical)] =
           request.event.multiValueHeaders[key]
       }
 
       request.event.multiValueHeaders = headers
-      // request.event.rawMultiValueHeaders = rawHeaders
     }
   }