Merge remote-tracking branch 'origin/master' into mvt-path-conf

test/acceptance/analysis/named-maps.js

@@ -7,7 +7,7 @@ var serverOptions = require('../../../lib/cartodb/server_options');
 var server = new CartodbWindshaft(serverOptions);
 var TestClient = require('../../support/test-client');
 
-var LayergroupToken = require('../../support/layergroup-token');
+var LayergroupToken = require('../../../lib/cartodb/models/layergroup-token');
 
 describe('named-maps analysis', function() {
 

test/acceptance/cache/cache_headers.js

@@ -8,7 +8,7 @@ var serverOptions = require('../../../lib/cartodb/server_options');
 var server = new CartodbWindshaft(serverOptions);
 server.setMaxListeners(0);
 
-var LayergroupToken = require('../../support/layergroup-token');
+var LayergroupToken = require('../../../lib/cartodb/models/layergroup-token');
 
 describe('get requests with cache headers', function() {
 

test/acceptance/dynamic-styling-named-maps.js

@@ -1,6 +1,6 @@
 var assert = require('../support/assert');
 var step = require('step');
-var LayergroupToken = require('../support/layergroup-token');
+var LayergroupToken = require('../../lib/cartodb/models/layergroup-token');
 var testHelper = require(__dirname + '/../support/test_helper');
 var CartodbWindshaft = require(__dirname + '/../../lib/cartodb/server');
 var serverOptions = require(__dirname + '/../../lib/cartodb/server_options');

test/acceptance/multilayer.js

@@ -9,7 +9,7 @@ var mapnik = require('windshaft').mapnik;
 var semver = require('semver');
 
 var helper = require(__dirname + '/../support/test_helper');
-var LayergroupToken = require('../support/layergroup-token');
+var LayergroupToken = require('../../lib/cartodb/models/layergroup-token');
 
 var windshaft_fixtures = __dirname + '/../../node_modules/windshaft/test/fixtures';
 

test/acceptance/multilayer_server.js

@@ -4,7 +4,7 @@ var assert = require('../support/assert');
 
 var _ = require('underscore');
 
-var LayergroupToken = require('../support/layergroup-token');
+var LayergroupToken = require('../../lib/cartodb/models/layergroup-token');
 
 var PgQueryRunner = require('../../lib/cartodb/backends/pg_query_runner');
 var QueryTables = require('cartodb-query-tables');

test/acceptance/named_layers.js

@@ -5,7 +5,7 @@ var CartodbWindshaft = require(__dirname + '/../../lib/cartodb/server');
 var serverOptions = require(__dirname + '/../../lib/cartodb/server_options');
 var server = new CartodbWindshaft(serverOptions);
 
-var LayergroupToken = require('../support/layergroup-token');
+var LayergroupToken = require('../../lib/cartodb/models/layergroup-token');
 
 var RedisPool = require('redis-mpool');
 var TemplateMaps = require('../../lib/cartodb/backends/template_maps.js');

test/acceptance/overviews_metadata.js

@@ -5,7 +5,7 @@ var CartodbWindshaft = require(__dirname + '/../../lib/cartodb/server');
 var serverOptions = require(__dirname + '/../../lib/cartodb/server_options');
 var server = new CartodbWindshaft(serverOptions);
 
-var LayergroupToken = require('../support/layergroup-token');
+var LayergroupToken = require('../../lib/cartodb/models/layergroup-token');
 
 var RedisPool = require('redis-mpool');
 

test/acceptance/overviews_metadata_named_maps.js

@@ -5,7 +5,7 @@ var CartodbWindshaft = require(__dirname + '/../../lib/cartodb/server');
 var serverOptions = require(__dirname + '/../../lib/cartodb/server_options');
 var server = new CartodbWindshaft(serverOptions);
 
-var LayergroupToken = require('../support/layergroup-token');
+var LayergroupToken = require('../../lib/cartodb/models/layergroup-token');
 
 var RedisPool = require('redis-mpool');
 

test/acceptance/ported/attributes.js

@@ -6,7 +6,7 @@ var cartodbServer = require('../../../lib/cartodb/server');
 var PortedServerOptions = require('./support/ported_server_options');
 var BaseController = require('../../../lib/cartodb/controllers/base');
 
-var LayergroupToken = require('../../support/layergroup-token');
+var LayergroupToken = require('../../../lib/cartodb/models/layergroup-token');
 
 
 describe('attributes', function() {

test/acceptance/ported/multilayer.js

@@ -7,7 +7,7 @@ var step = require('step');
 var mapnik = require('windshaft').mapnik;
 var cartodbServer = require('../../../lib/cartodb/server');
 var ServerOptions = require('./support/ported_server_options');
-var LayergroupToken = require('../../support/layergroup-token');
+var LayergroupToken = require('../../../lib/cartodb/models/layergroup-token');
 var BaseController = require('../../../lib/cartodb/controllers/base');
 
 describe('multilayer', function() {

test/acceptance/ported/multilayer_interactivity.js

@@ -5,7 +5,7 @@ var _             = require('underscore');
 var cartodbServer = require('../../../lib/cartodb/server');
 var getLayerTypeFn = require('windshaft').model.MapConfig.prototype.getType;
 var PortedServerOptions = require('./support/ported_server_options');
-var LayergroupToken = require('../../support/layergroup-token');
+var LayergroupToken = require('../../../lib/cartodb/models/layergroup-token');
 
 var BaseController = require('../../../lib/cartodb/controllers/base');
 

test/acceptance/ported/raster.js

@@ -6,7 +6,7 @@ var cartodbServer = require('../../../lib/cartodb/server');
 var ServerOptions = require('./support/ported_server_options');
 
 var BaseController = require('../../../lib/cartodb/controllers/base');
-var LayergroupToken = require('../../support/layergroup-token');
+var LayergroupToken = require('../../../lib/cartodb/models/layergroup-token');
 
 describe('raster', function() {
 

test/acceptance/ported/retina.js

@@ -6,7 +6,7 @@ var cartodbServer = require('../../../lib/cartodb/server');
 var ServerOptions = require('./support/ported_server_options');
 
 var BaseController = require('../../../lib/cartodb/controllers/base');
-var LayergroupToken = require('../../support/layergroup-token');
+var LayergroupToken = require('../../../lib/cartodb/models/layergroup-token');
 
 describe('retina support', function() {
 

test/acceptance/ported/server_png8_format.js

@@ -7,7 +7,7 @@ var cartodbServer = require('../../../lib/cartodb/server');
 var ServerOptions = require('./support/ported_server_options');
 
 var BaseController = require('../../../lib/cartodb/controllers/base');
-var LayergroupToken = require('../../support/layergroup-token');
+var LayergroupToken = require('../../../lib/cartodb/models/layergroup-token');
 
 var IMAGE_EQUALS_TOLERANCE_PER_MIL = 85;
 

test/acceptance/ported/support/ported_server_options.js

@@ -1,7 +1,7 @@
 var _ = require('underscore');
 var serverOptions = require('../../../../lib/cartodb/server_options');
-var LayergroupToken = require('../../../support/layergroup-token');
 var mapnik = require('windshaft').mapnik;
+var LayergroupToken = require('../../../../lib/cartodb/models/layergroup-token');
 var OverviewsQueryRewriter = require('../../../../lib/cartodb/utils/overviews_query_rewriter');
 var overviewsQueryRewriter = new OverviewsQueryRewriter({
   zoom_level: 'CDB_ZoomFromScale(!scale_denominator!)'
@@ -48,7 +48,7 @@ module.exports = _.extend({}, serverOptions, {
     log_format: null, // do not log anything
     afterLayergroupCreateCalls: 0,
     useProfiler: true,
-    req2params: function(req, callback){
+    req2params: function(req, res, callback){
 
         if ( req.query.testUnexpectedError ) {
             return callback('test unexpected error');
@@ -56,13 +56,14 @@ module.exports = _.extend({}, serverOptions, {
 
         // this is in case you want to test sql parameters eg ...png?sql=select * from my_table limit 10
         req.params =  _.extend({}, req.params);
+
         if (req.params.token) {
             req.params.token = LayergroupToken.parse(req.params.token).token;
         }
 
         _.extend(req.params, req.query);
         req.params.user = 'localhost';
-        req.context = {user: 'localhost'};
+        res.locals.user = 'localhost';
 
         req.params.dbhost = global.environment.postgres.host;
         req.params.dbport = req.params.dbport || global.environment.postgres.port;
@@ -73,6 +74,9 @@ module.exports = _.extend({}, serverOptions, {
         }
         req.params.dbname = 'test_windshaft_cartodb_user_1_db';
 
+        // add all params to res.locals
+        res.locals = _.extend({}, req.params);
+
 
         // increment number of calls counter
         global.req2params_calls = global.req2params_calls ? global.req2params_calls + 1 : 1;

test/acceptance/ported/support/test_client.js

@@ -1,5 +1,5 @@
 var testHelper = require('../../../support/test_helper');
-var LayergroupToken = require('../../../support/layergroup-token');
+var LayergroupToken = require('../../../../lib/cartodb/models/layergroup-token');
 
 var step = require('step');
 var assert = require('../../../support/assert');

test/acceptance/ported/torque.js

@@ -7,7 +7,7 @@ var cartodbServer = require('../../../lib/cartodb/server');
 var ServerOptions = require('./support/ported_server_options');
 
 var BaseController = require('../../../lib/cartodb/controllers/base');
-var LayergroupToken = require('../../support/layergroup-token');
+var LayergroupToken = require('../../../lib/cartodb/models/layergroup-token');
 
 describe('torque', function() {
 

test/acceptance/ported/torque_boundaries.js

@@ -5,7 +5,7 @@ var cartodbServer = require('../../../lib/cartodb/server');
 var ServerOptions = require('./support/ported_server_options');
 
 var BaseController = require('../../../lib/cartodb/controllers/base');
-var LayergroupToken = require('../../support/layergroup-token');
+var LayergroupToken = require('../../../lib/cartodb/models/layergroup-token');
 
 describe('torque boundary points', function() {
 

test/acceptance/templates.js

@@ -23,7 +23,7 @@ var serverOptions = require(__dirname + '/../../lib/cartodb/server_options');
 var server = new CartodbWindshaft(serverOptions);
 server.setMaxListeners(0);
 
-var LayergroupToken = require('../support/layergroup-token');
+var LayergroupToken = require('../../lib/cartodb/models/layergroup-token');
 
 describe('template_api', function() {
     server.layergroupAffectedTablesCache.cache.reset();

test/acceptance/turbo-carto/named-maps.js

@@ -1,6 +1,6 @@
 var assert = require('../../support/assert');
 var step = require('step');
-var LayergroupToken = require('../../support/layergroup-token');
+var LayergroupToken = require('../../../lib/cartodb/models/layergroup-token');
 var testHelper = require('../../support/test_helper');
 var CartodbWindshaft = require('../../../lib/cartodb/server');
 var serverOptions = require('../../../lib/cartodb/server_options');

test/acceptance/widgets/named-maps.js

@@ -10,7 +10,7 @@ var CartodbWindshaft = require('../../../lib/cartodb/server');
 var serverOptions = require('../../../lib/cartodb/server_options');
 var server = new CartodbWindshaft(serverOptions);
 
-var LayergroupToken = require('../../support/layergroup-token');
+var LayergroupToken = require('../../../lib/cartodb/models/layergroup-token');
 
 describe('named-maps widgets', function() {
 

test/support/layergroup-token.js

@@ -1,29 +0,0 @@
-/**
- * @param {String} token might match the following pattern: {user}@{tpl_id}@{token}:{cache_buster}
- */
-function parse(token) {
-    var signer, cacheBuster;
-
-    var tokenSplit = token.split(':');
-
-    token = tokenSplit[0];
-    if (tokenSplit.length > 1) {
-        cacheBuster = tokenSplit[1];
-    }
-
-    tokenSplit = token.split('@');
-    if ( tokenSplit.length > 1 ) {
-        signer = tokenSplit.shift();
-        if ( tokenSplit.length > 1 ) {
-            /*var template_hash = */tokenSplit.shift(); // unused
-        }
-        token = tokenSplit.shift();
-    }
-
-    return {
-        token: token,
-        signer: signer,
-        cacheBuster: cacheBuster
-    };
-}
-module.exports.parse = parse;

test/support/test-client.js

@@ -7,7 +7,7 @@ var PSQL = require('cartodb-psql');
 var _ = require('underscore');
 var mapnik = require('windshaft').mapnik;
 
-var LayergroupToken = require('./layergroup-token');
+var LayergroupToken = require('../../lib/cartodb/models/layergroup-token');
 
 var assert = require('./assert');
 var helper = require('./test_helper');
@@ -116,6 +116,15 @@ module.exports.SQL = {
     ONE_POINT: 'select 1 as cartodb_id, \'SRID=3857;POINT(0 0)\'::geometry the_geom_webmercator'
 };
 
+function resErr2errRes(callback) {
+    return (res, err) => {
+        if (err) {
+            return callback(err);
+        }
+        return callback(err, res);
+    };
+}
+
 TestClient.prototype.getWidget = function(widgetName, params, callback) {
     var self = this;
 
@@ -716,9 +725,9 @@ TestClient.prototype.getTile = function(z, x, y, params, callback) {
                 expectedResponse.headers['Content-Type'] = 'application/json; charset=utf-8';
             }
 
-            assert.response(self.server, request, expectedResponse, this);
+            assert.response(self.server, request, expectedResponse, resErr2errRes(this));
         },
-        function finish(res, err) {
+        function finish(err, res) {
             if (err) {
                 return callback(err);
             }
@@ -869,9 +878,9 @@ TestClient.prototype.getStaticCenter = function (params, callback) {
                 }
             }, params.response);
 
-            assert.response(self.server, request, expectedResponse, this);
+            assert.response(self.server, request, expectedResponse, resErr2errRes(this));
         },
-        function(res, err) {
+        function(err, res) {
             if (err) {
                 return callback(err);
             }
@@ -968,9 +977,9 @@ TestClient.prototype.getNodeStatus = function(nodeName, callback) {
                 }
             };
 
-            assert.response(self.server, request, expectedResponse, this);
+            assert.response(self.server, request, expectedResponse, resErr2errRes(this));
         },
-        function finish(res, err) {
+        function finish(err, res) {
             if (err) {
                 return callback(err);
             }
@@ -1063,9 +1072,9 @@ TestClient.prototype.getAttributes  = function(params, callback) {
                 }
             };
 
-            assert.response(self.server, request, expectedResponse, this);
+            assert.response(self.server, request, expectedResponse, resErr2errRes(this));
         },
-        function finish(res, err) {
+        function finish(err, res) {
             if (err) {
                 return callback(err);
             }

test/unit/cartodb/base_controller.js

@@ -1,21 +1,21 @@
 require('../../support/test_helper.js');
 
 var assert = require('assert');
-var BaseController = require('../../../lib/cartodb/controllers/base');
+var errorMiddleware = require('../../../lib/cartodb/middleware/error-middleware');
 
-describe('BaseController', function() {
+describe('error-middleware', function() {
 
     it('different formats for postgis plugin error returns 400 as status code', function() {
 
         var expectedStatusCode = 400;
         assert.equal(
-            BaseController.findStatusCode("Postgis Plugin: ERROR:  column \"missing\" does not exist\n"),
+            errorMiddleware.findStatusCode("Postgis Plugin: ERROR:  column \"missing\" does not exist\n"),
             expectedStatusCode,
             "Error status code for single line does not match"
         );
 
         assert.equal(
-            BaseController.findStatusCode("Postgis Plugin: PSQL error:\nERROR:  column \"missing\" does not exist\n"),
+            errorMiddleware.findStatusCode("Postgis Plugin: PSQL error:\nERROR:  column \"missing\" does not exist\n"),
             expectedStatusCode,
             "Error status code for multiline/PSQL does not match"
         );

test/unit/cartodb/error_messages.test.js

@@ -2,7 +2,7 @@ require('../../support/test_helper');
 
 var assert = require('assert');
 
-var BaseController = require('../../../lib/cartodb/controllers/base');
+var errorMiddleware = require('../../../lib/cartodb/middleware/error-middleware');
 
 describe('error messages clean up', function() {
 
@@ -15,7 +15,7 @@ describe('error messages clean up', function() {
             "  encountered during parsing of layer 'layer0' in Layer"
         ].join('\n');
 
-        var outMessage = BaseController.errorMessage(inMessage);
+        var outMessage = errorMiddleware.errorMessage(inMessage);
 
         assert.ok(outMessage.match('connect'), outMessage);
         assert.ok(!outMessage.match(/666/), outMessage);

test/unit/cartodb/ported/tile_stats.test.js

@@ -41,7 +41,9 @@ describe('tile stats', function() {
             jsonp: function() {},
             send: function() {}
         };
-        layergroupController.finalizeGetTileOrGrid('Unsupported format png2', reqMock, resMock, null, null);
+
+        var next = function () {};
+        layergroupController.finalizeGetTileOrGrid('Unsupported format png2', reqMock, resMock, null, null, next);
 
         assert.ok(formatMatched, 'Format was never matched in increment method');
         assert.equal(expectedCalls, 0, 'Unexpected number of calls to increment method');
@@ -74,7 +76,8 @@ describe('tile stats', function() {
 
         var layergroupController = new LayergroupController();
 
-        layergroupController.finalizeGetTileOrGrid('Another error happened', reqMock, resMock, null, null);
+        var next = function () {};
+        layergroupController.finalizeGetTileOrGrid('Another error happened', reqMock, resMock, null, null, next);
 
         assert.ok(formatMatched, 'Format was never matched in increment method');
         assert.equal(expectedCalls, 0, 'Unexpected number of calls to increment method');

test/unit/cartodb/prepare-context.test.js

@@ -0,0 +1,171 @@
+var assert = require('assert');
+var _ = require('underscore');
+
+var RedisPool = require('redis-mpool');
+var cartodbRedis = require('cartodb-redis');
+var PgConnection = require('../../../lib/cartodb/backends/pg_connection');
+var AuthApi = require('../../../lib/cartodb/api/auth_api');
+var TemplateMaps = require('../../../lib/cartodb/backends/template_maps');
+
+const cleanUpQueryParamsMiddleware = require('../../../lib/cartodb/middleware/context/clean-up-query-params');
+const authorizeMiddleware = require('../../../lib/cartodb/middleware/context/authorize');
+const dbConnSetupMiddleware = require('../../../lib/cartodb/middleware/context/db-conn-setup');
+const localsMiddleware =  require('../../../lib/cartodb/middleware/context/locals');
+
+var windshaft = require('windshaft');
+
+describe('prepare-context', function() {
+
+    var test_user = _.template(global.environment.postgres_auth_user, {user_id:1});
+    var test_pubuser = global.environment.postgres.user;
+    var test_database = test_user + '_db';
+
+    let cleanUpQueryParams;
+    let dbConnSetup;
+    let authorize;
+
+    before(function() {
+        var redisPool = new RedisPool(global.environment.redis);
+        var mapStore = new windshaft.storage.MapStore();
+        var metadataBackend = cartodbRedis({pool: redisPool});
+        var pgConnection = new PgConnection(metadataBackend);
+        var templateMaps = new TemplateMaps(redisPool);
+        var authApi = new AuthApi(pgConnection, metadataBackend, mapStore, templateMaps);
+
+        cleanUpQueryParams = cleanUpQueryParamsMiddleware();
+        authorize = authorizeMiddleware(authApi);
+        dbConnSetup = dbConnSetupMiddleware(pgConnection);
+    });
+
+
+    it('can be found in server_options', function(){
+        assert.ok(_.isFunction(authorize));
+        assert.ok(_.isFunction(dbConnSetup));
+        assert.ok(_.isFunction(cleanUpQueryParams));
+    });
+
+    function prepareRequest(req) {
+        req.profiler = {
+            done: function() {}
+        };
+
+        return req;
+    }
+
+    function prepareResponse(res) {
+        if(!res.locals) {
+            res.locals = {};
+        }
+        res.locals.user = 'localhost';
+
+        return res;
+    }
+
+    it('res.locals are created', function(done) {
+        let req = {};
+        let res = {};
+
+        localsMiddleware(prepareRequest(req), prepareResponse(res), function(err) {
+            if ( err ) { done(err); return; }
+            assert.ok(res.hasOwnProperty('locals'), 'response has locals');
+            done();
+        });
+    });
+    
+    it('cleans up request', function(done){
+      var req = {headers: { host:'localhost' }, query: {dbuser:'hacker',dbname:'secret'}};
+      var res = {};
+
+      cleanUpQueryParams(prepareRequest(req), prepareResponse(res), function(err) {
+          if ( err ) { done(err); return; }
+          assert.ok(_.isObject(req.query), 'request has query');
+          assert.ok(!req.query.hasOwnProperty('dbuser'), 'dbuser was removed from query');
+          assert.ok(res.hasOwnProperty('locals'), 'response has locals');
+          assert.ok(!res.locals.hasOwnProperty('interactivity'), 'response locals do not have interactivity');
+          done();
+      });
+    });
+
+    it('sets dbname from redis metadata', function(done){
+      var req = {headers: { host:'localhost' }, query: {} };
+      var res = { set: function () {} };
+
+      dbConnSetup(prepareRequest(req), prepareResponse(res), function(err) {
+        if ( err ) { done(err); return; }
+          assert.ok(_.isObject(req.query), 'request has query');
+          assert.ok(!req.query.hasOwnProperty('dbuser'), 'dbuser was removed from query');
+          assert.ok(res.hasOwnProperty('locals'), 'response has locals');
+          assert.ok(!res.locals.hasOwnProperty('interactivity'), 'response locals do not have interactivity');
+          assert.equal(res.locals.dbname, test_database);
+          assert.ok(res.locals.dbuser === test_pubuser, 'could inject dbuser ('+res.locals.dbuser+')');
+          done();
+      });
+    });
+
+    it('sets also dbuser for authenticated requests', function(done){
+        var req = { headers: { host: 'localhost' }, query: { map_key: '1234' }};
+        var res = { set: function () {} };
+
+        // FIXME: review authorize-pgconnsetup workflow, It might we are doing authorization twice.
+        authorize(prepareRequest(req), prepareResponse(res), function (err) {
+            if (err) { done(err); return; }
+            dbConnSetup(req, res, function(err) {
+                if ( err ) { done(err); return; }
+                assert.ok(_.isObject(req.query), 'request has query');
+                assert.ok(!req.query.hasOwnProperty('dbuser'), 'dbuser was removed from query');
+                assert.ok(res.hasOwnProperty('locals'), 'response has locals');
+                assert.ok(!res.locals.hasOwnProperty('interactivity'), 'request params do not have interactivity');
+                assert.equal(res.locals.dbname, test_database);
+                assert.equal(res.locals.dbuser, test_user);
+
+                req = {
+                    headers: {
+                        host:'localhost'
+                    },
+                    query: {
+                        map_key: '1235'
+                    }
+                };
+
+                res = { set: function () {} };
+
+                dbConnSetup(prepareRequest(req), prepareResponse(res), function() {
+                    // wrong key resets params to no user
+                    assert.ok(res.locals.dbuser === test_pubuser, 'could inject dbuser ('+res.locals.dbuser+')');
+                    done();
+                });
+            });
+        });
+    });
+
+    it('it should remove invalid params', function(done) {
+        var config = {
+            version: '1.3.0'
+        };
+        var req = {
+            headers: {
+                host:'localhost'
+            },
+            query: {
+                non_included: 'toberemoved',
+                api_key: 'test',
+                style: 'override',
+                config: config
+            }
+        };
+        var res = {};
+        
+        cleanUpQueryParams(prepareRequest(req), prepareResponse(res), function (err) {
+            if ( err ) {
+                return done(err);
+            }
+
+            var query = res.locals;
+            assert.deepEqual(config, query.config);
+            assert.equal('test', query.api_key);
+            assert.equal(undefined, query.non_included);
+            done();
+        });
+    });
+
+});

test/unit/cartodb/req2params.test.js

@@ -1,129 +0,0 @@
-var assert = require('assert');
-var _ = require('underscore');
-require('../../support/test_helper');
-
-var RedisPool = require('redis-mpool');
-var cartodbRedis = require('cartodb-redis');
-var PgConnection = require('../../../lib/cartodb/backends/pg_connection');
-var AuthApi = require('../../../lib/cartodb/api/auth_api');
-var TemplateMaps = require('../../../lib/cartodb/backends/template_maps');
-
-var BaseController = require('../../../lib/cartodb/controllers/base');
-var windshaft = require('windshaft');
-
-describe('req2params', function() {
-
-    var test_user = _.template(global.environment.postgres_auth_user, {user_id:1});
-    var test_pubuser = global.environment.postgres.user;
-    var test_database = test_user + '_db';
-
-
-    var baseController;
-    before(function() {
-        var redisPool = new RedisPool(global.environment.redis);
-        var mapStore = new windshaft.storage.MapStore();
-        var metadataBackend = cartodbRedis({pool: redisPool});
-        var pgConnection = new PgConnection(metadataBackend);
-        var templateMaps = new TemplateMaps(redisPool);
-        var authApi = new AuthApi(pgConnection, metadataBackend, mapStore, templateMaps);
-
-        baseController = new BaseController(authApi, pgConnection);
-    });
-
-
-    it('can be found in server_options', function(){
-      assert.ok(_.isFunction(baseController.req2params));
-    });
-
-    function prepareRequest(req) {
-        req.profiler = {
-            done: function() {}
-        };
-        req.context = { user: 'localhost' };
-        return req;
-    }
-
-    it('cleans up request', function(done){
-      var req = {headers: { host:'localhost' }, query: {dbuser:'hacker',dbname:'secret'}};
-      baseController.req2params(prepareRequest(req), function(err, req) {
-          if ( err ) { done(err); return; }
-          assert.ok(_.isObject(req.query), 'request has query');
-          assert.ok(!req.query.hasOwnProperty('dbuser'), 'dbuser was removed from query');
-          assert.ok(req.hasOwnProperty('params'), 'request has params');
-          assert.ok(!req.params.hasOwnProperty('interactivity'), 'request params do not have interactivity');
-          assert.equal(req.params.dbname, test_database, 'could forge dbname: '+ req.params.dbname);
-          assert.ok(req.params.dbuser === test_pubuser, 'could inject dbuser ('+req.params.dbuser+')');
-          done();
-      });
-    });
-
-    it('sets dbname from redis metadata', function(done){
-      var req = {headers: { host:'localhost' }, query: {} };
-      baseController.req2params(prepareRequest(req), function(err, req) {
-          if ( err ) { done(err); return; }
-          assert.ok(_.isObject(req.query), 'request has query');
-          assert.ok(!req.query.hasOwnProperty('dbuser'), 'dbuser was removed from query');
-          assert.ok(req.hasOwnProperty('params'), 'request has params');
-          assert.ok(!req.params.hasOwnProperty('interactivity'), 'request params do not have interactivity');
-          assert.equal(req.params.dbname, test_database);
-          assert.ok(req.params.dbuser === test_pubuser, 'could inject dbuser ('+req.params.dbuser+')');
-          done();
-      });
-    });
-
-    it('sets also dbuser for authenticated requests', function(done){
-      var req = {headers: { host:'localhost' }, query: {map_key: '1234'} };
-      baseController.req2params(prepareRequest(req), function(err, req) {
-          if ( err ) { done(err); return; }
-          assert.ok(_.isObject(req.query), 'request has query');
-          assert.ok(!req.query.hasOwnProperty('dbuser'), 'dbuser was removed from query');
-          assert.ok(req.hasOwnProperty('params'), 'request has params');
-          assert.ok(!req.params.hasOwnProperty('interactivity'), 'request params do not have interactivity');
-          assert.equal(req.params.dbname, test_database);
-          assert.equal(req.params.dbuser, test_user);
-
-          req = {
-              headers: {
-                  host:'localhost'
-              },
-              query: {
-                  map_key: '1235'
-              }
-          };
-          baseController.req2params(prepareRequest(req), function(err, req) {
-              // wrong key resets params to no user
-              assert.ok(req.params.dbuser === test_pubuser, 'could inject dbuser ('+req.params.dbuser+')');
-              done();
-          });
-      });
-    });
-
-    it('it should remove invalid params', function(done) {
-        var config = {
-            version: '1.3.0'
-        };
-        var req = {
-            headers: {
-                host:'localhost'
-            },
-            query: {
-                non_included: 'toberemoved',
-                api_key: 'test',
-                style: 'override',
-                config: config
-            }
-        };
-        baseController.req2params(prepareRequest(req), function(err, req) {
-            if (err) {
-                return done(err);
-            }
-            var query = req.params;
-            assert.deepEqual(config, query.config);
-            assert.equal('test', query.api_key);
-            assert.equal(undefined, query.non_included);
-            assert.equal(undefined, query.style);
-            done();
-        });
-    });
-
-});