From fa6f84e440ad9004d92b25dfa71d46abc28bc2dc Mon Sep 17 00:00:00 2001 From: Vikas Agarwal Date: Tue, 15 Jan 2019 16:56:29 +0530 Subject: [PATCH 1/6] debug statements --- src/routes/projectMemberInvites/create.js | 1 + src/util.js | 1 + 2 files changed, 2 insertions(+) diff --git a/src/routes/projectMemberInvites/create.js b/src/routes/projectMemberInvites/create.js index 490bbba6..d48ba88f 100644 --- a/src/routes/projectMemberInvites/create.js +++ b/src/routes/projectMemberInvites/create.js @@ -103,6 +103,7 @@ const buildCreateInvitePromises = (req, invite, invites, data) => { }; const sendInviteEmail = (req, projectId, invite) => { + req.log.info(req.authUser); const emailEventType = BUS_API_EVENT.PROJECT_MEMBER_EMAIL_INVITE_CREATED; const promises = [ models.Project.find({ diff --git a/src/util.js b/src/util.js index 33b66466..417209d1 100644 --- a/src/util.js +++ b/src/util.js @@ -335,6 +335,7 @@ _.assignIn(util, { try { const token = yield this.getSystemUserToken(logger); const httpClient = this.getHttpClient({ id: requestId, log: logger }); + logger.info(userIds); return httpClient.get(`${config.memberServiceEndpoint}/_search`, { params: { query: `${userIds.join(urlencode(' OR ', 'utf8'))}`, From 369cf6cadea70fbc1829c390626fdc6840edda4b Mon Sep 17 00:00:00 2001 From: Vikas Agarwal Date: Tue, 15 Jan 2019 17:56:18 +0530 Subject: [PATCH 2/6] more debugging --- src/routes/projectMemberInvites/create.js | 3 ++- src/util.js | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/routes/projectMemberInvites/create.js b/src/routes/projectMemberInvites/create.js index d48ba88f..23da1f72 100644 --- a/src/routes/projectMemberInvites/create.js +++ b/src/routes/projectMemberInvites/create.js @@ -103,7 +103,7 @@ const buildCreateInvitePromises = (req, invite, invites, data) => { }; const sendInviteEmail = (req, projectId, invite) => { - req.log.info(req.authUser); + req.log.debug(req.authUser); const emailEventType = BUS_API_EVENT.PROJECT_MEMBER_EMAIL_INVITE_CREATED; const promises = [ models.Project.find({ @@ -113,6 +113,7 @@ const sendInviteEmail = (req, projectId, invite) => { util.getMemberDetailsByUserIds([req.authUser.userId], req.log, req.id), ]; return Promise.all(promises).then((responses) => { + req.log.debug(responses); const project = responses[0]; const initiator = responses[1] && responses[1].length ? responses[1][0] : { userId: req.authUser.userId, diff --git a/src/util.js b/src/util.js index 417209d1..6fe533ee 100644 --- a/src/util.js +++ b/src/util.js @@ -335,7 +335,7 @@ _.assignIn(util, { try { const token = yield this.getSystemUserToken(logger); const httpClient = this.getHttpClient({ id: requestId, log: logger }); - logger.info(userIds); + logger.trace(userIds); return httpClient.get(`${config.memberServiceEndpoint}/_search`, { params: { query: `${userIds.join(urlencode(' OR ', 'utf8'))}`, From 500fdccd3b0bbef331361c1a4c683bb7325c0111 Mon Sep 17 00:00:00 2001 From: Vikas Agarwal Date: Tue, 15 Jan 2019 19:02:04 +0530 Subject: [PATCH 3/6] fixed issue with wrong user being identified in member details --- src/routes/projectMemberInvites/create.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/routes/projectMemberInvites/create.js b/src/routes/projectMemberInvites/create.js index 23da1f72..7717bdc9 100644 --- a/src/routes/projectMemberInvites/create.js +++ b/src/routes/projectMemberInvites/create.js @@ -110,7 +110,7 @@ const sendInviteEmail = (req, projectId, invite) => { where: { id: projectId }, raw: true, }), - util.getMemberDetailsByUserIds([req.authUser.userId], req.log, req.id), + util.getMemberDetailsByUserIds([`userId:${req.authUser.userId}`], req.log, req.id), ]; return Promise.all(promises).then((responses) => { req.log.debug(responses); From 4b6032faef41dd25f6d2d4f6af88b3dbc7c2e67a Mon Sep 17 00:00:00 2001 From: Vikas Agarwal Date: Tue, 15 Jan 2019 19:30:13 +0530 Subject: [PATCH 4/6] Fixing issue in creating project in smoke testing --- src/events/projectMembers/index.js | 2 +- src/events/projects/index.js | 2 +- src/util.js | 4 +++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/events/projectMembers/index.js b/src/events/projectMembers/index.js index e25eb7a2..bab7e486 100644 --- a/src/events/projectMembers/index.js +++ b/src/events/projectMembers/index.js @@ -178,7 +178,7 @@ const projectMemberUpdatedHandler = Promise.coroutine(function* a(logger, msg, c try { const data = JSON.parse(msg.content.toString()); // get member information - const memberDetails = yield util.getMemberDetailsByUserIds[data.original.userId]; + const memberDetails = yield util.getMemberDetailsByUserIds([data.original.userId], logger); const payload = _.merge(data.updated, _.pick(memberDetails[0], 'handle', 'firstName', 'lastName', 'email')); const doc = yield eClient.get({ index: ES_PROJECT_INDEX, type: ES_PROJECT_TYPE, id: data.original.projectId }); diff --git a/src/events/projects/index.js b/src/events/projects/index.js index 01848012..5bd0e150 100644 --- a/src/events/projects/index.js +++ b/src/events/projects/index.js @@ -26,7 +26,7 @@ const indexProject = Promise.coroutine(function* (logger, msg) { // eslint-disab const userIds = data.members ? data.members.map(single => `userId:${single.userId}`) : []; try { // retrieve member details - const memberDetails = yield util.getMemberDetailsByUserIds(userIds, msg.properties.correlationId, logger); + const memberDetails = yield util.getMemberDetailsByUserIds(userIds, logger, msg.properties.correlationId); // if no members are returned than this should result in nack // if (!_.isArray(memberDetails) || memberDetails.length === 0) { // logger.error(`Empty member details for userIds ${userIds.join(',')} requeing the message`); diff --git a/src/util.js b/src/util.js index 6fe533ee..c5e999c3 100644 --- a/src/util.js +++ b/src/util.js @@ -335,7 +335,9 @@ _.assignIn(util, { try { const token = yield this.getSystemUserToken(logger); const httpClient = this.getHttpClient({ id: requestId, log: logger }); - logger.trace(userIds); + if (logger) { + logger.trace(userIds); + } return httpClient.get(`${config.memberServiceEndpoint}/_search`, { params: { query: `${userIds.join(urlencode(' OR ', 'utf8'))}`, From fdcbb01972bd21385d08be9c7bcbfccd1d1ba3ed Mon Sep 17 00:00:00 2001 From: Vikas Agarwal Date: Wed, 16 Jan 2019 14:59:07 +0530 Subject: [PATCH 5/6] fixing issue with acceptance of inviting members by handle --- src/routes/projectMemberInvites/update.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/routes/projectMemberInvites/update.js b/src/routes/projectMemberInvites/update.js index 300ba0ad..16200c0a 100644 --- a/src/routes/projectMemberInvites/update.js +++ b/src/routes/projectMemberInvites/update.js @@ -66,7 +66,7 @@ module.exports = [ 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) || + } else if ((!!putInvite.userId && `${putInvite.userId}` !== req.authUser.userId) || (!!putInvite.email && putInvite.email !== req.authUser.email)) { error = 'Project members can only update invites for themselves'; } From ecf05992d8d81253444397138c31ba945eab6a11 Mon Sep 17 00:00:00 2001 From: Vikas Agarwal Date: Wed, 16 Jan 2019 15:33:02 +0530 Subject: [PATCH 6/6] Reverted change as it is a wrong fix --- src/routes/projectMemberInvites/update.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/routes/projectMemberInvites/update.js b/src/routes/projectMemberInvites/update.js index 16200c0a..300ba0ad 100644 --- a/src/routes/projectMemberInvites/update.js +++ b/src/routes/projectMemberInvites/update.js @@ -66,7 +66,7 @@ module.exports = [ 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) || + } else if ((!!putInvite.userId && putInvite.userId !== req.authUser.userId) || (!!putInvite.email && putInvite.email !== req.authUser.email)) { error = 'Project members can only update invites for themselves'; }