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

Add/Remove google and twitter app routes

Browse Source
This commit is contained in:
Sahat Yalkabov
2014-04-15 12:06:38 -04:00
parent 09c5eb3a0c
commit 517bd4fa23
1 changed files with 196 additions and 153 deletions
Download Patch File Download Diff File Expand all files Collapse all files

113
generator.js
View File

@ -207,23 +207,23 @@ inquirer.prompt({
if (passportConfig.indexOf(facebookStrategyRequire) < 0) { if (passportConfig.indexOf(facebookStrategyRequire) < 0) {
// config/passport.js (+) // config/passport.js
index = passportConfig.indexOf("var passport = require('passport');"); index = passportConfig.indexOf("var passport = require('passport');");
passportConfig.splice(index + 1, 0, facebookStrategyRequire); passportConfig.splice(index + 1, 0, facebookStrategyRequire);
index = passportConfig.indexOf('passport.deserializeUser(function(id, done) {'); index = passportConfig.indexOf('passport.deserializeUser(function(id, done) {');
passportConfig.splice(index + 6, 0, facebookStrategy); passportConfig.splice(index + 6, 0, facebookStrategy);
fs.writeFileSync(passportConfigFile, passportConfig.join('\n')); fs.writeFileSync(passportConfigFile, passportConfig.join('\n'));
// views/account/login.jade (+) // views/account/login.jade
loginTemplate.push(facebookButton); loginTemplate.push(facebookButton);
fs.writeFileSync(loginTemplateFile, loginTemplate.join('\n')); fs.writeFileSync(loginTemplateFile, loginTemplate.join('\n'));
// views/account/profile.jade (+) // views/account/profile.jade
index = profileTemplate.indexOf(' h3 Linked Accounts'); index = profileTemplate.indexOf(' h3 Linked Accounts');
profileTemplate.splice(index + 1, 0, facebookLinkUnlink); profileTemplate.splice(index + 1, 0, facebookLinkUnlink);
fs.writeFileSync(profileTemplateFile, profileTemplate.join('\n')); fs.writeFileSync(profileTemplateFile, profileTemplate.join('\n'));
// models/User.js (+) // models/User.js
index = userModel.indexOf(' tokens: Array,'); index = userModel.indexOf(' tokens: Array,');
userModel.splice(index - 1, 0, facebookModel); userModel.splice(index - 1, 0, facebookModel);
fs.writeFileSync(userModelFile, userModel.join('\n')); fs.writeFileSync(userModelFile, userModel.join('\n'));
@ -234,24 +234,24 @@ inquirer.prompt({
} }
} else { } else {
// config/passport.js (-) // config/passport.js
index = passportConfig.indexOf(facebookStrategyRequire); index = passportConfig.indexOf(facebookStrategyRequire);
passportConfig.splice(index, 1); passportConfig.splice(index, 1);
index = passportConfig.indexOf('// Sign in with Facebook.'); index = passportConfig.indexOf('// Sign in with Facebook.');
passportConfig.splice(index, 47); passportConfig.splice(index, 47);
fs.writeFileSync(passportConfigFile, passportConfig.join('\n')); fs.writeFileSync(passportConfigFile, passportConfig.join('\n'));
// views/account/login.jade (-) // views/account/login.jade
index = loginTemplate.indexOf(" a.btn.btn-block.btn-facebook.btn-social(href='/auth/facebook')"); index = loginTemplate.indexOf(" a.btn.btn-block.btn-facebook.btn-social(href='/auth/facebook')");
loginTemplate.splice(index, 4); loginTemplate.splice(index, 4);
fs.writeFileSync(loginTemplateFile, loginTemplate.join('\n')); fs.writeFileSync(loginTemplateFile, loginTemplate.join('\n'));
// views/account/profile.jade (-) // views/account/profile.jade
index = profileTemplate.indexOf(" if user.facebook"); index = profileTemplate.indexOf(" if user.facebook");
profileTemplate.splice(index - 1, 5); profileTemplate.splice(index - 1, 5);
fs.writeFileSync(profileTemplateFile, profileTemplate.join('\n')); fs.writeFileSync(profileTemplateFile, profileTemplate.join('\n'));
// models/User.js (-) // models/User.js
index = userModel.indexOf(' facebook: String,'); index = userModel.indexOf(' facebook: String,');
userModel.splice(index, 1); userModel.splice(index, 1);
fs.writeFileSync(userModelFile, userModel.join('\n')); fs.writeFileSync(userModelFile, userModel.join('\n'));
@ -334,23 +334,23 @@ inquirer.prompt({
if (passportConfig.indexOf(githubStrategyRequire) < 0) { if (passportConfig.indexOf(githubStrategyRequire) < 0) {
// config/passport.js (+) // config/passport.js
index = passportConfig.indexOf("var passport = require('passport');"); index = passportConfig.indexOf("var passport = require('passport');");
passportConfig.splice(index + 1, 0, githubStrategyRequire); passportConfig.splice(index + 1, 0, githubStrategyRequire);
index = passportConfig.indexOf('passport.deserializeUser(function(id, done) {'); index = passportConfig.indexOf('passport.deserializeUser(function(id, done) {');
passportConfig.splice(index + 6, 0, githubStrategy); passportConfig.splice(index + 6, 0, githubStrategy);
fs.writeFileSync(passportConfigFile, passportConfig.join('\n')); fs.writeFileSync(passportConfigFile, passportConfig.join('\n'));
// views/account/login.jade (+) // views/account/login.jade
loginTemplate.push(githubButton); loginTemplate.push(githubButton);
fs.writeFileSync(loginTemplateFile, loginTemplate.join('\n')); fs.writeFileSync(loginTemplateFile, loginTemplate.join('\n'));
// views/account/profile.jade (+) // views/account/profile.jade
index = profileTemplate.indexOf(' h3 Linked Accounts'); index = profileTemplate.indexOf(' h3 Linked Accounts');
profileTemplate.splice(index + 1, 0, githubLinkUnlink); profileTemplate.splice(index + 1, 0, githubLinkUnlink);
fs.writeFileSync(profileTemplateFile, profileTemplate.join('\n')); fs.writeFileSync(profileTemplateFile, profileTemplate.join('\n'));
// models/User.js (+) // models/User.js
index = userModel.indexOf(' tokens: Array,'); index = userModel.indexOf(' tokens: Array,');
userModel.splice(index - 1, 0, githubModel); userModel.splice(index - 1, 0, githubModel);
fs.writeFileSync(userModelFile, userModel.join('\n')); fs.writeFileSync(userModelFile, userModel.join('\n'));
@ -361,24 +361,24 @@ inquirer.prompt({
} }
} else { } else {
// config/passport.js (-) // config/passport.js
index = passportConfig.indexOf(githubStrategyRequire); index = passportConfig.indexOf(githubStrategyRequire);
passportConfig.splice(index, 1); passportConfig.splice(index, 1);
index = passportConfig.indexOf('// Sign in with GitHub.'); index = passportConfig.indexOf('// Sign in with GitHub.');
passportConfig.splice(index, 48); passportConfig.splice(index, 48);
fs.writeFileSync(passportConfigFile, passportConfig.join('\n')); fs.writeFileSync(passportConfigFile, passportConfig.join('\n'));
// views/account/login.jade (-) // views/account/login.jade
index = loginTemplate.indexOf(" a.btn.btn-block.btn-github.btn-social(href='/auth/github')"); index = loginTemplate.indexOf(" a.btn.btn-block.btn-github.btn-social(href='/auth/github')");
loginTemplate.splice(index, 4); loginTemplate.splice(index, 4);
fs.writeFileSync(loginTemplateFile, loginTemplate.join('\n')); fs.writeFileSync(loginTemplateFile, loginTemplate.join('\n'));
// views/account/profile.jade (-) // views/account/profile.jade
index = profileTemplate.indexOf(' if user.github'); index = profileTemplate.indexOf(' if user.github');
profileTemplate.splice(index - 1, 5); profileTemplate.splice(index - 1, 5);
fs.writeFileSync(profileTemplateFile, profileTemplate.join('\n')); fs.writeFileSync(profileTemplateFile, profileTemplate.join('\n'));
// models/User.js (-) // models/User.js
index = userModel.indexOf(' github: String,'); index = userModel.indexOf(' github: String,');
userModel.splice(index, 1); userModel.splice(index, 1);
fs.writeFileSync(userModelFile, userModel.join('\n')); fs.writeFileSync(userModelFile, userModel.join('\n'));
@ -386,7 +386,18 @@ inquirer.prompt({
console.log('✗ GitHub authentication has been removed.'.error); console.log('✗ GitHub authentication has been removed.'.error);
} }
if (_.contains(answer.auth, 'Google')) { ///////////////////////////
// Google Authentication //
///////////////////////////
var googleRoutes = M(function() {
/***
app.get('/auth/google', passport.authenticate('google', { scope: 'profile email' }));
app.get('/auth/google/callback', passport.authenticate('google', { failureRedirect: '/login' }), function(req, res) {
res.redirect(req.session.returnTo || '/');
});
***/
});
var googleStrategyRequire = "var GoogleStrategy = require('passport-google-oauth').OAuth2Strategy;"; var googleStrategyRequire = "var GoogleStrategy = require('passport-google-oauth').OAuth2Strategy;";
var googleStrategy = M(function() { var googleStrategy = M(function() {
/*** /***
@ -457,61 +468,83 @@ inquirer.prompt({
}); });
var googleModel = ' google: String,'; var googleModel = ' google: String,';
if (_.contains(answer.auth, 'Google')) {
if (passportConfig.indexOf(googleStrategyRequire) < 0) { if (passportConfig.indexOf(googleStrategyRequire) < 0) {
// config/passport.js (+) // Add Google to config/passport.js
index = passportConfig.indexOf("var passport = require('passport');"); index = passportConfig.indexOf("var passport = require('passport');");
passportConfig.splice(index + 1, 0, googleStrategyRequire); passportConfig.splice(index + 1, 0, googleStrategyRequire);
index = passportConfig.indexOf('passport.deserializeUser(function(id, done) {'); index = passportConfig.indexOf('passport.deserializeUser(function(id, done) {');
passportConfig.splice(index + 6, 0, googleStrategy); passportConfig.splice(index + 6, 0, googleStrategy);
fs.writeFileSync(passportConfigFile, passportConfig.join('\n')); fs.writeFileSync(passportConfigFile, passportConfig.join('\n'));
// views/account/login.jade (+) // Add Google to views/account/login.jade
loginTemplate.push(googleButton); loginTemplate.push(googleButton);
fs.writeFileSync(loginTemplateFile, loginTemplate.join('\n')); fs.writeFileSync(loginTemplateFile, loginTemplate.join('\n'));
// views/account/profile.jade (+) // Add Google to views/account/profile.jade
index = profileTemplate.indexOf(' h3 Linked Accounts'); index = profileTemplate.indexOf(' h3 Linked Accounts');
profileTemplate.splice(index + 1, 0, googleLinkUnlink); profileTemplate.splice(index + 1, 0, googleLinkUnlink);
fs.writeFileSync(profileTemplateFile, profileTemplate.join('\n')); fs.writeFileSync(profileTemplateFile, profileTemplate.join('\n'));
// models/User.js (+) // Add Google to models/User.js
index = userModel.indexOf(' tokens: Array,'); index = userModel.indexOf(' tokens: Array,');
userModel.splice(index - 1, 0, googleModel); userModel.splice(index - 1, 0, googleModel);
fs.writeFileSync(userModelFile, userModel.join('\n')); fs.writeFileSync(userModelFile, userModel.join('\n'));
// Add Google to app.js
index = app.indexOf(' * OAuth routes for sign-in.');
app.splice(index + 3, 0, googleRoutes);
fs.writeFileSync(appFile, app.join('\n'));
console.log('✓ Google authentication has been added.'.info); console.log('✓ Google authentication has been added.'.info);
} else { } else {
console.log('✓ Google authentication is already active.'.data); console.log('✓ Google authentication is already active.'.data);
} }
} else { } else {
// config/passport.js (-) // Remove Google from config/passport.js
index = passportConfig.indexOf(googleStrategyRequire); index = passportConfig.indexOf(googleStrategyRequire);
passportConfig.splice(index, 1); passportConfig.splice(index, 1);
index = passportConfig.indexOf('// Sign in with Google.'); index = passportConfig.indexOf('// Sign in with Google.');
passportConfig.splice(index, 46); passportConfig.splice(index, 46);
fs.writeFileSync(passportConfigFile, passportConfig.join('\n')); fs.writeFileSync(passportConfigFile, passportConfig.join('\n'));
// views/account/login.jade (-) // Remove Google from views/account/login.jade
index = loginTemplate.indexOf(" a.btn.btn-block.btn-google-plus.btn-social(href='/auth/google')"); index = loginTemplate.indexOf(" a.btn.btn-block.btn-google-plus.btn-social(href='/auth/google')");
loginTemplate.splice(index, 4); loginTemplate.splice(index, 4);
fs.writeFileSync(loginTemplateFile, loginTemplate.join('\n')); fs.writeFileSync(loginTemplateFile, loginTemplate.join('\n'));
// views/account/profile.jade (-) // Remove Google from views/account/profile.jade
index = profileTemplate.indexOf(' if user.google'); index = profileTemplate.indexOf(' if user.google');
profileTemplate.splice(index - 1, 5); profileTemplate.splice(index - 1, 5);
fs.writeFileSync(profileTemplateFile, profileTemplate.join('\n')); fs.writeFileSync(profileTemplateFile, profileTemplate.join('\n'));
// models/User.js (-) // Remove Google from models/User.js
index = userModel.indexOf(' google: String,'); index = userModel.indexOf(' google: String,');
userModel.splice(index, 1); userModel.splice(index, 1);
fs.writeFileSync(userModelFile, userModel.join('\n')); fs.writeFileSync(userModelFile, userModel.join('\n'));
// Remove Google from app.js
index = app.indexOf("app.get('/auth/google', passport.authenticate('google', { scope: 'profile email' }));");
app.splice(index, 4);
fs.writeFileSync(appFile, app.join('\n'));
console.log('✗ Google authentication has been removed.'.error); console.log('✗ Google authentication has been removed.'.error);
} }
if (_.contains(answer.auth, 'Twitter')) { ////////////////////////////
// Twitter Authentication //
////////////////////////////
var twitterRoutes = M(function() {
/***
app.get('/auth/twitter', passport.authenticate('twitter'));
app.get('/auth/twitter/callback', passport.authenticate('twitter', { failureRedirect: '/login' }), function(req, res) {
res.redirect(req.session.returnTo || '/');
});
***/
});
var twitterStrategyRequire = "var TwitterStrategy = require('passport-twitter').Strategy;"; var twitterStrategyRequire = "var TwitterStrategy = require('passport-twitter').Strategy;";
var twitterStrategy = M(function() { var twitterStrategy = M(function() {
/*** /***
@ -537,7 +570,6 @@ inquirer.prompt({
}); });
} }
}); });
} else { } else {
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);
@ -578,57 +610,68 @@ inquirer.prompt({
}); });
var twitterModel = ' twitter: String,'; var twitterModel = ' twitter: String,';
if (_.contains(answer.auth, 'Twitter')) {
if (passportConfig.indexOf(twitterStrategyRequire) < 0) { if (passportConfig.indexOf(twitterStrategyRequire) < 0) {
// config/passport.js (+) // config/passport.js
index = passportConfig.indexOf("var passport = require('passport');"); index = passportConfig.indexOf("var passport = require('passport');");
passportConfig.splice(index + 1, 0, twitterStrategyRequire); passportConfig.splice(index + 1, 0, twitterStrategyRequire);
index = passportConfig.indexOf('passport.deserializeUser(function(id, done) {'); index = passportConfig.indexOf('passport.deserializeUser(function(id, done) {');
passportConfig.splice(index + 6, 0, twitterStrategy); passportConfig.splice(index + 6, 0, twitterStrategy);
fs.writeFileSync(passportConfigFile, passportConfig.join('\n')); fs.writeFileSync(passportConfigFile, passportConfig.join('\n'));
// views/account/login.jade (+) // views/account/login.jade
loginTemplate.push(twitterButton); loginTemplate.push(twitterButton);
fs.writeFileSync(loginTemplateFile, loginTemplate.join('\n')); fs.writeFileSync(loginTemplateFile, loginTemplate.join('\n'));
// views/account/profile.jade (+) // views/account/profile.jade
index = profileTemplate.indexOf(' h3 Linked Accounts'); index = profileTemplate.indexOf(' h3 Linked Accounts');
profileTemplate.splice(index + 1, 0, twitterLinkUnlink); profileTemplate.splice(index + 1, 0, twitterLinkUnlink);
fs.writeFileSync(profileTemplateFile, profileTemplate.join('\n')); fs.writeFileSync(profileTemplateFile, profileTemplate.join('\n'));
// models/User.js (+) // models/User.js
index = userModel.indexOf(' tokens: Array,'); index = userModel.indexOf(' tokens: Array,');
userModel.splice(index - 1, 0, twitterModel); userModel.splice(index - 1, 0, twitterModel);
fs.writeFileSync(userModelFile, userModel.join('\n')); fs.writeFileSync(userModelFile, userModel.join('\n'));
// Add Twitter to app.js
index = app.indexOf(' * OAuth routes for sign-in.');
app.splice(index + 3, 0, twitterRoutes);
fs.writeFileSync(appFile, app.join('\n'));
console.log('✓ Twitter authentication has been added.'.info); console.log('✓ Twitter authentication has been added.'.info);
} else { } else {
console.log('✓ Twitter authentication is already active.'.data); console.log('✓ Twitter authentication is already active.'.data);
} }
} else { } else {
// config/passport.js (-) // Remove Twitter from config/passport.js
index = passportConfig.indexOf(twitterStrategyRequire); index = passportConfig.indexOf(twitterStrategyRequire);
passportConfig.splice(index, 1); passportConfig.splice(index, 1);
index = passportConfig.indexOf('// Sign in with Twitter.'); index = passportConfig.indexOf('// Sign in with Twitter.');
passportConfig.splice(index, 43); passportConfig.splice(index, 43);
fs.writeFileSync(passportConfigFile, passportConfig.join('\n')); fs.writeFileSync(passportConfigFile, passportConfig.join('\n'));
// views/account/login.jade (-) // Remove Twitter from views/account/login.jade
index = loginTemplate.indexOf(" a.btn.btn-block.btn-twitter.btn-social(href='/auth/twitter')"); index = loginTemplate.indexOf(" a.btn.btn-block.btn-twitter.btn-social(href='/auth/twitter')");
loginTemplate.splice(index, 4); loginTemplate.splice(index, 4);
fs.writeFileSync(loginTemplateFile, loginTemplate.join('\n')); fs.writeFileSync(loginTemplateFile, loginTemplate.join('\n'));
// views/account/profile.jade (-) // Remove Twitter from views/account/profile.jade
index = profileTemplate.indexOf(' if user.twitter'); index = profileTemplate.indexOf(' if user.twitter');
profileTemplate.splice(index - 1, 5); profileTemplate.splice(index - 1, 5);
fs.writeFileSync(profileTemplateFile, profileTemplate.join('\n')); fs.writeFileSync(profileTemplateFile, profileTemplate.join('\n'));
// models/User.js (-) // Remove Twitter from models/User.js
index = userModel.indexOf(' twitter: String,'); index = userModel.indexOf(' twitter: String,');
userModel.splice(index, 1); userModel.splice(index, 1);
fs.writeFileSync(userModelFile, userModel.join('\n')); fs.writeFileSync(userModelFile, userModel.join('\n'));
// Remove Twitter from app.js
index = app.indexOf("app.get('/auth/twitter', passport.authenticate('twitter'));");
app.splice(index, 4);
fs.writeFileSync(appFile, app.join('\n'));
console.log('✗ Twitter authentication has been removed.'.error); console.log('✗ Twitter authentication has been removed.'.error);
} }