Merge remote-tracking branch 'origin/master'

Evolveum · Nov 11, 2019 · 68edd3b · 68edd3b
2 parents 4a04782 + b4180c6
commit 68edd3b
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 0 deletions.
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
@@ -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/.../src/main/java/com/evolveum/midpoint/notifications/impl/api/transports/MailTransport.java b/.../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.");