Merge pull request #11995 from overleaf/em-unnecessary-returns

Decaf cleanup: unnecessary returns

GitOrigin-RevId: e3c006b0e15095c8cbed2911269f704a7fdd1d57

services/web/modules/launchpad/app/src/LaunchpadController.js

@@ -7,7 +7,6 @@
 // Fix any style issues and re-enable lint.
 /*
  * decaffeinate suggestions:
- * DS102: Remove unnecessary code created because of implicit returns
  * DS207: Consider shorter variations of null checks
  * Full docs: https://github.com/decaffeinate/decaffeinate/blob/master/docs/suggestions.md
  */
@@ -46,25 +45,22 @@ module.exports = LaunchpadController = {
     //   * how does all this work with ldap and saml?
     const sessionUser = SessionManager.getSessionUser(req.session)
     const authMethod = LaunchpadController._getAuthMethod()
-    return LaunchpadController._atLeastOneAdminExists(function (
-      err,
-      adminUserExists
-    ) {
+    LaunchpadController._atLeastOneAdminExists(function (err, adminUserExists) {
       if (err != null) {
         return next(err)
       }
       if (!sessionUser) {
         if (!adminUserExists) {
-          return res.render(Path.resolve(__dirname, '../views/launchpad'), {
+          res.render(Path.resolve(__dirname, '../views/launchpad'), {
             adminUserExists,
             authMethod,
           })
         } else {
           AuthenticationController.setRedirectInSession(req)
-          return res.redirect('/login')
+          res.redirect('/login')
         }
       } else {
-        return UserGetter.getUser(
+        UserGetter.getUser(
           sessionUser._id,
           { isAdmin: 1 },
           function (err, user) {
@@ -72,13 +68,13 @@ module.exports = LaunchpadController = {
               return next(err)
             }
             if (hasAdminAccess(user)) {
-              return res.render(Path.resolve(__dirname, '../views/launchpad'), {
+              res.render(Path.resolve(__dirname, '../views/launchpad'), {
                 wsUrl: Settings.wsUrl,
                 adminUserExists,
                 authMethod,
               })
             } else {
-              return res.redirect('/restricted')
+              res.redirect('/restricted')
             }
           }
         )
@@ -90,14 +86,14 @@ module.exports = LaunchpadController = {
     if (callback == null) {
       callback = function () {}
     }
-    return UserGetter.getUser(
+    UserGetter.getUser(
       { isAdmin: true },
       { _id: 1, isAdmin: 1 },
       function (err, user) {
         if (err != null) {
           return callback(err)
         }
-        return callback(null, user != null)
+        callback(null, user != null)
       }
     )
   },
@@ -112,7 +108,7 @@ module.exports = LaunchpadController = {
     }
     logger.debug({ email }, 'sending test email')
     const emailOptions = { to: email }
-    return EmailHandler.sendEmail('testEmail', emailOptions, function (err) {
+    EmailHandler.sendEmail('testEmail', emailOptions, function (err) {
       if (err != null) {
         OError.tag(err, 'error sending test email', {
           email,
@@ -140,7 +136,7 @@ module.exports = LaunchpadController = {
       }
 
       logger.debug({ email }, 'attempted register first admin user')
-      return LaunchpadController._atLeastOneAdminExists(function (err, exists) {
+      LaunchpadController._atLeastOneAdminExists(function (err, exists) {
         if (err != null) {
           return next(err)
         }
@@ -164,42 +160,39 @@ module.exports = LaunchpadController = {
           'creating admin account for specified external-auth user'
         )
 
-        return UserRegistrationHandler.registerNewUser(
-          body,
-          function (err, user) {
-            if (err != null) {
-              OError.tag(err, 'error with registerNewUser', {
-                email,
-                authMethod,
-              })
-              return next(err)
-            }
-
-            return User.updateOne(
-              { _id: user._id },
-              {
-                $set: { isAdmin: true },
-                emails: [{ email }],
-              },
-              function (err) {
-                if (err != null) {
-                  OError.tag(err, 'error setting user to admin', {
-                    user_id: user._id,
-                  })
-                  return next(err)
-                }
-
-                AuthenticationController.setRedirectInSession(req, '/launchpad')
-                logger.debug(
-                  { email, user_id: user._id, authMethod },
-                  'created first admin account'
-                )
-
-                return res.json({ redir: '/launchpad', email })
-              }
-            )
+        UserRegistrationHandler.registerNewUser(body, function (err, user) {
+          if (err != null) {
+            OError.tag(err, 'error with registerNewUser', {
+              email,
+              authMethod,
+            })
+            return next(err)
           }
-        )
+
+          User.updateOne(
+            { _id: user._id },
+            {
+              $set: { isAdmin: true },
+              emails: [{ email }],
+            },
+            function (err) {
+              if (err != null) {
+                OError.tag(err, 'error setting user to admin', {
+                  user_id: user._id,
+                })
+                return next(err)
+              }
+
+              AuthenticationController.setRedirectInSession(req, '/launchpad')
+              logger.debug(
+                { email, user_id: user._id, authMethod },
+                'created first admin account'
+              )
+
+              res.json({ redir: '/launchpad', email })
+            }
+          )
+        })
       })
     }
   },
@@ -213,7 +206,7 @@ module.exports = LaunchpadController = {
     }
 
     logger.debug({ email }, 'attempted register first admin user')
-    return LaunchpadController._atLeastOneAdminExists(function (err, exists) {
+    LaunchpadController._atLeastOneAdminExists(function (err, exists) {
       if (err != null) {
         return next(err)
       }
@@ -246,39 +239,36 @@ module.exports = LaunchpadController = {
       }
 
       const body = { email, password }
-      return UserRegistrationHandler.registerNewUser(
-        body,
-        function (err, user) {
-          if (err != null) {
-            return next(err)
-          }
-
-          logger.debug({ user_id: user._id }, 'making user an admin')
-          User.updateOne(
-            { _id: user._id },
-            {
-              $set: {
-                isAdmin: true,
-                emails: [{ email }],
-              },
-            },
-            function (err) {
-              if (err != null) {
-                OError.tag(err, 'error setting user to admin', {
-                  user_id: user._id,
-                })
-                return next(err)
-              }
-
-              logger.debug(
-                { email, user_id: user._id },
-                'created first admin account'
-              )
-              res.json({ redir: '/launchpad' })
-            }
-          )
+      UserRegistrationHandler.registerNewUser(body, function (err, user) {
+        if (err != null) {
+          return next(err)
         }
-      )
+
+        logger.debug({ user_id: user._id }, 'making user an admin')
+        User.updateOne(
+          { _id: user._id },
+          {
+            $set: {
+              isAdmin: true,
+              emails: [{ email }],
+            },
+          },
+          function (err) {
+            if (err != null) {
+              OError.tag(err, 'error setting user to admin', {
+                user_id: user._id,
+              })
+              return next(err)
+            }
+
+            logger.debug(
+              { email, user_id: user._id },
+              'created first admin account'
+            )
+            res.json({ redir: '/launchpad' })
+          }
+        )
+      })
     })
   },
 }