From df5ec0f4d95bd1ce5981ff9e233989281b35e046 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Garc=C3=ADa=20Aubert?=
 <danielgarciaaubert@gmail.com>
Date: Fri, 22 Sep 2017 00:42:17 +0200
Subject: [PATCH] Use req2params middleware for analysis catalog endpoint

---
 lib/cartodb/controllers/analyses.js | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/lib/cartodb/controllers/analyses.js b/lib/cartodb/controllers/analyses.js
index 55c00414..c8acd2cc 100644
--- a/lib/cartodb/controllers/analyses.js
+++ b/lib/cartodb/controllers/analyses.js
@@ -9,9 +9,11 @@ var BaseController = require('./base');
 
 var cors = require('../middleware/cors');
 var userMiddleware = require('../middleware/user');
+const req2paramsMiddleware = require('../middleware/req2params-middleware');
 
 function AnalysesController(authApi, pgConnection) {
     BaseController.call(this, authApi, pgConnection);
+    this.req2paramsMiddleware = req2paramsMiddleware(authApi, pgConnection);
 }
 
 util.inherits(AnalysesController, BaseController);
@@ -19,7 +21,13 @@ util.inherits(AnalysesController, BaseController);
 module.exports = AnalysesController;
 
 AnalysesController.prototype.register = function(app) {
-    app.get(app.base_url_mapconfig + '/analyses/catalog', cors(), userMiddleware, this.catalog.bind(this));
+    app.get(
+        app.base_url_mapconfig + '/analyses/catalog',
+        cors(),
+        userMiddleware,
+        this.req2paramsMiddleware,
+        this.catalog.bind(this)
+    );
 };
 
 AnalysesController.prototype.sendResponse = function(req, res, resource) {
@@ -32,11 +40,7 @@ AnalysesController.prototype.catalog = function (req, res, next) {
     var username = req.context.user;
 
     step(
-        function reqParams() {
-            self.req2params(req, res, this);
-        },
-        function catalogQuery(err) {
-            assert.ifError(err);
+        function catalogQuery() {
             var pg = new PSQL(dbParamsFromReqParams(req.params));
             getMetadata(username, pg, this);
         },