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

feat: more naming

Browse Source
This commit is contained in:
Barış Soner Uşaklı
2018-12-17 16:56:38 -05:00
parent f88db22ca2
commit ae0fe5e880
4 changed files with 20 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/controllers/404.js
View File

@@ -7,7 +7,7 @@ var validator = require('validator');
var meta = require('../meta'); var meta = require('../meta');
var plugins = require('../plugins'); var plugins = require('../plugins');
exports.handle404 = function (req, res) { exports.handle404 = function handle404(req, res) {
var relativePath = nconf.get('relative_path'); var relativePath = nconf.get('relative_path');
var isClientScript = new RegExp('^' + relativePath + '\\/assets\\/src\\/.+\\.js'); var isClientScript = new RegExp('^' + relativePath + '\\/assets\\/src\\/.+\\.js');

4
src/controllers/errors.js
View File

@@ -5,7 +5,7 @@ var winston = require('winston');
var validator = require('validator'); var validator = require('validator');
var plugins = require('../plugins'); var plugins = require('../plugins');
exports.handleURIErrors = function (err, req, res, next) { exports.handleURIErrors = function handleURIErrors(err, req, res, next) {
// Handle cases where malformed URIs are passed in // Handle cases where malformed URIs are passed in
if (err instanceof URIError) { if (err instanceof URIError) {
const cleanPath = req.path.replace(new RegExp('^' + nconf.get('relative_path')), ''); const cleanPath = req.path.replace(new RegExp('^' + nconf.get('relative_path')), '');
@@ -36,7 +36,7 @@ exports.handleURIErrors = function (err, req, res, next) {
// this needs to have four arguments or express treats it as `(req, res, next)` // this needs to have four arguments or express treats it as `(req, res, next)`
// don't remove `next`! // don't remove `next`!
exports.handleErrors = function (err, req, res, next) { // eslint-disable-line no-unused-vars exports.handleErrors = function handleErrors(err, req, res, next) { // eslint-disable-line no-unused-vars
var cases = { var cases = {
EBADCSRFTOKEN: function () { EBADCSRFTOKEN: function () {
winston.error(req.path + '\n', err.message); winston.error(req.path + '\n', err.message);

12
src/routes/authentication.js
View File

@@ -14,8 +14,14 @@ var loginStrategies = [];
var Auth = module.exports; var Auth = module.exports;
Auth.initialize = function (app, middleware) { Auth.initialize = function (app, middleware) {
app.use(passport.initialize()); const passwortInitMiddleware = passport.initialize();
app.use(passport.session()); app.use(function passportInitialize(req, res, next) {
passwortInitMiddleware(req, res, next);
});
const passportSessionMiddleware = passport.session();
app.use(function passportSession(req, res, next) {
passportSessionMiddleware(req, res, next);
});
app.use(Auth.setAuthVars); app.use(Auth.setAuthVars);
@@ -23,7 +29,7 @@ Auth.initialize = function (app, middleware) {
Auth.middleware = middleware; Auth.middleware = middleware;
}; };
Auth.setAuthVars = function (req, res, next) { Auth.setAuthVars = function setAuthVars(req, res, next) {
var isSpider = req.isSpider(); var isSpider = req.isSpider();
req.loggedIn = !isSpider && !!req.user; req.loggedIn = !isSpider && !!req.user;
if (req.user) { if (req.user) {

10
src/webserver.js
View File

@@ -166,8 +166,14 @@ function setupExpressApp(app, callback) {
app.use(bodyParser.urlencoded({ extended: true })); app.use(bodyParser.urlencoded({ extended: true }));
app.use(bodyParser.json()); app.use(bodyParser.json());
app.use(cookieParser()); app.use(cookieParser());
app.use(useragent.express()); const userAgentMiddleware = useragent.express();
app.use(detector.middleware()); app.use(function userAgent(req, res, next) {
userAgentMiddleware(req, res, next);
});
const spiderDetectorMiddleware = detector.middleware();
app.use(function spiderDetector(req, res, next) {
spiderDetectorMiddleware(req, res, next);
});
app.use(session({ app.use(session({
store: db.sessionStore, store: db.sessionStore,