merged with new version of master

1 files changed, 11 insertions, 11 deletions

diff --git a/src/server/authentication/DashUserModel.ts b/src/server/authentication/DashUserModel.ts
index dbb7a79ed..bfa6d7bdb 100644
--- a/src/server/authentication/DashUserModel.ts
+++ b/src/server/authentication/DashUserModel.ts
@@ -1,9 +1,8 @@
-//@ts-ignore
 import * as bcrypt from 'bcrypt-nodejs';
-//@ts-ignore
 import * as mongoose from 'mongoose';
 import { Utils } from '../../Utils';
 
+type comparePasswordFunction = (candidatePassword: string, cb: (err: any, isMatch: any) => void) => void;
 export type DashUserModel = mongoose.Document & {
     email: String;
     password: string;
@@ -26,8 +25,6 @@ export type DashUserModel = mongoose.Document & {
     comparePassword: comparePasswordFunction;
 };
 
-type comparePasswordFunction = (candidatePassword: string, cb: (err: any, isMatch: any) => void) => void;
-
 export type AuthToken = {
     accessToken: string;
     kind: string;
@@ -64,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();
     }
@@ -73,18 +70,21 @@ userSchema.pre('save', function save(next) {
             return next(err);
         }
         bcrypt.hash(
-            user.password,
+            user.password ?? '',
             salt,
-            () => void {},
-            (err: mongoose.Error, hash: string) => {
-                if (err) {
-                    return next(err);
+            () => {},
+            (cryptErr: mongoose.Error, hash: string) => {
+                if (cryptErr) {
+                    return next(cryptErr);
                 }
                 user.password = hash;
                 next();
+                return undefined;
             }
         );
+        return undefined;
     });
+    return undefined;
 });
 
 const comparePassword: comparePasswordFunction = function (this: DashUserModel, candidatePassword, cb) {
@@ -97,7 +97,7 @@ const comparePassword: comparePasswordFunction = function (this: DashUserModel,
 
 userSchema.methods.comparePassword = comparePassword;
 
-const User = mongoose.model('User', userSchema);
+const User: any = mongoose.model('User', userSchema);
 export function initializeGuest() {
     new User({
         email: 'guest',