Merge branch 'master' into hotfix/additional_logs_for_team_updated_event

Author: vikasrohit

src/events/projects/index.js

@@ -23,7 +23,7 @@ const eClient = util.getElasticSearchClient();
  */
 const indexProject = Promise.coroutine(function* (logger, msg) { // eslint-disable-line func-names
   const data = JSON.parse(msg.content.toString());
-  const userIds = data.members ? data.members.map(single => `userId:${single.userId}`) : [];
+  const userIds = data.members ? _.map(data.members, 'userId') : [];
   try {
     // retrieve member details
     const memberDetails = yield util.getMemberDetailsByUserIds(userIds, logger, msg.properties.correlationId);

src/routes/admin/project-index-create.js

@@ -69,7 +69,7 @@ module.exports = [
           // check context for project members
           project.members = _.map(currentProjectMembers, m => _.pick(m, fields.project_members));
           logger.debug('project.members => ', project.members);
-          const userIds = project.members ? project.members.map(single => `userId:${single.userId}`) : [];
+          const userIds = project.members ? _.map(project.members, 'userId') : [];
           logger.debug('userIds => ', userIds);
           return util.getMemberDetailsByUserIds(userIds, logger, req.id)
           .then((memberDetails) => {

src/routes/projectMemberInvites/create.js

@@ -186,7 +186,7 @@ const sendInviteEmail = (req, projectId, invite) => {
       where: { id: projectId },
       raw: true,
     }),
-    util.getMemberDetailsByUserIds([`userId:${req.authUser.userId}`], req.log, req.id),
+    util.getMemberDetailsByUserIds([req.authUser.userId], req.log, req.id),
   ];
   return Promise.all(promises).then((responses) => {
     req.log.debug(responses);

src/util.js

@@ -280,6 +280,8 @@ _.assignIn(util, {
 
     // for non topcoder admins remove emails from the field list
     _.assign(fields, { project_members: _.filter(fields.project_members, f => f !== 'email') });
+    _.assign(fields, { project_members: _.filter(fields.project_members, f => f !== 'firstName') });
+    _.assign(fields, { project_members: _.filter(fields.project_members, f => f !== 'lastName') });
 
     return fields;
   },
@@ -565,7 +567,7 @@ _.assignIn(util, {
       }
       return httpClient.get(`${config.memberServiceEndpoint}/_search`, {
         params: {
-          query: `${userIds.join(urlencode(' OR ', 'utf8'))}`,
+          query: `${_.map(userIds, id => `userId:${id}`).join(urlencode(' OR ', 'utf8'))}`,
           fields: 'userId,handle,firstName,lastName,email',
         },
         headers: {
@@ -665,11 +667,11 @@ _.assignIn(util, {
       return members;
     }
     const memberTraitFields = ['photoURL', 'workingHourStart', 'workingHourEnd', 'timeZone'];
-    const memberDetailFields = ['handle', 'firstName', 'lastName'];
+    let memberDetailFields = ['handle'];
 
     // Only Topcoder admins can get emails for users
     if (util.hasPermission({ topcoderRoles: [USER_ROLE.TOPCODER_ADMIN] }, req.authUser)) {
-      memberDetailFields.push('email');
+      memberDetailFields = memberDetailFields.concat(['email', 'firstName', 'lastName']);
     }
 
     let allMemberDetails = [];
@@ -727,6 +729,8 @@ _.assignIn(util, {
 
       // in general, only users with Topcoder administrator privileges can see emails
       let canSeeEmail = util.hasPermission({ topcoderRoles: [USER_ROLE.TOPCODER_ADMIN] }, req.authUser);
+      // we also shouldn't return full name to users except of admins
+      const canSeeFullName = util.hasPermission({ topcoderRoles: [USER_ROLE.TOPCODER_ADMIN] }, req.authUser);
 
       // specially for invite objects, we still have to return email, if invite is for a new user which doesn't have "userId"
       if (memberDetails.status) { // we identify that the object is "invite" and not a "member" if object has "status" field
@@ -736,6 +740,13 @@ _.assignIn(util, {
       if (!canSeeEmail) {
         delete memberDetails.email;
       }
+
+      // this is a temporary fix as ES also has this data, so we have explicitly remove it
+      if (!canSeeFullName) {
+        delete memberDetails.firstName;
+        delete memberDetails.lastName;
+      }
+
       return _(memberDetails).pick(fields).defaults(memberDefaults).value();
     });
   },