Merge pull request #2164 from overleaf/em-ownership-transfer

Project ownership transfer backend endpoint

GitOrigin-RevId: b7d267f2c105e8f51d5013289ac4afeb077c1e21

services/web/app/src/Features/Errors/Errors.js

@@ -111,6 +111,33 @@ class SubscriptionAdminDeletionError extends OError {
   }
 }
 
+class ProjectNotFoundError extends OError {
+  constructor(options) {
+    super({
+      message: 'project not found',
+      ...options
+    })
+  }
+}
+
+class UserNotFoundError extends OError {
+  constructor(options) {
+    super({
+      message: 'user not found',
+      ...options
+    })
+  }
+}
+
+class UserNotCollaboratorError extends OError {
+  constructor(options) {
+    super({
+      message: 'user not a collaborator',
+      ...options
+    })
+  }
+}
+
 module.exports = {
   OError,
   BackwardCompatibleError,
@@ -134,5 +161,8 @@ module.exports = {
   SLInV2Error,
   ThirdPartyIdentityExistsError,
   ThirdPartyUserNotFoundError,
-  SubscriptionAdminDeletionError
+  SubscriptionAdminDeletionError,
+  ProjectNotFoundError,
+  UserNotFoundError,
+  UserNotCollaboratorError
 }

services/web/app/src/Features/Project/ProjectController.js

@@ -1,28 +1,16 @@
-/* eslint-disable
-    camelcase,
-    handle-callback-err,
-    max-len,
-    no-path-concat,
-    no-unused-vars,
-*/
-// TODO: This file was created by bulk-decaffeinate.
-// Fix any style issues and re-enable lint.
-/*
- * decaffeinate suggestions:
- * DS101: Remove unnecessary use of Array.from
- * DS102: Remove unnecessary code created because of implicit returns
- * DS103: Rewrite code to no longer use __guard__
- * DS205: Consider reworking code to avoid use of IIFEs
- * DS207: Consider shorter variations of null checks
- * Full docs: https://github.com/decaffeinate/decaffeinate/blob/master/docs/suggestions.md
- */
-let generateThemeList, ProjectController
+const Path = require('path')
+const fs = require('fs')
+const crypto = require('crypto')
 const async = require('async')
 const logger = require('logger-sharelatex')
-const projectDeleter = require('./ProjectDeleter')
-const projectDuplicator = require('./ProjectDuplicator')
-const projectCreationHandler = require('./ProjectCreationHandler')
-const editorController = require('../Editor/EditorController')
+const HttpErrors = require('@overleaf/o-error/http')
+const { ObjectId } = require('mongodb')
+const Errors = require('../Errors/Errors')
+const ProjectDeleter = require('./ProjectDeleter')
+const ProjectDuplicator = require('./ProjectDuplicator')
+const ProjectCreationHandler = require('./ProjectCreationHandler')
+const ProjectDetailsHandler = require('./ProjectDetailsHandler')
+const EditorController = require('../Editor/EditorController')
 const ProjectHelper = require('./ProjectHelper')
 const metrics = require('metrics-sharelatex')
 const { User } = require('../../models/User')
@@ -30,17 +18,14 @@ const TagsHandler = require('../Tags/TagsHandler')
 const SubscriptionLocator = require('../Subscription/SubscriptionLocator')
 const NotificationsHandler = require('../Notifications/NotificationsHandler')
 const LimitationsManager = require('../Subscription/LimitationsManager')
-const underscore = require('underscore')
 const Settings = require('settings-sharelatex')
 const AuthorizationManager = require('../Authorization/AuthorizationManager')
-const fs = require('fs')
 const InactiveProjectManager = require('../InactiveData/InactiveProjectManager')
 const ProjectUpdateHandler = require('./ProjectUpdateHandler')
 const ProjectGetter = require('./ProjectGetter')
 const PrivilegeLevels = require('../Authorization/PrivilegeLevels')
 const AuthenticationController = require('../Authentication/AuthenticationController')
 const PackageVersions = require('../../infrastructure/PackageVersions')
-const AnalyticsManager = require('../Analytics/AnalyticsManager')
 const Sources = require('../Authorization/Sources')
 const TokenAccessHandler = require('../TokenAccess/TokenAccessHandler')
 const CollaboratorsHandler = require('../Collaborators/CollaboratorsHandler')
@@ -48,7 +33,6 @@ const Modules = require('../../infrastructure/Modules')
 const ProjectEntityHandler = require('./ProjectEntityHandler')
 const UserGetter = require('../User/UserGetter')
 const NotificationsBuilder = require('../Notifications/NotificationsBuilder')
-const crypto = require('crypto')
 const { V1ConnectionError } = require('../Errors/Errors')
 const Features = require('../../infrastructure/Features')
 const BrandVariationsHandler = require('../BrandVariations/BrandVariationsHandler')
@@ -56,7 +40,7 @@ const { getUserAffiliations } = require('../Institutions/InstitutionsAPI')
 const V1Handler = require('../V1/V1Handler')
 const { Project } = require('../../models/Project')
 
-module.exports = ProjectController = {
+const ProjectController = {
   _isInPercentageRollout(rolloutName, objectId, percentage) {
     if (Settings.bypassPercentageRollouts === true) {
       return true
@@ -71,32 +55,32 @@ module.exports = ProjectController = {
   },
 
   updateProjectSettings(req, res, next) {
-    const project_id = req.params.Project_id
+    const projectId = req.params.Project_id
 
     const jobs = []
 
     if (req.body.compiler != null) {
       jobs.push(callback =>
-        editorController.setCompiler(project_id, req.body.compiler, callback)
+        EditorController.setCompiler(projectId, req.body.compiler, callback)
       )
     }
 
     if (req.body.imageName != null) {
       jobs.push(callback =>
-        editorController.setImageName(project_id, req.body.imageName, callback)
+        EditorController.setImageName(projectId, req.body.imageName, callback)
       )
     }
 
     if (req.body.name != null) {
       jobs.push(callback =>
-        editorController.renameProject(project_id, req.body.name, callback)
+        EditorController.renameProject(projectId, req.body.name, callback)
       )
     }
 
     if (req.body.spellCheckLanguage != null) {
       jobs.push(callback =>
-        editorController.setSpellCheckLanguage(
-          project_id,
+        EditorController.setSpellCheckLanguage(
+          projectId,
           req.body.spellCheckLanguage,
           callback
         )
@@ -105,61 +89,61 @@ module.exports = ProjectController = {
 
     if (req.body.rootDocId != null) {
       jobs.push(callback =>
-        editorController.setRootDoc(project_id, req.body.rootDocId, callback)
+        EditorController.setRootDoc(projectId, req.body.rootDocId, callback)
       )
     }
 
-    return async.series(jobs, function(error) {
+    async.series(jobs, error => {
       if (error != null) {
         return next(error)
       }
-      return res.sendStatus(204)
+      res.sendStatus(204)
     })
   },
 
   updateProjectAdminSettings(req, res, next) {
-    const project_id = req.params.Project_id
+    const projectId = req.params.Project_id
 
     const jobs = []
     if (req.body.publicAccessLevel != null) {
       jobs.push(callback =>
-        editorController.setPublicAccessLevel(
-          project_id,
+        EditorController.setPublicAccessLevel(
+          projectId,
           req.body.publicAccessLevel,
           callback
         )
       )
     }
 
-    return async.series(jobs, function(error) {
+    async.series(jobs, error => {
       if (error != null) {
         return next(error)
       }
-      return res.sendStatus(204)
+      res.sendStatus(204)
     })
   },
 
   deleteProject(req, res) {
-    const project_id = req.params.Project_id
+    const projectId = req.params.Project_id
     const forever = (req.query != null ? req.query.forever : undefined) != null
-    logger.log({ project_id, forever }, 'received request to archive project')
+    logger.log({ projectId, forever }, 'received request to archive project')
     const user = AuthenticationController.getSessionUser(req)
-    const cb = function(err) {
+    const cb = err => {
       if (err != null) {
-        return res.sendStatus(500)
+        res.sendStatus(500)
       } else {
-        return res.sendStatus(200)
+        res.sendStatus(200)
       }
     }
 
     if (forever) {
-      return projectDeleter.deleteProject(
-        project_id,
+      ProjectDeleter.deleteProject(
+        projectId,
         { deleterUser: user, ipAddress: req.ip },
         cb
       )
     } else {
-      return projectDeleter.archiveProject(project_id, cb)
+      ProjectDeleter.archiveProject(projectId, cb)
     }
   },
 
@@ -167,11 +151,11 @@ module.exports = ProjectController = {
     logger.log(
       'received request to look for old deleted projects and expire them'
     )
-    projectDeleter.expireDeletedProjectsAfterDuration(function(err) {
+    ProjectDeleter.expireDeletedProjectsAfterDuration(err => {
       if (err != null) {
-        return res.sendStatus(500)
+        res.sendStatus(500)
       } else {
-        return res.sendStatus(200)
+        res.sendStatus(200)
       }
     })
   },
@@ -179,23 +163,23 @@ module.exports = ProjectController = {
   expireDeletedProject(req, res, next) {
     const { projectId } = req.params
     logger.log('received request to expire deleted project', { projectId })
-    projectDeleter.expireDeletedProject(projectId, function(err) {
+    ProjectDeleter.expireDeletedProject(projectId, err => {
       if (err != null) {
-        return next(err)
+        next(err)
       } else {
-        return res.sendStatus(200)
+        res.sendStatus(200)
       }
     })
   },
 
   restoreProject(req, res) {
-    const project_id = req.params.Project_id
-    logger.log({ project_id }, 'received request to restore project')
-    return projectDeleter.restoreProject(project_id, function(err) {
+    const projectId = req.params.Project_id
+    logger.log({ projectId }, 'received request to restore project')
+    ProjectDeleter.restoreProject(projectId, err => {
       if (err != null) {
-        return res.sendStatus(500)
+        res.sendStatus(500)
       } else {
-        return res.sendStatus(200)
+        res.sendStatus(200)
       }
     })
   },
@@ -235,26 +219,26 @@ module.exports = ProjectController = {
   cloneProject(req, res, next) {
     res.setTimeout(5 * 60 * 1000) // allow extra time for the copy to complete
     metrics.inc('cloned-project')
-    const project_id = req.params.Project_id
+    const projectId = req.params.Project_id
     const { projectName } = req.body
-    logger.log({ project_id, projectName }, 'cloning project')
+    logger.log({ projectId, projectName }, 'cloning project')
     if (!AuthenticationController.isUserLoggedIn(req)) {
       return res.send({ redir: '/register' })
     }
     const currentUser = AuthenticationController.getSessionUser(req)
-    return projectDuplicator.duplicate(
+    ProjectDuplicator.duplicate(
       currentUser,
-      project_id,
+      projectId,
       projectName,
-      function(err, project) {
+      (err, project) => {
         if (err != null) {
           logger.warn(
-            { err, project_id, user_id: currentUser._id },
+            { err, projectId, userId: currentUser._id },
             'error cloning project'
           )
           return next(err)
         }
-        return res.send({
+        res.send({
           name: project.name,
           project_id: project._id,
           owner_ref: project.owner_ref
@@ -264,117 +248,107 @@ module.exports = ProjectController = {
   },
 
   newProject(req, res, next) {
-    const user_id = AuthenticationController.getLoggedInUserId(req)
+    const userId = AuthenticationController.getLoggedInUserId(req)
     const projectName =
       req.body.projectName != null ? req.body.projectName.trim() : undefined
     const { template } = req.body
     logger.log(
-      { user: user_id, projectType: template, name: projectName },
+      { user: userId, projectType: template, name: projectName },
       'creating project'
     )
-    return async.waterfall(
+    async.waterfall(
       [
-        function(cb) {
+        cb => {
           if (template === 'example') {
-            return projectCreationHandler.createExampleProject(
-              user_id,
-              projectName,
-              cb
-            )
+            ProjectCreationHandler.createExampleProject(userId, projectName, cb)
           } else {
-            return projectCreationHandler.createBasicProject(
-              user_id,
-              projectName,
-              cb
-            )
+            ProjectCreationHandler.createBasicProject(userId, projectName, cb)
           }
         }
       ],
-      function(err, project) {
+      (err, project) => {
         if (err != null) {
           return next(err)
         }
         logger.log(
-          { project, user: user_id, name: projectName, templateType: template },
+          { project, userId, name: projectName, templateType: template },
           'created project'
         )
-        return res.send({ project_id: project._id })
+        res.send({ project_id: project._id })
       }
     )
   },
 
   renameProject(req, res, next) {
-    const project_id = req.params.Project_id
+    const projectId = req.params.Project_id
     const newName = req.body.newProjectName
-    return editorController.renameProject(project_id, newName, function(err) {
+    EditorController.renameProject(projectId, newName, err => {
       if (err != null) {
         return next(err)
       }
-      return res.sendStatus(200)
+      res.sendStatus(200)
     })
   },
 
   userProjectsJson(req, res, next) {
-    const user_id = AuthenticationController.getLoggedInUserId(req)
-    return ProjectGetter.findAllUsersProjects(
-      user_id,
+    const userId = AuthenticationController.getLoggedInUserId(req)
+    ProjectGetter.findAllUsersProjects(
+      userId,
       'name lastUpdated publicAccesLevel archived trashed owner_ref tokens',
-      function(err, projects) {
+      (err, projects) => {
         if (err != null) {
           return next(err)
         }
-        projects = ProjectController._buildProjectList(projects, user_id)
-          .filter(p => !ProjectHelper.isArchivedOrTrashed(p, user_id))
+        projects = ProjectController._buildProjectList(projects, userId)
+          .filter(p => !ProjectHelper.isArchivedOrTrashed(p, userId))
           .filter(p => !p.isV1Project)
           .map(p => ({ _id: p.id, name: p.name, accessLevel: p.accessLevel }))
 
-        return res.json({ projects })
+        res.json({ projects })
       }
     )
   },
 
   projectEntitiesJson(req, res, next) {
-    const user_id = AuthenticationController.getLoggedInUserId(req)
-    const project_id = req.params.Project_id
-    return ProjectGetter.getProject(project_id, function(err, project) {
+    const projectId = req.params.Project_id
+    ProjectGetter.getProject(projectId, (err, project) => {
       if (err != null) {
         return next(err)
       }
-      return ProjectEntityHandler.getAllEntitiesFromProject(project, function(
-        err,
-        docs,
-        files
-      ) {
-        if (err != null) {
-          return next(err)
+      ProjectEntityHandler.getAllEntitiesFromProject(
+        project,
+        (err, docs, files) => {
+          if (err != null) {
+            return next(err)
+          }
+          const entities = docs
+            .concat(files)
+            .sort((a, b) => a.path > b.path) // Sort by path ascending
+            .map(e => ({
+              path: e.path,
+              type: e.doc != null ? 'doc' : 'file'
+            }))
+          res.json({ project_id: projectId, entities })
         }
-        const entities = docs
-          .concat(files)
-          .sort((a, b) => a.path > b.path) // Sort by path ascending
-          .map(e => ({
-            path: e.path,
-            type: e.doc != null ? 'doc' : 'file'
-          }))
-        return res.json({ project_id, entities })
-      })
+      )
     })
   },
 
   projectListPage(req, res, next) {
     const timer = new metrics.Timer('project-list')
-    const user_id = AuthenticationController.getLoggedInUserId(req)
+    const userId = AuthenticationController.getLoggedInUserId(req)
     const currentUser = AuthenticationController.getSessionUser(req)
-    return async.parallel(
+    async.parallel(
       {
         tags(cb) {
-          return TagsHandler.getAllTags(user_id, cb)
+          TagsHandler.getAllTags(userId, cb)
         },
         notifications(cb) {
-          return NotificationsHandler.getUserNotifications(user_id, cb)
+          NotificationsHandler.getUserNotifications(userId, cb)
         },
         projects(cb) {
-          return ProjectGetter.findAllUsersProjects(
-            user_id,
+          ProjectGetter.findAllUsersProjects(
+            userId,
             'name lastUpdated lastUpdatedBy publicAccesLevel archived owner_ref tokens',
             cb
           )
@@ -384,34 +358,31 @@ module.exports = ProjectController = {
             return cb(null, null)
           }
 
-          return Modules.hooks.fire('findAllV1Projects', user_id, function(
-            error,
-            projects
-          ) {
+          Modules.hooks.fire('findAllV1Projects', userId, (error, projects) => {
             if (projects == null) {
               projects = []
             }
             if (error != null && error instanceof V1ConnectionError) {
               return cb(null, { projects: [], tags: [], noConnection: true })
             }
-            return cb(error, projects[0])
+            cb(error, projects[0])
           })
         }, // hooks.fire returns an array of results, only need first
         hasSubscription(cb) {
-          return LimitationsManager.hasPaidSubscription(currentUser, function(
-            error,
-            hasPaidSubscription
-          ) {
-            if (error != null && error instanceof V1ConnectionError) {
-              return cb(null, true)
+          LimitationsManager.hasPaidSubscription(
+            currentUser,
+            (error, hasPaidSubscription) => {
+              if (error != null && error instanceof V1ConnectionError) {
+                return cb(null, true)
+              }
+              cb(error, hasPaidSubscription)
             }
-            return cb(error, hasPaidSubscription)
-          })
+          )
         },
         user(cb) {
-          return User.findById(
-            user_id,
-            'featureSwitches overleaf awareOfV2 features',
+          User.findById(
+            userId,
+            'featureSwitches overleaf awareOfV2 features lastLoginIp',
             cb
           )
         },
@@ -419,10 +390,10 @@ module.exports = ProjectController = {
           if (!Features.hasFeature('affiliations')) {
             return cb(null, null)
           }
-          return getUserAffiliations(user_id, cb)
+          getUserAffiliations(userId, cb)
         }
       },
-      function(err, results) {
+      (err, results) => {
         if (err != null) {
           logger.warn({ err }, 'error getting data for project list page')
           return next(err)
@@ -431,22 +402,19 @@ module.exports = ProjectController = {
           (results.v1Projects != null ? results.v1Projects.tags : undefined) ||
           []
         const tags = results.tags.concat(v1Tags)
-        const notifications = require('underscore').map(
-          results.notifications,
-          function(notification) {
-            notification.html = req.i18n.translate(
-              notification.templateKey,
-              notification.messageOpts
-            )
-            return notification
-          }
-        )
+        const notifications = results.notifications
+        for (const notification of notifications) {
+          notification.html = req.i18n.translate(
+            notification.templateKey,
+            notification.messageOpts
+          )
+        }
         const portalTemplates = ProjectController._buildPortalTemplatesList(
           results.userAffiliations
         )
         const projects = ProjectController._buildProjectList(
           results.projects,
-          user_id,
+          userId,
           results.v1Projects != null ? results.v1Projects.projects : undefined
         )
         const { user } = results
@@ -456,23 +424,11 @@ module.exports = ProjectController = {
         )
 
         // in v2 add notifications for matching university IPs
-        if (Settings.overleaf != null) {
-          UserGetter.getUser(user_id, { lastLoginIp: 1 }, function(
-            error,
-            user
-          ) {
-            if (req.ip !== user.lastLoginIp) {
-              return NotificationsBuilder.ipMatcherAffiliation(user._id).create(
-                req.ip
-              )
-            }
-          })
+        if (Settings.overleaf != null && req.ip !== user.lastLoginIp) {
+          NotificationsBuilder.ipMatcherAffiliation(user._id).create(req.ip)
         }
 
-        return ProjectController._injectProjectUsers(projects, function(
-          error,
-          projects
-        ) {
+        ProjectController._injectProjectUsers(projects, (error, projects) => {
           if (error != null) {
             return next(error)
           }
@@ -523,40 +479,40 @@ module.exports = ProjectController = {
           }
 
           res.render('project/list', viewModel)
-          return timer.done()
+          timer.done()
         })
       }
     )
   },
 
   loadEditor(req, res, next) {
-    let anonymous, user_id
+    let anonymous, userId
     const timer = new metrics.Timer('load-editor')
     if (!Settings.editorIsOpen) {
       return res.render('general/closed', { title: 'updating_site' })
     }
 
     if (AuthenticationController.isUserLoggedIn(req)) {
-      user_id = AuthenticationController.getLoggedInUserId(req)
+      userId = AuthenticationController.getLoggedInUserId(req)
       anonymous = false
     } else {
       anonymous = true
-      user_id = null
+      userId = null
     }
 
-    const project_id = req.params.Project_id
-    logger.log({ project_id, anonymous, user_id }, 'loading editor')
+    const projectId = req.params.Project_id
+    logger.log({ projectId, anonymous, userId }, 'loading editor')
 
     // record failures to load the custom websocket
     if ((req.query != null ? req.query.ws : undefined) === 'fallback') {
       metrics.inc('load-editor-ws-fallback')
     }
 
-    return async.auto(
+    async.auto(
       {
         project(cb) {
-          return ProjectGetter.getProject(
-            project_id,
+          ProjectGetter.getProject(
+            projectId,
             {
               name: 1,
               lastUpdated: 1,
@@ -566,7 +522,7 @@ module.exports = ProjectController = {
               overleaf: 1,
               tokens: 1
             },
-            function(err, project) {
+            (err, project) => {
               if (err != null) {
                 return cb(err)
               }
@@ -589,56 +545,52 @@ module.exports = ProjectController = {
               ) {
                 return cb(null, project)
               }
-              return V1Handler.getDocExported(
+              V1Handler.getDocExported(
                 project.tokens.readAndWrite,
-                function(err, doc_exported) {
+                (err, docExported) => {
                   if (err != null) {
                     return next(err)
                   }
-                  project.exporting = doc_exported.exporting
-                  return cb(null, project)
+                  project.exporting = docExported.exporting
+                  cb(null, project)
                 }
               )
             }
           )
         },
         user(cb) {
-          if (user_id == null) {
-            return cb(null, defaultSettingsForAnonymousUser(user_id))
+          if (userId == null) {
+            cb(null, defaultSettingsForAnonymousUser(userId))
           } else {
-            return User.findById(user_id, function(err, user) {
-              logger.log({ project_id, user_id }, 'got user')
-              return cb(err, user)
+            User.findById(userId, (err, user) => {
+              logger.log({ projectId, userId }, 'got user')
+              cb(err, user)
             })
           }
         },
         subscription(cb) {
-          if (user_id == null) {
+          if (userId == null) {
             return cb()
           }
-          return SubscriptionLocator.getUsersSubscription(user_id, cb)
+          SubscriptionLocator.getUsersSubscription(userId, cb)
         },
         activate(cb) {
-          return InactiveProjectManager.reactivateProjectIfRequired(
-            project_id,
-            cb
-          )
+          InactiveProjectManager.reactivateProjectIfRequired(projectId, cb)
         },
         markAsOpened(cb) {
           // don't need to wait for this to complete
-          ProjectUpdateHandler.markAsOpened(project_id, function() {})
-          return cb()
+          ProjectUpdateHandler.markAsOpened(projectId, () => {})
+          cb()
         },
         isTokenMember(cb) {
-          cb = underscore.once(cb)
-          if (user_id == null) {
+          if (userId == null) {
             return cb()
           }
-          return CollaboratorsHandler.userIsTokenMember(user_id, project_id, cb)
+          CollaboratorsHandler.userIsTokenMember(userId, projectId, cb)
         },
         brandVariation: [
           'project',
-          function(cb, results) {
+          (cb, results) => {
             if (
               (results.project != null
                 ? results.project.brandVariationId
@@ -646,14 +598,14 @@ module.exports = ProjectController = {
             ) {
               return cb()
             }
-            return BrandVariationsHandler.getBrandVariationById(
+            BrandVariationsHandler.getBrandVariationById(
               results.project.brandVariationId,
               (error, brandVariationDetails) => cb(error, brandVariationDetails)
             )
           }
         ]
       },
-      function(err, results) {
+      (err, results) => {
         if (err != null) {
           logger.warn({ err }, 'error getting details for project page')
           return next(err)
@@ -666,17 +618,17 @@ module.exports = ProjectController = {
         const daysSinceLastUpdated =
           (new Date() - project.lastUpdated) / 86400000
         logger.log(
-          { project_id, daysSinceLastUpdated },
+          { projectId, daysSinceLastUpdated },
           'got db results for loading editor'
         )
 
-        const token = TokenAccessHandler.getRequestToken(req, project_id)
+        const token = TokenAccessHandler.getRequestToken(req, projectId)
         const { isTokenMember } = results
-        return AuthorizationManager.getPrivilegeLevelForProject(
-          user_id,
-          project_id,
+        AuthorizationManager.getPrivilegeLevelForProject(
+          userId,
+          projectId,
           token,
-          function(error, privilegeLevel) {
+          (error, privilegeLevel) => {
             let allowedFreeTrial
             if (error != null) {
               return next(error)
@@ -701,14 +653,14 @@ module.exports = ProjectController = {
               allowedFreeTrial = !!subscription.freeTrial.allowed || true
             }
 
-            logger.log({ project_id }, 'rendering editor page')
+            logger.log({ projectId }, 'rendering editor page')
             res.render('project/editor', {
               title: project.name,
               priority_title: true,
               bodyClasses: ['editor'],
               project_id: project._id,
               user: {
-                id: user_id,
+                id: userId,
                 email: user.email,
                 first_name: user.first_name,
                 last_name: user.last_name,
@@ -746,24 +698,92 @@ module.exports = ProjectController = {
               languages: Settings.languages,
               editorThemes: THEME_LIST,
               maxDocLength: Settings.max_doc_length,
-              useV2History: !!__guard__(
-                project.overleaf != null ? project.overleaf.history : undefined,
-                x => x.display
-              ),
+              useV2History:
+                project.overleaf &&
+                project.overleaf.history &&
+                Boolean(project.overleaf.history.display),
               showTestControls:
-                (req.query != null ? req.query.tc : undefined) === 'true' ||
-                user.isAdmin,
+                (req.query && req.query.tc === 'true') || user.isAdmin,
               brandVariation,
               allowedImageNames: Settings.allowedImageNames || [],
               gitBridgePublicBaseUrl: Settings.gitBridgePublicBaseUrl
             })
-            return timer.done()
+            timer.done()
           }
         )
       }
     )
   },
 
+  transferOwnership(req, res, next) {
+    const sessionUser = AuthenticationController.getSessionUser(req)
+    if (req.body.user_id == null) {
+      return next(
+        new HttpErrors.BadRequestError({
+          info: { public: { message: 'Missing parameter: user_id' } }
+        })
+      )
+    }
+    let projectId
+    try {
+      projectId = ObjectId(req.params.Project_id)
+    } catch (err) {
+      return next(
+        new HttpErrors.BadRequestError({
+          info: {
+            public: { message: `Invalid project id: ${req.params.Project_id}` }
+          }
+        })
+      )
+    }
+    let toUserId
+    try {
+      toUserId = ObjectId(req.body.user_id)
+    } catch (err) {
+      return next(
+        new HttpErrors.BadRequestError({
+          info: { public: { message: `Invalid user id: ${req.body.user_id}` } }
+        })
+      )
+    }
+    ProjectDetailsHandler.transferOwnership(
+      projectId,
+      toUserId,
+      { allowTransferToNonCollaborators: sessionUser.isAdmin },
+      err => {
+        if (err != null) {
+          if (err instanceof Errors.ProjectNotFoundError) {
+            next(
+              new HttpErrors.NotFoundError({
+                info: { public: { message: `project not found: ${projectId}` } }
+              })
+            )
+          } else if (err instanceof Errors.UserNotFoundError) {
+            next(
+              new HttpErrors.NotFoundError({
+                info: { public: { message: `user not found: ${toUserId}` } }
+              })
+            )
+          } else if (err instanceof Errors.UserNotCollaboratorError) {
+            next(
+              new HttpErrors.ForbiddenError({
+                info: {
+                  public: {
+                    message: `user ${toUserId} should be a collaborator in project ${projectId} prior to ownership transfer`
+                  }
+                }
+              })
+            )
+          } else {
+            next(err)
+          }
+        } else {
+          res.sendStatus(204)
+        }
+      }
+    )
+  },
+
   _buildProjectList(allProjects, userId, v1Projects) {
     let project
     if (v1Projects == null) {
@@ -777,7 +797,7 @@ module.exports = ProjectController = {
       tokenReadOnly
     } = allProjects
     const projects = []
-    for (project of Array.from(owned)) {
+    for (project of owned) {
       projects.push(
         ProjectController._buildProjectViewModel(
           project,
@@ -788,7 +808,7 @@ module.exports = ProjectController = {
       )
     }
     // Invite-access
-    for (project of Array.from(readAndWrite)) {
+    for (project of readAndWrite) {
       projects.push(
         ProjectController._buildProjectViewModel(
           project,
@@ -798,7 +818,7 @@ module.exports = ProjectController = {
         )
       )
     }
-    for (project of Array.from(readOnly)) {
+    for (project of readOnly) {
       projects.push(
         ProjectController._buildProjectViewModel(
           project,
@@ -808,13 +828,13 @@ module.exports = ProjectController = {
         )
       )
     }
-    for (project of Array.from(v1Projects)) {
+    for (project of v1Projects) {
       projects.push(ProjectController._buildV1ProjectViewModel(project))
     }
     // Token-access
     //   Only add these projects if they're not already present, this gives us cascading access
     //   from 'owner' => 'token-read-only'
-    for (project of Array.from(tokenReadAndWrite)) {
+    for (project of tokenReadAndWrite) {
       if (
         projects.filter(p => p.id.toString() === project._id.toString())
           .length === 0
@@ -829,7 +849,7 @@ module.exports = ProjectController = {
         )
       }
     }
-    for (project of Array.from(tokenReadOnly)) {
+    for (project of tokenReadOnly) {
       if (
         projects.filter(p => p.id.toString() === project._id.toString())
           .length === 0
@@ -899,12 +919,8 @@ module.exports = ProjectController = {
   },
 
   _injectProjectUsers(projects, callback) {
-    let project
-    if (callback == null) {
-      callback = function(error, projects) {}
-    }
     const users = {}
-    for (project of Array.from(projects)) {
+    for (const project of projects) {
       if (project.owner_ref != null) {
         users[project.owner_ref.toString()] = true
       }
@@ -913,37 +929,38 @@ module.exports = ProjectController = {
       }
     }
 
-    const jobs = []
-    for (let user_id in users) {
-      const _ = users[user_id]
-      ;(user_id =>
-        jobs.push(callback =>
-          UserGetter.getUserOrUserStubById(
-            user_id,
-            { first_name: 1, last_name: 1, email: 1 },
-            function(error, user) {
-              if (error != null) {
-                return callback(error)
-              }
-              users[user_id] = user
-              return callback()
+    const userIds = Object.keys(users)
+    async.eachSeries(
+      userIds,
+      (userId, cb) => {
+        UserGetter.getUserOrUserStubById(
+          userId,
+          { first_name: 1, last_name: 1, email: 1 },
+          (error, user) => {
+            if (error != null) {
+              return cb(error)
             }
-          )
-        ))(user_id)
-    }
-
-    return async.series(jobs, function(error) {
-      for (project of Array.from(projects)) {
-        if (project.owner_ref != null) {
-          project.owner = users[project.owner_ref.toString()]
+            users[userId] = user
+            cb()
+          }
+        )
+      },
+      error => {
+        if (error != null) {
+          return callback(error)
         }
-        if (project.lastUpdatedBy != null) {
-          project.lastUpdatedBy =
-            users[project.lastUpdatedBy.toString()] || null
+        for (const project of projects) {
+          if (project.owner_ref != null) {
+            project.owner = users[project.owner_ref.toString()]
+          }
+          if (project.lastUpdatedBy != null) {
+            project.lastUpdatedBy =
+              users[project.lastUpdatedBy.toString()] || null
+          }
         }
+        callback(null, projects)
       }
-      return callback(null, projects)
-    })
+    )
   },
 
   _buildWarningsList(v1ProjectData) {
@@ -967,7 +984,7 @@ module.exports = ProjectController = {
       affiliations = []
     }
     const portalTemplates = []
-    for (let aff of Array.from(affiliations)) {
+    for (let aff of affiliations) {
       if (
         aff.portal &&
         aff.portal.slug &&
@@ -985,8 +1002,8 @@ module.exports = ProjectController = {
   }
 }
 
-var defaultSettingsForAnonymousUser = user_id => ({
-  id: user_id,
+var defaultSettingsForAnonymousUser = userId => ({
+  id: userId,
   ace: {
     mode: 'none',
     theme: 'textmate',
@@ -1007,26 +1024,20 @@ var defaultSettingsForAnonymousUser = user_id => ({
 })
 
 var THEME_LIST = []
-;(generateThemeList = function() {
+function generateThemeList() {
   const files = fs.readdirSync(
-    __dirname + '/../../../../public/js/' + PackageVersions.lib('ace')
+    Path.join(__dirname, '/../../../../public/js/', PackageVersions.lib('ace'))
   )
-  return (() => {
-    const result = []
-    for (let file of Array.from(files)) {
-      if (file.slice(-2) === 'js' && /^theme-/.test(file)) {
-        const cleanName = file.slice(0, -3).slice(6)
-        result.push(THEME_LIST.push(cleanName))
-      } else {
-        result.push(undefined)
-      }
+  const result = []
+  for (let file of files) {
+    if (file.slice(-2) === 'js' && /^theme-/.test(file)) {
+      const cleanName = file.slice(0, -3).slice(6)
+      result.push(THEME_LIST.push(cleanName))
+    } else {
+      result.push(undefined)
     }
-    return result
-  })()
-})()
-
-function __guard__(value, transform) {
-  return typeof value !== 'undefined' && value !== null
-    ? transform(value)
-    : undefined
+  }
 }
+generateThemeList()
+
+module.exports = ProjectController

services/web/app/src/Features/Project/ProjectDetailsHandler.js

@@ -10,6 +10,7 @@ const ProjectTokenGenerator = require('./ProjectTokenGenerator')
 const ProjectEntityHandler = require('./ProjectEntityHandler')
 const ProjectHelper = require('./ProjectHelper')
 const CollaboratorsHandler = require('../Collaborators/CollaboratorsHandler')
+const PrivilegeLevels = require('../Authorization/PrivilegeLevels')
 const settings = require('settings-sharelatex')
 const { callbackify } = require('util')
 
@@ -100,35 +101,40 @@ async function setProjectDescription(projectId, description) {
   }
 }
 
-async function transferOwnership(projectId, userId, suffix = '') {
+async function transferOwnership(projectId, toUserId, options = {}) {
   const project = await ProjectGetter.promises.getProject(projectId, {
-    owner_ref: true,
-    name: true
+    owner_ref: 1,
+    collaberator_refs: 1
   })
   if (project == null) {
-    throw new Errors.NotFoundError('project not found')
+    throw new Errors.ProjectNotFoundError({ info: { projectId: projectId } })
   }
-  if (project.owner_ref === userId) {
+  const fromUserId = project.owner_ref
+  if (fromUserId.equals(toUserId)) {
     return
   }
-  const user = await UserGetter.promises.getUser(userId)
-  if (user == null) {
-    throw new Errors.NotFoundError('user not found')
+  const toUser = await UserGetter.promises.getUser(toUserId)
+  if (toUser == null) {
+    throw new Errors.UserNotFoundError({ info: { userId: toUserId } })
   }
-
-  // we make sure the user to which the project is transferred is not a collaborator for the project,
-  // this prevents any conflict during unique name generation
-  await CollaboratorsHandler.promises.removeUserFromProject(projectId, userId)
-  const name = await generateUniqueName(userId, project.name + suffix)
+  const collaboratorIds = project.collaberator_refs || []
+  if (
+    !options.allowTransferToNonCollaborators &&
+    !collaboratorIds.some(collaboratorId => collaboratorId.equals(toUser._id))
+  ) {
+    throw new Errors.UserNotCollaboratorError({ info: { userId: toUserId } })
+  }
+  await CollaboratorsHandler.promises.removeUserFromProject(projectId, toUserId)
   await Project.update(
     { _id: projectId },
-    {
-      $set: {
-        owner_ref: userId,
-        name
-      }
-    }
+    { $set: { owner_ref: toUserId } }
   ).exec()
+  await CollaboratorsHandler.promises.addUserIdToProject(
+    projectId,
+    toUserId,
+    fromUserId,
+    PrivilegeLevels.READ_AND_WRITE
+  )
   await ProjectEntityHandler.promises.flushProjectToThirdPartyDataStore(
     projectId
   )

services/web/app/src/router.js

@@ -485,7 +485,11 @@ function initialize(webRouter, privateApiRouter, publicApiRouter) {
     AuthorizationMiddleware.ensureUserCanAdminProject,
     ProjectController.renameProject
   )
-
+  webRouter.post(
+    '/project/:Project_id/transfer-ownership',
+    AuthorizationMiddleware.ensureUserCanAdminProject,
+    ProjectController.transferOwnership
+  )
   webRouter.get(
     '/project/:Project_id/updates',
     AuthorizationMiddleware.ensureUserCanReadProject,
@@ -598,7 +602,6 @@ function initialize(webRouter, privateApiRouter, publicApiRouter) {
     AuthenticationController.requireLogin(),
     MetaController.broadcastMetadataForDoc
   )
-
   privateApiRouter.post(
     '/internal/expire-deleted-projects-after-duration',
     AuthenticationController.httpAuth,

services/web/package.json

@@ -12,7 +12,7 @@
     "public": "./public"
   },
   "scripts": {
-    "test:acceptance:run_dir": "mocha --recursive --reporter spec --timeout 25000 --exit --grep=$MOCHA_GREP $@",
+    "test:acceptance:run_dir": "mocha --recursive --reporter spec --require test/acceptance/bootstrap.js --timeout 25000 --exit --grep=$MOCHA_GREP $@",
     "test:unit": "bin/unit_test --grep=$MOCHA_GREP $@",
     "test:unit:ci": "bin/unit_test --timeout 10000",
     "test:unit:app": "bin/unit_test_app $@",

services/web/test/acceptance/bootstrap.js

@@ -0,0 +1,2 @@
+const chai = require('chai')
+chai.use(require('chai-as-promised'))

services/web/test/acceptance/src/AuthorizationTests.js

@@ -278,7 +278,7 @@ describe('Authorization', function() {
             if (err != null) {
               return cb(err)
             }
-            this.site_admin.ensure_admin(cb)
+            return this.site_admin.ensureAdmin(cb)
           })
         }
       ],

services/web/test/acceptance/src/ProjectOwnershipTransferTests.js

@@ -0,0 +1,87 @@
+const { expect } = require('chai')
+const User = require('./helpers/User').promises
+
+describe('Project ownership transfer', function() {
+  beforeEach(async function() {
+    this.ownerSession = new User()
+    this.collaboratorSession = new User()
+    this.strangerSession = new User()
+    this.adminSession = new User()
+    await this.adminSession.ensureUserExists()
+    await this.adminSession.ensureAdmin()
+    await this.ownerSession.login()
+    await this.collaboratorSession.login()
+    await this.strangerSession.login()
+    await this.adminSession.login()
+    this.owner = await this.ownerSession.get()
+    this.collaborator = await this.collaboratorSession.get()
+    this.stranger = await this.strangerSession.get()
+    this.admin = await this.adminSession.get()
+    this.projectId = await this.ownerSession.createProject('Test project')
+    await this.ownerSession.addUserToProject(
+      this.projectId,
+      this.collaborator,
+      'readAndWrite'
+    )
+  })
+
+  describe('happy path', function() {
+    beforeEach(async function() {
+      await this.ownerSession.transferProjectOwnership(
+        this.projectId,
+        this.collaborator._id
+      )
+    })
+
+    it('changes the project owner', async function() {
+      const project = await this.collaboratorSession.getProject(this.projectId)
+      expect(project.owner_ref.toString()).to.equal(
+        this.collaborator._id.toString()
+      )
+    })
+
+    it('adds the previous owner as a read/write collaborator', async function() {
+      const project = await this.collaboratorSession.getProject(this.projectId)
+      expect(project.collaberator_refs.map(x => x.toString())).to.have.members([
+        this.owner._id.toString()
+      ])
+    })
+
+    it('lets the new owner open the project', async function() {
+      await this.collaboratorSession.openProject(this.projectId)
+    })
+
+    it('lets the previous owner open the project', async function() {
+      await this.ownerSession.openProject(this.projectId)
+    })
+  })
+
+  describe('validation', function() {
+    it('lets only the project owner transfer ownership', async function() {
+      await expect(
+        this.collaboratorSession.transferProjectOwnership(
+          this.projectId,
+          this.collaborator._id
+        )
+      ).to.be.rejectedWith('Unexpected status code: 403')
+    })
+
+    it('prevents transfers to a non-collaborator', async function() {
+      await expect(
+        this.ownerSession.transferProjectOwnership(
+          this.projectId,
+          this.stranger._id
+        )
+      ).to.be.rejectedWith('Unexpected status code: 403')
+    })
+
+    it('allows an admin to transfer to any project to a non-collaborator', async function() {
+      await expect(
+        this.adminSession.transferProjectOwnership(
+          this.projectId,
+          this.stranger._id
+        )
+      ).to.be.fulfilled
+    })
+  })
+})

services/web/test/acceptance/src/RegistrationTests.js

@@ -143,8 +143,8 @@ describe('Registration', function() {
       return (this.password = 'password11')
     })
 
-    afterEach(function() {
-      return this.user.full_delete_user(this.email)
+    afterEach(function(done) {
+      return this.user.fullDeleteUser(this.email, done)
     })
 
     it('should register with the csrf token', function(done) {

services/web/test/acceptance/src/UserMembershipAuthorizationTests.js

@@ -128,7 +128,7 @@ describe('UserMembershipAuthorization', function() {
         const url = `/metrics/institutions/${this.institution.v1Id}`
         async.series(
           [
-            this.user.ensure_admin.bind(this.user),
+            this.user.ensureAdmin.bind(this.user),
             this.user.login.bind(this.user),
             expectAccess(this.user, url, 200)
           ],
@@ -317,7 +317,7 @@ describe('UserMembershipAuthorization', function() {
       async.series(
         [
           expectAccess(this.user, url, 403),
-          this.user.ensure_admin.bind(this.user),
+          this.user.ensureAdmin.bind(this.user),
           this.user.login.bind(this.user),
           expectAccess(this.user, url, 200)
         ],
@@ -329,7 +329,7 @@ describe('UserMembershipAuthorization', function() {
       const url = '/metrics/templates/789'
       async.series(
         [
-          this.user.ensure_admin.bind(this.user),
+          this.user.ensureAdmin.bind(this.user),
           this.user.login.bind(this.user),
           expectAccess(this.user, url, 404)
         ],
@@ -345,7 +345,7 @@ describe('UserMembershipAuthorization', function() {
         [
           this.user.login.bind(this.user),
           expectAccess(this.user, url, 403),
-          this.user.ensure_admin.bind(this.user),
+          this.user.ensureAdmin.bind(this.user),
           this.user.login.bind(this.user),
           expectAccess(this.user, url, 200)
         ],
@@ -382,7 +382,7 @@ describe('UserMembershipAuthorization', function() {
     it('should allow admin users', function(done) {
       async.series(
         [
-          this.user.ensure_admin.bind(this.user),
+          this.user.ensureAdmin.bind(this.user),
           this.user.login.bind(this.user),
           expectAccess(this.user, '/metrics/admin', 200)
         ],

services/web/test/acceptance/src/UserThirdPartyIdentityTests.js

@@ -28,7 +28,7 @@ describe('ThirdPartyIdentityManager', function() {
   })
 
   afterEach(function(done) {
-    return this.user.full_delete_user(this.user.email, done)
+    return this.user.fullDeleteUser(this.user.email, done)
   })
 
   describe('login', function() {
@@ -175,7 +175,7 @@ describe('ThirdPartyIdentityManager', function() {
       //         return done()
       //       }
       //     )
-      //     this.user2.full_delete_user(this.user2.email, done)
+      //     this.user2.fullDeleteUser(this.user2.email, done)
       //   })
       // })
     })

services/web/test/acceptance/src/helpers/User.js

@@ -1,22 +1,4 @@
-/* eslint-disable
-    camelcase,
-    handle-callback-err,
-    max-len,
-    no-return-assign,
-    no-undef,
-    no-unused-vars,
-*/
-// TODO: This file was created by bulk-decaffeinate.
-// Fix any style issues and re-enable lint.
-/*
- * decaffeinate suggestions:
- * DS102: Remove unnecessary code created because of implicit returns
- * DS103: Rewrite code to no longer use __guard__
- * DS207: Consider shorter variations of null checks
- * Full docs: https://github.com/decaffeinate/decaffeinate/blob/master/docs/suggestions.md
- */
 const request = require('./request')
-const _ = require('underscore')
 const settings = require('settings-sharelatex')
 const { db, ObjectId } = require('../../../../app/src/infrastructure/mongojs')
 const UserModel = require('../../../../app/src/models/User').User
@@ -53,42 +35,30 @@ class User {
     this.id = user._id.toString()
     this._id = user._id.toString()
     this.first_name = user.first_name
-    return (this.referal_id = user.referal_id)
+    this.referal_id = user.referal_id
   }
 
   get(callback) {
-    if (callback == null) {
-      callback = function(error, user) {}
-    }
-    return db.users.findOne({ _id: ObjectId(this._id) }, callback)
+    db.users.findOne({ _id: ObjectId(this._id) }, callback)
   }
 
   mongoUpdate(updateOp, callback) {
-    if (callback == null) {
-      callback = function(error) {}
-    }
-    return db.users.update({ _id: ObjectId(this._id) }, updateOp, callback)
+    db.users.update({ _id: ObjectId(this._id) }, updateOp, callback)
   }
 
   register(callback) {
-    if (callback == null) {
-      callback = function(error, user) {}
-    }
-    return this.registerWithQuery('', callback)
+    this.registerWithQuery('', callback)
   }
 
   registerWithQuery(query, callback) {
-    if (callback == null) {
-      callback = function(error, user) {}
-    }
     if (this._id != null) {
       return callback(new Error('User already registered'))
     }
-    return this.getCsrfToken(error => {
+    this.getCsrfToken(error => {
       if (error != null) {
         return callback(error)
       }
-      return this.request.post(
+      this.request.post(
         {
           url: `/register${query}`,
           json: { email: this.email, password: this.password }
@@ -97,12 +67,12 @@ class User {
           if (error != null) {
             return callback(error)
           }
-          return db.users.findOne({ email: this.email }, (error, user) => {
+          db.users.findOne({ email: this.email }, (error, user) => {
             if (error != null) {
               return callback(error)
             }
             this.setExtraAttributes(user)
-            return callback(null, user)
+            callback(null, user)
           })
         }
       )
@@ -110,25 +80,19 @@ class User {
   }
 
   login(callback) {
-    if (callback == null) {
-      callback = function(error) {}
-    }
-    return this.loginWith(this.email, callback)
+    this.loginWith(this.email, callback)
   }
 
   loginWith(email, callback) {
-    if (callback == null) {
-      callback = function(error) {}
-    }
-    return this.ensureUserExists(error => {
+    this.ensureUserExists(error => {
       if (error != null) {
         return callback(error)
       }
-      return this.getCsrfToken(error => {
+      this.getCsrfToken(error => {
         if (error != null) {
           return callback(error)
         }
-        return this.request.post(
+        this.request.post(
           {
             url: settings.enableLegacyLogin ? '/login/legacy' : '/login',
             json: { email, password: this.password }
@@ -140,23 +104,20 @@ class User {
   }
 
   ensureUserExists(callback) {
-    if (callback == null) {
-      callback = function(error) {}
-    }
     const filter = { email: this.email }
     const options = { upsert: true, new: true, setDefaultsOnInsert: true }
-    return UserModel.findOneAndUpdate(filter, {}, options, (error, user) => {
+    UserModel.findOneAndUpdate(filter, {}, options, (error, user) => {
       if (error != null) {
         return callback(error)
       }
-      return AuthenticationManager.setUserPasswordInV2(
+      AuthenticationManager.setUserPasswordInV2(
         user._id,
         this.password,
         error => {
           if (error != null) {
             return callback(error)
           }
-          return UserUpdater.updateUser(
+          UserUpdater.updateUser(
             user._id,
             { $set: { emails: this.emails } },
             error => {
@@ -164,7 +125,7 @@ class User {
                 return callback(error)
               }
               this.setExtraAttributes(user)
-              return callback(null, this.password)
+              callback(null, this.password)
             }
           )
         }
@@ -173,37 +134,24 @@ class User {
   }
 
   setFeatures(features, callback) {
-    if (callback == null) {
-      callback = function(error) {}
-    }
     const update = {}
     for (let key in features) {
       const value = features[key]
       update[`features.${key}`] = value
     }
-    return UserModel.update({ _id: this.id }, update, callback)
+    UserModel.update({ _id: this.id }, update, callback)
   }
 
-  setOverleafId(overleaf_id, callback) {
-    if (callback == null) {
-      callback = function(error) {}
-    }
-    return UserModel.update(
-      { _id: this.id },
-      { 'overleaf.id': overleaf_id },
-      callback
-    )
+  setOverleafId(overleafId, callback) {
+    UserModel.update({ _id: this.id }, { 'overleaf.id': overleafId }, callback)
   }
 
   logout(callback) {
-    if (callback == null) {
-      callback = function(error) {}
-    }
-    return this.getCsrfToken(error => {
+    this.getCsrfToken(error => {
       if (error != null) {
         return callback(error)
       }
-      return this.request.post(
+      this.request.post(
         {
           url: '/logout',
           json: {
@@ -215,17 +163,16 @@ class User {
           if (error != null) {
             return callback(error)
           }
-          return db.users.findOne({ email: this.email }, (error, user) => {
+          db.users.findOne({ email: this.email }, (error, user) => {
             if (error != null) {
               return callback(error)
             }
-            this.id = __guard__(user != null ? user._id : undefined, x =>
-              x.toString()
-            )
-            this._id = __guard__(user != null ? user._id : undefined, x1 =>
-              x1.toString()
-            )
-            return callback()
+            if (user == null) {
+              return callback()
+            }
+            this.id = user._id.toString()
+            this._id = user._id.toString()
+            callback()
           })
         }
       )
@@ -233,31 +180,22 @@ class User {
   }
 
   addEmail(email, callback) {
-    if (callback == null) {
-      callback = function(error) {}
-    }
     this.emails.push({ email, createdAt: new Date() })
-    return UserUpdater.addEmailAddress(this.id, email, callback)
+    UserUpdater.addEmailAddress(this.id, email, callback)
   }
 
   confirmEmail(email, callback) {
-    if (callback == null) {
-      callback = function(error) {}
-    }
     for (let idx = 0; idx < this.emails.length; idx++) {
       const emailData = this.emails[idx]
       if (emailData.email === email) {
         this.emails[idx].confirmedAt = new Date()
       }
     }
-    return UserUpdater.confirmEmail(this.id, email, callback)
+    UserUpdater.confirmEmail(this.id, email, callback)
   }
 
-  ensure_admin(callback) {
-    if (callback == null) {
-      callback = function(error) {}
-    }
-    return db.users.update(
+  ensureAdmin(callback) {
+    db.users.update(
       { _id: ObjectId(this.id) },
       { $set: { isAdmin: true } },
       callback
@@ -267,13 +205,10 @@ class User {
   ensureStaffAccess(flag, callback) {
     const update = { $set: {} }
     update.$set[`staffAccess.${flag}`] = true
-    return db.users.update({ _id: ObjectId(this.id) }, update, callback)
+    db.users.update({ _id: ObjectId(this.id) }, update, callback)
   }
 
   upgradeFeatures(callback) {
-    if (callback == null) {
-      callback = function(error) {}
-    }
     const features = {
       collaborators: -1, // Infinite
       versioning: true,
@@ -285,7 +220,7 @@ class User {
       trackChanges: true,
       trackChangesVisible: true
     }
-    return db.users.update(
+    db.users.update(
       { _id: ObjectId(this.id) },
       { $set: { features } },
       callback
@@ -293,9 +228,6 @@ class User {
   }
 
   downgradeFeatures(callback) {
-    if (callback == null) {
-      callback = function(error) {}
-    }
     const features = {
       collaborators: 1,
       versioning: false,
@@ -307,7 +239,7 @@ class User {
       trackChanges: false,
       trackChangesVisible: false
     }
-    return db.users.update(
+    db.users.update(
       { _id: ObjectId(this.id) },
       { $set: { features } },
       callback
@@ -315,11 +247,8 @@ class User {
   }
 
   defaultFeatures(callback) {
-    if (callback == null) {
-      callback = function(error) {}
-    }
     const features = settings.defaultFeatures
-    return db.users.update(
+    db.users.update(
       { _id: ObjectId(this.id) },
       { $set: { features } },
       callback
@@ -327,31 +256,30 @@ class User {
   }
 
   getFeatures(callback) {
-    const features = settings.defaultFeatures
-    return db.users.findOne(
+    db.users.findOne(
       { _id: ObjectId(this.id) },
       { features: 1 },
       (error, user) => callback(error, user && user.features)
     )
   }
 
-  full_delete_user(email, callback) {
-    if (callback == null) {
-      callback = function(error) {}
-    }
-    return db.users.findOne({ email }, (error, user) => {
+  fullDeleteUser(email, callback) {
+    db.users.findOne({ email }, (error, user) => {
+      if (error != null) {
+        return callback(error)
+      }
       if (user == null) {
         return callback()
       }
-      const user_id = user._id
-      return db.projects.remove(
-        { owner_ref: ObjectId(user_id) },
+      const userId = user._id
+      db.projects.remove(
+        { owner_ref: ObjectId(userId) },
         { multi: true },
         err => {
           if (err != null) {
             callback(err)
           }
-          return db.users.remove({ _id: ObjectId(user_id) }, callback)
+          db.users.remove({ _id: ObjectId(userId) }, callback)
         }
       )
     })
@@ -383,33 +311,21 @@ class User {
     })
   }
 
-  getProject(project_id, callback) {
-    if (callback == null) {
-      callback = function(error, project) {}
-    }
-    return db.projects.findOne(
-      { _id: ObjectId(project_id.toString()) },
-      callback
-    )
+  getProject(projectId, callback) {
+    db.projects.findOne({ _id: ObjectId(projectId.toString()) }, callback)
   }
 
   saveProject(project, callback) {
-    if (callback == null) {
-      callback = function(error) {}
-    }
-    return db.projects.update({ _id: project._id }, project, callback)
+    db.projects.update({ _id: project._id }, project, callback)
   }
 
   createProject(name, options, callback) {
-    if (callback == null) {
-      callback = function(error, oroject_id) {}
-    }
     if (typeof options === 'function') {
       callback = options
       options = {}
     }
 
-    return this.request.post(
+    this.request.post(
       {
         url: '/project/new',
         json: Object.assign({ projectName: name }, options)
@@ -429,49 +345,38 @@ class User {
               body
             ])
           )
-          return callback(error)
+          callback(error)
         } else {
-          return callback(null, body.project_id)
+          callback(null, body.project_id)
         }
       }
     )
   }
 
-  deleteProject(project_id, callback) {
-    if (callback == null) {
-      callback = error
-    }
-    return this.request.delete(
+  deleteProject(projectId, callback) {
+    this.request.delete(
       {
-        url: `/project/${project_id}?forever=true`
+        url: `/project/${projectId}?forever=true`
       },
       (error, response, body) => {
         if (error != null) {
           return callback(error)
         }
-        return callback(null)
+        callback(null)
       }
     )
   }
 
   deleteProjects(callback) {
-    if (callback == null) {
-      callback = error
-    }
-    return db.projects.remove(
-      { owner_ref: ObjectId(this.id) },
-      { multi: true },
-      err => callback(err)
+    db.projects.remove({ owner_ref: ObjectId(this.id) }, { multi: true }, err =>
+      callback(err)
     )
   }
 
-  openProject(project_id, callback) {
-    if (callback == null) {
-      callback = error
-    }
-    return this.request.get(
+  openProject(projectId, callback) {
+    this.request.get(
       {
-        url: `/project/${project_id}`
+        url: `/project/${projectId}`
       },
       (error, response, body) => {
         if (error != null) {
@@ -483,56 +388,50 @@ class User {
           )
           return callback(err)
         }
-        return callback(null)
+        callback(null)
       }
     )
   }
 
-  createDocInProject(project_id, parent_folder_id, name, callback) {
-    if (callback == null) {
-      callback = function(error, doc_id) {}
-    }
-    return this.getCsrfToken(error => {
+  createDocInProject(projectId, parentFolderId, name, callback) {
+    this.getCsrfToken(error => {
       if (error != null) {
         return callback(error)
       }
-      return this.request.post(
+      this.request.post(
         {
-          url: `/project/${project_id}/doc`,
+          url: `/project/${projectId}/doc`,
           json: {
             name,
-            parent_folder_id
+            parentFolderId
           }
         },
         (error, response, body) => {
-          return callback(null, body._id)
+          if (error != null) {
+            return callback(error)
+          }
+          callback(null, body._id)
         }
       )
     })
   }
 
-  addUserToProject(project_id, user, privileges, callback) {
+  addUserToProject(projectId, user, privileges, callback) {
     let updateOp
-    if (callback == null) {
-      callback = function(error, user) {}
-    }
     if (privileges === 'readAndWrite') {
-      updateOp = { $addToSet: { collaberator_refs: user._id.toString() } }
+      updateOp = { $addToSet: { collaberator_refs: user._id } }
     } else if (privileges === 'readOnly') {
-      updateOp = { $addToSet: { readOnly_refs: user._id.toString() } }
+      updateOp = { $addToSet: { readOnly_refs: user._id } }
     }
-    return db.projects.update({ _id: db.ObjectId(project_id) }, updateOp, err =>
+    db.projects.update({ _id: db.ObjectId(projectId) }, updateOp, err =>
       callback(err)
     )
   }
 
-  makePublic(project_id, level, callback) {
-    if (callback == null) {
-      callback = function(error) {}
-    }
-    return this.request.post(
+  makePublic(projectId, level, callback) {
+    this.request.post(
       {
-        url: `/project/${project_id}/settings/admin`,
+        url: `/project/${projectId}/settings/admin`,
         json: {
           publicAccessLevel: level
         }
@@ -541,18 +440,15 @@ class User {
         if (error != null) {
           return callback(error)
         }
-        return callback(null)
+        callback(null)
       }
     )
   }
 
-  makePrivate(project_id, callback) {
-    if (callback == null) {
-      callback = function(error) {}
-    }
-    return this.request.post(
+  makePrivate(projectId, callback) {
+    this.request.post(
       {
-        url: `/project/${project_id}/settings/admin`,
+        url: `/project/${projectId}/settings/admin`,
         json: {
           publicAccessLevel: 'private'
         }
@@ -561,18 +457,15 @@ class User {
         if (error != null) {
           return callback(error)
         }
-        return callback(null)
+        callback(null)
       }
     )
   }
 
-  makeTokenBased(project_id, callback) {
-    if (callback == null) {
-      callback = function(error) {}
-    }
-    return this.request.post(
+  makeTokenBased(projectId, callback) {
+    this.request.post(
       {
-        url: `/project/${project_id}/settings/admin`,
+        url: `/project/${projectId}/settings/admin`,
         json: {
           publicAccessLevel: 'tokenBased'
         }
@@ -581,16 +474,13 @@ class User {
         if (error != null) {
           return callback(error)
         }
-        return callback(null)
+        callback(null)
       }
     )
   }
 
   getCsrfToken(callback) {
-    if (callback == null) {
-      callback = function(error) {}
-    }
-    return this.request.get(
+    this.request.get(
       {
         url: '/dev/csrf'
       },
@@ -604,20 +494,17 @@ class User {
             'x-csrf-token': this.csrfToken
           }
         })
-        return callback()
+        callback()
       }
     )
   }
 
   changePassword(callback) {
-    if (callback == null) {
-      callback = function(error) {}
-    }
-    return this.getCsrfToken(error => {
+    this.getCsrfToken(error => {
       if (error != null) {
         return callback(error)
       }
-      return this.request.post(
+      this.request.post(
         {
           url: '/user/password/update',
           json: {
@@ -630,48 +517,42 @@ class User {
           if (error != null) {
             return callback(error)
           }
-          return db.users.findOne({ email: this.email }, (error, user) => {
+          db.users.findOne({ email: this.email }, (error, user) => {
             if (error != null) {
               return callback(error)
             }
-            return callback()
+            callback()
           })
         }
       )
     })
   }
 
-  reconfirmAccountRequest(user_email, callback) {
-    if (callback == null) {
-      callback = function(error) {}
-    }
-    return this.getCsrfToken(error => {
+  reconfirmAccountRequest(userEmail, callback) {
+    this.getCsrfToken(error => {
       if (error != null) {
         return callback(error)
       }
-      return this.request.post(
+      this.request.post(
         {
           url: '/user/reconfirm',
           json: {
-            email: user_email
+            email: userEmail
           }
         },
         (error, response, body) => {
-          return callback(error, response)
+          callback(error, response)
         }
       )
     })
   }
 
   getUserSettingsPage(callback) {
-    if (callback == null) {
-      callback = function(error, statusCode) {}
-    }
-    return this.getCsrfToken(error => {
+    this.getCsrfToken(error => {
       if (error != null) {
         return callback(error)
       }
-      return this.request.get(
+      this.request.get(
         {
           url: '/user/settings'
         },
@@ -679,21 +560,18 @@ class User {
           if (error != null) {
             return callback(error)
           }
-          return callback(null, response.statusCode)
+          callback(null, response.statusCode)
         }
       )
     })
   }
 
   activateSudoMode(callback) {
-    if (callback == null) {
-      callback = function(error) {}
-    }
-    return this.getCsrfToken(error => {
+    this.getCsrfToken(error => {
       if (error != null) {
         return callback(error)
       }
-      return this.request.post(
+      this.request.post(
         {
           uri: '/confirm-password',
           json: {
@@ -706,14 +584,11 @@ class User {
   }
 
   updateSettings(newSettings, callback) {
-    if (callback == null) {
-      callback = function(error, response, body) {}
-    }
-    return this.getCsrfToken(error => {
+    this.getCsrfToken(error => {
       if (error != null) {
         return callback(error)
       }
-      return this.request.post(
+      this.request.post(
         {
           url: '/user/settings',
           json: newSettings
@@ -724,14 +599,11 @@ class User {
   }
 
   getProjectListPage(callback) {
-    if (callback == null) {
-      callback = function(error, statusCode) {}
-    }
-    return this.getCsrfToken(error => {
+    this.getCsrfToken(error => {
       if (error != null) {
         return callback(error)
       }
-      return this.request.get(
+      this.request.get(
         {
           url: '/project'
         },
@@ -739,26 +611,23 @@ class User {
           if (error != null) {
             return callback(error)
           }
-          return callback(null, response.statusCode)
+          callback(null, response.statusCode)
         }
       )
     })
   }
 
   isLoggedIn(callback) {
-    if (callback == null) {
-      callback = function(error, loggedIn) {}
-    }
-    return this.request.get('/user/personal_info', (error, response, body) => {
+    this.request.get('/user/personal_info', (error, response, body) => {
       if (error != null) {
         return callback(error)
       }
       if (response.statusCode === 200) {
-        return callback(null, true)
+        callback(null, true)
       } else if (response.statusCode === 302) {
-        return callback(null, false)
+        callback(null, false)
       } else {
-        return callback(
+        callback(
           new Error(
             `unexpected status code from /user/personal_info: ${
               response.statusCode
@@ -769,8 +638,35 @@ class User {
     })
   }
 
+  transferProjectOwnership(projectId, userId, callback) {
+    this.getCsrfToken(err => {
+      if (err != null) {
+        return callback(err)
+      }
+      this.request.post(
+        {
+          url: `/project/${projectId.toString()}/transfer-ownership`,
+          json: {
+            user_id: userId.toString()
+          }
+        },
+        (err, response) => {
+          if (err != null) {
+            return callback(err)
+          }
+          if (response.statusCode !== 204) {
+            return callback(
+              new Error(`Unexpected status code: ${response.statusCode}`)
+            )
+          }
+          callback()
+        }
+      )
+    })
+  }
+
   setV1Id(v1Id, callback) {
-    return UserModel.update(
+    UserModel.update(
       {
         _id: this._id
       },
@@ -809,9 +705,3 @@ Object.getOwnPropertyNames(User.prototype).forEach(methodName => {
 })
 
 module.exports = User
-
-function __guard__(value, transform) {
-  return typeof value !== 'undefined' && value !== null
-    ? transform(value)
-    : undefined
-}

services/web/test/unit/src/Project/ProjectControllerTests.js

@@ -1,33 +1,22 @@
-/* eslint-disable
-    max-len,
-    no-return-assign,
-    no-unused-vars,
-*/
-// TODO: This file was created by bulk-decaffeinate.
-// Fix any style issues and re-enable lint.
-/*
- * decaffeinate suggestions:
- * DS102: Remove unnecessary code created because of implicit returns
- * Full docs: https://github.com/decaffeinate/decaffeinate/blob/master/docs/suggestions.md
- */
-const should = require('chai').should()
 const SandboxedModule = require('sandboxed-module')
-const assert = require('assert')
 const path = require('path')
 const sinon = require('sinon')
-const modulePath = path.join(
+const { expect } = require('chai')
+const HttpErrors = require('@overleaf/o-error/http')
+const { ObjectId } = require('mongodb')
+const Errors = require('../../../../app/src/Features/Errors/Errors')
+
+const MODULE_PATH = path.join(
   __dirname,
   '../../../../app/src/Features/Project/ProjectController'
 )
-const { expect } = require('chai')
-const Errors = require('../../../../app/src/Features/Errors/Errors')
 
 describe('ProjectController', function() {
   beforeEach(function() {
-    this.project_id = '123213jlkj9kdlsaj'
+    this.project_id = ObjectId('abcdefabcdefabcdefabcdef')
 
     this.user = {
-      _id: '588f3ddae8ebc1bac07c9fa4',
+      _id: ObjectId('123456123456123456123456'),
       first_name: 'bjkdsjfk',
       features: {}
     }
@@ -79,6 +68,9 @@ describe('ProjectController', function() {
       findAllUsersProjects: sinon.stub(),
       getProject: sinon.stub()
     }
+    this.ProjectDetailsHandler = {
+      transferOwnership: sinon.stub().yields()
+    }
     this.ProjectHelper = {
       isArchived: sinon.stub(),
       isTrashed: sinon.stub(),
@@ -121,7 +113,7 @@ describe('ProjectController', function() {
     }
     this.getUserAffiliations = sinon.stub().callsArgWith(1, null, [])
 
-    this.ProjectController = SandboxedModule.require(modulePath, {
+    this.ProjectController = SandboxedModule.require(MODULE_PATH, {
       globals: {
         console: console
       },
@@ -137,6 +129,7 @@ describe('ProjectController', function() {
           },
           inc() {}
         },
+        '@overleaf/o-error/http': HttpErrors,
         './ProjectDeleter': this.ProjectDeleter,
         './ProjectDuplicator': this.ProjectDuplicator,
         './ProjectCreationHandler': this.ProjectCreationHandler,
@@ -155,6 +148,7 @@ describe('ProjectController', function() {
         '../ReferencesSearch/ReferencesSearchHandler': this
           .ReferencesSearchHandler,
         './ProjectGetter': this.ProjectGetter,
+        './ProjectDetailsHandler': this.ProjectDetailsHandler,
         '../Authentication/AuthenticationController': this
           .AuthenticationController,
         '../Analytics/AnalyticsManager': this.AnalyticsManager,
@@ -196,12 +190,12 @@ describe('ProjectController', function() {
       },
       ip: '192.170.18.1'
     }
-    return (this.res = {
+    this.res = {
       locals: {
         jsPath: 'js path here'
       },
       setTimeout: sinon.stub()
-    })
+    }
   })
 
   describe('updateProjectSettings', function() {
@@ -213,9 +207,9 @@ describe('ProjectController', function() {
           .calledWith(this.project_id, this.name)
           .should.equal(true)
         code.should.equal(204)
-        return done()
+        done()
       }
-      return this.ProjectController.updateProjectSettings(this.req, this.res)
+      this.ProjectController.updateProjectSettings(this.req, this.res)
     })
 
     it('should update the compiler', function(done) {
@@ -226,9 +220,9 @@ describe('ProjectController', function() {
           .calledWith(this.project_id, this.compiler)
           .should.equal(true)
         code.should.equal(204)
-        return done()
+        done()
       }
-      return this.ProjectController.updateProjectSettings(this.req, this.res)
+      this.ProjectController.updateProjectSettings(this.req, this.res)
     })
 
     it('should update the imageName', function(done) {
@@ -239,9 +233,9 @@ describe('ProjectController', function() {
           .calledWith(this.project_id, this.imageName)
           .should.equal(true)
         code.should.equal(204)
-        return done()
+        done()
       }
-      return this.ProjectController.updateProjectSettings(this.req, this.res)
+      this.ProjectController.updateProjectSettings(this.req, this.res)
     })
 
     it('should update the spell check language', function(done) {
@@ -252,9 +246,9 @@ describe('ProjectController', function() {
           .calledWith(this.project_id, this.languageCode)
           .should.equal(true)
         code.should.equal(204)
-        return done()
+        done()
       }
-      return this.ProjectController.updateProjectSettings(this.req, this.res)
+      this.ProjectController.updateProjectSettings(this.req, this.res)
     })
 
     it('should update the root doc', function(done) {
@@ -265,9 +259,9 @@ describe('ProjectController', function() {
           .calledWith(this.project_id, this.rootDocId)
           .should.equal(true)
         code.should.equal(204)
-        return done()
+        done()
       }
-      return this.ProjectController.updateProjectSettings(this.req, this.res)
+      this.ProjectController.updateProjectSettings(this.req, this.res)
     })
   })
 
@@ -282,12 +276,9 @@ describe('ProjectController', function() {
           .calledWith(this.project_id, this.publicAccessLevel)
           .should.equal(true)
         code.should.equal(204)
-        return done()
+        done()
       }
-      return this.ProjectController.updateProjectAdminSettings(
-        this.req,
-        this.res
-      )
+      this.ProjectController.updateProjectAdminSettings(this.req, this.res)
     })
   })
 
@@ -298,9 +289,9 @@ describe('ProjectController', function() {
           .calledWith(this.project_id)
           .should.equal(true)
         code.should.equal(200)
-        return done()
+        done()
       }
-      return this.ProjectController.deleteProject(this.req, this.res)
+      this.ProjectController.deleteProject(this.req, this.res)
     })
 
     it('should tell the project deleter to delete when forever=true', function(done) {
@@ -313,9 +304,9 @@ describe('ProjectController', function() {
           })
           .should.equal(true)
         code.should.equal(200)
-        return done()
+        done()
       }
-      return this.ProjectController.deleteProject(this.req, this.res)
+      this.ProjectController.deleteProject(this.req, this.res)
     })
   })
 
@@ -326,9 +317,9 @@ describe('ProjectController', function() {
           .calledWith(this.project_id)
           .should.equal(true)
         code.should.equal(200)
-        return done()
+        done()
       }
-      return this.ProjectController.restoreProject(this.req, this.res)
+      this.ProjectController.restoreProject(this.req, this.res)
     })
   })
 
@@ -339,9 +330,9 @@ describe('ProjectController', function() {
           .calledWith(this.user, this.project_id, this.projectName)
           .should.equal(true)
         json.project_id.should.equal(this.project_id)
-        return done()
+        done()
       }
-      return this.ProjectController.cloneProject(this.req, this.res)
+      this.ProjectController.cloneProject(this.req, this.res)
     })
   })
 
@@ -355,9 +346,9 @@ describe('ProjectController', function() {
         this.ProjectCreationHandler.createBasicProject.called.should.equal(
           false
         )
-        return done()
+        done()
       }
-      return this.ProjectController.newProject(this.req, this.res)
+      this.ProjectController.newProject(this.req, this.res)
     })
 
     it('should call the projectCreationHandler with createBasicProject', function(done) {
@@ -369,9 +360,9 @@ describe('ProjectController', function() {
         this.ProjectCreationHandler.createBasicProject
           .calledWith(this.user._id, this.projectName)
           .should.equal(true)
-        return done()
+        done()
       }
-      return this.ProjectController.newProject(this.req, this.res)
+      this.ProjectController.newProject(this.req, this.res)
     })
   })
 
@@ -411,10 +402,10 @@ describe('ProjectController', function() {
       }
       this.users[this.user._id] = this.user // Owner
       this.UserModel.findById = (id, fields, callback) => {
-        return callback(null, this.users[id])
+        callback(null, this.users[id])
       }
       this.UserGetter.getUserOrUserStubById = (id, fields, callback) => {
-        return callback(null, this.users[id])
+        callback(null, this.users[id])
       }
 
       this.LimitationsManager.hasPaidSubscription.callsArgWith(1, null, false)
@@ -427,7 +418,7 @@ describe('ProjectController', function() {
         null,
         this.allProjects
       )
-      return this.Modules.hooks.fire
+      this.Modules.hooks.fire
         .withArgs('findAllV1Projects', this.user._id)
         .yields(undefined)
     }) // Without integration module hook, cb returns undefined
@@ -435,26 +426,26 @@ describe('ProjectController', function() {
     it('should render the project/list page', function(done) {
       this.res.render = (pageName, opts) => {
         pageName.should.equal('project/list')
-        return done()
+        done()
       }
-      return this.ProjectController.projectListPage(this.req, this.res)
+      this.ProjectController.projectListPage(this.req, this.res)
     })
 
     it('should send the tags', function(done) {
       this.res.render = (pageName, opts) => {
         opts.tags.length.should.equal(this.tags.length)
-        return done()
+        done()
       }
-      return this.ProjectController.projectListPage(this.req, this.res)
+      this.ProjectController.projectListPage(this.req, this.res)
     })
 
     it('should create trigger ip matcher notifications', function(done) {
       this.settings.overleaf = true
       this.res.render = (pageName, opts) => {
         this.NotificationBuilder.ipMatcherAffiliation.called.should.equal(true)
-        return done()
+        done()
       }
-      return this.ProjectController.projectListPage(this.req, this.res)
+      this.ProjectController.projectListPage(this.req, this.res)
     })
 
     it('should send the projects', function(done) {
@@ -466,17 +457,17 @@ describe('ProjectController', function() {
             this.tokenReadAndWrite.length +
             this.tokenReadOnly.length
         )
-        return done()
+        done()
       }
-      return this.ProjectController.projectListPage(this.req, this.res)
+      this.ProjectController.projectListPage(this.req, this.res)
     })
 
     it('should send the user', function(done) {
       this.res.render = (pageName, opts) => {
         opts.user.should.deep.equal(this.user)
-        return done()
+        done()
       }
-      return this.ProjectController.projectListPage(this.req, this.res)
+      this.ProjectController.projectListPage(this.req, this.res)
     })
 
     it('should inject the users', function(done) {
@@ -490,17 +481,17 @@ describe('ProjectController', function() {
         opts.projects[1].lastUpdatedBy.should.equal(
           this.users[this.projects[1].lastUpdatedBy]
         )
-        return done()
+        done()
       }
-      return this.ProjectController.projectListPage(this.req, this.res)
+      this.ProjectController.projectListPage(this.req, this.res)
     })
 
     it('should send hasSubscription == false when no subscription', function(done) {
       this.res.render = (pageName, opts) => {
         opts.hasSubscription.should.equal(false)
-        return done()
+        done()
       }
-      return this.ProjectController.projectListPage(this.req, this.res)
+      this.ProjectController.projectListPage(this.req, this.res)
     })
 
     it('should send hasSubscription == true when there is a subscription', function(done) {
@@ -509,16 +500,16 @@ describe('ProjectController', function() {
         .callsArgWith(1, null, true)
       this.res.render = (pageName, opts) => {
         opts.hasSubscription.should.equal(true)
-        return done()
+        done()
       }
-      return this.ProjectController.projectListPage(this.req, this.res)
+      this.ProjectController.projectListPage(this.req, this.res)
     })
 
     describe('front widget', function(done) {
       beforeEach(function() {
-        return (this.settings.overleaf = {
+        this.settings.overleaf = {
           front_chat_widget_room_id: 'chat-room-id'
-        })
+        }
       })
 
       it('should show for paid users', function(done) {
@@ -528,29 +519,29 @@ describe('ProjectController', function() {
           opts.frontChatWidgetRoomId.should.equal(
             this.settings.overleaf.front_chat_widget_room_id
           )
-          return done()
+          done()
         }
-        return this.ProjectController.projectListPage(this.req, this.res)
+        this.ProjectController.projectListPage(this.req, this.res)
       })
 
       it('should show for sample users', function(done) {
-        this.user._id = '588f3ddae8ebc1bac07c9f00' // last two digits
+        this.user._id = ObjectId('588f3ddae8ebc1bac07c9f00') // last two digits
         this.res.render = (pageName, opts) => {
           opts.frontChatWidgetRoomId.should.equal(
             this.settings.overleaf.front_chat_widget_room_id
           )
-          return done()
+          done()
         }
-        return this.ProjectController.projectListPage(this.req, this.res)
+        this.ProjectController.projectListPage(this.req, this.res)
       })
 
       it('should not show for non sample users', function(done) {
-        this.user._id = '588f3ddae8ebc1bac07c9fff' // last two digits
+        this.user._id = ObjectId('588f3ddae8ebc1bac07c9fff') // last two digits
         this.res.render = (pageName, opts) => {
           expect(opts.frontChatWidgetRoomId).to.equal(undefined)
-          return done()
+          done()
         }
-        return this.ProjectController.projectListPage(this.req, this.res)
+        this.ProjectController.projectListPage(this.req, this.res)
       })
     })
 
@@ -579,7 +570,7 @@ describe('ProjectController', function() {
           ],
           tags: [{ name: 'mock tag', project_ids: ['123mockV1Id'] }]
         }
-        return this.Modules.hooks.fire
+        this.Modules.hooks.fire
           .withArgs('findAllV1Projects', this.user._id)
           .yields(null, [this.V1Response])
       }) // Need to wrap response in array, as multiple hooks could fire
@@ -600,11 +591,11 @@ describe('ProjectController', function() {
             expect(p).to.have.property('name')
             expect(p).to.have.property('lastUpdated')
             expect(p).to.have.property('accessLevel')
-            return expect(p).to.have.property('archived')
+            expect(p).to.have.property('archived')
           })
-          return done()
+          done()
         }
-        return this.ProjectController.projectListPage(this.req, this.res)
+        this.ProjectController.projectListPage(this.req, this.res)
       })
 
       it('should include V1 tags', function(done) {
@@ -614,19 +605,19 @@ describe('ProjectController', function() {
           )
           opts.tags.forEach(t => {
             expect(t).to.have.property('name')
-            return expect(t).to.have.property('project_ids')
+            expect(t).to.have.property('project_ids')
           })
-          return done()
+          done()
         }
-        return this.ProjectController.projectListPage(this.req, this.res)
+        this.ProjectController.projectListPage(this.req, this.res)
       })
 
       it('should have isShowingV1Projects flag', function(done) {
         this.res.render = (pageName, opts) => {
           opts.isShowingV1Projects.should.equal(true)
-          return done()
+          done()
         }
-        return this.ProjectController.projectListPage(this.req, this.res)
+        this.ProjectController.projectListPage(this.req, this.res)
       })
     })
   })
@@ -670,7 +661,7 @@ describe('ProjectController', function() {
       }
       this.users[this.user._id] = this.user // Owner
       this.UserModel.findById = (id, fields, callback) => {
-        return callback(null, this.users[id])
+        callback(null, this.users[id])
       }
 
       this.LimitationsManager.hasPaidSubscription.callsArgWith(1, null, false)
@@ -683,7 +674,7 @@ describe('ProjectController', function() {
         null,
         this.allProjects
       )
-      return this.Modules.hooks.fire
+      this.Modules.hooks.fire
         .withArgs('findAllV1Projects', this.user._id)
         .yields(undefined)
     }) // Without integration module hook, cb returns undefined
@@ -691,9 +682,9 @@ describe('ProjectController', function() {
     it('should render the project/list page', function(done) {
       this.res.render = (pageName, opts) => {
         pageName.should.equal('project/list')
-        return done()
+        done()
       }
-      return this.ProjectController.projectListPage(this.req, this.res)
+      this.ProjectController.projectListPage(this.req, this.res)
     })
 
     it('should omit one of the projects', function(done) {
@@ -706,16 +697,16 @@ describe('ProjectController', function() {
             this.tokenReadOnly.length -
             1
         )
-        return done()
+        done()
       }
-      return this.ProjectController.projectListPage(this.req, this.res)
+      this.ProjectController.projectListPage(this.req, this.res)
     })
   })
 
   describe('renameProject', function() {
     beforeEach(function() {
       this.newProjectName = 'my supper great new project'
-      return (this.req.body.newProjectName = this.newProjectName)
+      this.req.body.newProjectName = this.newProjectName
     })
 
     it('should call the editor controller', function(done) {
@@ -725,9 +716,9 @@ describe('ProjectController', function() {
         this.EditorController.renameProject
           .calledWith(this.project_id, this.newProjectName)
           .should.equal(true)
-        return done()
+        done()
       }
-      return this.ProjectController.renameProject(this.req, this.res)
+      this.ProjectController.renameProject(this.req, this.res)
     })
 
     it('should send an error to next() if there is a problem', function(done) {
@@ -738,9 +729,9 @@ describe('ProjectController', function() {
       )
       const next = e => {
         e.should.equal(error)
-        return done()
+        done()
       }
-      return this.ProjectController.renameProject(this.req, this.res, next)
+      this.ProjectController.renameProject(this.req, this.res, next)
     })
   })
 
@@ -777,32 +768,32 @@ describe('ProjectController', function() {
       this.ProjectDeleter.unmarkAsDeletedByExternalSource = sinon.stub()
       this.InactiveProjectManager.reactivateProjectIfRequired.callsArgWith(1)
       this.AnalyticsManager.getLastOccurrence.yields(null, { mock: 'event' })
-      return this.ProjectUpdateHandler.markAsOpened.callsArgWith(1)
+      this.ProjectUpdateHandler.markAsOpened.callsArgWith(1)
     })
 
     it('should render the project/editor page', function(done) {
       this.res.render = (pageName, opts) => {
         pageName.should.equal('project/editor')
-        return done()
+        done()
       }
-      return this.ProjectController.loadEditor(this.req, this.res)
+      this.ProjectController.loadEditor(this.req, this.res)
     })
 
     it('should add user', function(done) {
       this.res.render = (pageName, opts) => {
         opts.user.email.should.equal(this.user.email)
-        return done()
+        done()
       }
-      return this.ProjectController.loadEditor(this.req, this.res)
+      this.ProjectController.loadEditor(this.req, this.res)
     })
 
     it('should add on userSettings', function(done) {
       this.res.render = (pageName, opts) => {
         opts.userSettings.fontSize.should.equal(this.user.ace.fontSize)
         opts.userSettings.editorTheme.should.equal(this.user.ace.theme)
-        return done()
+        done()
       }
-      return this.ProjectController.loadEditor(this.req, this.res)
+      this.ProjectController.loadEditor(this.req, this.res)
     })
 
     it('should add isRestrictedTokenMember', function(done) {
@@ -848,9 +839,9 @@ describe('ProjectController', function() {
       this.settings.editorIsOpen = false
       this.res.render = (pageName, opts) => {
         pageName.should.equal('general/closed')
-        return done()
+        done()
       }
-      return this.ProjectController.loadEditor(this.req, this.res)
+      this.ProjectController.loadEditor(this.req, this.res)
     })
 
     it('should not render the page if the project can not be accessed', function(done) {
@@ -859,9 +850,9 @@ describe('ProjectController', function() {
         .callsArgWith(3, null, null)
       this.res.sendStatus = (resCode, opts) => {
         resCode.should.equal(401)
-        return done()
+        done()
       }
-      return this.ProjectController.loadEditor(this.req, this.res)
+      this.ProjectController.loadEditor(this.req, this.res)
     })
 
     it('should reactivateProjectIfRequired', function(done) {
@@ -869,9 +860,9 @@ describe('ProjectController', function() {
         this.InactiveProjectManager.reactivateProjectIfRequired
           .calledWith(this.project_id)
           .should.equal(true)
-        return done()
+        done()
       }
-      return this.ProjectController.loadEditor(this.req, this.res)
+      this.ProjectController.loadEditor(this.req, this.res)
     })
 
     it('should mark project as opened', function(done) {
@@ -879,9 +870,9 @@ describe('ProjectController', function() {
         this.ProjectUpdateHandler.markAsOpened
           .calledWith(this.project_id)
           .should.equal(true)
-        return done()
+        done()
       }
-      return this.ProjectController.loadEditor(this.req, this.res)
+      this.ProjectController.loadEditor(this.req, this.res)
     })
 
     it('should call the brand variations handler for branded projects', function(done) {
@@ -890,9 +881,9 @@ describe('ProjectController', function() {
         this.BrandVariationsHandler.getBrandVariationById
           .calledWith()
           .should.equal(true)
-        return done()
+        done()
       }
-      return this.ProjectController.loadEditor(this.req, this.res)
+      this.ProjectController.loadEditor(this.req, this.res)
     })
 
     it('should not call the brand variations handler for unbranded projects', function(done) {
@@ -900,18 +891,18 @@ describe('ProjectController', function() {
         this.BrandVariationsHandler.getBrandVariationById.called.should.equal(
           false
         )
-        return done()
+        done()
       }
-      return this.ProjectController.loadEditor(this.req, this.res)
+      this.ProjectController.loadEditor(this.req, this.res)
     })
 
     it('should expose the brand variation details as locals for branded projects', function(done) {
       this.ProjectGetter.getProject.callsArgWith(2, null, this.brandedProject)
       this.res.render = (pageName, opts) => {
         opts.brandVariation.should.deep.equal(this.brandVariationDetails)
-        return done()
+        done()
       }
-      return this.ProjectController.loadEditor(this.req, this.res)
+      this.ProjectController.loadEditor(this.req, this.res)
     })
   })
 
@@ -971,7 +962,7 @@ describe('ProjectController', function() {
       this.AuthenticationController.getLoggedInUserId = sinon
         .stub()
         .returns(this.user._id)
-      return done()
+      done()
     })
 
     it('should produce a list of projects', function(done) {
@@ -982,13 +973,9 @@ describe('ProjectController', function() {
             { _id: 'd', name: 'D', accessLevel: 'd' }
           ]
         })
-        return done()
+        done()
       }
-      return this.ProjectController.userProjectsJson(
-        this.req,
-        this.res,
-        this.next
-      )
+      this.ProjectController.userProjectsJson(this.req, this.res, this.next)
     })
   })
 
@@ -1007,9 +994,9 @@ describe('ProjectController', function() {
       this.ProjectGetter.getProject = sinon
         .stub()
         .callsArgWith(1, null, this.project)
-      return (this.ProjectEntityHandler.getAllEntitiesFromProject = sinon
+      this.ProjectEntityHandler.getAllEntitiesFromProject = sinon
         .stub()
-        .callsArgWith(1, null, this.docs, this.files))
+        .callsArgWith(1, null, this.docs, this.files)
     })
 
     it('should produce a list of entities', function(done) {
@@ -1026,13 +1013,9 @@ describe('ProjectController', function() {
         expect(
           this.ProjectEntityHandler.getAllEntitiesFromProject.callCount
         ).to.equal(1)
-        return done()
+        done()
       }
-      return this.ProjectController.projectEntitiesJson(
-        this.req,
-        this.res,
-        this.next
-      )
+      this.ProjectController.projectEntitiesJson(this.req, this.res, this.next)
     })
   })
 
@@ -1115,7 +1098,7 @@ describe('ProjectController', function() {
   })
   describe('_isInPercentageRollout', function() {
     before(function() {
-      return (this.ids = [
+      this.ids = [
         '5a05cd7621f9fe22be131740',
         '5a05cd7821f9fe22be131741',
         '5a05cd7921f9fe22be131742',
@@ -1136,14 +1119,14 @@ describe('ProjectController', function() {
         '5a05cd8421f9fe22be131751',
         '5a05cd8421f9fe22be131752',
         '5a05cd8521f9fe22be131753'
-      ])
+      ]
     })
 
     it('should produce the expected results', function() {
       expect(
-        this.ids.map(i => {
-          return this.ProjectController._isInPercentageRollout('abcd', i, 50)
-        })
+        this.ids.map(i =>
+          this.ProjectController._isInPercentageRollout('abcd', i, 50)
+        )
       ).to.deep.equal([
         false,
         false,
@@ -1166,10 +1149,10 @@ describe('ProjectController', function() {
         false,
         true
       ])
-      return expect(
-        this.ids.map(i => {
-          return this.ProjectController._isInPercentageRollout('efgh', i, 50)
-        })
+      expect(
+        this.ids.map(i =>
+          this.ProjectController._isInPercentageRollout('efgh', i, 50)
+        )
       ).to.deep.equal([
         false,
         false,
@@ -1194,4 +1177,46 @@ describe('ProjectController', function() {
       ])
     })
   })
+
+  describe('transferOwnership', function() {
+    beforeEach(function() {
+      this.req.body = { user_id: this.user._id.toString() }
+    })
+
+    it('validates the request body', function(done) {
+      this.req.body = {}
+      this.ProjectController.transferOwnership(this.req, this.res, err => {
+        expect(err).to.be.instanceof(HttpErrors.BadRequestError)
+        done()
+      })
+    })
+
+    it('returns 204 on success', function(done) {
+      this.res.sendStatus = status => {
+        expect(status).to.equal(204)
+        done()
+      }
+      this.ProjectController.transferOwnership(this.req, this.res)
+    })
+
+    it('returns 404 if the project does not exist', function(done) {
+      this.ProjectDetailsHandler.transferOwnership.yields(
+        new Errors.ProjectNotFoundError()
+      )
+      this.ProjectController.transferOwnership(this.req, this.res, err => {
+        expect(err).to.be.instanceof(HttpErrors.NotFoundError)
+        done()
+      })
+    })
+
+    it('returns 404 if the user does not exist', function(done) {
+      this.ProjectDetailsHandler.transferOwnership.yields(
+        new Errors.UserNotFoundError()
+      )
+      this.ProjectController.transferOwnership(this.req, this.res, err => {
+        expect(err).to.be.instanceof(HttpErrors.NotFoundError)
+        done()
+      })
+    })
+  })
 })

services/web/test/unit/src/Project/ProjectDetailsHandlerTests.js

@@ -1,22 +1,30 @@
-const Errors = require('../../../../app/src/Features/Errors/Errors')
 const SandboxedModule = require('sandboxed-module')
 const sinon = require('sinon')
 const { expect } = require('chai')
+const { ObjectId } = require('mongodb')
+const Errors = require('../../../../app/src/Features/Errors/Errors')
+const PrivilegeLevels = require('../../../../app/src/Features/Authorization/PrivilegeLevels')
 
 const MODULE_PATH = '../../../../app/src/Features/Project/ProjectDetailsHandler'
 
 describe('ProjectDetailsHandler', function() {
   beforeEach(function() {
-    this.project_id = '321l3j1kjkjl'
-    this.user_id = 'user-id-123'
+    this.user = {
+      _id: ObjectId('abcdefabcdefabcdefabcdef'),
+      features: 'mock-features'
+    }
+    this.collaborator = {
+      _id: ObjectId('123456123456123456123456')
+    }
     this.project = {
+      _id: ObjectId('5d5dabdbb351de090cdff0b2'),
       name: 'project',
       description: 'this is a great project',
       something: 'should not exist',
       compiler: 'latexxxxxx',
-      owner_ref: this.user_id
+      owner_ref: this.user._id,
+      collaberator_refs: [this.collaborator._id]
     }
-    this.user = { features: 'mock-features' }
     this.ProjectGetter = {
       promises: {
         getProjectWithoutDocLines: sinon.stub().resolves(this.project),
@@ -52,7 +60,8 @@ describe('ProjectDetailsHandler', function() {
     }
     this.CollaboratorsHandler = {
       promises: {
-        removeUserFromProject: sinon.stub().resolves()
+        removeUserFromProject: sinon.stub().resolves(),
+        addUserIdToProject: sinon.stub().resolves()
       }
     }
     this.ProjectTokenGenerator = {
@@ -91,7 +100,7 @@ describe('ProjectDetailsHandler', function() {
 
   describe('getDetails', function() {
     it('should find the project and owner', async function() {
-      const details = await this.handler.promises.getDetails(this.project_id)
+      const details = await this.handler.promises.getDetails(this.project._id)
       details.name.should.equal(this.project.name)
       details.description.should.equal(this.project.description)
       details.compiler.should.equal(this.project.compiler)
@@ -101,7 +110,7 @@ describe('ProjectDetailsHandler', function() {
 
     it('should find overleaf metadata if it exists', async function() {
       this.project.overleaf = { id: 'id' }
-      const details = await this.handler.promises.getDetails(this.project_id)
+      const details = await this.handler.promises.getDetails(this.project._id)
       details.overleaf.should.equal(this.project.overleaf)
       expect(details.something).to.be.undefined
     })
@@ -115,95 +124,122 @@ describe('ProjectDetailsHandler', function() {
 
     it('should return the default features if no owner found', async function() {
       this.UserGetter.promises.getUser.resolves(null)
-      const details = await this.handler.promises.getDetails(this.project_id)
+      const details = await this.handler.promises.getDetails(this.project._id)
       details.features.should.equal(this.settings.defaultFeatures)
     })
 
     it('should rethrow any error', async function() {
       this.ProjectGetter.promises.getProject.rejects(new Error('boom'))
-      await expect(this.handler.promises.getDetails(this.project_id)).to.be
+      await expect(this.handler.promises.getDetails(this.project._id)).to.be
         .rejected
     })
   })
 
   describe('transferOwnership', function() {
     beforeEach(function() {
-      this.ProjectGetter.promises.findAllUsersProjects.resolves({
-        owned: [{ name: this.project.name }],
-        readAndWrite: [],
-        readOnly: [],
-        tokenReadAndWrite: [],
-        tokenReadOnly: []
-      })
+      this.UserGetter.promises.getUser.resolves(this.collaborator)
     })
 
     it("should return a not found error if the project can't be found", async function() {
       this.ProjectGetter.promises.getProject.resolves(null)
       await expect(
-        this.handler.promises.transferOwnership('abc', '123')
-      ).to.be.rejectedWith(Errors.NotFoundError)
+        this.handler.promises.transferOwnership('abc', this.collaborator._id)
+      ).to.be.rejectedWith(Errors.ProjectNotFoundError)
     })
 
     it("should return a not found error if the user can't be found", async function() {
       this.UserGetter.promises.getUser.resolves(null)
       await expect(
-        this.handler.promises.transferOwnership('abc', '123')
-      ).to.be.rejectedWith(Errors.NotFoundError)
+        this.handler.promises.transferOwnership(
+          this.project._id,
+          this.collaborator._id
+        )
+      ).to.be.rejectedWith(Errors.UserNotFoundError)
     })
 
     it('should return an error if user cannot be removed as collaborator ', async function() {
       this.CollaboratorsHandler.promises.removeUserFromProject.rejects(
         new Error('user-cannot-be-removed')
       )
-      await expect(this.handler.promises.transferOwnership('abc', '123')).to.be
-        .rejected
+      await expect(
+        this.handler.promises.transferOwnership(
+          this.project._id,
+          this.collaborator._id
+        )
+      ).to.be.rejected
     })
 
     it('should transfer ownership of the project', async function() {
-      await this.handler.promises.transferOwnership('abc', '123')
+      await this.handler.promises.transferOwnership(
+        this.project._id,
+        this.collaborator._id
+      )
       expect(this.ProjectModel.update).to.have.been.calledWith(
-        { _id: 'abc' },
-        sinon.match({ $set: { owner_ref: '123' } })
+        { _id: this.project._id },
+        sinon.match({ $set: { owner_ref: this.collaborator._id } })
       )
     })
 
+    it('should do nothing if transferring back to the owner', async function() {
+      await this.handler.promises.transferOwnership(
+        this.project._id,
+        this.user._id
+      )
+      expect(this.ProjectModel.update).not.to.have.been.called
+    })
+
     it("should remove the user from the project's collaborators", async function() {
-      await this.handler.promises.transferOwnership('abc', '123')
+      await this.handler.promises.transferOwnership(
+        this.project._id,
+        this.collaborator._id
+      )
       expect(
         this.CollaboratorsHandler.promises.removeUserFromProject
-      ).to.have.been.calledWith('abc', '123')
+      ).to.have.been.calledWith(this.project._id, this.collaborator._id)
     })
 
-    it('should flush the project to tpds', async function() {
-      await this.handler.promises.transferOwnership('abc', '123')
+    it('should add the former project owner as a read/write collaborator', async function() {
+      await this.handler.promises.transferOwnership(
+        this.project._id,
+        this.collaborator._id
+      )
       expect(
-        this.ProjectEntityHandler.promises.flushProjectToThirdPartyDataStore
-      ).to.have.been.calledWith('abc')
+        this.CollaboratorsHandler.promises.addUserIdToProject
+      ).to.have.been.calledWith(
+        this.project._id,
+        this.collaborator._id,
+        this.user._id,
+        PrivilegeLevels.READ_AND_WRITE
+      )
     })
 
-    it('should generate a unique name for the project', async function() {
-      await this.handler.promises.transferOwnership('abc', '123')
-      expect(this.ProjectModel.update).to.have.been.calledWith(
-        { _id: 'abc' },
-        sinon.match({ $set: { name: `${this.project.name} (1)` } })
+    it('should flush the project to tpds', async function() {
+      await this.handler.promises.transferOwnership(
+        this.project._id,
+        this.collaborator._id
       )
+      expect(
+        this.ProjectEntityHandler.promises.flushProjectToThirdPartyDataStore
+      ).to.have.been.calledWith(this.project._id)
     })
 
-    it('should append the supplied suffix to the project name, if passed', async function() {
-      await this.handler.promises.transferOwnership('abc', '123', ' wombat')
-      expect(this.ProjectModel.update).to.have.been.calledWith(
-        { _id: 'abc' },
-        sinon.match({ $set: { name: `${this.project.name} wombat` } })
-      )
+    it('should decline to transfer ownership to a non-collaborator', async function() {
+      this.project.collaberator_refs = []
+      await expect(
+        this.handler.promises.transferOwnership(
+          this.project._id,
+          this.collaborator._id
+        )
+      ).to.be.rejectedWith(Errors.UserNotCollaboratorError)
     })
   })
 
   describe('getProjectDescription', function() {
     it('should make a call to mongo just for the description', async function() {
       this.ProjectGetter.promises.getProject.resolves()
-      await this.handler.promises.getProjectDescription(this.project_id)
+      await this.handler.promises.getProjectDescription(this.project._id)
       expect(this.ProjectGetter.promises.getProject).to.have.been.calledWith(
-        this.project_id,
+        this.project._id,
         { description: true }
       )
     })
@@ -214,7 +250,7 @@ describe('ProjectDetailsHandler', function() {
         description: expectedDescription
       })
       const description = await this.handler.promises.getProjectDescription(
-        this.project_id
+        this.project._id
       )
       expect(description).to.equal(expectedDescription)
     })
@@ -227,11 +263,11 @@ describe('ProjectDetailsHandler', function() {
 
     it('should update the project detials', async function() {
       await this.handler.promises.setProjectDescription(
-        this.project_id,
+        this.project._id,
         this.description
       )
       expect(this.ProjectModel.update).to.have.been.calledWith(
-        { _id: this.project_id },
+        { _id: this.project._id },
         { description: this.description }
       )
     })
@@ -243,18 +279,18 @@ describe('ProjectDetailsHandler', function() {
     })
 
     it('should update the project with the new name', async function() {
-      await this.handler.promises.renameProject(this.project_id, this.newName)
+      await this.handler.promises.renameProject(this.project._id, this.newName)
       expect(this.ProjectModel.update).to.have.been.calledWith(
-        { _id: this.project_id },
+        { _id: this.project._id },
         { name: this.newName }
       )
     })
 
     it('should tell the TpdsUpdateSender', async function() {
-      await this.handler.promises.renameProject(this.project_id, this.newName)
+      await this.handler.promises.renameProject(this.project._id, this.newName)
       expect(this.TpdsUpdateSender.promises.moveEntity).to.have.been.calledWith(
         {
-          project_id: this.project_id,
+          project_id: this.project._id,
           project_name: this.project.name,
           newProjectName: this.newName
         }
@@ -262,7 +298,7 @@ describe('ProjectDetailsHandler', function() {
     })
 
     it('should not do anything with an invalid name', async function() {
-      await expect(this.handler.promises.renameProject(this.project_id)).to.be
+      await expect(this.handler.promises.renameProject(this.project._id)).to.be
         .rejected
       expect(this.TpdsUpdateSender.promises.moveEntity).not.to.have.been.called
       expect(this.ProjectModel.update).not.to.have.been.called
@@ -358,7 +394,7 @@ describe('ProjectDetailsHandler', function() {
 
     it('should leave a unique name unchanged', async function() {
       const name = await this.handler.promises.generateUniqueName(
-        this.user_id,
+        this.user._id,
         'unique-name',
         ['-test-suffix']
       )
@@ -367,7 +403,7 @@ describe('ProjectDetailsHandler', function() {
 
     it('should append a suffix to an existing name', async function() {
       const name = await this.handler.promises.generateUniqueName(
-        this.user_id,
+        this.user._id,
         'name1',
         ['-test-suffix']
       )
@@ -376,7 +412,7 @@ describe('ProjectDetailsHandler', function() {
 
     it('should fallback to a second suffix when needed', async function() {
       const name = await this.handler.promises.generateUniqueName(
-        this.user_id,
+        this.user._id,
         'name1',
         ['1', '-test-suffix']
       )
@@ -385,7 +421,7 @@ describe('ProjectDetailsHandler', function() {
 
     it('should truncate the name when append a suffix if the result is too long', async function() {
       const name = await this.handler.promises.generateUniqueName(
-        this.user_id,
+        this.user._id,
         this.longName,
         ['-test-suffix']
       )
@@ -397,7 +433,7 @@ describe('ProjectDetailsHandler', function() {
 
     it('should use a numeric index if no suffix is supplied', async function() {
       const name = await this.handler.promises.generateUniqueName(
-        this.user_id,
+        this.user._id,
         'name1',
         []
       )
@@ -406,7 +442,7 @@ describe('ProjectDetailsHandler', function() {
 
     it('should use a numeric index if all suffixes are exhausted', async function() {
       const name = await this.handler.promises.generateUniqueName(
-        this.user_id,
+        this.user._id,
         'name',
         ['1', '11']
       )
@@ -415,7 +451,7 @@ describe('ProjectDetailsHandler', function() {
 
     it('should find the next lowest available numeric index for the base name', async function() {
       const name = await this.handler.promises.generateUniqueName(
-        this.user_id,
+        this.user._id,
         'numeric',
         []
       )
@@ -424,7 +460,7 @@ describe('ProjectDetailsHandler', function() {
 
     it('should find the next available numeric index when a numeric index is already present', async function() {
       const name = await this.handler.promises.generateUniqueName(
-        this.user_id,
+        this.user._id,
         'numeric (5)',
         []
       )
@@ -433,7 +469,7 @@ describe('ProjectDetailsHandler', function() {
 
     it('should not find a numeric index lower than the one already present', async function() {
       const name = await this.handler.promises.generateUniqueName(
-        this.user_id,
+        this.user._id,
         'numeric (31)',
         []
       )
@@ -472,11 +508,11 @@ describe('ProjectDetailsHandler', function() {
 
     it('should update the project with the new level', async function() {
       await this.handler.promises.setPublicAccessLevel(
-        this.project_id,
+        this.project._id,
         this.accessLevel
       )
       expect(this.ProjectModel.update).to.have.been.calledWith(
-        { _id: this.project_id },
+        { _id: this.project._id },
         { publicAccesLevel: this.accessLevel }
       )
     })
@@ -484,7 +520,7 @@ describe('ProjectDetailsHandler', function() {
     it('should not produce an error', async function() {
       await expect(
         this.handler.promises.setPublicAccessLevel(
-          this.project_id,
+          this.project._id,
           this.accessLevel
         )
       ).to.be.resolved
@@ -498,7 +534,7 @@ describe('ProjectDetailsHandler', function() {
       it('should produce an error', async function() {
         await expect(
           this.handler.promises.setPublicAccessLevel(
-            this.project_id,
+            this.project._id,
             this.accessLevel
           )
         ).to.be.rejected
@@ -510,7 +546,7 @@ describe('ProjectDetailsHandler', function() {
     describe('when the project has tokens', function() {
       beforeEach(function() {
         this.project = {
-          _id: this.project_id,
+          _id: this.project._id,
           tokens: {
             readOnly: 'aaa',
             readAndWrite: '42bbb',
@@ -521,10 +557,10 @@ describe('ProjectDetailsHandler', function() {
       })
 
       it('should get the project', async function() {
-        await this.handler.promises.ensureTokensArePresent(this.project_id)
+        await this.handler.promises.ensureTokensArePresent(this.project._id)
         expect(this.ProjectGetter.promises.getProject).to.have.been.calledOnce
         expect(this.ProjectGetter.promises.getProject).to.have.been.calledWith(
-          this.project_id,
+          this.project._id,
           {
             tokens: 1
           }
@@ -532,13 +568,13 @@ describe('ProjectDetailsHandler', function() {
       })
 
       it('should not update the project with new tokens', async function() {
-        await this.handler.promises.ensureTokensArePresent(this.project_id)
+        await this.handler.promises.ensureTokensArePresent(this.project._id)
         expect(this.ProjectModel.update).not.to.have.been.called
       })
 
       it('should produce the tokens without error', async function() {
         const tokens = await this.handler.promises.ensureTokensArePresent(
-          this.project_id
+          this.project._id
         )
         expect(tokens).to.deep.equal(this.project.tokens)
       })
@@ -546,7 +582,7 @@ describe('ProjectDetailsHandler', function() {
 
     describe('when tokens are missing', function() {
       beforeEach(function() {
-        this.project = { _id: this.project_id }
+        this.project = { _id: this.project._id }
         this.ProjectGetter.promises.getProject.resolves(this.project)
         this.readOnlyToken = 'abc'
         this.readAndWriteToken = '42def'
@@ -561,10 +597,10 @@ describe('ProjectDetailsHandler', function() {
       })
 
       it('should get the project', async function() {
-        await this.handler.promises.ensureTokensArePresent(this.project_id)
+        await this.handler.promises.ensureTokensArePresent(this.project._id)
         expect(this.ProjectGetter.promises.getProject).to.have.been.calledOnce
         expect(this.ProjectGetter.promises.getProject).to.have.been.calledWith(
-          this.project_id,
+          this.project._id,
           {
             tokens: 1
           }
@@ -572,14 +608,14 @@ describe('ProjectDetailsHandler', function() {
       })
 
       it('should update the project with new tokens', async function() {
-        await this.handler.promises.ensureTokensArePresent(this.project_id)
+        await this.handler.promises.ensureTokensArePresent(this.project._id)
         expect(this.ProjectTokenGenerator.promises.generateUniqueReadOnlyToken)
           .to.have.been.calledOnce
         expect(this.ProjectTokenGenerator.readAndWriteToken).to.have.been
           .calledOnce
         expect(this.ProjectModel.update).to.have.been.calledOnce
         expect(this.ProjectModel.update).to.have.been.calledWith(
-          { _id: this.project_id },
+          { _id: this.project._id },
           {
             $set: {
               tokens: {
@@ -594,7 +630,7 @@ describe('ProjectDetailsHandler', function() {
 
       it('should produce the tokens without error', async function() {
         const tokens = await this.handler.promises.ensureTokensArePresent(
-          this.project_id
+          this.project._id
         )
         expect(tokens).to.deep.equal({
           readOnly: this.readOnlyToken,