add passport stuff back

Because Berkeley really needs to wait for his coffee to kick in before
commiting anything...

package.json

@@ -64,9 +64,17 @@
     "lusca": "~1.0.2",
     "method-override": "~2.3.0",
     "moment": "~2.10.2",
+    "mongodb": "^2.0.33",
     "morgan": "~1.5.0",
     "node-slack": "0.0.7",
     "nodemailer": "~1.3.0",
+    "passport-facebook": "^2.0.0",
+    "passport-google-oauth": "^0.2.0",
+    "passport-google-oauth2": "^0.1.6",
+    "passport-linkedin-oauth2": "^1.2.1",
+    "passport-local": "^1.0.0",
+    "passport-oauth": "^1.0.0",
+    "passport-twitter": "^1.0.3",
     "ramda": "~0.10.0",
     "request": "~2.53.0",
     "rx": "^2.5.3",

server/boot/passport.js

@@ -1,3 +1,4 @@
+/*
 var passport = require('passport'),
     passportConf = require('../../config/passport');
 
@@ -67,3 +68,4 @@ module.exports = function(app) {
 
   app.use(router);
 };
+*/

server/boot/user.js

@@ -3,7 +3,6 @@ var _ = require('lodash'),
   async = require('async'),
   crypto = require('crypto'),
   nodemailer = require('nodemailer'),
-  passport = require('passport'),
   moment = require('moment'),
   debug = require('debug')('freecc:cntr:userController'),
 
@@ -22,7 +21,7 @@ module.exports = function(app) {
     res.redirect(301, '/signout');
   });
   router.get('/signin', getSignin);
-  router.post('/signin', postSignin);
+  // router.post('/signin', postSignin);
   router.get('/signout', signout);
   router.get('/forgot', getForgot);
   router.post('/forgot', postForgot);
@@ -31,7 +30,7 @@ module.exports = function(app) {
   router.get('/email-signup', getEmailSignup);
   router.get('/email-signin', getEmailSignin);
   router.post('/email-signup', postEmailSignup);
-  router.post('/email-signin', postSignin);
+  // router.post('/email-signin', postSignin);
   router.get('/account/api', getAccountAngular);
   router.get('/api/checkUniqueUsername/:username', checkUniqueUsername);
   router.get('/api/checkExistingUsername/:username', checkExistingUsername);
@@ -65,6 +64,8 @@ module.exports = function(app) {
   * Sign in using email and password.
   */
 
+ /*
+  * TODO(berks): this should be done using loopback
   function postSignin (req, res, next) {
     req.assert('email', 'Email is not valid').isEmail();
     req.assert('password', 'Password cannot be blank').notEmpty();
@@ -99,6 +100,7 @@ module.exports = function(app) {
       });
     })(req, res, next);
   }
+  */
 
   /**
   * GET /signout

server/passport-providers.js

@@ -38,33 +38,6 @@ module.exports = {
     link: true,
     failureFlash: true
   },
-  'github-login': {
-    provider: 'github',
-    module: 'passport-github',
-    clientID: process.env.GITHUB_ID,
-    clientSecret: process.env.GITHUB_SECRET,
-    authPath: '/auth/github',
-    callbackURL: '/auth/github/callback',
-    callbackPath: '/auth/github/callback',
-    successRedirect: successRedirect,
-    failureRedirect: failureRedirect,
-    scope: ['email'],
-    failureFlash: true
-  },
-  'github-link': {
-    provider: 'github',
-    module: 'passport-github',
-    clientID: process.env.GITHUB_ID,
-    clientSecret: process.env.GITHUB_SECRET,
-    authPath: '/link/github',
-    callbackURL: '/link/github/callback',
-    callbackPath: '/link/github/callback',
-    successRedirect: successRedirect,
-    failureRedirect: failureRedirect,
-    scope: ['email', 'user_likes'],
-    link: true,
-    failureFlash: true
-  },
   'google-login': {
     provider: 'google',
     module: 'passport-google-oauth2',

server/server.js

@@ -24,7 +24,6 @@ var R = require('ramda'),
     MongoStore = require('connect-mongo')(session),
     flash = require('express-flash'),
     path = require('path'),
-    passport = require('passport'),
     expressValidator = require('express-validator'),
     forceDomain = require('forcedomain'),
     lessMiddleware = require('less-middleware'),
@@ -76,8 +75,7 @@ app.use(session({
     'autoReconnect': true
   })
 }));
-app.use(passport.initialize());
+
-app.use(passport.session());
 app.use(flash());
 app.disable('x-powered-by');