Merge branch 'dev'

clintonwoo · clintonwoo · commit 7d98592d4adc · 2017-10-04T13:26:04.000-04:00
diff --git a/src/server.js b/src/server.js
@@ -51,7 +51,7 @@ app.prepare()
         if (!user) {
           return done(null, false, { message: 'Incorrect username.' });
         }
-        if (!User.validPassword(username, password)) {
+        if (!(await User.validPassword(username, password))) {
           return done(null, false, { message: 'Incorrect password.' });
         }
         return done(null, user);

Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ app.prepare()`
`51`	`51`	`if (!user) {`
`52`	`52`	`return done(null, false, { message: 'Incorrect username.' });`
`53`	`53`	`}`
`54`		`- if (!User.validPassword(username, password)) {`
	`54`	`+ if (!(await User.validPassword(username, password))) {`
`55`	`55`	`return done(null, false, { message: 'Incorrect password.' });`
`56`	`56`	`}`
`57`	`57`	`return done(null, user);`