From e7bd5dd6447a6742aff2f0c2926ec2a55ffba4d0 Mon Sep 17 00:00:00 2001
From: Raul Ochoa <rochoaf@gmail.com>
Date: Mon, 27 Apr 2015 14:47:58 +0200
Subject: [PATCH] Moves setDBParams to serverOptions so it can be reused

---
 lib/cartodb/controllers/template_maps.js | 18 +-----------------
 lib/cartodb/server_options.js            | 15 +++++++++++++++
 2 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/lib/cartodb/controllers/template_maps.js b/lib/cartodb/controllers/template_maps.js
index 6ba3e285..5cd12d35 100644
--- a/lib/cartodb/controllers/template_maps.js
+++ b/lib/cartodb/controllers/template_maps.js
@@ -302,7 +302,7 @@ TemplateMapsController.prototype.instantiateTemplate = function(req, res, templa
                 res: res,
                 profiler: req.profiler
             };
-            self.setDBParams(cdbuser, fakereq.params, this);
+            self.serverOptions.setDBParams(cdbuser, fakereq.params, this);
         },
         function setApiKey(err){
             if ( req.profiler ) req.profiler.done('setDBParams');
@@ -343,22 +343,6 @@ TemplateMapsController.prototype.finish_instantiation = function(err, response,
     }
 };
 
-TemplateMapsController.prototype.setDBParams = function(cdbuser, params, callback) {
-    var self = this;
-    step(
-        function setAuth() {
-            self.pgConnection.setDBAuth(cdbuser, params, this);
-        },
-        function setConn(err) {
-            if ( err ) throw err;
-            self.pgConnection.setDBConn(cdbuser, params, this);
-        },
-        function finish(err) {
-            callback(err);
-        }
-    );
-};
-
 function finishFn(app, res, description, okResponse) {
     return function finish(err, response){
         var statusCode = 200;
diff --git a/lib/cartodb/server_options.js b/lib/cartodb/server_options.js
index 65c94808..50baf0d1 100644
--- a/lib/cartodb/server_options.js
+++ b/lib/cartodb/server_options.js
@@ -509,6 +509,21 @@ module.exports = function(redisPool) {
         );
     };
 
+    me.setDBParams = function(cdbuser, params, callback) {
+        step(
+            function setAuth() {
+                pgConnection.setDBAuth(cdbuser, params, this);
+            },
+            function setConn(err) {
+                if ( err ) throw err;
+                pgConnection.setDBConn(cdbuser, params, this);
+            },
+            function finish(err) {
+                callback(err);
+            }
+        );
+    };
+
     // jshint maxcomplexity:10
     /**
      * Whitelist input and get database name & default geometry type from