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

make twitter photo higher resolution on login. remove twitter redirect middleware

Browse Source
This commit is contained in:
Michael Q Larson
2015-01-09 13:02:00 -08:00
parent a272d6fd4f
commit d46ac080dd
2 changed files with 4 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app.js
View File

@ -293,13 +293,11 @@ app.get('/auth/twitter', passport.authenticate('twitter'));
app.get( app.get(
'/auth/twitter/callback', '/auth/twitter/callback',
passport.authenticate('twitter', { passport.authenticate('twitter', {
successRedirect: '/auth/twitter/middle', successRedirect: '/',
failureRedirect: '/login' failureRedirect: '/login'
}) })
); );
app.get('/auth/twitter/middle', passportConf.hasEmail);
app.get( app.get(
'/auth/linkedin', '/auth/linkedin',
passport.authenticate('linkedin', { passport.authenticate('linkedin', {

21
config/passport.js
View File

@ -15,7 +15,6 @@ var _ = require('lodash'),
module.exports = { module.exports = {
isAuthenticated: isAuthenticated, isAuthenticated: isAuthenticated,
isAuthorized: isAuthorized, isAuthorized: isAuthorized,
hasEmail: hasEmail
}; };
passport.serializeUser(function(user, done) { passport.serializeUser(function(user, done) {
@ -59,7 +58,7 @@ passport.use(new TwitterStrategy(secrets.twitter, function(req, accessToken, tok
user.tokens.push({ kind: 'twitter', accessToken: accessToken, tokenSecret: tokenSecret }); user.tokens.push({ kind: 'twitter', accessToken: accessToken, tokenSecret: tokenSecret });
user.profile.name = user.profile.name || profile.displayName; user.profile.name = user.profile.name || profile.displayName;
user.profile.location = user.profile.location || profile._json.location; user.profile.location = user.profile.location || profile._json.location;
user.profile.picture = user.profile.picture || profile._json.profile_image_url_https; user.profile.picture = user.profile.picture || profile._json.profile_image_url_https.replace('_normal', '');
user.save(function(err) { user.save(function(err) {
req.flash('info', { msg: 'Twitter account has been linked.' }); req.flash('info', { msg: 'Twitter account has been linked.' });
done(err, user); done(err, user);
@ -75,13 +74,13 @@ passport.use(new TwitterStrategy(secrets.twitter, function(req, accessToken, tok
// Twitter will not provide an email address. Period. // Twitter will not provide an email address. Period.
// But a person’s twitter username is guaranteed to be unique // But a person’s twitter username is guaranteed to be unique
// so we can "fake" a twitter email address as follows: // so we can "fake" a twitter email address as follows:
user.email = profile.username + "@please_add_your_email_here.com"; user.email = '';
user.profile.username = profile.username; user.profile.username = profile.username;
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;
user.profile.location = profile._json.location; user.profile.location = profile._json.location;
user.profile.picture = profile._json.profile_image_url_https; user.profile.picture = profile._json.profile_image_url_https.replace('_normal', '');
user.save(function(err) { user.save(function(err) {
done(err, user); done(err, user);
}); });
@ -477,20 +476,6 @@ function isAuthenticated(req, res, next) {
res.redirect('/login'); res.redirect('/login');
} }
function hasEmail(req, res) {
if (req.user) {
if (req.user.email) {
res.redirect('/');
} else {
req.flash('info', {
msg: 'Please add your email address before starting our challenges.'
});
res.redirect('/account');
}
}
}
// Authorization Required middleware.
function isAuthorized(req, res, next) { function isAuthorized(req, res, next) {
var provider = req.path.split('/').slice(-1)[0]; var provider = req.path.split('/').slice(-1)[0];