updated checkAccountPermissions to call requireUser, and added new hook for plugins to handle auth login

v1.18.x
Julian Lam 10 years ago
parent 1ade973e56
commit 40834cc010

@ -32,6 +32,12 @@ var app,
middleware.authenticate = function(req, res, next) { middleware.authenticate = function(req, res, next) {
if (req.user) { if (req.user) {
return next(); return next();
} else if (plugins.hasListeners('action:middleware.authenticate')) {
return plugins.fireHook('action:middleware.authenticate', {
req: req,
res: res,
next: next
});
} }
controllers.helpers.notAllowed(req, res); controllers.helpers.notAllowed(req, res);
@ -124,8 +130,9 @@ middleware.checkGlobalPrivacySettings = function(req, res, next) {
middleware.checkAccountPermissions = function(req, res, next) { middleware.checkAccountPermissions = function(req, res, next) {
// This middleware ensures that only the requested user and admins can pass // This middleware ensures that only the requested user and admins can pass
if (!req.uid) { middleware.authenticate(req, res, function(err) {
return controllers.helpers.notAllowed(req, res); if (err) {
return next(err);
} }
user.getUidByUserslug(req.params.userslug, function (err, uid) { user.getUidByUserslug(req.params.userslug, function (err, uid) {
@ -149,6 +156,7 @@ middleware.checkAccountPermissions = function(req, res, next) {
controllers.helpers.notAllowed(req, res); controllers.helpers.notAllowed(req, res);
}); });
}); });
});
}; };
middleware.isAdmin = function(req, res, next) { middleware.isAdmin = function(req, res, next) {

Loading…
Cancel
Save