Move application middlewares to routers folder

lib/cartodb/routers/analyses.js

@@ -1,11 +1,11 @@
 const PSQL = require('cartodb-psql');
-const cleanUpQueryParams = require('../middleware/clean-up-query-params');
-const credentials = require('../middleware/credentials');
-const authorize = require('../middleware/authorize');
-const dbConnSetup = require('../middleware/db-conn-setup');
-const rateLimit = require('../middleware/rate-limit');
+const cleanUpQueryParams = require('./middlewares/clean-up-query-params');
+const credentials = require('./middlewares/credentials');
+const authorize = require('./middlewares/authorize');
+const dbConnSetup = require('./middlewares/db-conn-setup');
+const rateLimit = require('./middlewares/rate-limit');
 const { RATE_LIMIT_ENDPOINTS_GROUPS } = rateLimit;
-const cacheControlHeader = require('../middleware/cache-control-header');
+const cacheControlHeader = require('./middlewares/cache-control-header');
 const dbParamsFromResLocals = require('../utils/database-params');
 
 function AnalysesController(pgConnection, authApi, userLimitsApi) {

lib/cartodb/routers/api-router.js

@@ -40,16 +40,16 @@ const ResourceLocator = require('../models/resource-locator');
 const LayergroupMetadata = require('../utils/layergroup-metadata');
 const RendererStatsReporter = require('../stats/reporter/renderer');
 
-const logger = require('../middleware/logger');
+const logger = require('./middlewares/logger');
 const bodyParser = require('body-parser');
-const servedByHostHeader = require('../middleware/served-by-host-header');
-const stats = require('../middleware/stats');
-const lzmaMiddleware = require('../middleware/lzma');
-const cors = require('../middleware/cors');
-const user = require('../middleware/user');
-const sendResponse = require('../middleware/send-response');
-const syntaxError = require('../middleware/syntax-error');
-const errorMiddleware = require('../middleware/error-middleware');
+const servedByHostHeader = require('./middlewares/served-by-host-header');
+const stats = require('./middlewares/stats');
+const lzmaMiddleware = require('./middlewares/lzma');
+const cors = require('./middlewares/cors');
+const user = require('./middlewares/user');
+const sendResponse = require('./middlewares/send-response');
+const syntaxError = require('./middlewares/syntax-error');
+const errorMiddleware = require('./middlewares/error-middleware');
 
 const MapRouter = require('./map-router');
 const TemplateRouter = require('./template-router');

lib/cartodb/routers/layergroup/analysis.js

@@ -1,9 +1,9 @@
-const layergroupToken = require('../../middleware/layergroup-token');
-const cleanUpQueryParams = require('../../middleware/clean-up-query-params');
-const credentials = require('../../middleware/credentials');
-const dbConnSetup = require('../../middleware/db-conn-setup');
-const authorize = require('../../middleware/authorize');
-const rateLimit = require('../../middleware/rate-limit');
+const layergroupToken = require('../middlewares/layergroup-token');
+const cleanUpQueryParams = require('../middlewares/clean-up-query-params');
+const credentials = require('../middlewares/credentials');
+const dbConnSetup = require('../middlewares/db-conn-setup');
+const authorize = require('../middlewares/authorize');
+const rateLimit = require('../middlewares/rate-limit');
 const { RATE_LIMIT_ENDPOINTS_GROUPS } = rateLimit;
 const dbParamsFromResLocals = require('../../utils/database-params');
 

lib/cartodb/routers/layergroup/attributes.js

@@ -1,15 +1,15 @@
-const layergroupToken = require('../../middleware/layergroup-token');
-const cleanUpQueryParams = require('../../middleware/clean-up-query-params');
-const credentials = require('../../middleware/credentials');
-const dbConnSetup = require('../../middleware/db-conn-setup');
-const authorize = require('../../middleware/authorize');
-const rateLimit = require('../../middleware/rate-limit');
+const layergroupToken = require('../middlewares/layergroup-token');
+const cleanUpQueryParams = require('../middlewares/clean-up-query-params');
+const credentials = require('../middlewares/credentials');
+const dbConnSetup = require('../middlewares/db-conn-setup');
+const authorize = require('../middlewares/authorize');
+const rateLimit = require('../middlewares/rate-limit');
 const { RATE_LIMIT_ENDPOINTS_GROUPS } = rateLimit;
 const createMapStoreMapConfigProvider = require('./middlewares/map-store-map-config-provider');
-const cacheControlHeader = require('../../middleware/cache-control-header');
-const cacheChannelHeader = require('../../middleware/cache-channel-header');
-const surrogateKeyHeader = require('../../middleware/surrogate-key-header');
-const lastModifiedHeader = require('../../middleware/last-modified-header');
+const cacheControlHeader = require('../middlewares/cache-control-header');
+const cacheChannelHeader = require('../middlewares/cache-channel-header');
+const surrogateKeyHeader = require('../middlewares/surrogate-key-header');
+const lastModifiedHeader = require('../middlewares/last-modified-header');
 
 module.exports = class AttributesLayergroupController {
     constructor (

lib/cartodb/routers/layergroup/dataview.js

@@ -1,15 +1,15 @@
-const layergroupToken = require('../../middleware/layergroup-token');
-const cleanUpQueryParams = require('../../middleware/clean-up-query-params');
-const credentials = require('../../middleware/credentials');
-const dbConnSetup = require('../../middleware/db-conn-setup');
-const authorize = require('../../middleware/authorize');
-const rateLimit = require('../../middleware/rate-limit');
+const layergroupToken = require('../middlewares/layergroup-token');
+const cleanUpQueryParams = require('../middlewares/clean-up-query-params');
+const credentials = require('../middlewares/credentials');
+const dbConnSetup = require('../middlewares/db-conn-setup');
+const authorize = require('../middlewares/authorize');
+const rateLimit = require('../middlewares/rate-limit');
 const { RATE_LIMIT_ENDPOINTS_GROUPS } = rateLimit;
 const createMapStoreMapConfigProvider = require('./middlewares/map-store-map-config-provider');
-const cacheControlHeader = require('../../middleware/cache-control-header');
-const cacheChannelHeader = require('../../middleware/cache-channel-header');
-const surrogateKeyHeader = require('../../middleware/surrogate-key-header');
-const lastModifiedHeader = require('../../middleware/last-modified-header');
+const cacheControlHeader = require('../middlewares/cache-control-header');
+const cacheChannelHeader = require('../middlewares/cache-channel-header');
+const surrogateKeyHeader = require('../middlewares/surrogate-key-header');
+const lastModifiedHeader = require('../middlewares/last-modified-header');
 
 const ALLOWED_DATAVIEW_QUERY_PARAMS = [
     'filters', // json

lib/cartodb/routers/layergroup/preview.js

@@ -1,15 +1,15 @@
-const layergroupToken = require('../../middleware/layergroup-token');
-const cleanUpQueryParams = require('../../middleware/clean-up-query-params');
-const credentials = require('../../middleware/credentials');
-const dbConnSetup = require('../../middleware/db-conn-setup');
-const authorize = require('../../middleware/authorize');
-const rateLimit = require('../../middleware/rate-limit');
+const layergroupToken = require('../middlewares/layergroup-token');
+const cleanUpQueryParams = require('../middlewares/clean-up-query-params');
+const credentials = require('../middlewares/credentials');
+const dbConnSetup = require('../middlewares/db-conn-setup');
+const authorize = require('../middlewares/authorize');
+const rateLimit = require('../middlewares/rate-limit');
 const { RATE_LIMIT_ENDPOINTS_GROUPS } = rateLimit;
 const createMapStoreMapConfigProvider = require('./middlewares/map-store-map-config-provider');
-const cacheControlHeader = require('../../middleware/cache-control-header');
-const cacheChannelHeader = require('../../middleware/cache-channel-header');
-const surrogateKeyHeader = require('../../middleware/surrogate-key-header');
-const lastModifiedHeader = require('../../middleware/last-modified-header');
+const cacheControlHeader = require('../middlewares/cache-control-header');
+const cacheChannelHeader = require('../middlewares/cache-channel-header');
+const surrogateKeyHeader = require('../middlewares/surrogate-key-header');
+const lastModifiedHeader = require('../middlewares/last-modified-header');
 
 module.exports = class PreviewLayergroupController {
     constructor (

lib/cartodb/routers/layergroup/tile.js

@@ -1,16 +1,16 @@
-const layergroupToken = require('../../middleware/layergroup-token');
-const cleanUpQueryParams = require('../../middleware/clean-up-query-params');
-const credentials = require('../../middleware/credentials');
-const dbConnSetup = require('../../middleware/db-conn-setup');
-const authorize = require('../../middleware/authorize');
-const rateLimit = require('../../middleware/rate-limit');
+const layergroupToken = require('../middlewares/layergroup-token');
+const cleanUpQueryParams = require('../middlewares/clean-up-query-params');
+const credentials = require('../middlewares/credentials');
+const dbConnSetup = require('../middlewares/db-conn-setup');
+const authorize = require('../middlewares/authorize');
+const rateLimit = require('../middlewares/rate-limit');
 const { RATE_LIMIT_ENDPOINTS_GROUPS } = rateLimit;
 const createMapStoreMapConfigProvider = require('./middlewares/map-store-map-config-provider');
-const cacheControlHeader = require('../../middleware/cache-control-header');
-const cacheChannelHeader = require('../../middleware/cache-channel-header');
-const surrogateKeyHeader = require('../../middleware/surrogate-key-header');
-const lastModifiedHeader = require('../../middleware/last-modified-header');
-const vectorError = require('../../middleware/vector-error');
+const cacheControlHeader = require('../middlewares/cache-control-header');
+const cacheChannelHeader = require('../middlewares/cache-channel-header');
+const surrogateKeyHeader = require('../middlewares/surrogate-key-header');
+const lastModifiedHeader = require('../middlewares/last-modified-header');
+const vectorError = require('../middlewares/vector-error');
 
 const SUPPORTED_FORMATS = {
     grid_json: true,

lib/cartodb/routers/map/anonymous.js

@@ -1,25 +1,25 @@
 const windshaft = require('windshaft');
 const MapConfig = windshaft.model.MapConfig;
 const Datasource = windshaft.model.Datasource;
-const cleanUpQueryParams = require('../../middleware/clean-up-query-params');
-const credentials = require('../../middleware/credentials');
-const dbConnSetup = require('../../middleware/db-conn-setup');
-const authorize = require('../../middleware/authorize');
+const cleanUpQueryParams = require('../middlewares/clean-up-query-params');
+const credentials = require('../middlewares/credentials');
+const dbConnSetup = require('../middlewares/db-conn-setup');
+const authorize = require('../middlewares/authorize');
 const initProfiler = require('./middlewares/init-profiler');
 const checkJsonContentType = require('./middlewares/check-json-content-type');
 const incrementMapViewCount = require('./middlewares/increment-map-view-count');
 const augmentLayergroupData = require('./middlewares/augment-layergroup-data');
-const cacheControlHeader = require('../../middleware/cache-control-header');
-const cacheChannelHeader = require('../../middleware/cache-channel-header');
-const surrogateKeyHeader = require('../../middleware/surrogate-key-header');
-const lastModifiedHeader = require('../../middleware/last-modified-header');
+const cacheControlHeader = require('../middlewares/cache-control-header');
+const cacheChannelHeader = require('../middlewares/cache-channel-header');
+const surrogateKeyHeader = require('../middlewares/surrogate-key-header');
+const lastModifiedHeader = require('../middlewares/last-modified-header');
 const lastUpdatedTimeLayergroup = require('./middlewares/last-updated-time-layergroup');
 const layerStats = require('./middlewares/layer-stats');
 const layergroupIdHeader = require('./middlewares/layergroup-id-header');
 const layergroupMetadata = require('./middlewares/layergroup-metadata');
 const mapError = require('./middlewares/map-error');
 const CreateLayergroupMapConfigProvider = require('../../models/mapconfig/provider/create-layergroup-provider');
-const rateLimit = require('../../middleware/rate-limit');
+const rateLimit = require('../middlewares/rate-limit');
 const { RATE_LIMIT_ENDPOINTS_GROUPS } = rateLimit;
 
 /**

lib/cartodb/routers/map/named.js

@@ -1,15 +1,15 @@
-const cleanUpQueryParams = require('../../middleware/clean-up-query-params');
-const credentials = require('../../middleware/credentials');
-const dbConnSetup = require('../../middleware/db-conn-setup');
-const authorize = require('../../middleware/authorize');
+const cleanUpQueryParams = require('../middlewares/clean-up-query-params');
+const credentials = require('../middlewares/credentials');
+const dbConnSetup = require('../middlewares/db-conn-setup');
+const authorize = require('../middlewares/authorize');
 const initProfiler = require('./middlewares/init-profiler');
 const checkJsonContentType = require('./middlewares/check-json-content-type');
 const incrementMapViewCount = require('./middlewares/increment-map-view-count');
 const augmentLayergroupData = require('./middlewares/augment-layergroup-data');
-const cacheControlHeader = require('../../middleware/cache-control-header');
-const cacheChannelHeader = require('../../middleware/cache-channel-header');
-const surrogateKeyHeader = require('../../middleware/surrogate-key-header');
-const lastModifiedHeader = require('../../middleware/last-modified-header');
+const cacheControlHeader = require('../middlewares/cache-control-header');
+const cacheChannelHeader = require('../middlewares/cache-channel-header');
+const surrogateKeyHeader = require('../middlewares/surrogate-key-header');
+const lastModifiedHeader = require('../middlewares/last-modified-header');
 const lastUpdatedTimeLayergroup = require('./middlewares/last-updated-time-layergroup');
 const layerStats = require('./middlewares/layer-stats');
 const layergroupIdHeader = require('./middlewares/layergroup-id-header');
@@ -17,7 +17,7 @@ const layergroupMetadata = require('./middlewares/layergroup-metadata');
 const mapError = require('./middlewares/map-error');
 const NamedMapMapConfigProvider = require('../../models/mapconfig/provider/named-map-provider');
 const CreateLayergroupMapConfigProvider = require('../../models/mapconfig/provider/create-layergroup-provider');
-const rateLimit = require('../../middleware/rate-limit');
+const rateLimit = require('../middlewares/rate-limit');
 const { RATE_LIMIT_ENDPOINTS_GROUPS } = rateLimit;
 
 /**

lib/cartodb/routers/middlewares/layergroup-token.js

@@ -1,4 +1,4 @@
-const LayergroupToken = require('../models/layergroup-token');
+const LayergroupToken = require('../../models/layergroup-token');
 const authErrorMessageTemplate = function (signer, user) {
     return `Cannot use map signature of user "${signer}" on db of user "${user}"`;
 };

lib/cartodb/routers/middlewares/stats.js

@@ -1,4 +1,4 @@
-const Profiler = require('../stats/profiler_proxy');
+const Profiler = require('../../stats/profiler_proxy');
 const debug = require('debug')('windshaft:cartodb:stats');
 const onHeaders = require('on-headers');
 

lib/cartodb/routers/middlewares/surrogate-key-header.js

@@ -1,5 +1,5 @@
-const NamedMapsCacheEntry = require('../cache/model/named_maps_entry');
-const NamedMapMapConfigProvider = require('../models/mapconfig/provider/named-map-provider');
+const NamedMapsCacheEntry = require('../../cache/model/named_maps_entry');
+const NamedMapMapConfigProvider = require('../../models/mapconfig/provider/named-map-provider');
 
 module.exports = function setSurrogateKeyHeader ({ surrogateKeysCache }) {
     return function setSurrogateKeyHeaderMiddleware(req, res, next) {

lib/cartodb/routers/middlewares/user.js

@@ -1,4 +1,4 @@
-const CdbRequest = require('../models/cdb_request');
+const CdbRequest = require('../../models/cdb_request');
 
 module.exports = function user () {
     const cdbRequest = new CdbRequest();

lib/cartodb/routers/middlewares/vector-error.js

@@ -1,5 +1,5 @@
 const fs = require('fs');
-const timeoutErrorVectorTile = fs.readFileSync(__dirname + '/../../../assets/render-timeout-fallback.mvt');
+const timeoutErrorVectorTile = fs.readFileSync(__dirname + '/../../../../assets/render-timeout-fallback.mvt');
 
 module.exports = function vectorError() {
     return function vectorErrorMiddleware(err, req, res, next) {

lib/cartodb/routers/template/admin.js

@@ -1,6 +1,6 @@
 const { templateName } = require('../../backends/template_maps');
-const credentials = require('../../middleware/credentials');
-const rateLimit = require('../../middleware/rate-limit');
+const credentials = require('../middlewares/credentials');
+const rateLimit = require('../middlewares/rate-limit');
 const { RATE_LIMIT_ENDPOINTS_GROUPS } = rateLimit;
 
 /**

lib/cartodb/routers/template/preview.js

@@ -1,13 +1,13 @@
-const cleanUpQueryParams = require('../../middleware/clean-up-query-params');
-const credentials = require('../../middleware/credentials');
-const dbConnSetup = require('../../middleware/db-conn-setup');
-const authorize = require('../../middleware/authorize');
+const cleanUpQueryParams = require('../middlewares/clean-up-query-params');
+const credentials = require('../middlewares/credentials');
+const dbConnSetup = require('../middlewares/db-conn-setup');
+const authorize = require('../middlewares/authorize');
 const namedMapProvider = require('./middlewares/named-map-provider');
-const cacheControlHeader = require('../../middleware/cache-control-header');
-const cacheChannelHeader = require('../../middleware/cache-channel-header');
-const surrogateKeyHeader = require('../../middleware/surrogate-key-header');
-const lastModifiedHeader = require('../../middleware/last-modified-header');
-const rateLimit = require('../../middleware/rate-limit');
+const cacheControlHeader = require('../middlewares/cache-control-header');
+const cacheChannelHeader = require('../middlewares/cache-channel-header');
+const surrogateKeyHeader = require('../middlewares/surrogate-key-header');
+const lastModifiedHeader = require('../middlewares/last-modified-header');
+const rateLimit = require('../middlewares/rate-limit');
 const { RATE_LIMIT_ENDPOINTS_GROUPS } = rateLimit;
 
 const DEFAULT_ZOOM_CENTER = {

lib/cartodb/routers/template/tile.js

@@ -1,14 +1,14 @@
-const cleanUpQueryParams = require('../../middleware/clean-up-query-params');
-const credentials = require('../../middleware/credentials');
-const dbConnSetup = require('../../middleware/db-conn-setup');
-const authorize = require('../../middleware/authorize');
+const cleanUpQueryParams = require('../middlewares/clean-up-query-params');
+const credentials = require('../middlewares/credentials');
+const dbConnSetup = require('../middlewares/db-conn-setup');
+const authorize = require('../middlewares/authorize');
 const namedMapProvider = require('./middlewares/named-map-provider');
-const cacheControlHeader = require('../../middleware/cache-control-header');
-const cacheChannelHeader = require('../../middleware/cache-channel-header');
-const surrogateKeyHeader = require('../../middleware/surrogate-key-header');
-const lastModifiedHeader = require('../../middleware/last-modified-header');
-const vectorError = require('../../middleware/vector-error');
-const rateLimit = require('../../middleware/rate-limit');
+const cacheControlHeader = require('../middlewares/cache-control-header');
+const cacheChannelHeader = require('../middlewares/cache-channel-header');
+const surrogateKeyHeader = require('../middlewares/surrogate-key-header');
+const lastModifiedHeader = require('../middlewares/last-modified-header');
+const vectorError = require('../middlewares/vector-error');
+const rateLimit = require('../middlewares/rate-limit');
 const { RATE_LIMIT_ENDPOINTS_GROUPS } = rateLimit;
 
 function TileTemplateController (

test/acceptance/rate-limit.test.js

@@ -6,10 +6,10 @@ const RedisPool = require('redis-mpool');
 const cartodbRedis = require('cartodb-redis');
 const TestClient = require('../support/test-client');
 const UserLimitsApi = require('../../lib/cartodb/api/user_limits_api');
-const rateLimitMiddleware = require('../../lib/cartodb/middleware/rate-limit');
+const rateLimitMiddleware = require('../../lib/cartodb/routers/middlewares/rate-limit');
 const { RATE_LIMIT_ENDPOINTS_GROUPS } = rateLimitMiddleware;
 
-let userLimitsApi; 
+let userLimitsApi;
 let rateLimit;
 let redisClient;
 let testClient;
@@ -112,11 +112,11 @@ function assertGetLayergroupRequest (status, limit, remaining, reset, retry, don
             'Carto-Rate-Limit-Reset': reset
         }
     };
-    
+
     if(retry) {
         response.headers['Retry-After'] = retry;
     }
-    
+
     testClient.getLayergroup({ response }, err => {
         assert.ifError(err);
         if (done) {
@@ -133,11 +133,11 @@ function assertRateLimitRequest (status, limit, remaining, reset, retry, done) {
             "Carto-Rate-Limit-Remaining": remaining,
             "Carto-Rate-Limit-Reset": reset
         };
-        
+
         if(retry) {
             expectedHeaders['Retry-After'] = retry;
         }
-    
+
         assert.deepEqual(res.headers, expectedHeaders);
 
         if(status === 200) {
@@ -160,7 +160,7 @@ describe('rate limit', function() {
     before(function() {
         global.environment.enabledFeatures.rateLimitsEnabled = true;
         global.environment.enabledFeatures.rateLimitsByEndpoint.anonymous = true;
-        
+
         redisClient = redis.createClient(global.environment.redis.port);
         testClient = new TestClient(createMapConfig(), 1234);
     });
@@ -183,7 +183,7 @@ describe('rate limit', function() {
                 done();
             });
         });
-    }); 
+    });
 
     it('should not be rate limited', function (done) {
         const count = 1;
@@ -257,9 +257,9 @@ describe('rate limit middleware', function () {
 
     it("1 req/sec: 2 req/seg should be limited, removing SHA script from Redis", function (done) {
         userLimitsApi.metadataBackend.redisCmd(
-            8, 
-            'SCRIPT', 
-            ['FLUSH'], 
+            8,
+            'SCRIPT',
+            ['FLUSH'],
             function () {
                 assertRateLimitRequest(200, 1, 0, 1);
                 setTimeout( () => assertRateLimitRequest(429, 1, 0, 0, 1), 500);
@@ -277,7 +277,7 @@ describe('rate limit and vector tiles', function () {
     before(function(done) {
         global.environment.enabledFeatures.rateLimitsEnabled = true;
         global.environment.enabledFeatures.rateLimitsByEndpoint.tile = true;
-        
+
         redisClient = redis.createClient(global.environment.redis.port);
         const count = 1;
         const period = 1;
@@ -287,9 +287,9 @@ describe('rate limit and vector tiles', function () {
         testClient = new TestClient(createMapConfig(), 1234);
         testClient.getLayergroup({status: 200}, (err, res) => {
             assert.ifError(err);
-            
+
             layergroupid = res.layergroupid;
-    
+
             done();
         });
     });
@@ -336,12 +336,12 @@ describe('rate limit and vector tiles', function () {
 
         testClient.getTile(0, 0, 0, tileParams(204, '1', '0', '1'), (err) => {
             assert.ifError(err);
-    
+
             testClient.getTile(
-                0, 
-                0, 
-                0, 
-                tileParams(429, '1', '0', '0', '1', 'application/x-protobuf'), 
+                0,
+                0,
+                0,
+                tileParams(429, '1', '0', '0', '1', 'application/x-protobuf'),
                 (err, res, tile) => {
                     assert.ifError(err);
 
@@ -350,11 +350,11 @@ describe('rate limit and vector tiles', function () {
                     assert.equal(tileJSON.length, 2);
                     assert.equal(tileJSON[0].name, 'errorTileSquareLayer');
                     assert.equal(tileJSON[1].name, 'errorTileStripesLayer');
-            
+
                     done();
                 }
-            );    
+            );
         });
-    
+
     });
 });

test/unit/cartodb/error-middleware.test.js

@@ -1,7 +1,7 @@
 require('../../support/test_helper.js');
 
 var assert = require('assert');
-var errorMiddleware = require('../../../lib/cartodb/middleware/error-middleware');
+var errorMiddleware = require('../../../lib/cartodb/routers/middlewares/error-middleware');
 
 describe('error-middleware', function() {
 
@@ -28,7 +28,7 @@ describe('error-middleware', function() {
         error.subtype = 'test subtype';
 
         const errors = [error, error];
-        
+
         const req = {};
         const res = {
             headers: {},
@@ -43,7 +43,7 @@ describe('error-middleware', function() {
             send () {}
         };
 
-        const errorHeader = {      
+        const errorHeader = {
             mainError: {
                 statusCode: 400,
                 message: error.message,
@@ -133,7 +133,7 @@ describe('error-middleware', function() {
         error.subtype = badString;
 
         const errors = [error, error];
-        
+
         const req = {};
         const res = {
             headers: {},
@@ -148,7 +148,7 @@ describe('error-middleware', function() {
             send () {}
         };
 
-        const errorHeader = {      
+        const errorHeader = {
             mainError: {
                 statusCode: 400,
                 message: escapedString,

test/unit/cartodb/error_messages.test.js

@@ -2,7 +2,7 @@ require('../../support/test_helper');
 
 var assert = require('assert');
 
-var errorMiddleware = require('../../../lib/cartodb/middleware/error-middleware');
+var errorMiddleware = require('../../../lib/cartodb/routers/middlewares/error-middleware');
 
 describe('error messages clean up', function() {
 

test/unit/cartodb/lzmaMiddleware.test.js

@@ -1,7 +1,7 @@
 var assert = require('assert');
 var testHelper = require('../../support/test_helper');
 
-var lzmaMiddleware = require('../../../lib/cartodb/middleware/lzma');
+var lzmaMiddleware = require('../../../lib/cartodb/routers/middlewares/lzma');
 
 describe('lzma-middleware', function() {
 

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

@@ -7,10 +7,10 @@ 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/clean-up-query-params');
-const authorizeMiddleware = require('../../../lib/cartodb/middleware/authorize');
-const dbConnSetupMiddleware = require('../../../lib/cartodb/middleware/db-conn-setup');
-const credentialsMiddleware = require('../../../lib/cartodb/middleware/credentials');
+const cleanUpQueryParamsMiddleware = require('../../../lib/cartodb/routers/middlewares/clean-up-query-params');
+const authorizeMiddleware = require('../../../lib/cartodb/routers/middlewares/authorize');
+const dbConnSetupMiddleware = require('../../../lib/cartodb/routers/middlewares/db-conn-setup');
+const credentialsMiddleware = require('../../../lib/cartodb/routers/middlewares/credentials');
 
 var windshaft = require('windshaft');