mirror of
https://github.com/NodeBB/NodeBB.git
synced 2025-11-10 16:05:49 +01:00
* DRY req props that depend on auth (fix #6727) authentication leads to req.loggedIn and req.uid being set. However, a later authentication event might outdate them. Here, I create one function for setting those properties, and make sure it also is called on the `action:middleware.authenticate` hook, which would be such an authentication event. If there are other places, those should be added as well. * fix lint errors * fix lint error * change exports
This commit is contained in:
committed by
Barış Soner Uşaklı
parent
3e1b007f9f
commit
c7f3b76b4e
@@ -8,7 +8,7 @@ var groups = require('../groups');
|
|||||||
var user = require('../user');
|
var user = require('../user');
|
||||||
var helpers = require('./helpers');
|
var helpers = require('./helpers');
|
||||||
|
|
||||||
var groupsController = {};
|
var groupsController = module.exports;
|
||||||
|
|
||||||
groupsController.list = function (req, res, next) {
|
groupsController.list = function (req, res, next) {
|
||||||
var sort = req.query.sort || 'alpha';
|
var sort = req.query.sort || 'alpha';
|
||||||
@@ -177,5 +177,3 @@ groupsController.uploadCover = function (req, res, next) {
|
|||||||
res.json([{ url: image.url }]);
|
res.json([{ url: image.url }]);
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|
||||||
module.exports = groupsController;
|
|
||||||
|
|||||||
@@ -8,6 +8,8 @@ var user = require('../user');
|
|||||||
var privileges = require('../privileges');
|
var privileges = require('../privileges');
|
||||||
var plugins = require('../plugins');
|
var plugins = require('../plugins');
|
||||||
|
|
||||||
|
var auth = require('../routes/authentication');
|
||||||
|
|
||||||
var controllers = {
|
var controllers = {
|
||||||
helpers: require('../controllers/helpers'),
|
helpers: require('../controllers/helpers'),
|
||||||
};
|
};
|
||||||
@@ -22,7 +24,9 @@ module.exports = function (middleware) {
|
|||||||
return plugins.fireHook('action:middleware.authenticate', {
|
return plugins.fireHook('action:middleware.authenticate', {
|
||||||
req: req,
|
req: req,
|
||||||
res: res,
|
res: res,
|
||||||
next: next,
|
next: function (err) {
|
||||||
|
auth.setAuthVars(req, res, function () { next(err); });
|
||||||
|
},
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -19,23 +19,25 @@ Auth.initialize = function (app, middleware) {
|
|||||||
app.use(passport.initialize());
|
app.use(passport.initialize());
|
||||||
app.use(passport.session());
|
app.use(passport.session());
|
||||||
|
|
||||||
app.use(function (req, res, next) {
|
app.use(Auth.setAuthVars);
|
||||||
var isSpider = req.isSpider();
|
|
||||||
req.loggedIn = !isSpider && !!req.user;
|
|
||||||
if (isSpider) {
|
|
||||||
req.uid = -1;
|
|
||||||
} else if (req.user) {
|
|
||||||
req.uid = parseInt(req.user.uid, 10);
|
|
||||||
} else {
|
|
||||||
req.uid = 0;
|
|
||||||
}
|
|
||||||
next();
|
|
||||||
});
|
|
||||||
|
|
||||||
Auth.app = app;
|
Auth.app = app;
|
||||||
Auth.middleware = middleware;
|
Auth.middleware = middleware;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
Auth.setAuthVars = function (req, res, next) {
|
||||||
|
var isSpider = req.isSpider();
|
||||||
|
req.loggedIn = !isSpider && !!req.user;
|
||||||
|
if (isSpider) {
|
||||||
|
req.uid = -1;
|
||||||
|
} else if (req.user) {
|
||||||
|
req.uid = parseInt(req.user.uid, 10);
|
||||||
|
} else {
|
||||||
|
req.uid = 0;
|
||||||
|
}
|
||||||
|
next();
|
||||||
|
};
|
||||||
|
|
||||||
Auth.getLoginStrategies = function () {
|
Auth.getLoginStrategies = function () {
|
||||||
return loginStrategies;
|
return loginStrategies;
|
||||||
};
|
};
|
||||||
|
|||||||
Reference in New Issue
Block a user