awatertrevi/infisical
1
0
Fork 0
mirror of https://github.com/awatertrevi/infisical.git synced 2026-09-22 13:39:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3781 from Infisical/fix/inviteUsersWithIdentities

Browse Source 
feat(invite-users): fix issue where invitations were not sent when the actor was an identity
This commit is contained in:
carlosmonastyrski
2025-06-11 16:42:04 -03:00
committed by GitHub
parent fbc8264732 852664e2cb
commit de48c3e161
2 changed files with 17 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
backend/src/services/org/org-service.ts
View File

@@ -1211,8 +1211,8 @@ export const orgServiceFactory = ({
subjectLine: "Infisical organization invitation",
recipients: [el.email],
substitutions: {
inviterFirstName: invitingUser.firstName,
inviterUsername: invitingUser.email,
inviterFirstName: invitingUser?.firstName,
inviterUsername: invitingUser?.email,
organizationName: org?.name,
email: el.email,
organizationId: org?.id.toString(),

22
backend/src/services/smtp/emails/OrganizationInvitationTemplate.tsx
View File

@@ -5,8 +5,8 @@ import { BaseEmailWrapper, BaseEmailWrapperProps } from "./BaseEmailWrapper";
interface OrganizationInvitationTemplateProps extends Omit<BaseEmailWrapperProps, "preview" | "title"> {
metadata?: string;
inviterFirstName: string;
inviterUsername: string;
inviterFirstName?: string;
inviterUsername?: string;
organizationName: string;
email: string;
organizationId: string;
@@ -38,11 +38,19 @@ export const OrganizationInvitationTemplate = ({
</Heading>
<Section className="px-[24px] mt-[36px] pt-[12px] pb-[8px] border text-center border-solid border-gray-200 rounded-md bg-gray-50">
<Text className="text-black text-[14px] leading-[24px]">
<strong>{inviterFirstName}</strong> (
<Link href={`mailto:${inviterUsername}`} className="text-slate-700 no-underline">
{inviterUsername}
</Link>
) has invited you to collaborate on <strong>{organizationName}</strong>.
{inviterFirstName && inviterUsername ? (
<>
<strong>{inviterFirstName}</strong> (
<Link href={`mailto:${inviterUsername}`} className="text-slate-700 no-underline">
{inviterUsername}
</Link>
) has invited you to collaborate on <strong>{organizationName}</strong>.
</>
) : (
<>
You have been invited to collaborate on <strong>{organizationName}</strong>.
</>
)}
</Text>
</Section>
<Section className="text-center mt-[28px]">