From 9d982b3f27e7664117b6b58427a58b700c0389f7 Mon Sep 17 00:00:00 2001
From: Sahat Yalkabov <sakhat@gmail.com>
Date: Fri, 31 Jan 2014 23:23:14 -0500
Subject: [PATCH] Update merging strategies

---
 config/passport.js | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/config/passport.js b/config/passport.js
index a6af151812..4935692fb0 100755
--- a/config/passport.js
+++ b/config/passport.js
@@ -50,8 +50,9 @@ passport.use(new FacebookStrategy(secrets.facebook, function (req, accessToken,
   if (req.user) {
     User.findOne({ $or: [{ facebook: profile.id }, { email: profile.email }] }, function(err, existingUser) {
       if (existingUser) {
-        existingUser.github = existingUser.github || req.user.github;
+        existingUser.facebook = existingUser.facebook || req.user.facebook;
         existingUser.google = existingUser.google || req.user.google;
+        existingUser.github = existingUser.github || req.user.github;
         existingUser.twitter = existingUser.twitter || req.user.twitter;
         existingUser.email = existingUser.email || req.user.email;
         existingUser.password = existingUser.password || req.user.password;
@@ -113,6 +114,7 @@ passport.use(new GitHubStrategy(secrets.github, function(req, accessToken, refre
       if (existingUser) {
         existingUser.facebook = existingUser.facebook || req.user.facebook;
         existingUser.google = existingUser.google || req.user.google;
+        existingUser.github = existingUser.github || req.user.github;
         existingUser.twitter = existingUser.twitter || req.user.twitter;
         existingUser.email = existingUser.email || req.user.email;
         existingUser.password = existingUser.password || req.user.password;
@@ -174,8 +176,9 @@ passport.use(new TwitterStrategy(secrets.twitter, function(req, accessToken, tok
     User.findOne({ $or: [{ twitter: profile.id }, { email: profile.email }] }, function(err, existingUser) {
       if (existingUser) {
         existingUser.facebook = existingUser.facebook || req.user.facebook;
-        existingUser.github = existingUser.github || req.user.github;
         existingUser.google = existingUser.google || req.user.google;
+        existingUser.twitter = existingUser.twitter || req.user.twitter;
+        existingUser.github = existingUser.github || req.user.github;
         existingUser.email = existingUser.email || req.user.email;
         existingUser.password = existingUser.password || req.user.password;
         existingUser.profile = existingUser.profile || req.user.profile;
@@ -235,6 +238,7 @@ passport.use(new GoogleStrategy(secrets.google, function(req, accessToken, refre
     User.findOne({ $or: [{ google: profile.id }, { email: profile.email }] }, function(err, existingUser) {
       if (existingUser) {
         existingUser.facebook = existingUser.facebook || req.user.facebook;
+        existingUser.google = existingUser.google || req.user.google;
         existingUser.github = existingUser.github || req.user.github;
         existingUser.twitter = existingUser.twitter || req.user.twitter;
         existingUser.email = existingUser.email || req.user.email;