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

Merge branch 'master' of https://github.com/dstroot/hackathon-starter into dstroot-master

Browse Source 
* 'master' of https://github.com/dstroot/hackathon-starter:
  Better approach to Twitter email and Facebook location
This commit is contained in:
Sahat Yalkabov
2014-02-04 13:26:28 -05:00
parent 141ae63c27 7121cbfe83
commit f56bd90dce
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app.js
View File

@ -79,7 +79,7 @@ app.use(passport.initialize());
app.use(passport.session()); app.use(passport.session());
app.use(function(req, res, next) { app.use(function(req, res, next) {
res.locals.user = req.user; res.locals.user = req.user;
res.locals.token = req.csrfToken(); res.locals.token = req.csrfToken();
next(); next();
}); });
app.use(flash()); app.use(flash());
@ -126,7 +126,7 @@ app.get('/api/paypal/cancel', apiController.getPayPalCancel);
* OAuth routes for sign-in. * OAuth routes for sign-in.
*/ */
app.get('/auth/facebook', passport.authenticate('facebook', { scope: 'email' })); app.get('/auth/facebook', passport.authenticate('facebook', { scope: ['email', 'user_location'] }));
app.get('/auth/facebook/callback', passport.authenticate('facebook', { successRedirect: '/', failureRedirect: '/login' })); app.get('/auth/facebook/callback', passport.authenticate('facebook', { successRedirect: '/', failureRedirect: '/login' }));
app.get('/auth/github', passport.authenticate('github')); app.get('/auth/github', passport.authenticate('github'));
app.get('/auth/github/callback', passport.authenticate('github', { successRedirect: '/', failureRedirect: '/login' })); app.get('/auth/github/callback', passport.authenticate('github', { successRedirect: '/', failureRedirect: '/login' }));

6
config/passport.js
View File

@ -68,6 +68,7 @@ passport.use(new FacebookStrategy(secrets.facebook, function (req, accessToken,
user.profile.name = profile.displayName; user.profile.name = profile.displayName;
user.profile.gender = profile._json.gender; user.profile.gender = profile._json.gender;
user.profile.picture = 'https://graph.facebook.com/' + profile.id + '/picture?type=large'; user.profile.picture = 'https://graph.facebook.com/' + profile.id + '/picture?type=large';
user.profile.location = profile._json.location.name;
user.save(function(err) { user.save(function(err) {
done(err, user); done(err, user);
}); });
@ -147,7 +148,10 @@ passport.use(new TwitterStrategy(secrets.twitter, function(req, accessToken, tok
User.findOne({ twitter: profile.id }, function(err, existingUser) { User.findOne({ twitter: profile.id }, function(err, existingUser) {
if (existingUser) return done(null, existingUser); if (existingUser) return done(null, existingUser);
var user = new User(); var user = new User();
user.email = profile.displayName; // Twitter will not provide an email address. Period.
// But a person’s twitter username is guaranteed to be unique
// so we can “fake” a twitter email address as follows:
user.email = profile.username + "@twitter.com";
user.twitter = profile.id; user.twitter = profile.id;
user.tokens.push({ kind: 'twitter', accessToken: accessToken, tokenSecret: tokenSecret }); user.tokens.push({ kind: 'twitter', accessToken: accessToken, tokenSecret: tokenSecret });
user.profile.name = profile.displayName; user.profile.name = profile.displayName;