Merge pull request #6259 from overleaf/jpa-cleanup-self

[web] ExportsHandler: replace usage of self with ExportsHandler

GitOrigin-RevId: aa895f955248bf791008afc0d3dfbd61be75f154

services/web/app/src/Features/Exports/ExportsHandler.js

@@ -13,7 +13,7 @@
  * DS207: Consider shorter variations of null checks
  * Full docs: https://github.com/decaffeinate/decaffeinate/blob/master/docs/suggestions.md
  */
-let ExportsHandler, self
+let ExportsHandler
 const OError = require('@overleaf/o-error')
 const ProjectGetter = require('../Project/ProjectGetter')
 const ProjectHistoryHandler = require('../Project/ProjectHistoryHandler')
@@ -27,264 +27,263 @@ let request = require('request')
 request = request.defaults()
 settings = require('@overleaf/settings')
 
-module.exports =
-  ExportsHandler =
-  self =
-    {
-      exportProject(export_params, callback) {
-        if (callback == null) {
-          callback = function () {}
-        }
-        return self._buildExport(export_params, function (err, export_data) {
-          if (err != null) {
-            return callback(err)
-          }
-          return self._requestExport(export_data, function (err, body) {
-            if (err != null) {
-              return callback(err)
-            }
-            export_data.v1_id = body.exportId
-            export_data.message = body.message
-            // TODO: possibly store the export data in Mongo
-            return callback(null, export_data)
-          })
-        })
-      },
-
-      _buildExport(export_params, callback) {
-        if (callback == null) {
-          callback = function () {}
-        }
-        const {
-          project_id,
-          user_id,
-          brand_variation_id,
-          title,
-          description,
-          author,
-          license,
-          show_source,
-        } = export_params
-        const jobs = {
-          project(cb) {
-            return ProjectGetter.getProject(project_id, cb)
-          },
-          // TODO: when we update async, signature will change from (cb, results) to (results, cb)
-          rootDoc: [
-            'project',
-            (cb, results) =>
-              ProjectRootDocManager.ensureRootDocumentIsValid(
-                project_id,
-                function (error) {
-                  if (error != null) {
-                    return callback(error)
-                  }
-                  return ProjectLocator.findRootDoc(
-                    { project: results.project, project_id },
-                    cb
-                  )
-                }
-              ),
-          ],
-          user(cb) {
-            return UserGetter.getUser(
-              user_id,
-              { first_name: 1, last_name: 1, email: 1, overleaf: 1 },
-              cb
-            )
-          },
-          historyVersion(cb) {
-            return ProjectHistoryHandler.ensureHistoryExistsForProject(
-              project_id,
-              function (error) {
-                if (error != null) {
-                  return callback(error)
-                }
-                return self._requestVersion(project_id, cb)
-              }
-            )
-          },
+module.exports = ExportsHandler = {
+  exportProject(export_params, callback) {
+    if (callback == null) {
+      callback = function () {}
+    }
+    return ExportsHandler._buildExport(
+      export_params,
+      function (err, export_data) {
+        if (err != null) {
+          return callback(err)
         }
-
-        return async.auto(jobs, function (err, results) {
+        return ExportsHandler._requestExport(export_data, function (err, body) {
           if (err != null) {
-            OError.tag(err, 'error building project export', {
-              project_id,
-              user_id,
-              brand_variation_id,
-            })
             return callback(err)
           }
-
-          const { project, rootDoc, user, historyVersion } = results
-          if (!rootDoc || rootDoc[1] == null) {
-            err = new OError('cannot export project without root doc', {
-              project_id,
-            })
-            return callback(err)
-          }
-
-          if (export_params.first_name && export_params.last_name) {
-            user.first_name = export_params.first_name
-            user.last_name = export_params.last_name
-          }
-
-          const export_data = {
-            project: {
-              id: project_id,
-              rootDocPath:
-                rootDoc[1] != null ? rootDoc[1].fileSystem : undefined,
-              historyId: __guard__(
-                project.overleaf != null ? project.overleaf.history : undefined,
-                x => x.id
-              ),
-              historyVersion,
-              v1ProjectId:
-                project.overleaf != null ? project.overleaf.id : undefined,
-              metadata: {
-                compiler: project.compiler,
-                imageName: project.imageName,
-                title,
-                description,
-                author,
-                license,
-                showSource: show_source,
-              },
-            },
-            user: {
-              id: user_id,
-              firstName: user.first_name,
-              lastName: user.last_name,
-              email: user.email,
-              orcidId: null, // until v2 gets ORCID
-              v1UserId: user.overleaf != null ? user.overleaf.id : undefined,
-            },
-            destination: {
-              brandVariationId: brand_variation_id,
-            },
-            options: {
-              callbackUrl: null,
-            }, // for now, until we want v1 to call us back
-          }
+          export_data.v1_id = body.exportId
+          export_data.message = body.message
+          // TODO: possibly store the export data in Mongo
           return callback(null, export_data)
         })
-      },
+      }
+    )
+  },
 
-      _requestExport(export_data, callback) {
-        if (callback == null) {
-          callback = function () {}
-        }
-        return request.post(
-          {
-            url: `${settings.apis.v1.url}/api/v1/sharelatex/exports`,
-            auth: { user: settings.apis.v1.user, pass: settings.apis.v1.pass },
-            json: export_data,
-          },
-          function (err, res, body) {
-            if (err != null) {
-              OError.tag(err, 'error making request to v1 export', {
-                export: export_data,
-              })
-              return callback(err)
-            } else if (res.statusCode >= 200 && res.statusCode < 300) {
-              return callback(null, body)
-            } else {
-              logger.warn(
-                { export: export_data },
-                `v1 export returned failure; forwarding: ${body}`
+  _buildExport(export_params, callback) {
+    if (callback == null) {
+      callback = function () {}
+    }
+    const {
+      project_id,
+      user_id,
+      brand_variation_id,
+      title,
+      description,
+      author,
+      license,
+      show_source,
+    } = export_params
+    const jobs = {
+      project(cb) {
+        return ProjectGetter.getProject(project_id, cb)
+      },
+      // TODO: when we update async, signature will change from (cb, results) to (results, cb)
+      rootDoc: [
+        'project',
+        (cb, results) =>
+          ProjectRootDocManager.ensureRootDocumentIsValid(
+            project_id,
+            function (error) {
+              if (error != null) {
+                return callback(error)
+              }
+              return ProjectLocator.findRootDoc(
+                { project: results.project, project_id },
+                cb
               )
-              // pass the v1 error along for the publish modal to handle
-              const err = { forwardResponse: body }
-              return callback(err)
             }
-          }
+          ),
+      ],
+      user(cb) {
+        return UserGetter.getUser(
+          user_id,
+          { first_name: 1, last_name: 1, email: 1, overleaf: 1 },
+          cb
         )
       },
-
-      _requestVersion(project_id, callback) {
-        if (callback == null) {
-          callback = function () {}
-        }
-        return request.get(
-          {
-            url: `${settings.apis.project_history.url}/project/${project_id}/version`,
-            json: true,
-          },
-          function (err, res, body) {
-            if (err != null) {
-              OError.tag(err, 'error making request to project history', {
-                project_id,
-              })
-              return callback(err)
-            } else if (res.statusCode >= 200 && res.statusCode < 300) {
-              return callback(null, body.version)
-            } else {
-              err = new OError(
-                `project history version returned a failure status code: ${res.statusCode}`,
-                { project_id }
-              )
-              return callback(err)
+      historyVersion(cb) {
+        return ProjectHistoryHandler.ensureHistoryExistsForProject(
+          project_id,
+          function (error) {
+            if (error != null) {
+              return callback(error)
             }
+            return ExportsHandler._requestVersion(project_id, cb)
           }
         )
       },
+    }
 
-      fetchExport(export_id, callback) {
-        if (callback == null) {
-          callback = function () {}
-        }
-        return request.get(
-          {
-            url: `${settings.apis.v1.url}/api/v1/sharelatex/exports/${export_id}`,
-            auth: { user: settings.apis.v1.user, pass: settings.apis.v1.pass },
+    return async.auto(jobs, function (err, results) {
+      if (err != null) {
+        OError.tag(err, 'error building project export', {
+          project_id,
+          user_id,
+          brand_variation_id,
+        })
+        return callback(err)
+      }
+
+      const { project, rootDoc, user, historyVersion } = results
+      if (!rootDoc || rootDoc[1] == null) {
+        err = new OError('cannot export project without root doc', {
+          project_id,
+        })
+        return callback(err)
+      }
+
+      if (export_params.first_name && export_params.last_name) {
+        user.first_name = export_params.first_name
+        user.last_name = export_params.last_name
+      }
+
+      const export_data = {
+        project: {
+          id: project_id,
+          rootDocPath: rootDoc[1] != null ? rootDoc[1].fileSystem : undefined,
+          historyId: __guard__(
+            project.overleaf != null ? project.overleaf.history : undefined,
+            x => x.id
+          ),
+          historyVersion,
+          v1ProjectId:
+            project.overleaf != null ? project.overleaf.id : undefined,
+          metadata: {
+            compiler: project.compiler,
+            imageName: project.imageName,
+            title,
+            description,
+            author,
+            license,
+            showSource: show_source,
           },
-          function (err, res, body) {
-            if (err != null) {
-              OError.tag(err, 'error making request to v1 export', {
-                export: export_id,
-              })
-              return callback(err)
-            } else if (res.statusCode >= 200 && res.statusCode < 300) {
-              return callback(null, body)
-            } else {
-              err = new OError(
-                `v1 export returned a failure status code: ${res.statusCode}`,
-                { export: export_id }
-              )
-              return callback(err)
-            }
-          }
-        )
+        },
+        user: {
+          id: user_id,
+          firstName: user.first_name,
+          lastName: user.last_name,
+          email: user.email,
+          orcidId: null, // until v2 gets ORCID
+          v1UserId: user.overleaf != null ? user.overleaf.id : undefined,
+        },
+        destination: {
+          brandVariationId: brand_variation_id,
+        },
+        options: {
+          callbackUrl: null,
+        }, // for now, until we want v1 to call us back
+      }
+      return callback(null, export_data)
+    })
+  },
+
+  _requestExport(export_data, callback) {
+    if (callback == null) {
+      callback = function () {}
+    }
+    return request.post(
+      {
+        url: `${settings.apis.v1.url}/api/v1/sharelatex/exports`,
+        auth: { user: settings.apis.v1.user, pass: settings.apis.v1.pass },
+        json: export_data,
       },
+      function (err, res, body) {
+        if (err != null) {
+          OError.tag(err, 'error making request to v1 export', {
+            export: export_data,
+          })
+          return callback(err)
+        } else if (res.statusCode >= 200 && res.statusCode < 300) {
+          return callback(null, body)
+        } else {
+          logger.warn(
+            { export: export_data },
+            `v1 export returned failure; forwarding: ${body}`
+          )
+          // pass the v1 error along for the publish modal to handle
+          const err = { forwardResponse: body }
+          return callback(err)
+        }
+      }
+    )
+  },
 
-      fetchDownload(export_id, type, callback) {
-        if (callback == null) {
-          callback = function () {}
+  _requestVersion(project_id, callback) {
+    if (callback == null) {
+      callback = function () {}
+    }
+    return request.get(
+      {
+        url: `${settings.apis.project_history.url}/project/${project_id}/version`,
+        json: true,
+      },
+      function (err, res, body) {
+        if (err != null) {
+          OError.tag(err, 'error making request to project history', {
+            project_id,
+          })
+          return callback(err)
+        } else if (res.statusCode >= 200 && res.statusCode < 300) {
+          return callback(null, body.version)
+        } else {
+          err = new OError(
+            `project history version returned a failure status code: ${res.statusCode}`,
+            { project_id }
+          )
+          return callback(err)
         }
-        return request.get(
-          {
-            url: `${settings.apis.v1.url}/api/v1/sharelatex/exports/${export_id}/${type}_url`,
-            auth: { user: settings.apis.v1.user, pass: settings.apis.v1.pass },
-          },
-          function (err, res, body) {
-            if (err != null) {
-              OError.tag(err, 'error making request to v1 export', {
-                export: export_id,
-              })
-              return callback(err)
-            } else if (res.statusCode >= 200 && res.statusCode < 300) {
-              return callback(null, body)
-            } else {
-              err = new OError(
-                `v1 export returned a failure status code: ${res.statusCode}`,
-                { export: export_id }
-              )
-              return callback(err)
-            }
-          }
-        )
+      }
+    )
+  },
+
+  fetchExport(export_id, callback) {
+    if (callback == null) {
+      callback = function () {}
+    }
+    return request.get(
+      {
+        url: `${settings.apis.v1.url}/api/v1/sharelatex/exports/${export_id}`,
+        auth: { user: settings.apis.v1.user, pass: settings.apis.v1.pass },
       },
+      function (err, res, body) {
+        if (err != null) {
+          OError.tag(err, 'error making request to v1 export', {
+            export: export_id,
+          })
+          return callback(err)
+        } else if (res.statusCode >= 200 && res.statusCode < 300) {
+          return callback(null, body)
+        } else {
+          err = new OError(
+            `v1 export returned a failure status code: ${res.statusCode}`,
+            { export: export_id }
+          )
+          return callback(err)
+        }
+      }
+    )
+  },
+
+  fetchDownload(export_id, type, callback) {
+    if (callback == null) {
+      callback = function () {}
     }
+    return request.get(
+      {
+        url: `${settings.apis.v1.url}/api/v1/sharelatex/exports/${export_id}/${type}_url`,
+        auth: { user: settings.apis.v1.user, pass: settings.apis.v1.pass },
+      },
+      function (err, res, body) {
+        if (err != null) {
+          OError.tag(err, 'error making request to v1 export', {
+            export: export_id,
+          })
+          return callback(err)
+        } else if (res.statusCode >= 200 && res.statusCode < 300) {
+          return callback(null, body)
+        } else {
+          err = new OError(
+            `v1 export returned a failure status code: ${res.statusCode}`,
+            { export: export_id }
+          )
+          return callback(err)
+        }
+      }
+    )
+  },
+}
 
 function __guard__(value, transform) {
   return typeof value !== 'undefined' && value !== null