Merge branch 'separate-app-and-controllers-creation' into separate-routers

lib/cartodb/controllers/map/middlewares/last-updated-time-layergroup.js

@@ -3,7 +3,7 @@ module.exports = function setLastUpdatedTimeToLayergroup () {
         const { mapConfigProvider, analysesResults } = res.locals;
         const layergroup = res.body;
 
-        mapConfigProvider.getAffectedTables((err, affectedTables) => {
+        mapConfigProvider.createAffectedTables((err, affectedTables) => {
             if (err) {
                 return next(err);
             }

lib/cartodb/controllers/template/admin.js

@@ -79,7 +79,7 @@ function authorizedByAPIKey ({ authApi, action, label }) {
     return function authorizedByAPIKeyMiddleware (req, res, next) {
         const { user } = res.locals;
 
-        authApi.authorizedByAPIKey(user, res, (err, authenticated) => {
+        authApi.authorizedByAPIKey(user, res, (err, authenticated, apikey) => {
             if (err) {
                 return next(err);
             }
@@ -91,6 +91,15 @@ function authorizedByAPIKey ({ authApi, action, label }) {
                 return next(error);
             }
 
+            if (apikey.type !== 'master') {
+                const error = new Error('Forbidden');
+                error.type = 'auth';
+                error.subtype = 'api-key-does-not-grant-access';
+                error.http_status = 403;
+
+                return next(error);
+            }
+
             next();
         });
     };

lib/cartodb/controllers/template/preview.js

@@ -153,7 +153,7 @@ function getStaticImageOptions ({ tablesExtentApi }) {
 
         res.locals.imageOpts = DEFAULT_ZOOM_CENTER;
 
-        mapConfigProvider.getAffectedTables((err, affectedTables) => {
+        mapConfigProvider.createAffectedTables((err, affectedTables) => {
             if (err) {
                 return next();
             }