Skip to content

Commit cb1517e

Browse files
committed
filter invites by email in case-insensitive way
1 parent 613beeb commit cb1517e

File tree

2 files changed

+9
-3
lines changed

2 files changed

+9
-3
lines changed

src/routes/projects/get.js

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -123,8 +123,11 @@ const retrieveProjectFromES = (projectId, req) => {
123123
if (util.hasPermissionByReq(PERMISSION.READ_PROJECT_INVITE_OWN, req)) {
124124
// only include own invites
125125
const currentUserId = req.authUser.userId;
126-
const email = req.authUser.email;
127-
invites = _.filter(project.invites, invite => invite.userId === currentUserId || invite.email === email);
126+
const currentUserEmail = req.authUser.email;
127+
invites = _.filter(project.invites, invite => (
128+
(invite.userId !== null && invite.userId === currentUserId) ||
129+
(invite.email && currentUserEmail && invite.email.toLowerCase() === currentUserEmail.toLowerCase())
130+
));
128131
} else {
129132
// return empty invites
130133
invites = [];

src/routes/projects/list.js

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -575,7 +575,10 @@ const retrieveProjects = (req, criteria, sort, ffields) => {
575575
const currentUserId = req.authUser.userId;
576576
const email = req.authUser.email;
577577
_.forEach(rows, (fp) => {
578-
const invites = _.filter(fp.invites, invite => invite.userId === currentUserId || invite.email === email);
578+
const invites = _.filter(fp.invites, invite => (
579+
(invite.userId !== null && invite.userId === currentUserId) ||
580+
(invite.email && currentUserEmail && invite.email.toLowerCase() === currentUserEmail.toLowerCase())
581+
));
579582
_.set(fp, 'invites', invites);
580583
});
581584
} else {

0 commit comments

Comments
 (0)