aboutsummaryrefslogtreecommitdiff
path: root/routes
diff options
context:
space:
mode:
authornanalelfe <nargiza.nosirova@mail.utoronto.ca>2016-08-14 10:13:55 +0000
committernanalelfe <nargiza.nosirova@mail.utoronto.ca>2016-08-14 10:13:55 +0000
commita532390f81e35f611fd02ad3d543f4d52217ca3c (patch)
tree7bebb4f5614afb82c3103b6e9730a62f0b97a42d /routes
parentef2674cfe13d2c425c5a3b312244c46f2531979d (diff)
Fixed signin and signup
Diffstat (limited to 'routes')
-rw-r--r--routes/admin.js4
-rw-r--r--routes/index.js4
-rw-r--r--routes/user.js4
3 files changed, 6 insertions, 6 deletions
diff --git a/routes/admin.js b/routes/admin.js
index 6518aef..68bb456 100644
--- a/routes/admin.js
+++ b/routes/admin.js
@@ -125,7 +125,7 @@ router.post('/add/course', function(req,res){
req.sanitize('title').escape();
req.sanitize('title').trim();
- req.check('title','Invalid title').isAlpha();
+ //req.check('title','Invalid title');
var errors = req.validationErrors();
@@ -262,7 +262,7 @@ router.post('/remove/user', function(req,res){
req.sanitize('username').escape();
req.check('username','Invalid user name format').notEmpty();
- var errors = validationErrors();
+ var errors = req.validationErrors();
if (errors){
req.session.errors = errors;
req.session.success = false;
diff --git a/routes/index.js b/routes/index.js
index b2a90dc..c87ced9 100644
--- a/routes/index.js
+++ b/routes/index.js
@@ -271,7 +271,7 @@ router.get('/solutions/:exam_id/:q_num', function (req, res) {
/** Redirect the user to Facebook for authentication. When complete,
Facebook will redirect the user back to the application at
/auth/facebook/callback */
-router.get('/auth/facebook', passport.authenticate('facebook'));
+router.get('/auth/facebook', passport.authenticate('facebook', { scope: ['email']}));
/** Facebook will redirect the user to this URL after approval. Finish the
authentication process by attempting to obtain an access token. If
@@ -280,7 +280,7 @@ router.get('/auth/facebook', passport.authenticate('facebook'));
router.get('/auth/facebook/callback',
passport.authenticate('facebook', {
successRedirect: '/user/user_profile',
- failureRedirect: '/user/logout' }));
+ failureRedirect: '/user/signin' }));
diff --git a/routes/user.js b/routes/user.js
index 8f73f21..56b5321 100644
--- a/routes/user.js
+++ b/routes/user.js
@@ -190,7 +190,7 @@ router.post('/signup', loggedOut, function(req, res, next) {
res.redirect('/user/signup');
} else {
passport.authenticate('local_signup', {
- successRedirect: '/user/verify',
+ successRedirect: '/user/user_profile',
failureRedirect: '/user/signup/failed',
failureFlash: true
})(req, res);
@@ -210,7 +210,7 @@ router.post('/signin', loggedOut, function(req, res, next) {
res.redirect('/signin');
} else {
passport.authenticate('local_signin', {
- successRedirect: '/user/verify',
+ successRedirect: '/user/user_profile',
failureRedirect: '/user/signin',
failureFlash: true
})(req, res);