cartodb/Windshaft-cartodb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove legacy hack

Browse Source
This commit is contained in:
Daniel García Aubert 2017-09-22 18:15:48 +02:00
parent ff19a8a2fe
commit 85d4c81e58
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/cartodb/middleware/prepare-context.js
View File

@ -27,11 +27,12 @@ var REQUEST_QUERY_PARAMS_WHITELIST = [
module.exports = function prepareContextMiddleware (authApi, pgConnection) { module.exports = function prepareContextMiddleware (authApi, pgConnection) {
return function prepareContext (req, res, next) { return function prepareContext (req, res, next) {
var allowedQueryParams = REQUEST_QUERY_PARAMS_WHITELIST; var allowedQueryParams = REQUEST_QUERY_PARAMS_WHITELIST;
if (Array.isArray(req.context.allowedQueryParams)) { if (Array.isArray(req.context.allowedQueryParams)) {
allowedQueryParams = allowedQueryParams.concat(req.context.allowedQueryParams); allowedQueryParams = allowedQueryParams.concat(req.context.allowedQueryParams);
} }
req.query = _.pick(req.query, 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; var user = req.context.user;

1
test/unit/cartodb/prepare-context.test.js
View File

@ -39,6 +39,7 @@ describe('prepare-context', function() {
done: function() {} done: function() {}
}; };
req.context = { user: 'localhost' }; req.context = { user: 'localhost' };
req.params = {};
return req; return req;
} }