Stop overwriting response object (#3)

* Stop overwriting the response object entirely This change allows other onError middlewares to set response headers * 0.1.2 Co-authored-by: Wojciech Iskra <[email protected]>
schibsted · Oct 28, 2020 · f1f1f1e · f1f1f1e
1 parent 9df8e5c
commit f1f1f1e
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 2 deletions.
diff --git a/index.js b/index.js
@@ -13,6 +13,7 @@ module.exports = ({ logger = console, level = 'error' } = {}) => {
 
             // eslint-disable-next-line no-param-reassign
             handler.response = {
+                ...R.propOr({}, 'response', handler),
                 statusCode: R.propOr(500, 'statusCode', error),
                 body: JSON.stringify(
                     R.filter(Boolean, {

diff --git a/index.test.js b/index.test.js
@@ -45,3 +45,34 @@ test('Middleware returns error details', async () => {
 
     expect(mockLogger.error).toHaveBeenCalledTimes(1);
 });
+
+test('Keep data already present in response', async () => {
+    const handler = middy(async () => {
+        throw error;
+    });
+
+    // eslint-disable-next-line no-shadow
+    handler.onError(async (handler) => {
+        // eslint-disable-next-line no-param-reassign
+        handler.response = {
+            headers: {
+                someHeader: 'someValue',
+            },
+        };
+
+        return true;
+    });
+
+    handler.use(middleware({ logger: false }));
+
+    await expect(handler({}, {})).rejects.toEqual(
+        expect.objectContaining({
+            response: {
+                body: JSON.stringify({ statusCode: 404, message: 'File not found' }),
+                statusCode: 404,
+                headers: { someHeader: 'someValue' },
+            },
+            error,
+        })
+    );
+});
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@schibsted/middy-error-handler",
-  "version": "0.1.1",
+  "version": "0.1.2",
   "description": "Middy middleware for adding caching headers to success response and errors",
   "main": "index.js",
   "scripts": {