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

added req.uid user id for logged in users, 0 for guests

Browse Source
This commit is contained in:
barisusakli
2015-04-01 00:23:57 -04:00
parent 878e548296
commit 2fd4bcde3f
17 changed files with 93 additions and 134 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/middleware/admin.js
View File

@@ -53,19 +53,17 @@ middleware.buildHeader = function(req, res, next) {
};
middleware.renderHeader = function(req, res, next) {
var uid = req.user ? req.user.uid : 0;
var custom_header = {
'plugins': [],
'authentication': []
};
user.getUserFields(uid, ['username', 'userslug', 'email', 'picture', 'email:confirmed'], function(err, userData) {
user.getUserFields(req.uid, ['username', 'userslug', 'email', 'picture', 'email:confirmed'], function(err, userData) {
if (err) {
return next(err);
}
userData.uid = uid;
userData.uid = req.uid;
userData['email:confirmed'] = parseInt(userData['email:confirmed'], 10) === 1;
async.parallel({

22
src/middleware/middleware.js
View File

@@ -124,9 +124,7 @@ middleware.checkGlobalPrivacySettings = function(req, res, next) {
middleware.checkAccountPermissions = function(req, res, next) {
// This middleware ensures that only the requested user and admins can pass
var callerUID = req.user ? parseInt(req.user.uid, 10) : 0;
if (callerUID === 0) {
if (!req.uid) {
return controllers.helpers.notAllowed(req, res);
}
@@ -139,11 +137,11 @@ middleware.checkAccountPermissions = function(req, res, next) {
return controllers.helpers.notFound(req, res);
}
if (parseInt(uid, 10) === callerUID) {
if (parseInt(uid, 10) === req.uid) {
return next();
}
user.isAdministrator(callerUID, function(err, isAdmin) {
user.isAdministrator(req.uid, function(err, isAdmin) {
if (err || isAdmin) {
return next(err);
}
@@ -201,8 +199,6 @@ middleware.buildHeader = function(req, res, next) {
};
middleware.renderHeader = function(req, res, callback) {
var uid = req.user ? parseInt(req.user.uid, 10) : 0;
navigation.get(function(err, menuItems) {
if (err) {
return callback(err);
@@ -284,8 +280,8 @@ middleware.renderHeader = function(req, res, callback) {
next(null, templateValues.useCustomJS ? meta.config.customJS : '');
},
title: function(next) {
if (uid) {
user.getSettings(uid, function(err, settings) {
if (req.uid) {
user.getSettings(req.uid, function(err, settings) {
if (err) {
return next(err);
}
@@ -296,11 +292,11 @@ middleware.renderHeader = function(req, res, callback) {
}
},
isAdmin: function(next) {
user.isAdministrator(uid, next);
user.isAdministrator(req.uid, next);
},
user: function(next) {
if (uid) {
user.getUserFields(uid, ['username', 'userslug', 'email', 'picture', 'status', 'email:confirmed', 'banned'], next);
if (req.uid) {
user.getUserFields(req.uid, ['username', 'userslug', 'email', 'picture', 'status', 'email:confirmed', 'banned'], next);
} else {
next(null, {
username: '[[global:guest]]',
@@ -527,7 +523,7 @@ middleware.exposeUid = function(req, res, next) {
res.locals.uid = uid;
next();
})
});
} else {
next();
}