Merge pull request #24 from hckrnews/feature/more-than-json

Remove accept header
hckrnews · Sep 2, 2022 · d146011 · d146011
2 parents b4abe09 + 258e687
commit d146011
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 7 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@hckrnews/express-callback",
-    "version": "4.0.3",
+    "version": "4.0.4",
     "description": "Express callback",
     "files": [
         "src/error-status.js",

diff --git a/src/__tests__/express-callback.unit.js b/src/__tests__/express-callback.unit.js
@@ -87,7 +87,9 @@ describe('Test the express callback', () => {
         const currentRes = { ...res, values: { ...res.values } };
 
         const controller = () => ({
-            headers: {},
+            headers: {
+                'Content-Type': 'text/csv',
+            },
             statusCode: 200,
             body: {},
             attachment: true,
@@ -126,6 +128,9 @@ describe('Test the express callback', () => {
         const controller = () => ({
             statusCode: 200,
             body: {},
+            headers: {
+                'Content-Type': 'text/xml',
+            },
         });
 
         const expressCallback = makeExpressCallback({

diff --git a/src/express-callback.js b/src/express-callback.js
@@ -20,10 +20,10 @@ export default function makeExpressCallback({
                 meta,
             });
 
+            // also check if we can auto use the accept header
+            // context.request.headers.accept
             const contentType =
-                response?.headers?.['Content-Type'] ??
-                context?.request?.headers?.accept ??
-                'application/json';
+                response?.headers?.['Content-Type'] ?? 'application/json';
 
             const httpResponse = buildResponse(
                 response,