fixes for rich text menu updates and setting parameters on text doc vs within in RTF. Lots of lint cleanup.

1 files changed, 4 insertions, 4 deletions

diff --git a/src/server/authentication/DashUserModel.ts b/src/server/authentication/DashUserModel.ts
index 3bc21ecb6..a288bfeab 100644
--- a/src/server/authentication/DashUserModel.ts
+++ b/src/server/authentication/DashUserModel.ts
@@ -73,9 +73,9 @@ userSchema.pre('save', function save(next) {
             user.password,
             salt,
             () => {},
-            (err: mongoose.Error, hash: string) => {
-                if (err) {
-                    return next(err);
+            (cryptErr: mongoose.Error, hash: string) => {
+                if (cryptErr) {
+                    return next(cryptErr);
                 }
                 user.password = hash;
                 next();
@@ -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',