diff --git a/lib/cartodb/controllers/base.js b/lib/cartodb/controllers/base.js index 6474eecc..135448d1 100644 --- a/lib/cartodb/controllers/base.js +++ b/lib/cartodb/controllers/base.js @@ -35,7 +35,7 @@ module.exports = BaseController; * @param req - standard express request obj. Should have host & table * @param callback */ -BaseController.prototype.req2params = function(req, callback){ +BaseController.prototype.req2params = function(req, res, next) { var self = this; if ( req.query.lzma ) { @@ -60,7 +60,7 @@ BaseController.prototype.req2params = function(req, callback){ self.req2params(req, callback); } catch (err) { req.profiler.done('req2params'); - callback(new Error('Error parsing lzma as JSON: ' + err)); + next(new Error('Error parsing lzma as JSON: ' + err)); } } ); @@ -96,7 +96,7 @@ BaseController.prototype.req2params = function(req, callback){ ); err.http_status = 403; req.profiler.done('req2params'); - callback(err); + next(err); return; } if ( tksplit.length > 1 ) { @@ -137,7 +137,7 @@ BaseController.prototype.req2params = function(req, callback){ function finishSetup(err) { if ( err ) { req.profiler.done('req2params'); - return callback(err, req); + return next(err, req); } // Add default database connection parameters @@ -155,7 +155,7 @@ BaseController.prototype.req2params = function(req, callback){ _.defaults(req.locals, req.params); req.profiler.done('req2params'); - callback(null, req); + next(null, req); } ); };