Fix authorization and aws set-cookie (#875)

reimagined · Nov 21, 2018 · 12eac8b · 12eac8b
1 parent a13bd12
commit 12eac8b
Show file tree

Hide file tree

Showing 9 changed files with 68 additions and 2,012 deletions.
diff --git a/packages/adapters/api-handler-adapters/resolve-api-handler-awslambda/package.json b/packages/adapters/api-handler-adapters/resolve-api-handler-awslambda/package.json
@@ -26,6 +26,7 @@
   "homepage": "https://github.com/reimagined/resolve/tree/master/packages/adapters/api-handler-adapters/resolve-api-handler-awslambda#readme",
   "dependencies": {
     "@babel/runtime": "^7.0.0",
+    "binary-case": "1.1.4",
     "content-disposition": "0.5.2",
     "cookie": "0.3.1"
   },

diff --git a/packages/adapters/api-handler-adapters/resolve-api-handler-awslambda/src/index.js b/packages/adapters/api-handler-adapters/resolve-api-handler-awslambda/src/index.js
@@ -1,3 +1,4 @@
+import binaryCase from 'binary-case'
 import contentDisposition from 'content-disposition'
 import cookie from 'cookie'
 
@@ -87,6 +88,7 @@ const createResponse = () => {
   const internalRes = {
     status: 200,
     headers: {},
+    cookies: [],
     body: '',
     closed: false
   }
@@ -125,14 +127,7 @@ const createResponse = () => {
     validateResponseOpened()
     const serializedCookie = cookie.serialize(name, value, options)
 
-    let cookieHeader = internalRes.headers['Set-Cookie']
-    if (cookieHeader != null) {
-      cookieHeader = `${cookieHeader}, ${serializedCookie}`
-    } else {
-      cookieHeader = serializedCookie
-    }
-
-    internalRes.headers['Set-Cookie'] = cookieHeader
+    internalRes.cookies.push(serializedCookie)
   })
 
   defineResponseMethod('clearCookie', (name, options) => {
@@ -142,14 +137,7 @@ const createResponse = () => {
       expire: COOKIE_CLEAR_DATE
     })
 
-    let cookieHeader = internalRes.headers['Set-Cookie']
-    if (cookieHeader != null) {
-      cookieHeader = `${cookieHeader}, ${serializedCookie}`
-    } else {
-      cookieHeader = serializedCookie
-    }
-
-    internalRes.headers['Set-Cookie'] = cookieHeader
+    internalRes.cookies.push(serializedCookie)
   })
 
   defineResponseMethod('status', code => {
@@ -238,9 +226,15 @@ const wrapApiHandler = (handler, getCustomParameters) => async (
 
     await handler(req, res)
 
-    const { status: statusCode, headers, body: bodyBuffer } = res[INTERNAL]
+    const { status: statusCode, headers, cookies, body: bodyBuffer } = res[
+      INTERNAL
+    ]
     const body = bodyBuffer.toString()
 
+    for (let idx = 0; idx < cookies.length; idx++) {
+      headers[binaryCase('Set-cookie', idx)] = cookies[idx]
+    }
+
     result = { statusCode, headers, body }
   } catch (error) {
     const outError =

diff --git a/.../api-handler-adapters/resolve-api-handler-awslambda/test/__snapshots__/index.test.js.snap b/.../api-handler-adapters/resolve-api-handler-awslambda/test/__snapshots__/index.test.js.snap
@@ -7,7 +7,7 @@ Object {
     Object {
       "args": Array [
         "null",
-        "{\\"statusCode\\":200,\\"headers\\":{\\"One-Header-Name\\":\\"One-Header-Value\\",\\"Two-Header-Name\\":\\"Two-Header-Value\\",\\"Set-Cookie\\":\\"One-Cookie-Name=One-Cookie-Value, Two-Cookie-Name=Two-Cookie-Value, Two-Cookie-Name=\\"},\\"body\\":\\"{\\\\\\"adapter\\\\\\":\\\\\\"awslambda\\\\\\",\\\\\\"method\\\\\\":\\\\\\"GET\\\\\\",\\\\\\"query\\\\\\":{\\\\\\"query-name-1\\\\\\":\\\\\\"query-value-1\\\\\\",\\\\\\"query-name-2\\\\\\":\\\\\\"query-value-2\\\\\\"},\\\\\\"path\\\\\\":\\\\\\"PATH_INFO\\\\\\",\\\\\\"headers\\\\\\":{\\\\\\"Header-Name-1\\\\\\":\\\\\\"header-value-1\\\\\\",\\\\\\"Header-Name-2\\\\\\":\\\\\\"header-value-2\\\\\\",\\\\\\"Cookie\\\\\\":\\\\\\"cookie-content\\\\\\",\\\\\\"Host\\\\\\":\\\\\\"host-content\\\\\\"},\\\\\\"cookies\\\\\\":{},\\\\\\"body\\\\\\":\\\\\\"BODY_CONTENT\\\\\\",\\\\\\"param\\\\\\":\\\\\\"value\\\\\\",\\\\\\"existingHeader\\\\\\":\\\\\\"Two-Header-Value\\\\\\"}\\"}",
+        "{\\"statusCode\\":200,\\"headers\\":{\\"One-Header-Name\\":\\"One-Header-Value\\",\\"Two-Header-Name\\":\\"Two-Header-Value\\",\\"Set-cookie\\":\\"One-Cookie-Name=One-Cookie-Value\\",\\"set-cookie\\":\\"Two-Cookie-Name=Two-Cookie-Value\\",\\"SEt-cookie\\":\\"Two-Cookie-Name=\\"},\\"body\\":\\"{\\\\\\"adapter\\\\\\":\\\\\\"awslambda\\\\\\",\\\\\\"method\\\\\\":\\\\\\"GET\\\\\\",\\\\\\"query\\\\\\":{\\\\\\"query-name-1\\\\\\":\\\\\\"query-value-1\\\\\\",\\\\\\"query-name-2\\\\\\":\\\\\\"query-value-2\\\\\\"},\\\\\\"path\\\\\\":\\\\\\"PATH_INFO\\\\\\",\\\\\\"headers\\\\\\":{\\\\\\"Header-Name-1\\\\\\":\\\\\\"header-value-1\\\\\\",\\\\\\"Header-Name-2\\\\\\":\\\\\\"header-value-2\\\\\\",\\\\\\"Cookie\\\\\\":\\\\\\"cookie-content\\\\\\",\\\\\\"Host\\\\\\":\\\\\\"host-content\\\\\\"},\\\\\\"cookies\\\\\\":{},\\\\\\"body\\\\\\":\\\\\\"BODY_CONTENT\\\\\\",\\\\\\"param\\\\\\":\\\\\\"value\\\\\\",\\\\\\"existingHeader\\\\\\":\\\\\\"Two-Header-Value\\\\\\"}\\"}",
       ],
       "returnValue": "undefined",
     },
@@ -69,7 +69,7 @@ Object {
     Object {
       "args": Array [
         "null",
-        "{\\"statusCode\\":200,\\"headers\\":{\\"One-Header-Name\\":\\"One-Header-Value\\",\\"Two-Header-Name\\":\\"Two-Header-Value\\",\\"Set-Cookie\\":\\"One-Cookie-Name=One-Cookie-Value, Two-Cookie-Name=Two-Cookie-Value, Two-Cookie-Name=\\",\\"Content-Disposition\\":\\"attachment; filename=\\\\\\"synthetic-filename.txt\\\\\\"\\"},\\"body\\":\\"{\\\\\\"adapter\\\\\\":\\\\\\"awslambda\\\\\\",\\\\\\"method\\\\\\":\\\\\\"GET\\\\\\",\\\\\\"query\\\\\\":{\\\\\\"query-name-1\\\\\\":\\\\\\"query-value-1\\\\\\",\\\\\\"query-name-2\\\\\\":\\\\\\"query-value-2\\\\\\"},\\\\\\"path\\\\\\":\\\\\\"PATH_INFO\\\\\\",\\\\\\"headers\\\\\\":{\\\\\\"Header-Name-1\\\\\\":\\\\\\"header-value-1\\\\\\",\\\\\\"Header-Name-2\\\\\\":\\\\\\"header-value-2\\\\\\",\\\\\\"Cookie\\\\\\":\\\\\\"cookie-content\\\\\\",\\\\\\"Host\\\\\\":\\\\\\"host-content\\\\\\"},\\\\\\"cookies\\\\\\":{},\\\\\\"body\\\\\\":\\\\\\"BODY_CONTENT\\\\\\",\\\\\\"param\\\\\\":\\\\\\"value\\\\\\",\\\\\\"existingHeader\\\\\\":\\\\\\"Two-Header-Value\\\\\\"}\\"}",
+        "{\\"statusCode\\":200,\\"headers\\":{\\"One-Header-Name\\":\\"One-Header-Value\\",\\"Two-Header-Name\\":\\"Two-Header-Value\\",\\"Content-Disposition\\":\\"attachment; filename=\\\\\\"synthetic-filename.txt\\\\\\"\\",\\"Set-cookie\\":\\"One-Cookie-Name=One-Cookie-Value\\",\\"set-cookie\\":\\"Two-Cookie-Name=Two-Cookie-Value\\",\\"SEt-cookie\\":\\"Two-Cookie-Name=\\"},\\"body\\":\\"{\\\\\\"adapter\\\\\\":\\\\\\"awslambda\\\\\\",\\\\\\"method\\\\\\":\\\\\\"GET\\\\\\",\\\\\\"query\\\\\\":{\\\\\\"query-name-1\\\\\\":\\\\\\"query-value-1\\\\\\",\\\\\\"query-name-2\\\\\\":\\\\\\"query-value-2\\\\\\"},\\\\\\"path\\\\\\":\\\\\\"PATH_INFO\\\\\\",\\\\\\"headers\\\\\\":{\\\\\\"Header-Name-1\\\\\\":\\\\\\"header-value-1\\\\\\",\\\\\\"Header-Name-2\\\\\\":\\\\\\"header-value-2\\\\\\",\\\\\\"Cookie\\\\\\":\\\\\\"cookie-content\\\\\\",\\\\\\"Host\\\\\\":\\\\\\"host-content\\\\\\"},\\\\\\"cookies\\\\\\":{},\\\\\\"body\\\\\\":\\\\\\"BODY_CONTENT\\\\\\",\\\\\\"param\\\\\\":\\\\\\"value\\\\\\",\\\\\\"existingHeader\\\\\\":\\\\\\"Two-Header-Value\\\\\\"}\\"}",
       ],
       "returnValue": "undefined",
     },
@@ -100,7 +100,7 @@ Object {
     Object {
       "args": Array [
         "null",
-        "{\\"statusCode\\":200,\\"headers\\":{\\"One-Header-Name\\":\\"One-Header-Value\\",\\"Two-Header-Name\\":\\"Two-Header-Value\\",\\"Set-Cookie\\":\\"One-Cookie-Name=One-Cookie-Value, Two-Cookie-Name=Two-Cookie-Value, Two-Cookie-Name=\\"},\\"body\\":\\"{\\\\\\"adapter\\\\\\":\\\\\\"awslambda\\\\\\",\\\\\\"method\\\\\\":\\\\\\"GET\\\\\\",\\\\\\"query\\\\\\":{\\\\\\"query-name-1\\\\\\":\\\\\\"query-value-1\\\\\\",\\\\\\"query-name-2\\\\\\":\\\\\\"query-value-2\\\\\\"},\\\\\\"path\\\\\\":\\\\\\"PATH_INFO\\\\\\",\\\\\\"headers\\\\\\":{\\\\\\"Header-Name-1\\\\\\":\\\\\\"header-value-1\\\\\\",\\\\\\"Header-Name-2\\\\\\":\\\\\\"header-value-2\\\\\\",\\\\\\"Cookie\\\\\\":\\\\\\"cookie-content\\\\\\",\\\\\\"Host\\\\\\":\\\\\\"host-content\\\\\\"},\\\\\\"cookies\\\\\\":{},\\\\\\"body\\\\\\":\\\\\\"BODY_CONTENT\\\\\\",\\\\\\"param\\\\\\":\\\\\\"value\\\\\\",\\\\\\"existingHeader\\\\\\":\\\\\\"Two-Header-Value\\\\\\"}\\"}",
+        "{\\"statusCode\\":200,\\"headers\\":{\\"One-Header-Name\\":\\"One-Header-Value\\",\\"Two-Header-Name\\":\\"Two-Header-Value\\",\\"Set-cookie\\":\\"One-Cookie-Name=One-Cookie-Value\\",\\"set-cookie\\":\\"Two-Cookie-Name=Two-Cookie-Value\\",\\"SEt-cookie\\":\\"Two-Cookie-Name=\\"},\\"body\\":\\"{\\\\\\"adapter\\\\\\":\\\\\\"awslambda\\\\\\",\\\\\\"method\\\\\\":\\\\\\"GET\\\\\\",\\\\\\"query\\\\\\":{\\\\\\"query-name-1\\\\\\":\\\\\\"query-value-1\\\\\\",\\\\\\"query-name-2\\\\\\":\\\\\\"query-value-2\\\\\\"},\\\\\\"path\\\\\\":\\\\\\"PATH_INFO\\\\\\",\\\\\\"headers\\\\\\":{\\\\\\"Header-Name-1\\\\\\":\\\\\\"header-value-1\\\\\\",\\\\\\"Header-Name-2\\\\\\":\\\\\\"header-value-2\\\\\\",\\\\\\"Cookie\\\\\\":\\\\\\"cookie-content\\\\\\",\\\\\\"Host\\\\\\":\\\\\\"host-content\\\\\\"},\\\\\\"cookies\\\\\\":{},\\\\\\"body\\\\\\":\\\\\\"BODY_CONTENT\\\\\\",\\\\\\"param\\\\\\":\\\\\\"value\\\\\\",\\\\\\"existingHeader\\\\\\":\\\\\\"Two-Header-Value\\\\\\"}\\"}",
       ],
       "returnValue": "undefined",
     },
@@ -131,7 +131,7 @@ Object {
     Object {
       "args": Array [
         "null",
-        "{\\"statusCode\\":200,\\"headers\\":{\\"One-Header-Name\\":\\"One-Header-Value\\",\\"Two-Header-Name\\":\\"Two-Header-Value\\",\\"Set-Cookie\\":\\"One-Cookie-Name=One-Cookie-Value, Two-Cookie-Name=Two-Cookie-Value, Two-Cookie-Name=\\"},\\"body\\":\\"{\\\\\\"adapter\\\\\\":\\\\\\"awslambda\\\\\\",\\\\\\"method\\\\\\":\\\\\\"GET\\\\\\",\\\\\\"query\\\\\\":{\\\\\\"query-name-1\\\\\\":\\\\\\"query-value-1\\\\\\",\\\\\\"query-name-2\\\\\\":\\\\\\"query-value-2\\\\\\"},\\\\\\"path\\\\\\":\\\\\\"PATH_INFO\\\\\\",\\\\\\"headers\\\\\\":{\\\\\\"Header-Name-1\\\\\\":\\\\\\"header-value-1\\\\\\",\\\\\\"Header-Name-2\\\\\\":\\\\\\"header-value-2\\\\\\",\\\\\\"Cookie\\\\\\":\\\\\\"cookie-content\\\\\\",\\\\\\"Host\\\\\\":\\\\\\"host-content\\\\\\"},\\\\\\"cookies\\\\\\":{},\\\\\\"body\\\\\\":\\\\\\"BODY_CONTENT\\\\\\",\\\\\\"param\\\\\\":\\\\\\"value\\\\\\",\\\\\\"existingHeader\\\\\\":\\\\\\"Two-Header-Value\\\\\\"}\\"}",
+        "{\\"statusCode\\":200,\\"headers\\":{\\"One-Header-Name\\":\\"One-Header-Value\\",\\"Two-Header-Name\\":\\"Two-Header-Value\\",\\"Set-cookie\\":\\"One-Cookie-Name=One-Cookie-Value\\",\\"set-cookie\\":\\"Two-Cookie-Name=Two-Cookie-Value\\",\\"SEt-cookie\\":\\"Two-Cookie-Name=\\"},\\"body\\":\\"{\\\\\\"adapter\\\\\\":\\\\\\"awslambda\\\\\\",\\\\\\"method\\\\\\":\\\\\\"GET\\\\\\",\\\\\\"query\\\\\\":{\\\\\\"query-name-1\\\\\\":\\\\\\"query-value-1\\\\\\",\\\\\\"query-name-2\\\\\\":\\\\\\"query-value-2\\\\\\"},\\\\\\"path\\\\\\":\\\\\\"PATH_INFO\\\\\\",\\\\\\"headers\\\\\\":{\\\\\\"Header-Name-1\\\\\\":\\\\\\"header-value-1\\\\\\",\\\\\\"Header-Name-2\\\\\\":\\\\\\"header-value-2\\\\\\",\\\\\\"Cookie\\\\\\":\\\\\\"cookie-content\\\\\\",\\\\\\"Host\\\\\\":\\\\\\"host-content\\\\\\"},\\\\\\"cookies\\\\\\":{},\\\\\\"body\\\\\\":\\\\\\"BODY_CONTENT\\\\\\",\\\\\\"param\\\\\\":\\\\\\"value\\\\\\",\\\\\\"existingHeader\\\\\\":\\\\\\"Two-Header-Value\\\\\\"}\\"}",
       ],
       "returnValue": "undefined",
     },
@@ -193,7 +193,7 @@ Object {
     Object {
       "args": Array [
         "null",
-        "{\\"statusCode\\":200,\\"headers\\":{\\"One-Header-Name\\":\\"One-Header-Value\\",\\"Two-Header-Name\\":\\"Two-Header-Value\\",\\"Set-Cookie\\":\\"One-Cookie-Name=One-Cookie-Value, Two-Cookie-Name=Two-Cookie-Value, Two-Cookie-Name=\\"},\\"body\\":\\"{\\\\\\"adapter\\\\\\":\\\\\\"awslambda\\\\\\",\\\\\\"method\\\\\\":\\\\\\"GET\\\\\\",\\\\\\"query\\\\\\":{\\\\\\"query-name-1\\\\\\":\\\\\\"query-value-1\\\\\\",\\\\\\"query-name-2\\\\\\":\\\\\\"query-value-2\\\\\\"},\\\\\\"path\\\\\\":\\\\\\"PATH_INFO\\\\\\",\\\\\\"headers\\\\\\":{\\\\\\"Header-Name-1\\\\\\":\\\\\\"header-value-1\\\\\\",\\\\\\"Header-Name-2\\\\\\":\\\\\\"header-value-2\\\\\\",\\\\\\"Cookie\\\\\\":\\\\\\"cookie-content\\\\\\",\\\\\\"Host\\\\\\":\\\\\\"host-content\\\\\\"},\\\\\\"cookies\\\\\\":{},\\\\\\"body\\\\\\":\\\\\\"BODY_CONTENT\\\\\\",\\\\\\"param\\\\\\":\\\\\\"value\\\\\\",\\\\\\"existingHeader\\\\\\":\\\\\\"Two-Header-Value\\\\\\"}\\"}",
+        "{\\"statusCode\\":200,\\"headers\\":{\\"One-Header-Name\\":\\"One-Header-Value\\",\\"Two-Header-Name\\":\\"Two-Header-Value\\",\\"Set-cookie\\":\\"One-Cookie-Name=One-Cookie-Value\\",\\"set-cookie\\":\\"Two-Cookie-Name=Two-Cookie-Value\\",\\"SEt-cookie\\":\\"Two-Cookie-Name=\\"},\\"body\\":\\"{\\\\\\"adapter\\\\\\":\\\\\\"awslambda\\\\\\",\\\\\\"method\\\\\\":\\\\\\"GET\\\\\\",\\\\\\"query\\\\\\":{\\\\\\"query-name-1\\\\\\":\\\\\\"query-value-1\\\\\\",\\\\\\"query-name-2\\\\\\":\\\\\\"query-value-2\\\\\\"},\\\\\\"path\\\\\\":\\\\\\"PATH_INFO\\\\\\",\\\\\\"headers\\\\\\":{\\\\\\"Header-Name-1\\\\\\":\\\\\\"header-value-1\\\\\\",\\\\\\"Header-Name-2\\\\\\":\\\\\\"header-value-2\\\\\\",\\\\\\"Cookie\\\\\\":\\\\\\"cookie-content\\\\\\",\\\\\\"Host\\\\\\":\\\\\\"host-content\\\\\\"},\\\\\\"cookies\\\\\\":{},\\\\\\"body\\\\\\":\\\\\\"BODY_CONTENT\\\\\\",\\\\\\"param\\\\\\":\\\\\\"value\\\\\\",\\\\\\"existingHeader\\\\\\":\\\\\\"Two-Header-Value\\\\\\"}\\"}",
       ],
       "returnValue": "undefined",
     },

diff --git a/packages/adapters/api-handler-adapters/resolve-api-handler-express/package.json b/packages/adapters/api-handler-adapters/resolve-api-handler-express/package.json
@@ -26,6 +26,7 @@
   "homepage": "https://github.com/reimagined/resolve/tree/master/packages/adapters/api-handler-adapters/resolve-api-handler-express#readme",
   "dependencies": {
     "@babel/runtime": "^7.0.0",
+    "binary-case": "1.1.4",
     "content-disposition": "0.5.2",
     "cookie": "0.3.1",
     "raw-body": "2.3.3"

diff --git a/packages/adapters/api-handler-adapters/resolve-api-handler-express/src/index.js b/packages/adapters/api-handler-adapters/resolve-api-handler-express/src/index.js
@@ -1,3 +1,4 @@
+import binaryCase from 'binary-case'
 import contentDisposition from 'content-disposition'
 import cookie from 'cookie'
 import getRawBody from 'raw-body'
@@ -93,6 +94,7 @@ const createResponse = () => {
   const internalRes = {
     status: 200,
     headers: {},
+    cookies: [],
     body: '',
     closed: false
   }
@@ -131,14 +133,7 @@ const createResponse = () => {
     validateResponseOpened()
     const serializedCookie = cookie.serialize(name, value, options)
 
-    let cookieHeader = internalRes.headers['Set-Cookie']
-    if (cookieHeader != null) {
-      cookieHeader = `${cookieHeader}, ${serializedCookie}`
-    } else {
-      cookieHeader = serializedCookie
-    }
-
-    internalRes.headers['Set-Cookie'] = cookieHeader
+    internalRes.cookies.push(serializedCookie)
   })
 
   defineResponseMethod('clearCookie', (name, options) => {
@@ -148,14 +143,7 @@ const createResponse = () => {
       expire: COOKIE_CLEAR_DATE
     })
 
-    let cookieHeader = internalRes.headers['Set-Cookie']
-    if (cookieHeader != null) {
-      cookieHeader = `${cookieHeader}, ${serializedCookie}`
-    } else {
-      cookieHeader = serializedCookie
-    }
-
-    internalRes.headers['Set-Cookie'] = cookieHeader
+    internalRes.cookies.push(serializedCookie)
   })
 
   defineResponseMethod('status', code => {
@@ -242,9 +230,13 @@ const wrapApiHandler = (handler, getCustomParameters) => async (
 
     await handler(req, res)
 
-    const { status, headers, body } = res[INTERNAL]
+    const { status, headers, cookies, body } = res[INTERNAL]
     expressRes.status(status)
 
+    for (let idx = 0; idx < cookies.length; idx++) {
+      headers[binaryCase('Set-cookie', idx)] = cookies[idx]
+    }
+
     expressRes.set(headers)
 
     expressRes.end(body)

diff --git a/...rs/api-handler-adapters/resolve-api-handler-express/test/__snapshots__/index.test.js.snap b/...rs/api-handler-adapters/resolve-api-handler-express/test/__snapshots__/index.test.js.snap
@@ -27,7 +27,7 @@ Object {
   "callsInfo": Array [
     Object {
       "args": Array [
-        "{\\"One-Header-Name\\":\\"One-Header-Value\\",\\"Two-Header-Name\\":\\"Two-Header-Value\\",\\"Set-Cookie\\":\\"One-Cookie-Name=One-Cookie-Value, Two-Cookie-Name=Two-Cookie-Value, Two-Cookie-Name=\\"}",
+        "{\\"One-Header-Name\\":\\"One-Header-Value\\",\\"Two-Header-Name\\":\\"Two-Header-Value\\",\\"Set-cookie\\":\\"One-Cookie-Name=One-Cookie-Value\\",\\"set-cookie\\":\\"Two-Cookie-Name=Two-Cookie-Value\\",\\"SEt-cookie\\":\\"Two-Cookie-Name=\\"}",
       ],
       "returnValue": "{}",
     },
@@ -148,7 +148,7 @@ Object {
   "callsInfo": Array [
     Object {
       "args": Array [
-        "{\\"One-Header-Name\\":\\"One-Header-Value\\",\\"Two-Header-Name\\":\\"Two-Header-Value\\",\\"Set-Cookie\\":\\"One-Cookie-Name=One-Cookie-Value, Two-Cookie-Name=Two-Cookie-Value, Two-Cookie-Name=\\",\\"Content-Disposition\\":\\"attachment; filename=\\\\\\"synthetic-filename.txt\\\\\\"\\"}",
+        "{\\"One-Header-Name\\":\\"One-Header-Value\\",\\"Two-Header-Name\\":\\"Two-Header-Value\\",\\"Content-Disposition\\":\\"attachment; filename=\\\\\\"synthetic-filename.txt\\\\\\"\\",\\"Set-cookie\\":\\"One-Cookie-Name=One-Cookie-Value\\",\\"set-cookie\\":\\"Two-Cookie-Name=Two-Cookie-Value\\",\\"SEt-cookie\\":\\"Two-Cookie-Name=\\"}",
       ],
       "returnValue": "{}",
     },
@@ -212,7 +212,7 @@ Object {
   "callsInfo": Array [
     Object {
       "args": Array [
-        "{\\"One-Header-Name\\":\\"One-Header-Value\\",\\"Two-Header-Name\\":\\"Two-Header-Value\\",\\"Set-Cookie\\":\\"One-Cookie-Name=One-Cookie-Value, Two-Cookie-Name=Two-Cookie-Value, Two-Cookie-Name=\\"}",
+        "{\\"One-Header-Name\\":\\"One-Header-Value\\",\\"Two-Header-Name\\":\\"Two-Header-Value\\",\\"Set-cookie\\":\\"One-Cookie-Name=One-Cookie-Value\\",\\"set-cookie\\":\\"Two-Cookie-Name=Two-Cookie-Value\\",\\"SEt-cookie\\":\\"Two-Cookie-Name=\\"}",
       ],
       "returnValue": "{}",
     },
@@ -276,7 +276,7 @@ Object {
   "callsInfo": Array [
     Object {
       "args": Array [
-        "{\\"One-Header-Name\\":\\"One-Header-Value\\",\\"Two-Header-Name\\":\\"Two-Header-Value\\",\\"Set-Cookie\\":\\"One-Cookie-Name=One-Cookie-Value, Two-Cookie-Name=Two-Cookie-Value, Two-Cookie-Name=\\"}",
+        "{\\"One-Header-Name\\":\\"One-Header-Value\\",\\"Two-Header-Name\\":\\"Two-Header-Value\\",\\"Set-cookie\\":\\"One-Cookie-Name=One-Cookie-Value\\",\\"set-cookie\\":\\"Two-Cookie-Name=Two-Cookie-Value\\",\\"SEt-cookie\\":\\"Two-Cookie-Name=\\"}",
       ],
       "returnValue": "{}",
     },
@@ -397,7 +397,7 @@ Object {
   "callsInfo": Array [
     Object {
       "args": Array [
-        "{\\"One-Header-Name\\":\\"One-Header-Value\\",\\"Two-Header-Name\\":\\"Two-Header-Value\\",\\"Set-Cookie\\":\\"One-Cookie-Name=One-Cookie-Value, Two-Cookie-Name=Two-Cookie-Value, Two-Cookie-Name=\\"}",
+        "{\\"One-Header-Name\\":\\"One-Header-Value\\",\\"Two-Header-Name\\":\\"Two-Header-Value\\",\\"Set-cookie\\":\\"One-Cookie-Name=One-Cookie-Value\\",\\"set-cookie\\":\\"Two-Cookie-Name=Two-Cookie-Value\\",\\"SEt-cookie\\":\\"Two-Cookie-Name=\\"}",
       ],
       "returnValue": "{}",
     },

diff --git a/packages/modules/resolve-module-auth/src/api_handler_constructor.js b/packages/modules/resolve-module-auth/src/api_handler_constructor.js
@@ -20,7 +20,13 @@ const apiHandlerConstructor = (
     await sendAuthResponse(authResponse, res, authRequest.resolve.rootPath)
   } catch (error) {
     res.status(504)
-    res.end(String(error.stack))
+
+    const outError =
+      error != null && error.stack != null
+        ? `${error.stack}`
+        : `Unknown error ${error}`
+
+    res.end(outError)
   }
 }
 

diff --git a/packages/modules/resolve-module-auth/src/wrap_auth_request.js b/packages/modules/resolve-module-auth/src/wrap_auth_request.js
@@ -10,14 +10,33 @@ const wrapDefaultJwt = (executor, defaultJwtToken) => async ({
 const wrapAuthRequest = req => {
   const jwtToken = req.cookies[req.resolve.jwtCookie.name]
 
-  const authRequest = {
-    ...req,
+  const authRequest = Object.create(req, {
     resolve: {
-      ...req.resolve,
-      executeCommand: wrapDefaultJwt(req.resolve.executeCommand, jwtToken),
-      executeQuery: wrapDefaultJwt(req.resolve.executeQuery, jwtToken)
+      value: Object.create(req.resolve, {
+        executeCommand: {
+          value: wrapDefaultJwt(req.resolve.executeCommand, jwtToken),
+          enumerable: true,
+          configurable: true,
+          writable: true
+        },
+        executeQuery: {
+          value: wrapDefaultJwt(req.resolve.executeQuery, jwtToken),
+          enumerable: true,
+          configurable: true,
+          writable: true
+        }
+      }),
+      enumerable: true,
+      configurable: true,
+      writable: true
+    },
+    body: {
+      value: null,
+      enumerable: true,
+      configurable: true,
+      writable: true
     }
-  }
+  })
 
   // TODO: use string-based body parsers (not stream-based like npm body-parser)
   if (req.body != null && req.headers['content-type'] != null) {