Refactor mail attachments (#7521)

OrchardCMS · Nov 5, 2020 · 772652e · 772652e
1 parent 84ac3aa
commit 772652e
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 10 deletions.
diff --git a/src/OrchardCore.Modules/OrchardCore.Email/Services/SmtpService.cs b/src/OrchardCore.Modules/OrchardCore.Email/Services/SmtpService.cs
@@ -128,16 +128,13 @@ private MimeMessage FromMailMessage(MailMessage message)
                 body.TextBody = message.Body;
             }
 
-            if (message.Attachments != null)
+            foreach (var attachment in message.Attachments)
             {
-                foreach (var attachment in message.Attachments)
+                // Stream must not be null, otherwise it would try to get the filesystem path
+                if (attachment.Stream != null)
                 {
-                    // Stream must not be null, otherwise it would try to get the filesystem path
-                    if (attachment.Stream != null)
-                    {
-                        body.Attachments.Add(attachment.Filename, attachment.Stream);
-                    }
-                }
+                    body.Attachments.Add(attachment.Filename, attachment.Stream);
+                }            
             }
 
             mimeMessage.Body = body.ToMessageBody();

diff --git a/src/OrchardCore/OrchardCore.Email.Abstractions/MailMessage.cs b/src/OrchardCore/OrchardCore.Email.Abstractions/MailMessage.cs
@@ -56,8 +56,8 @@ public class MailMessage
         public bool IsBodyHtml { get; set; }
 
         /// <summary>
-        /// Gets or sets the message attachments.
+        /// The collection of message attachments.
         /// </summary>
-        public IEnumerable<MailMessageAttachment> Attachments { get; set; }
+        public List<MailMessageAttachment> Attachments { get; } = new List<MailMessageAttachment>();
     }
 }