The merge conficts

This commit is contained in:
Belen Curcio
2017-05-15 17:13:48 -03:00
44 changed files with 868 additions and 469 deletions
@@ -15,6 +15,6 @@ module.exports = (router) => {
router.get('/api/v1/auth/facebook/callback', (req, res, next) => {
// Perform the facebook login flow and pass the data back through the opener.
passport.authenticate('facebook', HandleAuthPopupCallback(req, res, next))(req, res, next);
passport.authenticate('facebook', {session: false}, HandleAuthPopupCallback(req, res, next))(req, res, next);
});
};