From fbcbdda45d826f1d7681406a0c189a1c587b8cec Mon Sep 17 00:00:00 2001 From: Reeska Date: Mon, 25 Mar 2019 11:43:58 +0100 Subject: [PATCH] overwrite cached response headers with global options headers fields --- .gitignore | 1 + src/apicache.js | 2 +- test/apicache_test.js | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 0a0275a..323d53d 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ .DS_STORE *.rdb .nyc_output +.idea diff --git a/src/apicache.js b/src/apicache.js index 7936287..35fdac5 100644 --- a/src/apicache.js +++ b/src/apicache.js @@ -226,7 +226,7 @@ function ApiCache() { Object.assign(headers, filterBlacklistedHeaders(cacheObject.headers || {}), { // set properly-decremented max-age header. This ensures that max-age is in sync with the cache expiration. 'cache-control': 'max-age=' + ((duration/1000 - (new Date().getTime()/1000 - cacheObject.timestamp))).toFixed(0) - }) + }, globalOptions.headers) // only embed apicache headers when not in production environment if (process.env.NODE_ENV !== 'production') { diff --git a/test/apicache_test.js b/test/apicache_test.js index d69cf8f..0e4d179 100644 --- a/test/apicache_test.js +++ b/test/apicache_test.js @@ -619,6 +619,7 @@ describe('.middleware {MIDDLEWARE}', function() { .expect('apicache-store', 'memory') .expect('apicache-version', pkg.version) .expect(200, movies) + .expect('Cache-Control', 'no-cache') .then(assertNumRequestsProcessed(app, 1)) }) })