From 5925cccccb391dd35af7709447d3d6ddf4e8d775 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20Taj=C3=A8?= <sandro.taje@gmail.com>
Date: Tue, 14 Oct 2025 17:25:13 +0200
Subject: [PATCH 1/2] refactor: add integrity and removed useless style import

---
 .../src/resources/templates/headers/common-header.hbs  |  8 +++-----
 .../resources/templates/agreement-activated-mail.html  | 10 ++++++----
 .../resources/templates/agreement-rejected-mail.html   | 10 ++++++----
 .../resources/templates/agreement-submitted-mail.html  | 10 ++++++----
 .../templates/eservice-descriptor-published-mail.html  | 10 ++++++----
 .../templates/first-purpose-version-rejected-mail.html |  8 +++++---
 .../new-purpose-version-waiting-for-approval-mail.html | 10 ++++++----
 .../templates/other-purpose-version-rejected-mail.html |  8 +++++---
 .../templates/purpose-version-activated-mail.html      | 10 ++++++----
 .../templates/purpose-waiting-for-approval-mail.html   | 10 ++++++----
 10 files changed, 55 insertions(+), 39 deletions(-)

diff --git a/packages/email-notification-dispatcher/src/resources/templates/headers/common-header.hbs b/packages/email-notification-dispatcher/src/resources/templates/headers/common-header.hbs
index 73eef1ce63..a6e9ff8b99 100644
--- a/packages/email-notification-dispatcher/src/resources/templates/headers/common-header.hbs
+++ b/packages/email-notification-dispatcher/src/resources/templates/headers/common-header.hbs
@@ -37,13 +37,11 @@
         <![endif]-->
   <!--[if !mso]><!-->
   <link
-    href="https://selfcare.pagopa.it/assets/font/selfhostedfonts.css"
     rel="stylesheet"
-    type="text/css"
+    href="https://selfcare.pagopa.it/assets/font/selfhostedfonts.css"
+    integrity="sha384-pTEX27xRwV9gE3zi2iAdapYn6pEZ+f//cYR7Wm31DbTWyxHmn8eVK+BIz6vMb70r"
+    crossorigin="anonymous"
   />
-  <style type="text/css">
-    @import url(https://selfcare.pagopa.it/assets/font/selfhostedfonts.css);
-  </style>
   <!--<![endif]-->
   <style type="text/css">
     @media only screen and (min-width:480px) { .mj-column-per-100 { width: 100%
diff --git a/packages/notification-email-sender/src/resources/templates/agreement-activated-mail.html b/packages/notification-email-sender/src/resources/templates/agreement-activated-mail.html
index 11f3a4b78e..478fa369df 100644
--- a/packages/notification-email-sender/src/resources/templates/agreement-activated-mail.html
+++ b/packages/notification-email-sender/src/resources/templates/agreement-activated-mail.html
@@ -57,10 +57,12 @@
         </style>
         <![endif]-->
   <!--[if !mso]><!-->
-  <link href="https://selfcare.pagopa.it/assets/font/selfhostedfonts.css" rel="stylesheet" type="text/css">
-  <style type="text/css">
-    @import url(https://selfcare.pagopa.it/assets/font/selfhostedfonts.css);
-  </style>
+  <link
+    rel="stylesheet"
+    href="https://selfcare.pagopa.it/assets/font/selfhostedfonts.css"
+    integrity="sha384-pTEX27xRwV9gE3zi2iAdapYn6pEZ+f//cYR7Wm31DbTWyxHmn8eVK+BIz6vMb70r"
+    crossorigin="anonymous"
+  />
   <!--<![endif]-->
   <style type="text/css">
     @media only screen and (min-width:480px) {
diff --git a/packages/notification-email-sender/src/resources/templates/agreement-rejected-mail.html b/packages/notification-email-sender/src/resources/templates/agreement-rejected-mail.html
index 7b19ef3a04..8b0a349547 100644
--- a/packages/notification-email-sender/src/resources/templates/agreement-rejected-mail.html
+++ b/packages/notification-email-sender/src/resources/templates/agreement-rejected-mail.html
@@ -57,10 +57,12 @@
         </style>
         <![endif]-->
   <!--[if !mso]><!-->
-  <link href="https://selfcare.pagopa.it/assets/font/selfhostedfonts.css" rel="stylesheet" type="text/css">
-  <style type="text/css">
-    @import url(https://selfcare.pagopa.it/assets/font/selfhostedfonts.css);
-  </style>
+  <link
+    rel="stylesheet"
+    href="https://selfcare.pagopa.it/assets/font/selfhostedfonts.css"
+    integrity="sha384-pTEX27xRwV9gE3zi2iAdapYn6pEZ+f//cYR7Wm31DbTWyxHmn8eVK+BIz6vMb70r"
+    crossorigin="anonymous"
+  />
   <!--<![endif]-->
   <style type="text/css">
     @media only screen and (min-width:480px) {
diff --git a/packages/notification-email-sender/src/resources/templates/agreement-submitted-mail.html b/packages/notification-email-sender/src/resources/templates/agreement-submitted-mail.html
index a9e78a5692..e658153b44 100644
--- a/packages/notification-email-sender/src/resources/templates/agreement-submitted-mail.html
+++ b/packages/notification-email-sender/src/resources/templates/agreement-submitted-mail.html
@@ -57,10 +57,12 @@
         </style>
         <![endif]-->
   <!--[if !mso]><!-->
-  <link href="https://selfcare.pagopa.it/assets/font/selfhostedfonts.css" rel="stylesheet" type="text/css">
-  <style type="text/css">
-    @import url(https://selfcare.pagopa.it/assets/font/selfhostedfonts.css);
-  </style>
+  <link
+    rel="stylesheet"
+    href="https://selfcare.pagopa.it/assets/font/selfhostedfonts.css"
+    integrity="sha384-pTEX27xRwV9gE3zi2iAdapYn6pEZ+f//cYR7Wm31DbTWyxHmn8eVK+BIz6vMb70r"
+    crossorigin="anonymous"
+  />
   <!--<![endif]-->
   <style type="text/css">
     @media only screen and (min-width:480px) {
diff --git a/packages/notification-email-sender/src/resources/templates/eservice-descriptor-published-mail.html b/packages/notification-email-sender/src/resources/templates/eservice-descriptor-published-mail.html
index 1d5a6aa5b2..7b4b3d112e 100644
--- a/packages/notification-email-sender/src/resources/templates/eservice-descriptor-published-mail.html
+++ b/packages/notification-email-sender/src/resources/templates/eservice-descriptor-published-mail.html
@@ -57,10 +57,12 @@
         </style>
         <![endif]-->
   <!--[if !mso]><!-->
-  <link href="https://selfcare.pagopa.it/assets/font/selfhostedfonts.css" rel="stylesheet" type="text/css">
-  <style type="text/css">
-    @import url(https://selfcare.pagopa.it/assets/font/selfhostedfonts.css);
-  </style>
+  <link
+    rel="stylesheet"
+    href="https://selfcare.pagopa.it/assets/font/selfhostedfonts.css"
+    integrity="sha384-pTEX27xRwV9gE3zi2iAdapYn6pEZ+f//cYR7Wm31DbTWyxHmn8eVK+BIz6vMb70r"
+    crossorigin="anonymous"
+  />
   <!--<![endif]-->
   <style type="text/css">
     @media only screen and (min-width:480px) {
diff --git a/packages/notification-email-sender/src/resources/templates/first-purpose-version-rejected-mail.html b/packages/notification-email-sender/src/resources/templates/first-purpose-version-rejected-mail.html
index d4659c3f42..143e17e877 100644
--- a/packages/notification-email-sender/src/resources/templates/first-purpose-version-rejected-mail.html
+++ b/packages/notification-email-sender/src/resources/templates/first-purpose-version-rejected-mail.html
@@ -64,12 +64,14 @@
     <![endif]-->
     <!--[if !mso]><!-->
     <link
-      href="https://selfcare.pagopa.it/assets/font/selfhostedfonts.css"
       rel="stylesheet"
-      type="text/css"
+      href="https://selfcare.pagopa.it/assets/font/selfhostedfonts.css"
+      integrity="sha384-pTEX27xRwV9gE3zi2iAdapYn6pEZ+f//cYR7Wm31DbTWyxHmn8eVK+BIz6vMb70r"
+      crossorigin="anonymous"
     />
+    <!--<![endif]-->
     <style type="text/css">
-      @import url(https://selfcare.pagopa.it/assets/font/selfhostedfonts.css);
+      @media only screen and (min-width: 480px) {
     </style>
     <!--<![endif]-->
     <style type="text/css">
diff --git a/packages/notification-email-sender/src/resources/templates/new-purpose-version-waiting-for-approval-mail.html b/packages/notification-email-sender/src/resources/templates/new-purpose-version-waiting-for-approval-mail.html
index 2486b560cd..e4ac0b4ec3 100644
--- a/packages/notification-email-sender/src/resources/templates/new-purpose-version-waiting-for-approval-mail.html
+++ b/packages/notification-email-sender/src/resources/templates/new-purpose-version-waiting-for-approval-mail.html
@@ -57,10 +57,12 @@
         </style>
         <![endif]-->
   <!--[if !mso]><!-->
-  <link href="https://selfcare.pagopa.it/assets/font/selfhostedfonts.css" rel="stylesheet" type="text/css">
-  <style type="text/css">
-    @import url(https://selfcare.pagopa.it/assets/font/selfhostedfonts.css);
-  </style>
+  <link
+    rel="stylesheet"
+    href="https://selfcare.pagopa.it/assets/font/selfhostedfonts.css"
+    integrity="sha384-pTEX27xRwV9gE3zi2iAdapYn6pEZ+f//cYR7Wm31DbTWyxHmn8eVK+BIz6vMb70r"
+    crossorigin="anonymous"
+  />
   <!--<![endif]-->
   <style type="text/css">
     @media only screen and (min-width:480px) {
diff --git a/packages/notification-email-sender/src/resources/templates/other-purpose-version-rejected-mail.html b/packages/notification-email-sender/src/resources/templates/other-purpose-version-rejected-mail.html
index e43ee70bf1..14c491d28b 100644
--- a/packages/notification-email-sender/src/resources/templates/other-purpose-version-rejected-mail.html
+++ b/packages/notification-email-sender/src/resources/templates/other-purpose-version-rejected-mail.html
@@ -64,12 +64,14 @@
     <![endif]-->
     <!--[if !mso]><!-->
     <link
-      href="https://selfcare.pagopa.it/assets/font/selfhostedfonts.css"
       rel="stylesheet"
-      type="text/css"
+      href="https://selfcare.pagopa.it/assets/font/selfhostedfonts.css"
+      integrity="sha384-pTEX27xRwV9gE3zi2iAdapYn6pEZ+f//cYR7Wm31DbTWyxHmn8eVK+BIz6vMb70r"
+      crossorigin="anonymous"
     />
+    <!--<![endif]-->
     <style type="text/css">
-      @import url(https://selfcare.pagopa.it/assets/font/selfhostedfonts.css);
+      @media only screen and (min-width: 480px) {
     </style>
     <!--<![endif]-->
     <style type="text/css">
diff --git a/packages/notification-email-sender/src/resources/templates/purpose-version-activated-mail.html b/packages/notification-email-sender/src/resources/templates/purpose-version-activated-mail.html
index 0cf9632c28..ea41f470f7 100644
--- a/packages/notification-email-sender/src/resources/templates/purpose-version-activated-mail.html
+++ b/packages/notification-email-sender/src/resources/templates/purpose-version-activated-mail.html
@@ -57,10 +57,12 @@
         </style>
         <![endif]-->
   <!--[if !mso]><!-->
-  <link href="https://selfcare.pagopa.it/assets/font/selfhostedfonts.css" rel="stylesheet" type="text/css">
-  <style type="text/css">
-    @import url(https://selfcare.pagopa.it/assets/font/selfhostedfonts.css);
-  </style>
+  <link
+    rel="stylesheet"
+    href="https://selfcare.pagopa.it/assets/font/selfhostedfonts.css"
+    integrity="sha384-pTEX27xRwV9gE3zi2iAdapYn6pEZ+f//cYR7Wm31DbTWyxHmn8eVK+BIz6vMb70r"
+    crossorigin="anonymous"
+  />
   <!--<![endif]-->
   <style type="text/css">
     @media only screen and (min-width:480px) {
diff --git a/packages/notification-email-sender/src/resources/templates/purpose-waiting-for-approval-mail.html b/packages/notification-email-sender/src/resources/templates/purpose-waiting-for-approval-mail.html
index 9b700034d6..bc8eddd8cb 100644
--- a/packages/notification-email-sender/src/resources/templates/purpose-waiting-for-approval-mail.html
+++ b/packages/notification-email-sender/src/resources/templates/purpose-waiting-for-approval-mail.html
@@ -57,10 +57,12 @@
         </style>
         <![endif]-->
   <!--[if !mso]><!-->
-  <link href="https://selfcare.pagopa.it/assets/font/selfhostedfonts.css" rel="stylesheet" type="text/css">
-  <style type="text/css">
-    @import url(https://selfcare.pagopa.it/assets/font/selfhostedfonts.css);
-  </style>
+  <link
+    rel="stylesheet"
+    href="https://selfcare.pagopa.it/assets/font/selfhostedfonts.css"
+    integrity="sha384-pTEX27xRwV9gE3zi2iAdapYn6pEZ+f//cYR7Wm31DbTWyxHmn8eVK+BIz6vMb70r"
+    crossorigin="anonymous"
+  />
   <!--<![endif]-->
   <style type="text/css">
     @media only screen and (min-width:480px) {

From e407a62835bd1f60b4d37580f4e3f852badd1ce8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20Taj=C3=A8?= <sandro.taje@gmail.com>
Date: Fri, 17 Oct 2025 12:31:47 +0200
Subject: [PATCH 2/2] fix: remove duplicate empty media query blocks from email
 templates

---
 .../templates/first-purpose-version-rejected-mail.html        | 4 ----
 .../templates/other-purpose-version-rejected-mail.html        | 4 ----
 2 files changed, 8 deletions(-)

diff --git a/packages/notification-email-sender/src/resources/templates/first-purpose-version-rejected-mail.html b/packages/notification-email-sender/src/resources/templates/first-purpose-version-rejected-mail.html
index 143e17e877..2e0bb2b5ad 100644
--- a/packages/notification-email-sender/src/resources/templates/first-purpose-version-rejected-mail.html
+++ b/packages/notification-email-sender/src/resources/templates/first-purpose-version-rejected-mail.html
@@ -70,10 +70,6 @@
       crossorigin="anonymous"
     />
     <!--<![endif]-->
-    <style type="text/css">
-      @media only screen and (min-width: 480px) {
-    </style>
-    <!--<![endif]-->
     <style type="text/css">
       @media only screen and (min-width: 480px) {
         .mj-column-per-100 {
diff --git a/packages/notification-email-sender/src/resources/templates/other-purpose-version-rejected-mail.html b/packages/notification-email-sender/src/resources/templates/other-purpose-version-rejected-mail.html
index 14c491d28b..a5dc3a11a8 100644
--- a/packages/notification-email-sender/src/resources/templates/other-purpose-version-rejected-mail.html
+++ b/packages/notification-email-sender/src/resources/templates/other-purpose-version-rejected-mail.html
@@ -70,10 +70,6 @@
       crossorigin="anonymous"
     />
     <!--<![endif]-->
-    <style type="text/css">
-      @media only screen and (min-width: 480px) {
-    </style>
-    <!--<![endif]-->
     <style type="text/css">
       @media only screen and (min-width: 480px) {
         .mj-column-per-100 {