no cache override. Closes #3206

hapijs · Jul 5, 2016 · 9d8d617 · 9d8d617
1 parent 4311884
commit 9d8d617
Show file tree

Hide file tree

Showing 5 changed files with 129 additions and 89 deletions.
diff --git a/lib/defaults.js b/lib/defaults.js
@@ -31,7 +31,8 @@ exports.connection = {
     },
     routes: {
         cache: {
-            statuses: [200, 204]                    // Array of HTTP status codes for which cache-control header is set
+            statuses: [200, 204],                   // Array of HTTP status codes for which cache-control header is set
+            otherwise: 'no-cache'
         },
         cors: false,                                // CORS headers
         files: {

diff --git a/lib/route.js b/lib/route.js
@@ -150,6 +150,7 @@ exports = module.exports = internals.Route = function (route, connection, plugin
     // Cache
 
     if (this.method === 'get' &&
+        typeof this.settings.cache === 'object' &&
         (this.settings.cache.expiresIn || this.settings.cache.expiresAt)) {
 
         this.settings.cache._statuses = Hoek.mapToObject(this.settings.cache.statuses);

diff --git a/lib/schema.js b/lib/schema.js
@@ -65,8 +65,10 @@ internals.routeBase = Joi.object({
         expiresIn: Joi.number(),
         expiresAt: Joi.string(),
         privacy: Joi.string().valid('default', 'public', 'private'),
-        statuses: Joi.array().items(Joi.number().integer().min(200)).min(1)
-    }).allow(false),
+        statuses: Joi.array().items(Joi.number().integer().min(200)).min(1).single(),
+        otherwise: Joi.string().required()
+    })
+        .allow(false),
     cors: Joi.object({
         origin: Joi.array().min(1),
         maxAge: Joi.number(),

diff --git a/lib/transmit.js b/lib/transmit.js
@@ -387,22 +387,23 @@ internals.cache = function (response) {
 
     const request = response.request;
 
-    if (response.headers['cache-control'] ||
-        !request.route.settings.cache) {
-
+    if (response.headers['cache-control']) {
         return;
     }
 
-    const policy = request._route._cache && (request.route.settings.cache._statuses[response.statusCode] || (response.statusCode === 304 && request.route.settings.cache._statuses['200']));
+    const policy = request.route.settings.cache &&
+                   request._route._cache &&
+                   (request.route.settings.cache._statuses[response.statusCode] || (response.statusCode === 304 && request.route.settings.cache._statuses['200']));
+
     if (policy ||
         response.settings.ttl) {
 
         const ttl = (response.settings.ttl !== null ? response.settings.ttl : request._route._cache.ttl());
         const privacy = (request.auth.isAuthenticated || response.headers['set-cookie'] ? 'private' : request.route.settings.cache.privacy || 'default');
         response._header('cache-control', 'max-age=' + Math.floor(ttl / 1000) + ', must-revalidate' + (privacy !== 'default' ? ', ' + privacy : ''));
     }
-    else {
-        response._header('cache-control', 'no-cache');
+    else if (request.route.settings.cache) {
+        response._header('cache-control', request.route.settings.cache.otherwise);
     }
 };