cartodb4/Windshaft-cartodb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename middleware

Browse Source
This commit is contained in:
Daniel García Aubert
2018-03-16 16:28:50 +01:00
parent 639a69a639
commit 313fc75ec8
5 changed files with 37 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/cartodb/controllers/analyses.js
+2 -2
View File
@@ -1,6 +1,6 @@
var PSQL = require('cartodb-psql');
var cors = require('../middleware/cors');
var userMiddleware = require('../middleware/user');
var user = require('../middleware/user');
const locals = require('../middleware/locals');
const cleanUpQueryParams = require('../middleware/clean-up-query-params');
const layergroupToken = require('../middleware/layergroup-token');
@@ -23,7 +23,7 @@ AnalysesController.prototype.register = function (app) {
cors(),
cleanUpQueryParams(),
locals(),
userMiddleware(),
user(),
layergroupToken(),
credentials(),
authorize(this.authApi),
lib/cartodb/controllers/layergroup.js
+12 -12
View File
@@ -1,5 +1,5 @@
const cors = require('../middleware/cors');
const userMiddleware = require('../middleware/user');
const user = require('../middleware/user');
const vectorError = require('../middleware/vector-error');
const locals = require('../middleware/locals');
const cleanUpQueryParams = require('../middleware/clean-up-query-params');
@@ -59,7 +59,7 @@ LayergroupController.prototype.register = function(app) {
cors(),
cleanUpQueryParams(),
locals(),
userMiddleware(),
user(),
layergroupToken(),
credentials(),
authorize(this.authApi),
@@ -83,7 +83,7 @@ LayergroupController.prototype.register = function(app) {
cors(),
cleanUpQueryParams(),
locals(),
userMiddleware(),
user(),
layergroupToken(),
credentials(),
authorize(this.authApi),
@@ -108,7 +108,7 @@ LayergroupController.prototype.register = function(app) {
cors(),
cleanUpQueryParams(),
locals(),
userMiddleware(),
user(),
layergroupToken(),
credentials(),
authorize(this.authApi),
@@ -132,7 +132,7 @@ LayergroupController.prototype.register = function(app) {
cors(),
cleanUpQueryParams(),
locals(),
userMiddleware(),
user(),
layergroupToken(),
credentials(),
authorize(this.authApi),
@@ -154,7 +154,7 @@ LayergroupController.prototype.register = function(app) {
cors(),
cleanUpQueryParams(['layer']),
locals(),
userMiddleware(),
user(),
layergroupToken(),
credentials(),
authorize(this.authApi),
@@ -174,7 +174,7 @@ LayergroupController.prototype.register = function(app) {
cors(),
cleanUpQueryParams(['layer']),
locals(),
userMiddleware(),
user(),
layergroupToken(),
credentials(),
authorize(this.authApi),
@@ -212,7 +212,7 @@ LayergroupController.prototype.register = function(app) {
cors(),
cleanUpQueryParams(allowedDataviewQueryParams),
locals(),
userMiddleware(),
user(),
layergroupToken(),
credentials(),
authorize(this.authApi),
@@ -232,7 +232,7 @@ LayergroupController.prototype.register = function(app) {
cors(),
cleanUpQueryParams(allowedDataviewQueryParams),
locals(),
userMiddleware(),
user(),
layergroupToken(),
credentials(),
authorize(this.authApi),
@@ -252,7 +252,7 @@ LayergroupController.prototype.register = function(app) {
cors(),
cleanUpQueryParams(allowedDataviewQueryParams),
locals(),
userMiddleware(),
user(),
layergroupToken(),
credentials(),
authorize(this.authApi),
@@ -272,7 +272,7 @@ LayergroupController.prototype.register = function(app) {
cors(),
cleanUpQueryParams(allowedDataviewQueryParams),
locals(),
userMiddleware(),
user(),
layergroupToken(),
credentials(),
authorize(this.authApi),
@@ -292,7 +292,7 @@ LayergroupController.prototype.register = function(app) {
cors(),
cleanUpQueryParams(),
locals(),
userMiddleware(),
user(),
layergroupToken(),
credentials(),
authorize(this.authApi),
lib/cartodb/controllers/map.js
+2 -2
View File
@@ -5,7 +5,7 @@ const Datasource = windshaft.model.Datasource;
const QueryTables = require('cartodb-query-tables');
const ResourceLocator = require('../models/resource-locator');
const cors = require('../middleware/cors');
const userMiddleware = require('../middleware/user');
const user = require('../middleware/user');
const locals = require('../middleware/locals');
const cleanUpQueryParams = require('../middleware/clean-up-query-params');
const layergroupToken = require('../middleware/layergroup-token');
@@ -75,7 +75,7 @@ MapController.prototype.composeCreateMapMiddleware = function (useTemplate = fal
cors(),
cleanUpQueryParams(['aggregation']),
locals(),
userMiddleware(),
user(),
layergroupToken(),
credentials(),
authorize(this.authApi),
lib/cartodb/controllers/named_maps.js
+3 -3
View File
@@ -1,6 +1,6 @@
const NamedMapsCacheEntry = require('../cache/model/named_maps_entry');
const cors = require('../middleware/cors');
const userMiddleware = require('../middleware/user');
const user = require('../middleware/user');
const locals = require('../middleware/locals');
const cleanUpQueryParams = require('../middleware/clean-up-query-params');
const layergroupToken = require('../middleware/layergroup-token');
@@ -54,7 +54,7 @@ NamedMapsController.prototype.register = function(app) {
cors(),
cleanUpQueryParams(),
locals(),
userMiddleware(),
user(),
layergroupToken(),
credentials(),
authorize(this.authApi),
@@ -82,7 +82,7 @@ NamedMapsController.prototype.register = function(app) {
cors(),
cleanUpQueryParams(['layer', 'zoom', 'lon', 'lat', 'bbox']),
locals(),
userMiddleware(),
user(),
layergroupToken(),
credentials(),
authorize(this.authApi),
lib/cartodb/controllers/named_maps_admin.js
+18 -18
View File
@@ -1,8 +1,8 @@
const { templateName } = require('../backends/template_maps');
const cors = require('../middleware/cors');
const userMiddleware = require('../middleware/user');
const localsMiddleware = require('../middleware/locals');
const credentialsMiddleware = require('../middleware/credentials');
const user = require('../middleware/user');
const locals = require('../middleware/locals');
const credentials = require('../middleware/credentials');
/**
* @param {AuthApi} authApi
@@ -23,9 +23,9 @@ NamedMapsAdminController.prototype.register = function (app) {
app.post(
`${templateBasePath}/`,
cors(),
localsMiddleware(),
userMiddleware(),
credentialsMiddleware(),
locals(),
user(),
credentials(),
checkContentType({ action: 'POST', label: 'POST TEMPLATE' }),
authorizedByAPIKey({ authApi: this.authApi, action: 'create', label: 'POST TEMPLATE' }),
createTemplate({ templateMaps: this.templateMaps }),
@@ -35,9 +35,9 @@ NamedMapsAdminController.prototype.register = function (app) {
app.put(
`${templateBasePath}/:template_id`,
cors(),
localsMiddleware(),
userMiddleware(),
credentialsMiddleware(),
locals(),
user(),
credentials(),
checkContentType({ action: 'PUT', label: 'PUT TEMPLATE' }),
authorizedByAPIKey({ authApi: this.authApi, action: 'update', label: 'PUT TEMPLATE' }),
updateTemplate({ templateMaps: this.templateMaps }),
@@ -47,9 +47,9 @@ NamedMapsAdminController.prototype.register = function (app) {
app.get(
`${templateBasePath}/:template_id`,
cors(),
localsMiddleware(),
userMiddleware(),
credentialsMiddleware(),
locals(),
user(),
credentials(),
authorizedByAPIKey({ authApi: this.authApi, action: 'get', label: 'GET TEMPLATE' }),
retrieveTemplate({ templateMaps: this.templateMaps }),
sendResponse()
@@ -58,9 +58,9 @@ NamedMapsAdminController.prototype.register = function (app) {
app.delete(
`${templateBasePath}/:template_id`,
cors(),
localsMiddleware(),
userMiddleware(),
credentialsMiddleware(),
locals(),
user(),
credentials(),
authorizedByAPIKey({ authApi: this.authApi, action: 'delete', label: 'DELETE TEMPLATE' }),
destroyTemplate({ templateMaps: this.templateMaps }),
sendResponse()
@@ -69,9 +69,9 @@ NamedMapsAdminController.prototype.register = function (app) {
app.get(
`${templateBasePath}/`,
cors(),
localsMiddleware(),
userMiddleware(),
credentialsMiddleware(),
locals(),
user(),
credentials(),
authorizedByAPIKey({ authApi: this.authApi, action: 'list', label: 'GET TEMPLATE LIST' }),
listTemplates({ templateMaps: this.templateMaps }),
sendResponse()