From d9231ccc3f897695ab783c1822ead7bb368b4e01 Mon Sep 17 00:00:00 2001
From: Amos Haviv <mail@amoshaviv.com>
Date: Mon, 26 May 2014 01:56:08 +0300
Subject: [PATCH] Fixing Grunt Watch

---
 app/controllers/users.server.controller.js | 40 ++++++++++------------
 gruntfile.js                               |  2 +-
 2 files changed, 19 insertions(+), 23 deletions(-)

diff --git a/app/controllers/users.server.controller.js b/app/controllers/users.server.controller.js
index e48784f94f..f5403527df 100755
--- a/app/controllers/users.server.controller.js
+++ b/app/controllers/users.server.controller.js
@@ -320,28 +320,24 @@ exports.saveOAuthUserProfile = function(req, providerUserProfile, done) {
 		});
 	} else {
 		// User is already logged in, join the provider data to the existing user
-		User.findById(req.user.id, '-salt -password', function(err, user) {
-			if (err) {
-				return done(err);
-			} else {
-				// Check if user exists, is not signed in using this provider, and doesn't have that provider data already configured
-				if (user && user.provider !== providerUserProfile.provider && (!user.additionalProvidersData || !user.additionalProvidersData[providerUserProfile.provider])) {
-					// Add the provider data to the additional provider data field
-					if (!user.additionalProvidersData) user.additionalProvidersData = {};
-					user.additionalProvidersData[providerUserProfile.provider] = providerUserProfile.providerData;
-
-					// Then tell mongoose that we've updated the additionalProvidersData field
-					user.markModified('additionalProvidersData');
-
-					// And save the user
-					user.save(function(err) {
-						return done(err, user, '/#!/settings/accounts');
-					});
-				} else {
-					return done(err, user);
-				}
-			}
-		});
+		var user = req.user;
+
+		// Check if user exists, is not signed in using this provider, and doesn't have that provider data already configured
+		if (user.provider !== providerUserProfile.provider && (!user.additionalProvidersData || !user.additionalProvidersData[providerUserProfile.provider])) {
+			// Add the provider data to the additional provider data field
+			if (!user.additionalProvidersData) user.additionalProvidersData = {};
+			user.additionalProvidersData[providerUserProfile.provider] = providerUserProfile.providerData;
+
+			// Then tell mongoose that we've updated the additionalProvidersData field
+			user.markModified('additionalProvidersData');
+
+			// And save the user
+			user.save(function(err) {
+				return done(err, user, '/#!/settings/accounts');
+			});
+		} else {
+			return done(new Error('User is already connected using this provider'), user);
+		}
 	}
 };
 
diff --git a/gruntfile.js b/gruntfile.js
index a924c9a76b..aab536a558 100644
--- a/gruntfile.js
+++ b/gruntfile.js
@@ -87,7 +87,7 @@ module.exports = function(grunt) {
 				script: 'server.js',
 				options: {
 					nodeArgs: ['--debug'],
-					ext: 'js, html',
+					ext: 'js,html',
 					watch: watchFiles.serverViews.concat(watchFiles.serverJS)
 				}
 			}