mirror of
https://github.com/awatertrevi/infisical.git
synced 2026-09-22 13:39:35 +00:00
Addressed greptile review
This commit is contained in:
@@ -134,35 +134,27 @@ export const orgAdminServiceFactory = ({
|
|||||||
});
|
});
|
||||||
|
|
||||||
const projectMembers = await projectMembershipDAL.findAllProjectMembers(projectId);
|
const projectMembers = await projectMembershipDAL.findAllProjectMembers(projectId);
|
||||||
const filteredProjectMembers = projectMembers
|
const projectAdmins = projectMembers.filter(
|
||||||
.filter(
|
(member) => member.roles.some((role) => role.role === ProjectMembershipRole.Admin) && member.userId !== actorId
|
||||||
(member) => member.roles.some((role) => role.role === ProjectMembershipRole.Admin) && member.userId !== actorId
|
);
|
||||||
)
|
const mappedProjectAdmins = projectAdmins.map((el) => el.user.email!).filter(Boolean);
|
||||||
.map((el) => el.user.email!)
|
|
||||||
.filter(Boolean);
|
|
||||||
|
|
||||||
const actorEmail = projectMembers.find((el) => el.userId === actorId)?.user?.username;
|
const actorEmail = projectMembers.find((el) => el.userId === actorId)?.user?.username;
|
||||||
|
|
||||||
if (actorEmail) {
|
if (actorEmail) {
|
||||||
await notificationService.createUserNotifications(
|
await notificationService.createUserNotifications(
|
||||||
projectMembers
|
projectAdmins.map((member) => ({
|
||||||
.filter(
|
userId: member.userId,
|
||||||
(member) =>
|
orgId: project.orgId,
|
||||||
member.roles.some((role) => role.role === ProjectMembershipRole.Admin) && member.userId !== actorId
|
type: NotificationType.DIRECT_PROJECT_ACCESS_ISSUED_TO_ADMIN,
|
||||||
)
|
title: "Direct Project Access Issued",
|
||||||
.map((member) => ({
|
body: `The organization admin **${actorEmail}** has self-issued direct access to the project **${project.name}**.`
|
||||||
userId: member.userId,
|
}))
|
||||||
orgId: project.orgId,
|
|
||||||
type: NotificationType.DIRECT_PROJECT_ACCESS_ISSUED_TO_ADMIN,
|
|
||||||
title: "Direct Project Access Issued",
|
|
||||||
body: `The organization admin **${actorEmail}** has self-issued direct access to the project **${project.name}**.`
|
|
||||||
}))
|
|
||||||
);
|
);
|
||||||
|
|
||||||
if (filteredProjectMembers.length) {
|
if (mappedProjectAdmins.length) {
|
||||||
await smtpService.sendMail({
|
await smtpService.sendMail({
|
||||||
template: SmtpTemplates.OrgAdminProjectDirectAccess,
|
template: SmtpTemplates.OrgAdminProjectDirectAccess,
|
||||||
recipients: filteredProjectMembers,
|
recipients: mappedProjectAdmins,
|
||||||
subjectLine: "Organization Admin Project Direct Access Issued",
|
subjectLine: "Organization Admin Project Direct Access Issued",
|
||||||
substitutions: {
|
substitutions: {
|
||||||
projectName: project.name,
|
projectName: project.name,
|
||||||
|
|||||||
Reference in New Issue
Block a user