From 4be0a7036280c6d718809f13745df6f4fbe451b7 Mon Sep 17 00:00:00 2001
From: Raul Ochoa <rochoaf@gmail.com>
Date: Thu, 26 Mar 2015 13:05:35 +0100
Subject: [PATCH] Do not append interactivity to params, it is no longer it
 will be used from mapconfig layer definition

---
 lib/cartodb/server_options.js        | 3 ---
 test/unit/cartodb/req2params.test.js | 6 +++---
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/lib/cartodb/server_options.js b/lib/cartodb/server_options.js
index af00223d..d1dbb11c 100644
--- a/lib/cartodb/server_options.js
+++ b/lib/cartodb/server_options.js
@@ -550,9 +550,6 @@ module.exports = function(redisPool) {
         // bring all query values onto req.params object
         _.extend(req.params, req.query);
 
-        // for cartodb, ensure interactivity is cartodb_id or user specified
-        req.params.interactivity = req.params.interactivity || 'cartodb_id';
-
         if (req.profiler) {
             req.profiler.done('req2params.setup');
         }
diff --git a/test/unit/cartodb/req2params.test.js b/test/unit/cartodb/req2params.test.js
index 7bc4f9ac..932bec05 100644
--- a/test/unit/cartodb/req2params.test.js
+++ b/test/unit/cartodb/req2params.test.js
@@ -22,7 +22,7 @@ suite('req2params', function() {
           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 have interactivity');
+          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();
@@ -36,7 +36,7 @@ suite('req2params', function() {
           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 have interactivity');
+          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();
@@ -50,7 +50,7 @@ suite('req2params', function() {
           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 have interactivity');
+          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);