From 286dc39ed25ba7756a0ec499974ae4c96826b859 Mon Sep 17 00:00:00 2001 From: Scott Wilson Date: Wed, 28 May 2025 16:45:43 -0700 Subject: [PATCH 1/2] fix: check for recipients to send project access email --- .../services/org-admin/org-admin-service.ts | 20 ++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/backend/src/services/org-admin/org-admin-service.ts b/backend/src/services/org-admin/org-admin-service.ts index 62767200c..a0f47224a 100644 --- a/backend/src/services/org-admin/org-admin-service.ts +++ b/backend/src/services/org-admin/org-admin-service.ts @@ -198,15 +198,17 @@ export const orgAdminServiceFactory = ({ ) .map((el) => el.user.email!); - await smtpService.sendMail({ - template: SmtpTemplates.OrgAdminProjectDirectAccess, - recipients: filteredProjectMembers, - subjectLine: "Organization Admin Project Direct Access Issued", - substitutions: { - projectName: project.name, - email: projectMembers.find((el) => el.userId === actorId)?.user?.username - } - }); + if (filteredProjectMembers.length) { + await smtpService.sendMail({ + template: SmtpTemplates.OrgAdminProjectDirectAccess, + recipients: filteredProjectMembers, + subjectLine: "Organization Admin Project Direct Access Issued", + substitutions: { + projectName: project.name, + email: projectMembers.find((el) => el.userId === actorId)?.user?.username + } + }); + } return { isExistingMember: false, membership: updatedMembership }; }; From 44367f91494d07c6066bd92ef59c0e1c5631b654 Mon Sep 17 00:00:00 2001 From: Scott Wilson Date: Wed, 28 May 2025 17:06:08 -0700 Subject: [PATCH 2/2] add boolean filter --- backend/src/services/org-admin/org-admin-service.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/backend/src/services/org-admin/org-admin-service.ts b/backend/src/services/org-admin/org-admin-service.ts index a0f47224a..5f9e25f29 100644 --- a/backend/src/services/org-admin/org-admin-service.ts +++ b/backend/src/services/org-admin/org-admin-service.ts @@ -196,7 +196,8 @@ export const orgAdminServiceFactory = ({ .filter( (member) => member.roles.some((role) => role.role === ProjectMembershipRole.Admin) && member.userId !== actorId ) - .map((el) => el.user.email!); + .map((el) => el.user.email!) + .filter(Boolean); if (filteredProjectMembers.length) { await smtpService.sendMail({