ignore duplicate member invites; fix invite remove error

Author: gondzo

src/events/projectMembers/index.js

@@ -88,7 +88,8 @@ const projectMemberAddedHandler = Promise.coroutine(function* a(logger, msg, cha
       members.push(payload);
       // now merge the updated changes and reindex the document for invites
       const invites = _.isArray(doc._source.invites) ? doc._source.invites : []; // eslint-disable-line no-underscore-dangle
-      _.remove(invites, invite => invite === payload.email || invite === payload.userId);
+      // removing any invites for the member just added to the team
+      _.remove(invites, invite => invite.email === payload.email || invite.userId === payload.userId);
       return _.merge(doc._source, { members, invites }); // eslint-disable-line no-underscore-dangle
     });
     yield Promise.all([directUpdatePromise(), updateESPromise(logger, origRequestId, projectId, updateDocPromise)]);

src/routes/projectMemberInvites/create.js

@@ -49,6 +49,8 @@ module.exports = [
 
     const promises = [];
     if (invite.userIds) {
+      // remove members already in the team
+      _.remove(invite.userIds, u => _.some(members, m => m.userId === u));
         // permission:
         // user has to have constants.MANAGER_ROLES role
         // to be invited as PROJECT_MEMBER_ROLE.MANAGER
@@ -58,19 +60,6 @@ module.exports = [
           promises.push(util.getUserRoles(userId, req.log, req.id));
         });
       }
-
-        // validate each userId is not already a member
-      const alreadyMembers = [];
-      _.forEach(members, (member) => {
-        if (invite.userIds.includes(member.userId)) {
-          alreadyMembers.push(member.userId);
-        }
-      });
-      if (alreadyMembers.length > 0) {
-        const err = new Error(`${alreadyMembers.join()} are already members of project ${projectId}`);
-        err.status = 400;
-        return next(err);
-      }
     }
 
     if (invite.emails) {
@@ -104,24 +93,6 @@ module.exports = [
       }
       return models.ProjectMemberInvite.getPendingInvitesForProject(projectId)
             .then((invites) => {
-              req.log.debug('Chekcing if user has been invited');
-              // validate for each userId/email there is no existing invitation
-              const alreadyInvites = [];
-              _.forEach(invites, (i) => {
-                if (invite.userIds) {
-                  if (invite.userIds.includes(i.userId)) {
-                    alreadyInvites.push(i.userId);
-                  }
-                } else if (invite.emails.includes(i.email)) {
-                  alreadyInvites.push(i.email);
-                }
-              });
-              if (alreadyInvites.length > 0) {
-                const err = new Error(`${alreadyInvites.join()} are already invited`);
-                err.status = 400;
-                return next(err);
-              }
-
               const data = {
                 projectId,
                 role: invite.role,
@@ -131,6 +102,8 @@ module.exports = [
               };
               const invitePromises = [];
               if (invite.userIds) {
+                // remove invites for users that are invited already
+                _.remove(invite.userIds, u => _.some(invites, i => i.userId === u));
                 invite.userIds.forEach((userId) => {
                   const dataNew = _.clone(data);
                   _.assign(dataNew, {
@@ -142,6 +115,8 @@ module.exports = [
               data.userId = null;
 
               if (invite.emails) {
+                // remove invites for users that are invited already
+                _.remove(invite.emails, u => _.some(invites, i => i.email === u));
                 invite.emails.forEach((email) => {
                   const dataNew = _.clone(data);
                   _.assign(dataNew, {

src/routes/projectMemberInvites/get.js

@@ -18,14 +18,14 @@ module.exports = [
     const projectId = _.parseInt(req.params.projectId);
     const currentUserId = req.authUser.userId;
     let invite;
-    return models.ProjectMemberInvite.getPendingInviteByEmailOrUserId(projectId, null, currentUserId)
+    return models.ProjectMemberInvite.getPendingInviteByEmailOrUserId(projectId, req.authUser.email, currentUserId)
         .then((_invite) => {
           invite = _invite;
           if (!invite) {
                 // check there is an existing invite for the user with status PENDING
                 // handle 404
             const err = new Error('invite not found for project id ' +
-                        `${projectId}, userId ${currentUserId}`);
+                        `${projectId}, userId ${currentUserId}, email ${req.authUser.email}`);
             err.status = 404;
             return next(err);
           }

src/routes/projectMemberInvites/update.js

@@ -4,7 +4,7 @@ import Joi from 'joi';
 import { middleware as tcMiddleware } from 'tc-core-library-js';
 import models from '../../models';
 import util from '../../util';
-import { PROJECT_MEMBER_ROLE, MANAGER_ROLES, USER_ROLE, INVITE_STATUS, EVENT } from '../../constants';
+import { PROJECT_MEMBER_ROLE, MANAGER_ROLES, INVITE_STATUS, EVENT } from '../../constants';
 
 /**
  * API to update invite member to project.
@@ -36,13 +36,6 @@ module.exports = [
     const putInvite = req.body.param;
     const projectId = _.parseInt(req.params.projectId);
 
-    // not userId and email at the same time
-    if (!!putInvite.userId && !!putInvite.email) {
-      const err = new Error('userId and email cannot be presented in the same request');
-      err.status = 400;
-      return next(err);
-    }
-
     // userId or email should be provided
     if (!putInvite.userId && !putInvite.email) {
       const err = new Error('userId or email should be provided');
@@ -70,9 +63,7 @@ module.exports = [
       req.log.debug('Chekcing user permission for updating invite');
       let error = null;
       if (putInvite.status === INVITE_STATUS.CANCELED) {
-        if (util.hasRole(req, USER_ROLE.COPILOT) && invite.role !== PROJECT_MEMBER_ROLE.CUSTOMER) {
-          error = `Copilot can cancel invites only for ${PROJECT_MEMBER_ROLE.CUSTOMER}`;
-        } else if (!util.hasRoles(req, MANAGER_ROLES)) {
+        if (!util.hasRoles(req, MANAGER_ROLES) && invite.role !== PROJECT_MEMBER_ROLE.CUSTOMER) {
           error = `Project members can cancel invites only for ${PROJECT_MEMBER_ROLE.CUSTOMER}`;
         }
       } else if (!!putInvite.userId && putInvite.userId !== req.authUser.userId) {
@@ -111,7 +102,7 @@ module.exports = [
                 const member = {
                   projectId,
                   role: updatedInvite.role,
-                  userId: updatedInvite.userId,
+                  userId: req.authUser.userId,
                   createdBy: req.authUser.userId,
                   updatedBy: req.authUser.userId,
                 };

src/routes/projects/list.js

@@ -32,7 +32,7 @@ const PROJECT_MEMBER_ATTRIBUTES = _.without(
 );
 const PROJECT_MEMBER_INVITE_ATTRIBUTES = _.without(
   _.keys(models.ProjectMemberInvite.rawAttributes),
-  'deletedAt'
+  'deletedAt',
 );
 const PROJECT_ATTACHMENT_ATTRIBUTES = _.without(
   _.keys(models.ProjectAttachment.rawAttributes),