From d91d9e1eb3d04b180701d40542e7ae4fc554a919 Mon Sep 17 00:00:00 2001
From: Tyler Renelle <tylerrenelle@gmail.com>
Date: Tue, 16 Dec 2014 16:30:51 -0700
Subject: [PATCH] refactor(facebook): use async.auto to collect multiple vars,
 cleaner than waterfall

---
 src/controllers/auth.js | 35 +++++++++++++++++------------------
 1 file changed, 17 insertions(+), 18 deletions(-)

diff --git a/src/controllers/auth.js b/src/controllers/auth.js
index 4e3877ca3f..67ddbc08f5 100644
--- a/src/controllers/auth.js
+++ b/src/controllers/auth.js
@@ -148,21 +148,19 @@ api.loginSocial = function(req, res, next) {
     network = req.body.network;
   if (network!=='facebook')
     return res.json(401, {err:"Only Facebook supported currently."});
-  async.waterfall([
-    function(cb){
+  async.auto({
+    profile: function (cb) {
       passport._strategies[network].userProfile(access_token, cb);
     },
-    function(profile, cb) {
-      var q = {};q['auth.'+network+'.id'] = profile.id;
-      User.findOne(q, {_id:1, apiToken:1, auth:1}, function(err, user){
-        if (err) return cb(err);
-        cb(null, {user:user, profile:profile});
-      });
-    },
-    function(data, cb){
-      if (data.user) return cb(null, data.user);
+    user: ['profile', function (cb, results) {
+      var q = {};
+      q['auth.' + network + '.id'] = results.profile.id;
+      User.findOne(q, {_id: 1, apiToken: 1, auth: 1}, cb);
+    }],
+    register: ['profile', 'user', function (cb, results) {
+      if (results.user) return cb(null, results.user);
       // Create new user
-      var prof = data.profile;
+      var prof = results.profile;
       var user = {
         preferences: {
           language: req.language // User language detected from browser, not saved
@@ -175,15 +173,16 @@ api.loginSocial = function(req, res, next) {
       user = new User(user);
       user.save(cb);
 
-      if(isProd && prof.emails && prof.emails[0] && prof.emails[0].value){
-        utils.txnEmail({name:prof.displayName || prof.username, email:prof.emails[0].value}, 'welcome');
+      if (isProd && prof.emails && prof.emails[0] && prof.emails[0].value) {
+        utils.txnEmail({name: prof.displayName || prof.username, email: prof.emails[0].value}, 'welcome');
       }
       ga.event('register', network).send();
-    }
-  ], function(err, user){
+    }]
+  }, function(err, results){
     if (err) return res.json(401, {err: err.toString ? err.toString() : err});
-    if (user.auth.blocked) return res.json(401, accountSuspended(user._id));
-    return res.json(200, {id: user.id, token:user.apiToken});
+    var acct = results.register[0] ? results.register[0] : results.register;
+    if (acct.auth.blocked) return res.json(401, accountSuspended(acct._id));
+    return res.json(200, {id:acct._id, token:acct.apiToken});
   })
 };