Split misc middleware

3 files changed, 30 insertions, 19 deletions

diff --git a/middlewares/cache.js b/middlewares/cache.js
new file mode 100644
index 000000000..782165155
--- /dev/null
+++ b/middlewares/cache.js
@@ -0,0 +1,25 @@
+;(function () {
+  'use strict'
+
+  var cacheMiddleware = {
+    cache: cache
+  }
+
+  function cache (cache) {
+    return function (req, res, next) {
+      // If we want explicitly a cache
+      // Or if we don't specify if we want a cache or no and we are in production
+      if (cache === true || (cache !== false && process.env.NODE_ENV === 'production')) {
+        res.setHeader('Cache-Control', 'public')
+      } else {
+        res.setHeader('Cache-Control', 'no-cache, no-store, max-age=0, must-revalidate')
+      }
+
+      next()
+    }
+  }
+
+  // ---------------------------------------------------------------------------
+
+  module.exports = cacheMiddleware
+})()
diff --git a/middlewares/index.js b/middlewares/index.js
index 311dfb6d2..bfe325b1e 100644
--- a/middlewares/index.js
+++ b/middlewares/index.js
@@ -2,8 +2,9 @@
   'use strict'
 
   var middlewares = {
-    misc: require('./misc'),
-    reqValidators: require('./reqValidators')
+    cache: require('./cache'),
+    reqValidators: require('./reqValidators'),
+    secure: require('./secure')
   }
 
   // ---------------------------------------------------------------------------
diff --git a/middlewares/misc.js b/middlewares/secure.js
index cc4e2e8a4..99ac9cdae 100644
--- a/middlewares/misc.js
+++ b/middlewares/secure.js
@@ -8,25 +8,10 @@
   var Pods = require('../models/pods')
   var utils = require('../helpers/utils')
 
-  var miscMiddleware = {
-    cache: cache,
+  var secureMiddleware = {
     decryptBody: decryptBody
   }
 
-  function cache (cache) {
-    return function (req, res, next) {
-      // If we want explicitly a cache
-      // Or if we don't specify if we want a cache or no and we are in production
-      if (cache === true || (cache !== false && process.env.NODE_ENV === 'production')) {
-        res.setHeader('Cache-Control', 'public')
-      } else {
-        res.setHeader('Cache-Control', 'no-cache, no-store, max-age=0, must-revalidate')
-      }
-
-      next()
-    }
-  }
-
   function decryptBody (req, res, next) {
     var url = req.body.signature.url
     Pods.findByUrl(url, function (err, pod) {
@@ -61,5 +46,5 @@
 
   // ---------------------------------------------------------------------------
 
-  module.exports = miscMiddleware
+  module.exports = secureMiddleware
 })()