From 3b1fd05940b1c17ca7a77ef53b5affa17a700125 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Garc=C3=ADa=20Aubert?=
 <danielgarciaaubert@gmail.com>
Date: Fri, 23 Mar 2018 17:24:56 +0100
Subject: [PATCH] Use layergroup token middleware where it's actually needed

---
 lib/cartodb/controllers/analyses.js        | 2 --
 lib/cartodb/controllers/map.js             | 2 --
 lib/cartodb/controllers/named_maps.js      | 3 ---
 lib/cartodb/middleware/layergroup-token.js | 4 ----
 4 files changed, 11 deletions(-)

diff --git a/lib/cartodb/controllers/analyses.js b/lib/cartodb/controllers/analyses.js
index 81b1757a..9a48e30f 100644
--- a/lib/cartodb/controllers/analyses.js
+++ b/lib/cartodb/controllers/analyses.js
@@ -2,7 +2,6 @@ const PSQL = require('cartodb-psql');
 const cors = require('../middleware/cors');
 const user = require('../middleware/user');
 const cleanUpQueryParams = require('../middleware/clean-up-query-params');
-const layergroupToken = require('../middleware/layergroup-token');
 const credentials = require('../middleware/credentials');
 const authorize = require('../middleware/authorize');
 const dbConnSetup = require('../middleware/db-conn-setup');
@@ -29,7 +28,6 @@ AnalysesController.prototype.register = function (app) {
         cleanUpQueryParams(),
         user(),
         rateLimit(this.userLimitsApi, RATE_LIMIT_ENDPOINTS_GROUPS.ANALYSIS_CATALOG),
-        layergroupToken(),
         credentials(),
         authorize(this.authApi),
         dbConnSetup(this.pgConnection),
diff --git a/lib/cartodb/controllers/map.js b/lib/cartodb/controllers/map.js
index 9b8694f8..0ec3a160 100644
--- a/lib/cartodb/controllers/map.js
+++ b/lib/cartodb/controllers/map.js
@@ -6,7 +6,6 @@ const ResourceLocator = require('../models/resource-locator');
 const cors = require('../middleware/cors');
 const user = require('../middleware/user');
 const cleanUpQueryParams = require('../middleware/clean-up-query-params');
-const layergroupToken = require('../middleware/layergroup-token');
 const credentials = require('../middleware/credentials');
 const dbConnSetup = require('../middleware/db-conn-setup');
 const authorize = require('../middleware/authorize');
@@ -104,7 +103,6 @@ MapController.prototype.composeCreateMapMiddleware = function (endpointGroup, us
         cleanUpQueryParams(['aggregation']),
         user(),
         rateLimit(this.userLimitsApi, endpointGroup),
-        layergroupToken(),
         credentials(),
         authorize(this.authApi),
         dbConnSetup(this.pgConnection),
diff --git a/lib/cartodb/controllers/named_maps.js b/lib/cartodb/controllers/named_maps.js
index b0d4cf23..f00acb8e 100644
--- a/lib/cartodb/controllers/named_maps.js
+++ b/lib/cartodb/controllers/named_maps.js
@@ -1,7 +1,6 @@
 const cors = require('../middleware/cors');
 const user = require('../middleware/user');
 const cleanUpQueryParams = require('../middleware/clean-up-query-params');
-const layergroupToken = require('../middleware/layergroup-token');
 const credentials = require('../middleware/credentials');
 const dbConnSetup = require('../middleware/db-conn-setup');
 const authorize = require('../middleware/authorize');
@@ -59,7 +58,6 @@ NamedMapsController.prototype.register = function(app) {
         cleanUpQueryParams(),
         user(),
         rateLimit(this.userLimitsApi, RATE_LIMIT_ENDPOINTS_GROUPS.NAMED_TILES),
-        layergroupToken(),
         credentials(),
         authorize(this.authApi),
         dbConnSetup(this.pgConnection),
@@ -86,7 +84,6 @@ NamedMapsController.prototype.register = function(app) {
         cleanUpQueryParams(['layer', 'zoom', 'lon', 'lat', 'bbox']),
         user(),
         rateLimit(this.userLimitsApi, RATE_LIMIT_ENDPOINTS_GROUPS.STATIC_NAMED),
-        layergroupToken(),
         credentials(),
         authorize(this.authApi),
         dbConnSetup(this.pgConnection),
diff --git a/lib/cartodb/middleware/layergroup-token.js b/lib/cartodb/middleware/layergroup-token.js
index c3fcec30..1a32e413 100644
--- a/lib/cartodb/middleware/layergroup-token.js
+++ b/lib/cartodb/middleware/layergroup-token.js
@@ -5,10 +5,6 @@ const authErrorMessageTemplate = function (signer, user) {
 
 module.exports = function layergroupToken () {
     return function layergroupTokenMiddleware (req, res, next) {
-        if (!req.params.token) {
-            return next();
-        }
-
         const user = res.locals.user;
         const layergroupToken = LayergroupToken.parse(req.params.token);