Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2026-03-06 20:41:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into mongodb-3.0-driver-2.0

Browse Source
This commit is contained in:
Barış Soner Uşaklı
2015-03-13 13:14:43 -04:00
parent eed00fadde 89333ab339
commit e4199179f7
152 changed files with 1790 additions and 1314 deletions
Download Patch File Download Diff File Expand all files Collapse all files

133
src/middleware/admin.js
View File

@@ -32,77 +32,86 @@ middleware.isAdmin = function(req, res, next) {
};
middleware.buildHeader = function(req, res, next) {
res.locals.renderAdminHeader = true;
async.parallel({
config: function(next) {
controllers.api.getConfig(req, res, next);
},
footer: function(next) {
app.render('admin/footer', {}, next);
}
}, function(err, results) {
if (err) {
return next(err);
}
res.locals.config = results.config;
res.locals.adminFooter = results.footer;
next();
});
};
middleware.renderHeader = function(req, res, next) {
var uid = req.user ? req.user.uid : 0;
async.parallel([
function(next) {
var custom_header = {
'plugins': [],
'authentication': []
};
user.getUserFields(uid, ['username', 'userslug', 'email', 'picture', 'email:confirmed'], function(err, userData) {
if (err) {
return next(err);
}
var custom_header = {
'plugins': [],
'authentication': []
};
userData.uid = uid;
userData['email:confirmed'] = parseInt(userData['email:confirmed'], 10) === 1;
async.parallel({
scripts: function(next) {
plugins.fireHook('filter:admin.scripts.get', [], function(err, scripts) {
if (err) {
return next(err);
}
var arr = [];
scripts.forEach(function(script) {
arr.push({src: nconf.get('url') + script});
});
user.getUserFields(uid, ['username', 'userslug', 'email', 'picture', 'email:confirmed'], function(err, userData) {
if (err) {
return next(err);
}
next(null, arr);
});
},
custom_header: function(next) {
plugins.fireHook('filter:admin.header.build', custom_header, next);
},
config: function(next) {
controllers.api.getConfig(req, res, next);
}
}, function(err, results) {
userData.uid = uid;
userData['email:confirmed'] = parseInt(userData['email:confirmed'], 10) === 1;
async.parallel({
scripts: function(next) {
plugins.fireHook('filter:admin.scripts.get', [], function(err, scripts) {
if (err) {
return next(err);
}
res.locals.config = results.config;
var data = {
relative_path: nconf.get('relative_path'),
configJSON: JSON.stringify(results.config),
user: userData,
userJSON: JSON.stringify(userData),
plugins: results.custom_header.plugins,
authentication: results.custom_header.authentication,
scripts: results.scripts,
'cache-buster': meta.config['cache-buster'] ? 'v=' + meta.config['cache-buster'] : '',
env: process.env.NODE_ENV ? true : false
};
app.render('admin/header', data, function(err, template) {
if (err) {
return next(err);
}
res.locals.adminHeader = template;
next();
var arr = [];
scripts.forEach(function(script) {
arr.push({src: nconf.get('url') + script});
});
next(null, arr);
});
});
},
function(next) {
app.render('admin/footer', {}, function(err, template) {
res.locals.adminFooter = template;
next(err);
});
}
], next);
},
custom_header: function(next) {
plugins.fireHook('filter:admin.header.build', custom_header, next);
},
config: function(next) {
controllers.api.getConfig(req, res, next);
}
}, function(err, results) {
if (err) {
return next(err);
}
res.locals.config = results.config;
var data = {
relative_path: nconf.get('relative_path'),
configJSON: JSON.stringify(results.config),
user: userData,
userJSON: JSON.stringify(userData),
plugins: results.custom_header.plugins,
authentication: results.custom_header.authentication,
scripts: results.scripts,
'cache-buster': meta.config['cache-buster'] ? 'v=' + meta.config['cache-buster'] : '',
env: process.env.NODE_ENV ? true : false,
};
data.template = {name: res.locals.template};
data.template[res.locals.template] = true;
app.render('admin/header', data, next);
});
});
};
module.exports = function(webserver) {

61
src/middleware/middleware.js
View File

@@ -60,19 +60,14 @@ middleware.redirectToAccountIfLoggedIn = function(req, res, next) {
if (err) {
return next(err);
}
if (res.locals.isAPI) {
res.status(302).json(nconf.get('relative_path') + '/user/' + userslug);
} else {
res.redirect(nconf.get('relative_path') + '/user/' + userslug);
}
controllers.helpers.redirect(res, '/user/' + userslug);
});
};
middleware.redirectToLoginIfGuest = function(req, res, next) {
if (!req.user || parseInt(req.user.uid, 10) === 0) {
req.session.returnTo = nconf.get('relative_path') + req.url.replace(/^\/api/, '');
return res.redirect(nconf.get('relative_path') + '/login');
return controllers.helpers.redirect(res, '/login');
} else {
next();
}
@@ -85,13 +80,7 @@ middleware.addSlug = function(req, res, next) {
return next(err);
}
var url = nconf.get('relative_path') + name + encodeURI(slug);
if (res.locals.isAPI) {
res.status(302).json(url);
} else {
res.redirect(url);
}
controllers.helpers.redirect(res, name + encodeURI(slug));
});
}
@@ -165,17 +154,9 @@ middleware.checkAccountPermissions = function(req, res, next) {
};
middleware.isAdmin = function(req, res, next) {
function render() {
if (res.locals.isAPI) {
return controllers.helpers.notAllowed(req, res);
}
middleware.buildHeader(req, res, function() {
controllers.helpers.notAllowed(req, res);
});
}
if (!req.user) {
return render();
req.session.returnTo = nconf.get('relative_path') + req.url.replace(/^\/api/, '');
return controllers.helpers.redirect(res, '/login');
}
user.isAdministrator((req.user && req.user.uid) ? req.user.uid : 0, function (err, isAdmin) {
@@ -183,7 +164,13 @@ middleware.isAdmin = function(req, res, next) {
return next(err);
}
render();
if (res.locals.isAPI) {
return controllers.helpers.notAllowed(req, res);
}
middleware.buildHeader(req, res, function() {
controllers.helpers.notAllowed(req, res);
});
});
};
@@ -284,7 +271,6 @@ middleware.renderHeader = function(req, res, callback) {
href: nconf.get('relative_path') + '/favicon.ico'
});
async.parallel({
customCSS: function(next) {
templateValues.useCustomCSS = parseInt(meta.config.useCustomCSS, 10) === 1;
@@ -339,7 +325,7 @@ middleware.renderHeader = function(req, res, callback) {
results.user.isAdmin = results.isAdmin || false;
results.user.uid = parseInt(results.user.uid, 10);
results.user['email:confirmed'] = parseInt(results.user['email:confirmed'], 10) === 1;
templateValues.browserTitle = results.title;
templateValues.isAdmin = results.user.isAdmin;
templateValues.user = results.user;
@@ -348,6 +334,9 @@ middleware.renderHeader = function(req, res, callback) {
templateValues.customJS = results.customJS;
templateValues.maintenanceHeader = parseInt(meta.config.maintenanceMode, 10) === 1 && !results.isAdmin;
templateValues.template = {name: res.locals.template};
templateValues.template[res.locals.template] = true;
app.render('header', templateValues, callback);
});
});
@@ -376,8 +365,9 @@ middleware.processRender = function(req, res, next) {
}
options.loggedIn = req.user ? parseInt(req.user.uid, 10) !== 0 : false;
options.template = {};
options.template = {name: template};
options.template[template] = true;
res.locals.template = template;
if ('function' !== typeof fn) {
fn = defaultFn;
@@ -402,20 +392,18 @@ middleware.processRender = function(req, res, next) {
str = str + res.locals.adminFooter;
}
if (res.locals.renderHeader) {
middleware.renderHeader(req, res, function(err, template) {
if (res.locals.renderHeader || res.locals.renderAdminHeader) {
var method = res.locals.renderHeader ? middleware.renderHeader : middleware.admin.renderHeader;
method(req, res, function(err, template) {
if (err) {
return fn(err);
}
str = template + str;
var language = res.locals.config ? res.locals.config.userLang || 'en_GB' : 'en_GB';
translator.translate(str, language, function(translated) {
fn(err, translated);
});
});
} else if (res.locals.adminHeader) {
str = res.locals.adminHeader + str;
var language = res.locals.config ? res.locals.config.userLang || 'en_GB' : 'en_GB';
translator.translate(str, language, function(translated) {
fn(err, translated);
});
} else {
fn(err, str);
}
@@ -458,7 +446,6 @@ middleware.maintenanceMode = function(req, res, next) {
'/nodebb.min.js',
'/vendor/fontawesome/fonts/fontawesome-webfont.woff',
'/src/modules/[\\w]+\.js',
'/api/get_templates_listing',
'/api/login',
'/api/?',
'/language/.+'