From bde86323fd8ca90b1376ec524af963bf9bb26ba0 Mon Sep 17 00:00:00 2001 From: Eneko Lakasta Date: Wed, 7 Feb 2018 15:36:24 +0100 Subject: [PATCH] use master api key in setDBAuth --- lib/cartodb/backends/pg_connection.js | 28 +++++---------------------- 1 file changed, 5 insertions(+), 23 deletions(-) diff --git a/lib/cartodb/backends/pg_connection.js b/lib/cartodb/backends/pg_connection.js index 162c0f61..80b14bc0 100644 --- a/lib/cartodb/backends/pg_connection.js +++ b/lib/cartodb/backends/pg_connection.js @@ -21,35 +21,17 @@ module.exports = PgConnection; // @param callback function(err) // PgConnection.prototype.setDBAuth = function(username, params, callback) { - var auth_user = global.environment.postgres_auth_user; - var auth_pass = global.environment.postgres_auth_pass; - - this.metadataBackend.getUserId(username, (err, userId) => { + this.metadataBackend.getMasterApikey(username, (err, apikey)=> { if (err) { return callback(err); } - - const userParams = { - user_id: userId - }; - params.dbuser = _.template(auth_user, userParams); + params.dbuser = apikey.databaseRole; + params.dbpassword = apikey.databasePassword; - if (!auth_pass || !auth_pass.match(/\buser_password\b/)) { - return callback(); - } - - this.metadataBackend.getUserDBPass(username, (err, userPassword) => { - if (err) { - return callback(err); - } - - userParams.user_password = userPassword; - params.dbpassword = _.template(auth_pass, userParams); - - callback(); - }); + callback(); }); + }; // Set db connection parameters to those for the given username