From c22a35489dd2cbcab37fc4de422de4aaecf82a55 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simon=20Mart=C3=ADn?= Date: Fri, 29 Sep 2017 14:38:28 +0200 Subject: [PATCH] res.locals forgotten things and make jshint happy --- lib/cartodb/controllers/layergroup.js | 8 +++++++- lib/cartodb/middleware/context/authorize.js | 2 -- lib/cartodb/middleware/context/index.js | 2 +- lib/cartodb/middleware/context/locals.js | 4 ++++ 4 files changed, 12 insertions(+), 4 deletions(-) diff --git a/lib/cartodb/controllers/layergroup.js b/lib/cartodb/controllers/layergroup.js index 700564fc..a68f22a7 100644 --- a/lib/cartodb/controllers/layergroup.js +++ b/lib/cartodb/controllers/layergroup.js @@ -177,7 +177,13 @@ LayergroupController.prototype.dataview = function(req, res, next) { var mapConfigProvider = new MapStoreMapConfigProvider( self.mapStore, req.context.user, self.userLimitsApi, res.locals ); - self.dataviewBackend.getDataview(mapConfigProvider, req.context.user, req.params.dataviewName, res.locals, this); + self.dataviewBackend.getDataview( + mapConfigProvider, + req.context.user, + req.params.dataviewName, + res.locals, + this + ); }, function finish(err, dataview, stats) { req.profiler.add(stats || {}); diff --git a/lib/cartodb/middleware/context/authorize.js b/lib/cartodb/middleware/context/authorize.js index bab100b0..a42b5407 100644 --- a/lib/cartodb/middleware/context/authorize.js +++ b/lib/cartodb/middleware/context/authorize.js @@ -1,5 +1,3 @@ -const _ = require('underscore'); - module.exports = function authorizeMiddleware (authApi) { return function (req, res, next) { req.profiler.done('req2params.setup'); diff --git a/lib/cartodb/middleware/context/index.js b/lib/cartodb/middleware/context/index.js index d660dcaf..640aafd6 100644 --- a/lib/cartodb/middleware/context/index.js +++ b/lib/cartodb/middleware/context/index.js @@ -1,4 +1,4 @@ -const locals = require('./locals') +const locals = require('./locals'); const cleanUpQueryParams = require('./clean-up-query-params'); const layergroupToken = require('./layergroup-token'); const authorize = require('./authorize'); diff --git a/lib/cartodb/middleware/context/locals.js b/lib/cartodb/middleware/context/locals.js index ec847788..a4df17ca 100644 --- a/lib/cartodb/middleware/context/locals.js +++ b/lib/cartodb/middleware/context/locals.js @@ -1,7 +1,11 @@ +const _ = require('underscore'); + module.exports = function layergroupTokenMiddleware(req, res, next) { // FIXME: Temporary hack to share data between middlewares. Express overrides req.params to // parse url params to an object and it's performed after matching path and controller. res.locals = {}; _.extend(res.locals, req.params); + + next(); }