Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-10-26 16:46:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix: change how admin middlewares are exported

Browse Source
This commit is contained in:
Julian Lam
2020-08-21 15:11:54 -04:00
parent ae68a254d7
commit f00595b32d
2 changed files with 95 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/middleware/admin.js
View File

@@ -18,16 +18,13 @@ var controllers = {
helpers: require('../controllers/helpers'), helpers: require('../controllers/helpers'),
}; };
module.exports = function (middleware) { module.exports.buildHeader = helpers.try(async function (req, res, next) {
middleware.admin = {};
middleware.admin.buildHeader = helpers.try(async function (req, res, next) {
res.locals.renderAdminHeader = true; res.locals.renderAdminHeader = true;
res.locals.config = await controllers.api.loadConfig(req); res.locals.config = await controllers.api.loadConfig(req);
next(); next();
}); });
middleware.admin.renderHeader = async (req, res, data) => { module.exports.renderHeader = async (req, res, data) => {
var custom_header = { var custom_header = {
plugins: [], plugins: [],
authentication: [], authentication: [],
@@ -99,11 +96,11 @@ module.exports = function (middleware) {
return null; return null;
} }
middleware.admin.renderFooter = async function (req, res, data) { module.exports.renderFooter = async function (req, res, data) {
return await req.app.renderAsync('admin/footer', data); return await req.app.renderAsync('admin/footer', data);
}; };
middleware.admin.checkPrivileges = async (req, res, next) => { module.exports.checkPrivileges = async (req, res, next) => {
// Kick out guests, obviously // Kick out guests, obviously
if (!req.uid) { if (!req.uid) {
return controllers.helpers.notAllowed(req, res); return controllers.helpers.notAllowed(req, res);
@@ -132,4 +129,3 @@ module.exports = function (middleware) {
next(); next();
}; };
};

2
src/middleware/index.js
View File

@@ -51,7 +51,7 @@ middleware.applyCSRF = function (req, res, next) {
middleware.ensureLoggedIn = ensureLoggedIn.ensureLoggedIn(nconf.get('relative_path') + '/login'); middleware.ensureLoggedIn = ensureLoggedIn.ensureLoggedIn(nconf.get('relative_path') + '/login');
require('./admin')(middleware); middleware.admin = require('./admin');
require('./header')(middleware); require('./header')(middleware);
require('./render')(middleware); require('./render')(middleware);
require('./maintenance')(middleware); require('./maintenance')(middleware);