gaspersic/freeCodeCamp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Revert "modify twitter auth to fail if mismatch between selected user and current user"

Browse Source 
This reverts commit f75d305939.
This commit is contained in:
Michael Q Larson
2014-12-30 16:55:54 -08:00
parent f75d305939
commit df335b0087
1 changed files with 18 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
config/passport.js
View File

@ -109,32 +109,26 @@ passport.use(
} else { } else {
User.findOne({ twitter: profile.id }, function(err, existingUser) { User.findOne({ twitter: profile.id }, function(err, existingUser) {
if (err) { return done(err); } if (err) { return done(err); }
if (!existingUser || (existingUser && existingUser.twitter == profile.id)) { var user = existingUser || new User();
var user = existingUser || new User(); user.twitter = profile.id;
user.twitter = profile.id; user.email = user.email || '';
user.email = user.email || ''; user.tokens.push({
user.tokens.push({ kind: 'twitter',
kind: 'twitter', accessToken: accessToken,
accessToken: accessToken, tokenSecret: tokenSecret
tokenSecret: tokenSecret });
}); user.profile.name = user.profile.name || profile.displayName;
user.profile.name = user.profile.name || profile.displayName; user.profile.username = user.profile.username || profile.username;
user.profile.username = user.profile.username || profile.username;
user.profile.location = user.profile.location =
user.profile.location || profile._json.location; user.profile.location || profile._json.location;
user.profile.picture = user.profile.picture =
user.profile.picture || profile._json.profile_image_url_https; user.profile.picture || profile._json.profile_image_url_https;
user.save(function (err) { user.save(function(err) {
if (err) { if (err) { return done(err); }
return done(err); done(null, user);
} });
done(null, user);
});
} else {
return done("Sorry, we experienced an error. This has been reported. Try logging in with a different authentication method.");
}
}); });
} }
}) })