Merge branch 'nathan-starter' of https://github.com/brown-dash/Dash-Web into nathan-starter

1 files changed, 14 insertions, 11 deletions

diff --git a/src/server/authentication/Passport.ts b/src/server/authentication/Passport.ts
index a9cf6698b..ca9e3058e 100644
--- a/src/server/authentication/Passport.ts
+++ b/src/server/authentication/Passport.ts
@@ -1,6 +1,6 @@
 import * as passport from 'passport';
 import * as passportLocal from 'passport-local';
-import { DashUserModel, default as User } from './DashUserModel';
+import User, { DashUserModel } from './DashUserModel';
 
 const LocalStrategy = passportLocal.Strategy;
 
@@ -11,22 +11,25 @@ passport.serializeUser<any, any>((req, user, done) => {
 passport.deserializeUser<any, any>((id, done) => {
     User.findById(id)
         .exec()
-        .then(user => done(undefined, user));
+        .then((user: any) => done(undefined, user));
 });
 
 // AUTHENTICATE JUST WITH EMAIL AND PASSWORD
 passport.use(
     new LocalStrategy({ usernameField: 'email', passReqToCallback: true }, (req, email, password, done) => {
         User.findOne({ email: email.toLowerCase() })
-            .then(user => {
-                if (!user) return done(undefined, false, { message: 'Invalid email or password' }); // invalid email
-                (user as any as DashUserModel).comparePassword(password, (error: Error, isMatch: boolean) => {
-                    if (error) return done(error);
-                    if (!isMatch) return done(undefined, false, { message: 'Invalid email or password' }); // invalid password
-                    // valid authentication HERE
-                    return done(undefined, user);
-                });
+            .then((user: DashUserModel) => {
+                if (!user) {
+                    done(undefined, false, { message: 'Invalid email or password' }); // invalid email
+                } else {
+                    user.comparePassword(password, (error: Error, isMatch: boolean) => {
+                        if (error) return done(error);
+                        if (!isMatch) return done(undefined, false, { message: 'Invalid email or password' }); // invalid password
+                        // valid authentication HERE
+                        return done(undefined, user);
+                    });
+                }
             })
-            .catch(error => done(error));
+            .catch((error: any) => done(error));
     })
 );