diff options
Diffstat (limited to 'src/server/authentication')
| -rw-r--r-- | src/server/authentication/DashUserModel.ts | 4 | ||||
| -rw-r--r-- | src/server/authentication/Passport.ts | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/server/authentication/DashUserModel.ts b/src/server/authentication/DashUserModel.ts index a288bfeab..bfa6d7bdb 100644 --- a/src/server/authentication/DashUserModel.ts +++ b/src/server/authentication/DashUserModel.ts @@ -61,7 +61,7 @@ const userSchema = new mongoose.Schema( * Password hash middleware. */ userSchema.pre('save', function save(next) { - const user = this as any as DashUserModel; + const user = this; if (!user.isModified('password')) { return next(); } @@ -70,7 +70,7 @@ userSchema.pre('save', function save(next) { return next(err); } bcrypt.hash( - user.password, + user.password ?? '', salt, () => {}, (cryptErr: mongoose.Error, hash: string) => { diff --git a/src/server/authentication/Passport.ts b/src/server/authentication/Passport.ts index a5222e531..ca9e3058e 100644 --- a/src/server/authentication/Passport.ts +++ b/src/server/authentication/Passport.ts @@ -18,11 +18,11 @@ passport.deserializeUser<any, any>((id, done) => { passport.use( new LocalStrategy({ usernameField: 'email', passReqToCallback: true }, (req, email, password, done) => { User.findOne({ email: email.toLowerCase() }) - .then((user: any) => { + .then((user: DashUserModel) => { if (!user) { done(undefined, false, { message: 'Invalid email or password' }); // invalid email } else { - (user as any as DashUserModel).comparePassword(password, (error: Error, isMatch: boolean) => { + 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 |