Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-11-01 03:26:04 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix waterfall

Browse Source 
Signed-off-by: Dustin Falgout <dustin@falgout.us>
This commit is contained in:
Dustin Falgout
2015-12-06 09:30:33 -06:00
parent 0e5830d6f2
commit 17e5d72815
1 changed files with 30 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
src/controllers/api.js
View File

@@ -195,50 +195,52 @@ apiController.getUserByUID = function(req, res, next) {
}; };
apiController.getUserByUsername = function (req, res, next) { apiController.getUserByUsername = function(req, res, next) {
var username = req.params.username ? req.params.username : 0; var username = req.params.username ? req.params.username : 0;
async.waterfall([ async.waterfall([
function (next) { function(next) {
user.getUidByUsername(username, next); user.getUidByUsername(username, next);
}, },
async.parallel({ function(uid, next) {
userData: async.apply(user.getUserData, uid), async.parallel({
settings: async.apply(user.getSettings, uid) userData: async.apply(user.getUserData, uid),
}, function (err, results) { settings: async.apply(user.getSettings, uid)
if (err || !results.userData) { }, function(err, results) {
return next(err); 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; 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(results.userData);
});
}
], next); ], next);
}; };
apiController.getUserByEmail = function (req, res, next) { apiController.getUserByEmail = function(req, res, next) {
var email = req.params.email ? req.params.email : 0; var email = req.params.email ? req.params.email : 0;
async.waterfall([ async.waterfall([
function (next) { function(next) {
user.getUidByEmail(email, next); user.getUidByEmail(email, next);
}, },
async.parallel({ function(uid, next) {
userData: async.apply(user.getUserData, uid), async.parallel({
settings: async.apply(user.getSettings, uid) userData: async.apply(user.getUserData, uid),
}, function (err, results) { settings: async.apply(user.getSettings, uid)
if (err || !results.userData) { }, function(err, results) {
return next(err); 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; 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(results.userData);
});
}
], next); ], next);
}; };