Retrieving db public user from redis. It uses a new multiget method from cartodb-redis

2014-07-03 21:39:47 +02:00
parent 470aea22d9
commit bfdcee3772
3 changed files with 12 additions and 12 deletions
@@ -559,21 +559,20 @@ module.exports = function(){
        dbport: global.environment.postgres.port
      });
      Step(
-        function getDatabaseHost(){
-            cartoData.getUserDBHost(dbowner, this);
+        function getConnectionParams() {
+            cartoData.getUserDBConnectionParams(dbowner, this);
        },
-        function getDatabase(err, data){
-            if(err) throw err;
-            if ( data ) _.extend(params, {dbhost:data});
-            cartoData.getUserDBName(dbowner, this);
-        },
-        function extendParams(err, data){
+        function extendParams(err, dbParams){
            if (err) throw err;
-            if ( data ) _.extend(params, {dbname:data});
+            // we don't want null values or overwrite a non public user
+            if (params.dbuser != 'publicuser' || !dbParams.dbuser) {
+                delete dbParams.dbuser;
+            }
+            if ( dbParams ) _.extend(params, dbParams);
            return null;
        },
        function finish(err) {
-          callback(err); 
+          callback(err);
        }
      );
    };