Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-10-28 17:46:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

refactor get user by x

Browse Source
This commit is contained in:
barisusakli
2015-12-09 17:43:28 +02:00
parent 69bc870017
commit 7b21760f00
1 changed files with 33 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

69
src/controllers/api.js
View File

@@ -179,18 +179,11 @@ apiController.getObject = function(req, res, next) {
apiController.getUserByUID = function(req, res, next) {
var uid = req.params.uid ? req.params.uid : 0;
async.parallel({
userData: async.apply(user.getUserData, uid),
settings: async.apply(user.getSettings, uid)
}, function(err, results) {
if (err || !results.userData) {
getUserByUID(uid, function(err, userData) {
if (err || !userData) {
return next(err);
}
results.userData.email = results.settings.showemail ? results.userData.email : undefined;
results.userData.fullname = results.settings.showfullname ? results.userData.fullname : undefined;
res.json(results.userData);
res.json(userData);
});
};
@@ -203,20 +196,14 @@ apiController.getUserByUsername = function(req, res, next) {
user.getUidByUsername(username, next);
},
function(uid, next) {
async.parallel({
userData: async.apply(user.getUserData, uid),
settings: async.apply(user.getSettings, uid)
}, function(err, results) {
if (err || !results.userData) {
return next(err);
}
results.userData.email = results.settings.showemail ? results.userData.email : undefined;
results.userData.fullname = results.settings.showfullname ? results.userData.fullname : undefined;
res.json(results.userData);
});
getUserByUID(uid, next);
}
], next);
], function(err, userData) {
if (err || !userData) {
return next(err);
}
res.json(userData);
});
};
@@ -228,23 +215,33 @@ apiController.getUserByEmail = function(req, res, next) {
user.getUidByEmail(email, next);
},
function(uid, next) {
async.parallel({
userData: async.apply(user.getUserData, uid),
settings: async.apply(user.getSettings, uid)
}, function(err, results) {
if (err || !results.userData) {
return next(err);
}
results.userData.email = results.settings.showemail ? results.userData.email : undefined;
results.userData.fullname = results.settings.showfullname ? results.userData.fullname : undefined;
res.json(results.userData);
});
getUserByUID(uid, next);
}
], next);
], function(err, userData) {
if (err || !userData) {
return next(err);
}
res.json(userData);
});
};
function getUserByUID(uid, callback) {
async.parallel({
userData: async.apply(user.getUserData, uid),
settings: async.apply(user.getSettings, uid)
}, function(err, results) {
if (err || !results.userData) {
return callback(err, null);
}
results.userData.email = results.settings.showemail ? results.userData.email : undefined;
results.userData.fullname = results.settings.showfullname ? results.userData.fullname : undefined;
callback(null, results.userData);
});
}
apiController.getModerators = function(req, res, next) {
categories.getModerators(req.params.cid, function(err, moderators) {
if (err) {