If user is already logged in, link google oauth with that existing account

pull/2/head
Sahat Yalkabov 2013-12-13 00:28:29 -05:00
parent 2da4d4ab1c
commit b21b53a09e
1 changed files with 27 additions and 13 deletions

View File

@ -81,20 +81,34 @@ passport.use(new TwitterStrategy(config.twitter, function(accessToken, tokenSecr
});
}));
passport.use(new GoogleStrategy(config.google, function(accessToken, refreshToken, profile, done) {
User.findOne({ google: profile.id }, function(err, existingUser) {
if (existingUser) return done(null, existingUser);
var user = new User();
user.google = profile.id;
user.tokens.push({ kind: 'google', token: accessToken });
user.profile.name = profile.displayName;
user.profile.email = profile._json.email;
user.profile.gender = profile._json.gender;
user.profile.picture = profile._json.picture;
user.save(function(err) {
done(err, user);
passport.use(new GoogleStrategy(config.google, function(req, accessToken, refreshToken, profile, done) {
if (req.user) {
User.findById(req.user.id, function(err, user) {
user.google = profile.id;
user.tokens.push({ kind: 'google', token: accessToken });
user.profile.name = profile.displayName;
user.profile.email = user.profile.email || profile._json.email;
user.profile.gender = user.profile.gender || profile._json.gender;
user.profile.picture = user.profile.picture || profile._json.picture;
user.save(function(err) {
done(err, user);
});
});
});
} else {
User.findOne({ google: profile.id }, function(err, existingUser) {
if (existingUser) return done(null, existingUser);
var user = new User();
user.google = profile.id;
user.tokens.push({ kind: 'google', token: accessToken });
user.profile.name = profile.displayName;
user.profile.email = profile._json.email;
user.profile.gender = profile._json.gender;
user.profile.picture = profile._json.picture;
user.save(function(err) {
done(err, user);
});
});
}
}));
passport.use('tumblr', new OAuthStrategy({