aboutsummaryrefslogtreecommitdiff
path: root/src/server/authentication
diff options
context:
space:
mode:
authormadelinegr <laura_wilson@brown.edu>2019-02-18 20:31:57 -0500
committermadelinegr <laura_wilson@brown.edu>2019-02-18 20:31:57 -0500
commit0bf7b0764bc49fdd40e775f4a5ee6bfac056bc79 (patch)
treee13272af751b33648b9842aa2ddcdf3a30ea1819 /src/server/authentication
parent6fd2cec91efd6672a70e15a786954f92c1d23416 (diff)
merged with server
Diffstat (limited to 'src/server/authentication')
-rw-r--r--src/server/authentication/config/passport.ts2
-rw-r--r--src/server/authentication/controllers/user.ts2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/server/authentication/config/passport.ts b/src/server/authentication/config/passport.ts
index 05f6c3133..9f1303135 100644
--- a/src/server/authentication/config/passport.ts
+++ b/src/server/authentication/config/passport.ts
@@ -18,7 +18,7 @@ passport.deserializeUser<any, any>((id, done) => {
});
// AUTHENTICATE JUST WITH EMAIL AND PASSWORD
-passport.use(new LocalStrategy({ usernameField: 'email' }, (email, password, done) => {
+passport.use(new LocalStrategy({ usernameField: 'email', passReqToCallback: true }, (req, email, password, done) => {
User.findOne({ email: email.toLowerCase() }, (error: any, user: any) => {
if (error) return done(error);
if (!user) return done(undefined, false, { message: "Invalid email or password" }) // invalid email
diff --git a/src/server/authentication/controllers/user.ts b/src/server/authentication/controllers/user.ts
index 03ebbe0d4..c75eaab3c 100644
--- a/src/server/authentication/controllers/user.ts
+++ b/src/server/authentication/controllers/user.ts
@@ -31,6 +31,8 @@ export let postSignup = (req: Request, res: Response, next: NextFunction) => {
req.assert("confirmPassword", "Passwords do not match").equals(req.body.password);
req.sanitize("email").normalizeEmail({ gmail_remove_dots: false });
+ req.flash("Working on something!!!");
+
const errors = req.validationErrors();
if (errors) {