From 60e186c8f36a6723000f4e0fdb06c69f62161bcb Mon Sep 17 00:00:00 2001
From: barisusakli <barisusakli@gmail.com>
Date: Fri, 11 Dec 2015 11:07:37 +0200
Subject: [PATCH] refactor api/username api/email

---
 src/controllers/api.js | 34 ++++++++--------------------------
 1 file changed, 8 insertions(+), 26 deletions(-)

diff --git a/src/controllers/api.js b/src/controllers/api.js
index 74c4d008c8..79cf9dd6d4 100644
--- a/src/controllers/api.js
+++ b/src/controllers/api.js
@@ -179,15 +179,9 @@ apiController.getObject = function(req, res, next) {
 apiController.getUserByUID = function(req, res, next) {
 	var uid = req.params.uid ? req.params.uid : 0;
 
-	getUserByUID(uid, function(err, userData) {
-		if (err || !userData) {
-			return next(err);
-		}
-		res.json(userData);
-	});
+	getUserByUID(uid, res, next);
 };
 
-
 apiController.getUserByUsername = function(req, res, next) {
 	var username = req.params.username ? req.params.username : 0;
 
@@ -196,17 +190,11 @@ apiController.getUserByUsername = function(req, res, next) {
 			user.getUidByUsername(username, next);
 		},
 		function(uid, next) {
-			getUserByUID(uid, next);
+			getUserByUID(uid, res, next);
 		}
-	], function(err, userData) {
-		if (err || !userData) {
-			return next(err);
-		}
-		res.json(userData);
-	});
+	], next);
 };
 
-
 apiController.getUserByEmail = function(req, res, next) {
 	var email = req.params.email ? req.params.email : 0;
 
@@ -215,30 +203,24 @@ apiController.getUserByEmail = function(req, res, next) {
 			user.getUidByEmail(email, next);
 		},
 		function(uid, next) {
-			getUserByUID(uid, next);
-		}
-	], function(err, userData) {
-		if (err || !userData) {
-			return next(err);
+			getUserByUID(uid, res, next);
 		}
-		res.json(userData);
-	});
+	], next);
 };
 
-
-function getUserByUID(uid, callback) {
+function getUserByUID(uid, res, next) {
 	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);
+			return next(err);
 		}
 
 		results.userData.email = results.settings.showemail ? results.userData.email : undefined;
 		results.userData.fullname = results.settings.showfullname ? results.userData.fullname : undefined;
 
-		callback(null, results.userData);
+		res.json(results.userData);
 	});
 }