From 85d4c81e586754c2177905a22fa2f86ceb038a98 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Garc=C3=ADa=20Aubert?= Date: Fri, 22 Sep 2017 18:15:48 +0200 Subject: [PATCH] Remove legacy hack --- lib/cartodb/middleware/prepare-context.js | 3 ++- test/unit/cartodb/prepare-context.test.js | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/cartodb/middleware/prepare-context.js b/lib/cartodb/middleware/prepare-context.js index f0732939..ee8e08cb 100644 --- a/lib/cartodb/middleware/prepare-context.js +++ b/lib/cartodb/middleware/prepare-context.js @@ -27,11 +27,12 @@ var REQUEST_QUERY_PARAMS_WHITELIST = [ module.exports = function prepareContextMiddleware (authApi, pgConnection) { return function prepareContext (req, res, next) { var allowedQueryParams = REQUEST_QUERY_PARAMS_WHITELIST; + if (Array.isArray(req.context.allowedQueryParams)) { allowedQueryParams = allowedQueryParams.concat(req.context.allowedQueryParams); } + req.query = _.pick(req.query, allowedQueryParams); - req.params = _.extend({}, req.params); // shuffle things as request is a strange array/object var user = req.context.user; diff --git a/test/unit/cartodb/prepare-context.test.js b/test/unit/cartodb/prepare-context.test.js index 1203f63c..7bd2415e 100644 --- a/test/unit/cartodb/prepare-context.test.js +++ b/test/unit/cartodb/prepare-context.test.js @@ -39,6 +39,7 @@ describe('prepare-context', function() { done: function() {} }; req.context = { user: 'localhost' }; + req.params = {}; return req; }