Skip to content

[Email] - Improve emails #1444 #1463

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
hervyt merged 2 commits into from
Jan 5, 2026
Merged

[Email] - Improve emails #1444 #1463

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3cb6894
[Email] - Improve emails #1444
hervyt Jan 2, 2026
0f7bb7b
Merge branch 'development' into fix/1444
hervyt Jan 5, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion apps/portal-api/src/modules/services/deployments/deployments.app.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,10 @@ export const DeploymentsApp = {
organizationName: user.organizations.find(
(o) => o.id === user.selected_organization_id
).name,
userName: `${user.first_name} ${user.last_name}`,
userName:
user.first_name && user.last_name
? `${user.first_name} ${user.last_name}`
: `${user.email}`,
userEmail: user.email,
region: input.region,
activitySector: input.activity_sector,
Expand Down
46 changes: 46 additions & 0 deletions apps/portal-api/src/modules/users/users.organization.app.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,52 @@ describe('UsersOrganizationApp', () => {
userEmailList:
'<li>John Doe (user1@test.com)</li><li>Robert Smith (user2@test.com)</li>',
userCount: 2,
requestLabel: 'requests',
},
template: 'organization_pending_user_digest',
to: 'admin@filigran.io',
});
});

it('should send email to each organization administrators with the correct grammary', async () => {
portalConfig.enabled_emails = {
...originalEnabledEmails,
pending_user_digest: true,
};

vi.spyOn(
UserOrganizationPendingDomain,
'loadOrganizationsWithPendingUsers'
).mockResolvedValue([
{
id: PLATFORM_ORGANIZATION_UUID,
name: 'organization name',
users: [
{
id: uuidv4() as UserId,
email: 'user1@test.com',
first_name: 'John',
last_name: 'Doe',
} as User,
],
},
] as Awaited<
ReturnType<
(typeof UserOrganizationPendingDomain)['loadOrganizationsWithPendingUsers']
>
>);

const sendMailSpy = vi.spyOn(MailService, 'sendMail');
await UsersOrganizationApp.sendPendingUsersDigest();

expect(sendMailSpy).toHaveBeenCalledTimes(1);
expect(sendMailSpy).toHaveBeenCalledWith({
params: {
adminName: 'Firstname',
organizationName: 'organization name',
userEmailList: '<li>John Doe (user1@test.com)</li>',
userCount: 1,
requestLabel: 'request',
},
template: 'organization_pending_user_digest',
to: 'admin@filigran.io',
Expand Down
2 changes: 2 additions & 0 deletions apps/portal-api/src/modules/users/users.organization.app.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,6 +164,8 @@ export const UsersOrganizationApp = {
)
.join(''),
userCount: organization.users.length,
requestLabel:
organization.users.length === 1 ? 'request' : 'requests',
},
})
)
Expand Down
21 changes: 20 additions & 1 deletion apps/portal-api/src/server/mail-template/admin_saas_instance_requested.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,14 @@
line-height: 32px !important;
}
}
@media (prefers-color-scheme: dark) {
.logo-light {
display: none !important;
}
.logo-dark {
display: block !important;
}
}
</style>
</head>
<body
Expand Down Expand Up @@ -108,10 +116,21 @@
">
<a href="{{ base_url_front }}">
<img
src="{{ base_url_front }}/logo.png"
src="{{ base_url_front }}/logo_xtm_hub_light.svg"
class="logo-light"
width="320"
alt="XTM Hub logo"
style="max-width: 100%; vertical-align: middle" />
<img
src="{{ base_url_front }}/logo_xtm_hub_dark.svg"
class="logo-dark"
width="320"
alt="XTM Hub logo"
style="
display: none;
max-width: 100%;
vertical-align: middle;
" />
</a>
</div>
<table
Expand Down
1 change: 1 addition & 0 deletions apps/portal-api/src/server/mail-template/mail.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ export interface OrganizationPendingUserDigestModel {
organizationName: string;
userEmailList: string;
userCount: number;
requestLabel: string;
}

export interface PlatformUnregisteredModel {
Expand Down
21 changes: 20 additions & 1 deletion apps/portal-api/src/server/mail-template/new_user_organization.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,14 @@
line-height: 32px !important;
}
}
@media (prefers-color-scheme: dark) {
.logo-light {
display: none !important;
}
.logo-dark {
display: block !important;
}
}
</style>
</head>
<body
Expand Down Expand Up @@ -105,10 +113,21 @@
">
<a href="{{ base_url_front }}">
<img
src="{{ base_url_front }}/logo.png"
src="{{ base_url_front }}/logo_xtm_hub_light.svg"
class="logo-light"
width="320"
alt="XTM Hub logo"
style="max-width: 100%; vertical-align: middle" />
<img
src="{{ base_url_front }}/logo_xtm_hub_dark.svg"
class="logo-dark"
width="320"
alt="XTM Hub logo"
style="
display: none;
max-width: 100%;
vertical-align: middle;
" />
</a>
</div>
<table
Expand Down
21 changes: 20 additions & 1 deletion apps/portal-api/src/server/mail-template/openaev_platform_registered.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,14 @@
line-height: 32px !important;
}
}
@media (prefers-color-scheme: dark) {
.logo-light {
display: none !important;
}
.logo-dark {
display: block !important;
}
}
</style>
</head>
<body
Expand Down Expand Up @@ -108,10 +116,21 @@
">
<a href="{{ base_url_front }}">
<img
src="{{ base_url_front }}/logo.png"
src="{{ base_url_front }}/logo_xtm_hub_light.svg"
class="logo-light"
width="320"
alt="XTM Hub logo"
style="max-width: 100%; vertical-align: middle" />
<img
src="{{ base_url_front }}/logo_xtm_hub_dark.svg"
class="logo-dark"
width="320"
alt="XTM Hub logo"
style="
display: none;
max-width: 100%;
vertical-align: middle;
" />
</a>
</div>
<table
Expand Down
21 changes: 20 additions & 1 deletion apps/portal-api/src/server/mail-template/openaev_platform_unregistered.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,14 @@
line-height: 32px !important;
}
}
@media (prefers-color-scheme: dark) {
.logo-light {
display: none !important;
}
.logo-dark {
display: block !important;
}
}
</style>
</head>
<body
Expand Down Expand Up @@ -108,10 +116,21 @@
">
<a href="{{ base_url_front }}">
<img
src="{{ base_url_front }}/logo.png"
src="{{ base_url_front }}/logo_xtm_hub_light.svg"
class="logo-light"
width="320"
alt="XTM Hub logo"
style="max-width: 100%; vertical-align: middle" />
<img
src="{{ base_url_front }}/logo_xtm_hub_dark.svg"
class="logo-dark"
width="320"
alt="XTM Hub logo"
style="
display: none;
max-width: 100%;
vertical-align: middle;
" />
</a>
</div>
<table
Expand Down
21 changes: 20 additions & 1 deletion apps/portal-api/src/server/mail-template/openaev_scenarios.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,14 @@
line-height: 32px !important;
}
}
@media (prefers-color-scheme: dark) {
.logo-light {
display: none !important;
}
.logo-dark {
display: block !important;
}
}
</style>
</head>
<body
Expand Down Expand Up @@ -105,10 +113,21 @@
">
<a href="{{ base_url_front }}">
<img
src="{{ base_url_front }}/logo.png"
src="{{ base_url_front }}/logo_xtm_hub_light.svg"
class="logo-light"
width="320"
alt="XTM Hub logo"
style="max-width: 100%; vertical-align: middle" />
<img
src="{{ base_url_front }}/logo_xtm_hub_dark.svg"
class="logo-dark"
width="320"
alt="XTM Hub logo"
style="
display: none;
max-width: 100%;
vertical-align: middle;
" />
</a>
</div>
<table
Expand Down
21 changes: 20 additions & 1 deletion apps/portal-api/src/server/mail-template/opencti_custom_dashboards.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,14 @@
line-height: 32px !important;
}
}
@media (prefers-color-scheme: dark) {
.logo-light {
display: none !important;
}
.logo-dark {
display: block !important;
}
}
</style>
</head>
<body
Expand Down Expand Up @@ -105,10 +113,21 @@
">
<a href="{{ base_url_front }}">
<img
src="{{ base_url_front }}/logo.png"
src="{{ base_url_front }}/logo_xtm_hub_light.svg"
class="logo-light"
width="320"
alt="XTM Hub logo"
style="max-width: 100%; vertical-align: middle" />
<img
src="{{ base_url_front }}/logo_xtm_hub_dark.svg"
class="logo-dark"
width="320"
alt="XTM Hub logo"
style="
display: none;
max-width: 100%;
vertical-align: middle;
" />
</a>
</div>
<table
Expand Down
21 changes: 20 additions & 1 deletion apps/portal-api/src/server/mail-template/opencti_free_trial_cancelled.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,14 @@
line-height: 32px !important;
}
}
@media (prefers-color-scheme: dark) {
.logo-light {
display: none !important;
}
.logo-dark {
display: block !important;
}
}
</style>
</head>
<body
Expand Down Expand Up @@ -105,10 +113,21 @@
">
<a href="{{ base_url_front }}">
<img
src="{{ base_url_front }}/logo.png"
src="{{ base_url_front }}/logo_xtm_hub_light.svg"
class="logo-light"
width="320"
alt="XTM Hub logo"
style="max-width: 100%; vertical-align: middle" />
<img
src="{{ base_url_front }}/logo_xtm_hub_dark.svg"
class="logo-dark"
width="320"
alt="XTM Hub logo"
style="
display: none;
max-width: 100%;
vertical-align: middle;
" />
</a>
</div>
<table
Expand Down
21 changes: 20 additions & 1 deletion apps/portal-api/src/server/mail-template/opencti_free_trial_expired.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,14 @@
line-height: 32px !important;
}
}
@media (prefers-color-scheme: dark) {
.logo-light {
display: none !important;
}
.logo-dark {
display: block !important;
}
}
</style>
</head>
<body
Expand Down Expand Up @@ -105,10 +113,21 @@
">
<a href="{{ base_url_front }}">
<img
src="{{ base_url_front }}/logo.png"
src="{{ base_url_front }}/logo_xtm_hub_light.svg"
class="logo-light"
width="320"
alt="XTM Hub logo"
style="max-width: 100%; vertical-align: middle" />
<img
src="{{ base_url_front }}/logo_xtm_hub_dark.svg"
class="logo-dark"
width="320"
alt="XTM Hub logo"
style="
display: none;
max-width: 100%;
vertical-align: middle;
" />
</a>
</div>
<table
Expand Down
Loading
Loading