From 3d7231929c265b24b7743d4fa3fddaeaf742478f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Garc=C3=ADa=20Aubert?=
 <danielgarciaaubert@gmail.com>
Date: Fri, 11 May 2018 15:34:10 +0200
Subject: [PATCH] Create .middlewares() method to return the middlewares to
 process the request

---
 .../api/map/preview-template-controller.js    | 95 ++++++++++---------
 .../api/map/tile-layergroup-controller.js     | 14 ++-
 2 files changed, 58 insertions(+), 51 deletions(-)

diff --git a/lib/cartodb/api/map/preview-template-controller.js b/lib/cartodb/api/map/preview-template-controller.js
index 9f5257a3..385b954d 100644
--- a/lib/cartodb/api/map/preview-template-controller.js
+++ b/lib/cartodb/api/map/preview-template-controller.js
@@ -22,54 +22,57 @@ function numMapper(n) {
     return +n;
 }
 
-function PreviewTemplateController (
-    namedMapProviderCache,
-    previewBackend,
-    surrogateKeysCache,
-    tablesExtentBackend,
-    metadataBackend,
-    pgConnection,
-    authBackend,
-    userLimitsBackend
-) {
-    this.namedMapProviderCache = namedMapProviderCache;
-    this.previewBackend = previewBackend;
-    this.surrogateKeysCache = surrogateKeysCache;
-    this.tablesExtentBackend = tablesExtentBackend;
-    this.metadataBackend = metadataBackend;
-    this.pgConnection = pgConnection;
-    this.authBackend = authBackend;
-    this.userLimitsBackend = userLimitsBackend;
-}
+module.exports = class PreviewTemplateController {
+    constructor (
+        namedMapProviderCache,
+        previewBackend,
+        surrogateKeysCache,
+        tablesExtentBackend,
+        metadataBackend,
+        pgConnection,
+        authBackend,
+        userLimitsBackend
+    ) {
+        this.namedMapProviderCache = namedMapProviderCache;
+        this.previewBackend = previewBackend;
+        this.surrogateKeysCache = surrogateKeysCache;
+        this.tablesExtentBackend = tablesExtentBackend;
+        this.metadataBackend = metadataBackend;
+        this.pgConnection = pgConnection;
+        this.authBackend = authBackend;
+        this.userLimitsBackend = userLimitsBackend;
+    }
 
-module.exports = PreviewTemplateController;
+    register (mapRouter) {
+        mapRouter.get('/static/named/:template_id/:width/:height.:format', this.middlewares());
+    }
 
-PreviewTemplateController.prototype.register = function (mapRouter) {
-    mapRouter.get(
-        `/static/named/:template_id/:width/:height.:format`,
-        credentials(),
-        authorize(this.authBackend),
-        dbConnSetup(this.pgConnection),
-        rateLimit(this.userLimitsBackend, RATE_LIMIT_ENDPOINTS_GROUPS.STATIC_NAMED),
-        cleanUpQueryParams(['layer', 'zoom', 'lon', 'lat', 'bbox']),
-        namedMapProvider({
-            namedMapProviderCache: this.namedMapProviderCache,
-            label: 'STATIC_VIZ_MAP', forcedFormat: 'png'
-        }),
-        getTemplate({ label: 'STATIC_VIZ_MAP' }),
-        prepareLayerFilterFromPreviewLayers({
-            namedMapProviderCache: this.namedMapProviderCache,
-            label: 'STATIC_VIZ_MAP'
-        }),
-        getStaticImageOptions({ tablesExtentBackend: this.tablesExtentBackend }),
-        getImage({ previewBackend: this.previewBackend, label: 'STATIC_VIZ_MAP' }),
-        setContentTypeHeader(),
-        incrementMapViews({ metadataBackend: this.metadataBackend }),
-        cacheControlHeader(),
-        cacheChannelHeader(),
-        surrogateKeyHeader({ surrogateKeysCache: this.surrogateKeysCache }),
-        lastModifiedHeader()
-    );
+    middlewares () {
+        return [
+            credentials(),
+            authorize(this.authBackend),
+            dbConnSetup(this.pgConnection),
+            rateLimit(this.userLimitsBackend, RATE_LIMIT_ENDPOINTS_GROUPS.STATIC_NAMED),
+            cleanUpQueryParams(['layer', 'zoom', 'lon', 'lat', 'bbox']),
+            namedMapProvider({
+                namedMapProviderCache: this.namedMapProviderCache,
+                label: 'STATIC_VIZ_MAP', forcedFormat: 'png'
+            }),
+            getTemplate({ label: 'STATIC_VIZ_MAP' }),
+            prepareLayerFilterFromPreviewLayers({
+                namedMapProviderCache: this.namedMapProviderCache,
+                label: 'STATIC_VIZ_MAP'
+            }),
+            getStaticImageOptions({ tablesExtentBackend: this.tablesExtentBackend }),
+            getImage({ previewBackend: this.previewBackend, label: 'STATIC_VIZ_MAP' }),
+            setContentTypeHeader(),
+            incrementMapViews({ metadataBackend: this.metadataBackend }),
+            cacheControlHeader(),
+            cacheChannelHeader(),
+            surrogateKeyHeader({ surrogateKeysCache: this.surrogateKeysCache }),
+            lastModifiedHeader()
+        ];
+    }
 };
 
 function getTemplate ({ label }) {
diff --git a/lib/cartodb/api/map/tile-layergroup-controller.js b/lib/cartodb/api/map/tile-layergroup-controller.js
index f882d13c..229f5d00 100644
--- a/lib/cartodb/api/map/tile-layergroup-controller.js
+++ b/lib/cartodb/api/map/tile-layergroup-controller.js
@@ -46,10 +46,14 @@ module.exports = class TileLayergroupController {
         const not = (val) => `(?!${val})([^\/]+?)`;
 
         mapRouter.get([
-                `/:token/:z/:x/:y@:scale_factor?x.:format`,
-                `/:token/:z/:x/:y.:format`,
-                `/:token${not('static')}/:layer/:z/:x/:y.(:format)`
-            ],
+            `/:token/:z/:x/:y@:scale_factor?x.:format`,
+            `/:token/:z/:x/:y.:format`,
+            `/:token${not('static')}/:layer/:z/:x/:y.(:format)`
+        ], this.middlewares());
+    }
+
+    middlewares () {
+        return [
             layergroupToken(),
             coordinates(),
             credentials(),
@@ -72,7 +76,7 @@ module.exports = class TileLayergroupController {
             incrementErrorMetrics(global.statsClient),
             tileError(),
             vectorError()
-        );
+        ];
     }
 };