From 49204650c69bfdeb28eb258487c05d075397eba4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Garc=C3=ADa=20Aubert?= Date: Thu, 21 Sep 2017 13:39:58 +0200 Subject: [PATCH] Use req2params middleware for datavie search endpoint --- lib/cartodb/controllers/layergroup.js | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/lib/cartodb/controllers/layergroup.js b/lib/cartodb/controllers/layergroup.js index 9f2a95e7..62adc7de 100644 --- a/lib/cartodb/controllers/layergroup.js +++ b/lib/cartodb/controllers/layergroup.js @@ -118,6 +118,7 @@ LayergroupController.prototype.register = function(app) { cors(), userMiddleware, allowQueryParams(allowedDataviewQueryParams), + this.req2paramsMiddleware, this.dataviewSearch.bind(this) ); @@ -126,11 +127,11 @@ LayergroupController.prototype.register = function(app) { cors(), userMiddleware, allowQueryParams(allowedDataviewQueryParams), + this.req2paramsMiddleware, this.dataviewSearch.bind(this) ); - app.get(app.base_url_mapconfig + - '/:token/analysis/node/:nodeId', + app.get(app.base_url_mapconfig + '/:token/analysis/node/:nodeId', cors(), userMiddleware, this.req2paramsMiddleware, @@ -194,12 +195,7 @@ LayergroupController.prototype.dataviewSearch = function(req, res, next) { var self = this; step( - function setupParams() { - self.req2params(req, res, this); - }, - function searchDataview(err) { - assert.ifError(err); - + function searchDataview() { var mapConfigProvider = new MapStoreMapConfigProvider( self.mapStore, req.context.user, self.userLimitsApi, req.params );