organize middlewares

removed app.locals.middleware
middlewares can be required anywhere, ie in controllers
This commit is contained in:
barisusakli
2016-08-26 18:50:37 +03:00
parent f5941cbf1c
commit 8f408faf46
10 changed files with 602 additions and 591 deletions

View File

@@ -376,8 +376,8 @@ Controllers.handle404 = function(req, res) {
if (res.locals.isAPI) {
return res.json({path: validator.escape(path.replace(/^\/api/, '')), title: '[[global:404.title]]'});
}
req.app.locals.middleware.buildHeader(req, res, function() {
var middleware = require('../middleware');
middleware.buildHeader(req, res, function() {
res.render('404', {path: validator.escape(path), title: '[[global:404.title]]'});
});
} else {
@@ -402,7 +402,8 @@ Controllers.handleURIErrors = function(err, req, res, next) {
error: '[[global:400.title]]'
});
} else {
req.app.locals.middleware.buildHeader(req, res, function() {
var middleware = require('../middleware');
middleware.buildHeader(req, res, function() {
res.render('400', { error: validator.escape(String(err.message)) });
});
}
@@ -435,7 +436,8 @@ Controllers.handleErrors = function(err, req, res, next) {
if (res.locals.isAPI) {
res.json({path: validator.escape(path), error: err.message});
} else {
req.app.locals.middleware.buildHeader(req, res, function() {
var middleware = require('../middleware');
middleware.buildHeader(req, res, function() {
res.render('500', { path: validator.escape(path), error: validator.escape(String(err.message)) });
});
}