From b5d8ef36d891df46a493867b12d7aa38e705e620 Mon Sep 17 00:00:00 2001 From: Vikas Agarwal Date: Tue, 2 Jul 2019 14:22:48 +0530 Subject: [PATCH 1/2] =?UTF-8?q?Github=20issue#3134,=20Project=20member=20i?= =?UTF-8?q?nvites=20via=20email=20fails=20when=20there=20is=20a=20case=20d?= =?UTF-8?q?ifference=20=E2=80=94=20Fixed?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/models/projectMemberInvite.js | 5 ++++- src/routes/projectMemberInvites/create.js | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/models/projectMemberInvite.js b/src/models/projectMemberInvite.js index ae27d0cb..9c248e9c 100644 --- a/src/models/projectMemberInvite.js +++ b/src/models/projectMemberInvite.js @@ -68,7 +68,10 @@ module.exports = function defineProjectMemberInvite(sequelize, DataTypes) { const where = { projectId, status: INVITE_STATUS.PENDING }; if (email && userId) { - _.assign(where, { $or: [{ email: { $eq: email } }, { userId: { $eq: userId } }] }); + _.assign(where, { $or: [ + { email: { $eq: email.toLowerCase() } }, + { userId: { $eq: userId } } + ] }); } else if (email) { _.assign(where, { email }); } else if (userId) { diff --git a/src/routes/projectMemberInvites/create.js b/src/routes/projectMemberInvites/create.js index 46b70399..f1c1edd7 100644 --- a/src/routes/projectMemberInvites/create.js +++ b/src/routes/projectMemberInvites/create.js @@ -267,7 +267,7 @@ module.exports = [ req.app.emit(EVENT.ROUTING_KEY.PROJECT_MEMBER_INVITE_CREATED, { req, userId: v.userId, - email: v.email, + email: v.email ? v.email.toLowerCase() : v.email, status: v.status, role: v.role, }); From db9c952eee9792936502e19ce369b10ba611109a Mon Sep 17 00:00:00 2001 From: Vikas Agarwal Date: Tue, 2 Jul 2019 14:24:27 +0530 Subject: [PATCH 2/2] Lint fix --- src/models/projectMemberInvite.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/models/projectMemberInvite.js b/src/models/projectMemberInvite.js index 9c248e9c..3b1e51cb 100644 --- a/src/models/projectMemberInvite.js +++ b/src/models/projectMemberInvite.js @@ -70,7 +70,7 @@ module.exports = function defineProjectMemberInvite(sequelize, DataTypes) { if (email && userId) { _.assign(where, { $or: [ { email: { $eq: email.toLowerCase() } }, - { userId: { $eq: userId } } + { userId: { $eq: userId } }, ] }); } else if (email) { _.assign(where, { email });