From 38ab41f35c5d26be85fa6272a84b44f5d0cc66ee Mon Sep 17 00:00:00 2001
From: Martin Lizner <martin.lizner@gmail.com>
Date: Mon, 11 Nov 2019 14:15:25 +0100
Subject: [PATCH] Notifications: Allow specifying contentId in mail attachments

---
 .../xml/ns/public/common/common-notifications-3.xsd        | 7 +++++++
 .../notifications/impl/api/transports/MailTransport.java   | 4 ++++
 2 files changed, 11 insertions(+)

diff --git a/infra/schema/src/main/resources/xml/ns/public/common/common-notifications-3.xsd b/infra/schema/src/main/resources/xml/ns/public/common/common-notifications-3.xsd
index e003cafc28e..57631f5e6ab 100644
--- a/infra/schema/src/main/resources/xml/ns/public/common/common-notifications-3.xsd
+++ b/infra/schema/src/main/resources/xml/ns/public/common/common-notifications-3.xsd
@@ -1521,6 +1521,13 @@
                     </xsd:documentation>
                 </xsd:annotation>
             </xsd:element>
+            <xsd:element name="contentId" type="xsd:string">
+                <xsd:annotation>
+                    <xsd:documentation>
+                        Value of the Content-ID header of MIME body part for this attachment.
+                    </xsd:documentation>
+                </xsd:annotation>
+            </xsd:element>
         </xsd:sequence>
     </xsd:complexType>
 </xsd:schema>
diff --git a/model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/api/transports/MailTransport.java b/model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/api/transports/MailTransport.java
index 22f7ce3c57a..005b9a46245 100644
--- a/model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/api/transports/MailTransport.java
+++ b/model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/api/transports/MailTransport.java
@@ -300,6 +300,10 @@ public String getContentType() {
                             fileName +=    MimeTypeUtil.getDefaultExt(attachment.getContentType());
                         }
                         attachmentBody.setFileName(fileName);
+                        if(!StringUtils.isBlank(attachment.getContentId())) {
+                            attachmentBody.setHeader("Content-ID", attachment.getContentId());
+                        }
+
                         multipart.addBodyPart(attachmentBody);
                     } else {
                         LOGGER.warn("NotificationMessageAttachmentType doesn't contain content.");