fix waterfall

Signed-off-by: Dustin Falgout <dustin@falgout.us>
v1.18.x
Dustin Falgout 9 years ago
parent 0e5830d6f2
commit 17e5d72815

@ -195,17 +195,18 @@ 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);
}, },
function(uid, next) {
async.parallel({ async.parallel({
userData: async.apply(user.getUserData, uid), userData: async.apply(user.getUserData, uid),
settings: async.apply(user.getSettings, uid) settings: async.apply(user.getSettings, uid)
}, function (err, results) { }, function(err, results) {
if (err || !results.userData) { if (err || !results.userData) {
return next(err); return next(err);
} }
@ -213,23 +214,24 @@ apiController.getUserByUsername = function (req, res, next) {
results.userData.fullname = results.settings.showfullname ? results.userData.fullname : 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);
}, },
function(uid, next) {
async.parallel({ async.parallel({
userData: async.apply(user.getUserData, uid), userData: async.apply(user.getUserData, uid),
settings: async.apply(user.getSettings, uid) settings: async.apply(user.getSettings, uid)
}, function (err, results) { }, function(err, results) {
if (err || !results.userData) { if (err || !results.userData) {
return next(err); return next(err);
} }
@ -237,8 +239,8 @@ apiController.getUserByEmail = function (req, res, next) {
results.userData.fullname = results.settings.showfullname ? results.userData.fullname : undefined; results.userData.fullname = results.settings.showfullname ? results.userData.fullname : undefined;
res.json(results.userData); res.json(results.userData);
}) });
}
], next); ], next);
}; };

Loading…
Cancel
Save