Procházet zdrojové kódy

Merge pull request #2991 from overleaf/msm-add-user-projection-project-controller

Added projection to User.getById() in ProjectController

GitOrigin-RevId: 9233a897414e3cda0b8c91f0b50d4ac422e0ab30
Miguel Serrano před 6 roky
rodič
revize
e692802690

+ 13 - 9
services/web/app/src/Features/Project/ProjectController.js

@@ -646,16 +646,20 @@ const ProjectController = {
           if (userId == null) {
             cb(null, defaultSettingsForAnonymousUser(userId))
           } else {
-            User.findById(userId, (err, user) => {
-              // Handle case of deleted user
-              if (user == null) {
-                UserController.logout(req, res, next)
-                return
+            User.findById(
+              userId,
+              'email first_name last_name referal_id signUpDate featureSwitches features refProviders alphaProgram betaProgram isAdmin ace',
+              (err, user) => {
+                // Handle case of deleted user
+                if (user == null) {
+                  UserController.logout(req, res, next)
+                  return
+                }
+
+                logger.log({ projectId, userId }, 'got user')
+                cb(err, user)
               }
-
-              logger.log({ projectId, userId }, 'got user')
-              cb(err, user)
-            })
+            )
           }
         },
         subscription(cb) {

+ 1 - 1
services/web/test/unit/src/Project/ProjectControllerTests.js

@@ -937,7 +937,7 @@ describe('ProjectController', function() {
         email: 'bob@bob.com'
       }
       this.ProjectGetter.getProject.callsArgWith(2, null, this.project)
-      this.UserModel.findById.callsArgWith(1, null, this.user)
+      this.UserModel.findById.callsArgWith(2, null, this.user)
       this.SubscriptionLocator.getUsersSubscription.callsArgWith(1, null, {})
       this.AuthorizationManager.getPrivilegeLevelForProject.callsArgWith(
         3,