From c0df0d12c686fba836f3ea9f109c018bfaf9fd28 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simon=20Mart=C3=ADn?= Date: Fri, 20 Oct 2017 17:21:55 +0200 Subject: [PATCH 1/2] ensure dont overwrite data in copy from req.params to res.locals --- lib/cartodb/middleware/context/locals.js | 2 +- lib/cartodb/middleware/user.js | 6 ------ 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/lib/cartodb/middleware/context/locals.js b/lib/cartodb/middleware/context/locals.js index bb7d5ee2..eb8fca89 100644 --- a/lib/cartodb/middleware/context/locals.js +++ b/lib/cartodb/middleware/context/locals.js @@ -1,7 +1,7 @@ const _ = require('underscore'); module.exports = function localsMiddleware(req, res, next) { - _.extend(res.locals, req.params); + _.defaults(res.locals, req.params); next(); }; diff --git a/lib/cartodb/middleware/user.js b/lib/cartodb/middleware/user.js index ce3fdd29..adf06203 100644 --- a/lib/cartodb/middleware/user.js +++ b/lib/cartodb/middleware/user.js @@ -4,11 +4,5 @@ var cdbRequest = new CdbRequest(); module.exports = function userMiddleware(req, res, next) { res.locals.user = cdbRequest.userByReq(req); - // avoid a req.params.user equals to undefined - // overwrites res.locals.user - if(!req.params.user) { - delete req.params.user; - } - next(); }; From 667b2a9cb139875b3ff9c287aece81eb8c341105 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simon=20Mart=C3=ADn?= Date: Wed, 15 Nov 2017 16:56:21 +0100 Subject: [PATCH 2/2] removing underscore dependency in locals middleware --- lib/cartodb/middleware/context/locals.js | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/lib/cartodb/middleware/context/locals.js b/lib/cartodb/middleware/context/locals.js index eb8fca89..0fdcce50 100644 --- a/lib/cartodb/middleware/context/locals.js +++ b/lib/cartodb/middleware/context/locals.js @@ -1,8 +1,6 @@ -const _ = require('underscore'); - module.exports = function localsMiddleware(req, res, next) { - _.defaults(res.locals, req.params); - + // save req.params in res.locals + res.locals = Object.assign(req.params || {}, res.locals); + next(); }; -