fix(app): callback failed if mailcheck was enabled

polonel · Mar 5, 2019 · 1520ad5 · 1520ad5
1 parent 4a75aed
commit 1520ad5
Show file tree

Hide file tree

Showing 2 changed files with 44 additions and 26 deletions.
diff --git a/app.js b/app.js
@@ -158,16 +158,18 @@ function launchServer (db) {
           settingSchema.getSetting('mailer:check:enable', function (err, mailCheckEnabled) {
             if (err) {
               winston.warn(err)
-              return next()
+              return next(err)
             }
 
             if (mailCheckEnabled && mailCheckEnabled.value) {
               settingSchema.getSettings(function (err, settings) {
-                if (err) return next()
+                if (err) return next(err)
 
                 var mailCheck = require('./src/mailer/mailCheck')
                 winston.debug('Starting MailCheck...')
                 mailCheck.init(settings)
+
+                return next()
               })
             } else {
               return next()
@@ -256,7 +258,9 @@ function launchServer (db) {
           return next()
         }
       ],
-      function () {
+      function (err) {
+        if (err) throw new Error(err)
+
         ws.listen(function () {
           winston.info('trudesk Ready')
         })

diff --git a/src/migration/index.js b/src/migration/index.js
@@ -54,6 +54,7 @@ function saveVersion (callback) {
         }
 
         if (_.isFunction(callback)) return callback()
+        return true
       })
     }
   })
@@ -69,25 +70,30 @@ function getDatabaseVersion (callback) {
 }
 
 function migrateUserRoles (callback) {
-  winston.verbose('Migrating Roles...')
+  winston.debug('Migrating Roles...')
   async.waterfall(
     [
       function (next) {
         roleSchema.getRoles(next)
       },
       function (roles, next) {
         var adminRole = _.find(roles, { normalized: 'admin' })
-        userSchema.collection.updateMany({ role: 'admin' }, { $set: { role: adminRole._id } }).then(function (res) {
-          if (res && res.result) {
-            if (res.result.ok === 1) return next(null, roles)
-            else {
-              winston.warn(res.message)
-              return next(res.message)
+        userSchema.collection
+          .updateMany({ role: 'admin' }, { $set: { role: adminRole._id } })
+          .then(function (res) {
+            if (res && res.result) {
+              if (res.result.ok === 1) return next(null, roles)
+              else {
+                winston.warn(res.message)
+                return next(res.message)
+              }
+            } else {
+              return next('Unknown Error Occurred')
             }
-          } else {
-            return next('Unknown Error Occurred')
-          }
-        })
+          })
+          .catch(function (err) {
+            return next(err)
+          })
       },
       function (roles, next) {
         var supportRole = _.find(roles, { normalized: 'support' })
@@ -104,20 +110,28 @@ function migrateUserRoles (callback) {
               return next('Unknown Error Occurred')
             }
           })
+          .catch(function (err) {
+            return next(err)
+          })
       },
       function (roles, next) {
         var userRole = _.find(roles, { normalized: 'user' })
-        userSchema.collection.updateMany({ role: 'user' }, { $set: { role: userRole._id } }).then(function (res) {
-          if (res && res.result) {
-            if (res.result.ok === 1) return next(null, roles)
-            else {
-              winston.warn(res.message)
-              return next(res.message)
+        userSchema.collection
+          .updateMany({ role: 'user' }, { $set: { role: userRole._id } })
+          .then(function (res) {
+            if (res && res.result) {
+              if (res.result.ok === 1) return next(null, roles)
+              else {
+                winston.warn(res.message)
+                return next(res.message)
+              }
+            } else {
+              return next('Unknown Error Occurred')
             }
-          } else {
-            return next('Unknown Error Occurred')
-          }
-        })
+          })
+          .catch(function (err) {
+            return next(err)
+          })
       }
     ],
     callback
@@ -130,7 +144,7 @@ migrations.run = function (callback) {
       function (next) {
         getDatabaseVersion(function (err, dbVer) {
           if (err) return next(err)
-          if (semver.satisfies(dbVer, '1.0.6')) migrateUserRoles(next)
+          if (semver.satisfies(dbVer, '1.0.6')) return migrateUserRoles(next)
 
           return next()
         })
@@ -140,7 +154,7 @@ migrations.run = function (callback) {
       if (err) return callback(err)
 
       //  Update DB Version Num
-      saveVersion(callback)
+      return saveVersion(callback)
     }
   )
 }