From 12890edd14253e6c1019c91a9c5e73e5c8bfcdaa Mon Sep 17 00:00:00 2001
From: Jakob Ackermann <jakob.ackermann@overleaf.com>
Date: Wed, 6 Oct 2021 13:24:30 +0200
Subject: [PATCH] Merge pull request #5344 from
 overleaf/jpa-no-callback-literal

[web] fix eslint violations for node/no-callback-literal

GitOrigin-RevId: 8d6bb1398b3db2794bf1b2f97cd6d2886f2b4b0a
---
 services/web/.eslintrc                                   | 1 -
 services/web/app/src/Features/Exports/ExportsHandler.js  | 3 ++-
 .../src/Features/UserMembership/UserMembershipHandler.js | 9 ++++++---
 services/web/frontend/js/services/queued-http.js         | 4 ++--
 .../web/test/unit/src/FileStore/FileStoreHandlerTests.js | 8 ++++----
 5 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/services/web/.eslintrc b/services/web/.eslintrc
index 41b93292bf..4f8010324a 100644
--- a/services/web/.eslintrc
+++ b/services/web/.eslintrc
@@ -22,7 +22,6 @@
     // do not allow importing of implicit dependencies.
     "import/no-extraneous-dependencies": "error",
 
-    "node/no-callback-literal": "off",
     "node/no-deprecated-api": "off"
   },
   "overrides": [
diff --git a/services/web/app/src/Features/Exports/ExportsHandler.js b/services/web/app/src/Features/Exports/ExportsHandler.js
index f057e1d8ed..b39aa572d7 100644
--- a/services/web/app/src/Features/Exports/ExportsHandler.js
+++ b/services/web/app/src/Features/Exports/ExportsHandler.js
@@ -190,7 +190,8 @@ module.exports = ExportsHandler = self = {
             `v1 export returned failure; forwarding: ${body}`
           )
           // pass the v1 error along for the publish modal to handle
-          return callback({ forwardResponse: body })
+          const err = { forwardResponse: body }
+          return callback(err)
         }
       }
     )
diff --git a/services/web/app/src/Features/UserMembership/UserMembershipHandler.js b/services/web/app/src/Features/UserMembership/UserMembershipHandler.js
index 7c224dec61..80da3476ae 100644
--- a/services/web/app/src/Features/UserMembership/UserMembershipHandler.js
+++ b/services/web/app/src/Features/UserMembership/UserMembershipHandler.js
@@ -61,10 +61,12 @@ const UserMembershipHandler = {
         return callback(error)
       }
       if (!user) {
-        return callback({ userNotFound: true })
+        const err = { userNotFound: true }
+        return callback(err)
       }
       if (entity[attribute].some(managerId => managerId.equals(user._id))) {
-        return callback({ alreadyAdded: true })
+        error = { alreadyAdded: true }
+        return callback(error)
       }
 
       return addUserToEntity(entity, attribute, user, error =>
@@ -79,7 +81,8 @@ const UserMembershipHandler = {
     }
     const attribute = entityConfig.fields.write
     if (entity.admin_id != null ? entity.admin_id.equals(userId) : undefined) {
-      return callback({ isAdmin: true })
+      const error = { isAdmin: true }
+      return callback(error)
     }
     return removeUserFromEntity(entity, attribute, userId, callback)
   },
diff --git a/services/web/frontend/js/services/queued-http.js b/services/web/frontend/js/services/queued-http.js
index b00b22744a..fe6597abf3 100644
--- a/services/web/frontend/js/services/queued-http.js
+++ b/services/web/frontend/js/services/queued-http.js
@@ -59,10 +59,10 @@ export default App.factory('queuedHttp', function ($http, $q) {
     const doRequest = () =>
       $http(...Array.from(args || []))
         .then((...args) =>
-          Array.from(successCallbacks).map(cb => cb(...Array.from(args || [])))
+          Array.from(successCallbacks).map(fn => fn(...Array.from(args || [])))
         )
         .catch((...args) =>
-          Array.from(errorCallbacks).map(cb => cb(...Array.from(args || [])))
+          Array.from(errorCallbacks).map(fn => fn(...Array.from(args || [])))
         )
 
     pendingRequests.push(doRequest)
diff --git a/services/web/test/unit/src/FileStore/FileStoreHandlerTests.js b/services/web/test/unit/src/FileStore/FileStoreHandlerTests.js
index 2de3d545cf..5ed9b0f02f 100644
--- a/services/web/test/unit/src/FileStore/FileStoreHandlerTests.js
+++ b/services/web/test/unit/src/FileStore/FileStoreHandlerTests.js
@@ -21,9 +21,9 @@ describe('FileStoreHandler', function () {
     }
     this.writeStream = {
       my: 'writeStream',
-      on(type, cb) {
+      on(type, fn) {
         if (type === 'response') {
-          cb({ statusCode: 200 })
+          fn({ statusCode: 200 })
         }
       },
     }
@@ -200,9 +200,9 @@ describe('FileStoreHandler', function () {
 
     describe('when upload fails', function () {
       beforeEach(function () {
-        this.writeStream.on = function (type, cb) {
+        this.writeStream.on = function (type, fn) {
           if (type === 'response') {
-            cb({ statusCode: 500 })
+            fn({ statusCode: 500 })
           }
         }
       })