fix: change how admin middlewares are exported

v1.18.x
Julian Lam 5 years ago
parent ae68a254d7
commit f00595b32d

@ -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: [],
@ -80,16 +77,16 @@ module.exports = function (middleware) {
templateValues.template[res.locals.template] = true; templateValues.template[res.locals.template] = true;
return await req.app.renderAsync('admin/header', templateValues); return await req.app.renderAsync('admin/header', templateValues);
}; };
async function getAdminScripts() { async function getAdminScripts() {
const scripts = await plugins.fireHook('filter:admin.scripts.get', []); const scripts = await plugins.fireHook('filter:admin.scripts.get', []);
return scripts.map(function (script) { return scripts.map(function (script) {
return { src: script }; return { src: script };
}); });
} }
async function getLatestVersion() { async function getLatestVersion() {
try { try {
const result = await versions.getLatestVersion(); const result = await versions.getLatestVersion();
return result; return result;
@ -97,13 +94,13 @@ module.exports = function (middleware) {
winston.error('[acp] Failed to fetch latest version' + err.stack); winston.error('[acp] Failed to fetch latest version' + err.stack);
} }
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);
@ -131,5 +128,4 @@ module.exports = function (middleware) {
} }
next(); next();
};
}; };

@ -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);

Loading…
Cancel
Save