Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-11-01 19:46:01 +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

10
src/controllers/api.js
View File

@@ -202,6 +202,7 @@ apiController.getUserByUsername = function (req, res, next) {
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)
@@ -213,8 +214,8 @@ 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);
}; };
@@ -226,6 +227,7 @@ apiController.getUserByEmail = function (req, res, next) {
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)
@@ -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);
}; };