From f7c712f6ebe0b53dff59c1f17b506eb6d8ff76ab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Garc=C3=ADa=20Aubert?=
 <danielgarciaaubert@gmail.com>
Date: Wed, 30 May 2018 18:31:59 +0200
Subject: [PATCH] Avoid functions with side effects

---
 .../mapconfig/provider/named-map-provider.js  | 25 +++++++++----------
 1 file changed, 12 insertions(+), 13 deletions(-)

diff --git a/lib/cartodb/models/mapconfig/provider/named-map-provider.js b/lib/cartodb/models/mapconfig/provider/named-map-provider.js
index 6e9e9aca..5e9de375 100644
--- a/lib/cartodb/models/mapconfig/provider/named-map-provider.js
+++ b/lib/cartodb/models/mapconfig/provider/named-map-provider.js
@@ -57,7 +57,6 @@ NamedMapMapConfigProvider.prototype.getMapConfig = function(callback) {
     }
 
     var mapConfig = null;
-    var rendererParams;
     var apiKey;
 
     var context = {};
@@ -68,11 +67,7 @@ NamedMapMapConfigProvider.prototype.getMapConfig = function(callback) {
             return callback(err);
         }
 
-        rendererParams = _.extend({}, this.params, {
-            user: this.owner
-        });
-
-        this.setDBParams(this.owner, rendererParams, (err) => {
+        this.getDBParams(this.owner, (err, rendererParams) => {
             if (err) {
                 this.err = err;
                 return callback(err);
@@ -253,19 +248,23 @@ function configHash(config) {
 
 module.exports.configHash = configHash;
 
-NamedMapMapConfigProvider.prototype.setDBParams = function(cdbuser, params, callback) {
+NamedMapMapConfigProvider.prototype.getDBParams = function(cdbuser, callback) {
+    const dbParams = _.extend({}, this.params, {
+        user: this.owner
+    });
+
     this.pgConnection.getDatabaseParams(cdbuser, (err, databaseParams) => {
         if (err) {
             return callback(err);
         }
 
-        params.dbuser = databaseParams.dbuser;
-        params.dbpass = databaseParams.dbpass;
-        params.dbhost = databaseParams.dbhost;
-        params.dbport = databaseParams.dbport;
-        params.dbname = databaseParams.dbname;
+        dbParams.dbuser = databaseParams.dbuser;
+        dbParams.dbpass = databaseParams.dbpass;
+        dbParams.dbhost = databaseParams.dbhost;
+        dbParams.dbport = databaseParams.dbport;
+        dbParams.dbname = databaseParams.dbname;
 
-        callback();
+        return callback(null, dbParams);
     });
 };