From e9db535dd8e8ca75e30b3e05d54825a8b05adb54 Mon Sep 17 00:00:00 2001
From: Sandro Santilli <strk@keybit.net>
Date: Mon, 16 Dec 2013 17:34:58 +0100
Subject: [PATCH] Drop the idea that we can distinguish a "dbowner" from the
 domain

We only recognize "users"
---
 lib/cartodb/server_options.js | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/lib/cartodb/server_options.js b/lib/cartodb/server_options.js
index 25456154..afa8043d 100644
--- a/lib/cartodb/server_options.js
+++ b/lib/cartodb/server_options.js
@@ -250,7 +250,7 @@ module.exports = function(){
     me.afterLayergroupCreate = function(req, mapconfig, response, callback) {
         var token = response.layergroupid;
 
-        var username = this.dbOwnerByReq(req); // cartoData.userFromHostname(req.headers.host);
+        var username = this.userByReq(req);
 
         var tasksleft = 2; // redis key and affectedTables
         var errors = [];
@@ -305,7 +305,7 @@ module.exports = function(){
 
 /* X-Cache-Channel generation } */
 
-    me.dbOwnerByReq = function(req) {
+    me.userByReq = function(req) {
         return cartoData.userFromHostname(req.headers.host);
     }
 
@@ -363,7 +363,7 @@ module.exports = function(){
      */
     me.authorize = function(req, callback) {
         var that = this;
-        var dbowner = me.dbOwnerByReq(req);
+        var user = me.userByReq(req);
 
         Step(
             function(){
@@ -375,8 +375,8 @@ module.exports = function(){
                 // if not authorized by api_key, continue 
                 if (check_result !== 1) return null;
 
-                // authorized by api key, login as db owner and stop
-                that.setDBAuth(dbowner, req.params, function(err) {
+                // authorized by api key, login as the given username and stop
+                that.setDBAuth(user, req.params, function(err) {
                   callback(err, true); // authorized (or error)
                 });
             },
@@ -385,7 +385,7 @@ module.exports = function(){
             function getDatabase(err){
                 if (err) throw err;
                 // NOTE: only used to get to table privacy
-                cartoData.getUserDBName(dbowner, this);
+                cartoData.getUserDBName(user, this);
             },
             function getPrivacy(err, dbname){
                 if (err) throw err;
@@ -485,7 +485,7 @@ module.exports = function(){
 
         if (req.profiler) req.profiler.done('req2params.setup');
 
-        var dbowner = me.dbOwnerByReq(req);
+        var user = me.userByReq(req);
 
         Step(
             function getPrivacy(){
@@ -500,14 +500,14 @@ module.exports = function(){
             function getDatabaseHost(err, data){
                 if(err) throw err;
 
-                cartoData.getUserDBHost(dbowner, this);
+                cartoData.getUserDBHost(user, this);
             },
             function getDatabase(err, data){
                 if (req.profiler) req.profiler.done('cartoData.getDatabaseHost');
                 if(err) throw err;
                 if ( data ) _.extend(req.params, {dbhost:data});
 
-                cartoData.getUserDBName(dbowner, this);
+                cartoData.getUserDBName(user, this);
             },
             function getGeometryType(err, data){
                 if (req.profiler) req.profiler.done('cartoData.getDatabase');