Merge pull request #3157 from gautamdsheth/feature/3137

Feature #3137: allow sending attachments via Graph API

Author: gautamdsheth

CHANGELOG.md

@@ -25,6 +25,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/).
 - Added `Move-PnPTerm` and `Move-PnPTermSet` cmdlets to allow moving the terms and termsets. [#2989](https://github.com/pnp/powershell/pull/2989)
 - Added `-VerticalZoneEmphasis` parameter to `Add-PnPPageSection` cmdlet to allow setting the emphasis value for vertical columns. [#3129](https://github.com/pnp/powershell/pull/3129)
 - Added `-AllowDeletion` parameter to `Set-PnPList` cmdlet to allow or prevent deletion of list from the SharePoint UI. [#3142](https://github.com/pnp/powershell/pull/3142)
+- Added `-Attachments` parameter to `Send-PnPMail` cmdlet to allow sending attachments via Microsoft Graph API. [#3157](https://github.com/pnp/powershell/pull/3157)
 
 ### Fixed
 

src/Commands/Model/Mail/Message.cs

@@ -69,5 +69,11 @@ public class Message
         /// </summary>
         [JsonPropertyName("importance")]
         public MessageImportanceType? Importance { get; set; }
+
+        /// <summary>
+        /// The attachments to attach to the message
+        /// </summary>
+        [JsonPropertyName("attachments")]
+        public List<MessageAttachmentOptions> Attachments { get; set; }
     }
-}
+}

src/Commands/Model/Mail/MessageAttachmentOptions.cs

@@ -0,0 +1,27 @@
+using System.Text.Json.Serialization;
+
+namespace PnP.PowerShell.Commands.Model.Mail
+{
+    public class MessageAttachmentOptions
+    {
+        [JsonPropertyName("@odata.type")]
+        public string Type { get; set; } = "#microsoft.graph.fileAttachment";
+        /// <summary>
+        /// Name of the attachment
+        /// </summary>
+        [JsonPropertyName("name")]
+        public string Name { get; set; }
+
+        /// <summary>
+        /// Content-Type of the attachment
+        /// </summary>
+        [JsonPropertyName("contentType")]
+        public string ContentType { get; set; } = "text/plain";
+
+        /// <summary>
+        /// Bytes of the attachment
+        /// </summary>
+        [JsonPropertyName("contentBytes")]
+        public string ContentBytes { get; set; }
+    }
+}

src/Commands/Utilities/MailUtility.cs

@@ -11,6 +11,8 @@
 using System.Net.Mail;
 using System.Net;
 using PnP.PowerShell.Commands.Enums;
+using System.IO;
+using System;
 
 namespace PnP.PowerShell.Commands.Utilities
 {
@@ -32,9 +34,9 @@ public static async Task SendGraphMail(PnPConnection connection, string accessTo
             var jsonSerializer = new JsonSerializerOptions { DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingNull, };
             jsonSerializer.Converters.Add(new JsonStringEnumConverter());
 
-            var stringContent = new StringContent(JsonSerializer.Serialize(new SendMailMessage { Message = message, SaveToSentItems = saveToSentItems}, jsonSerializer));
+            var stringContent = new StringContent(JsonSerializer.Serialize(new SendMailMessage { Message = message, SaveToSentItems = saveToSentItems }, jsonSerializer));
             stringContent.Headers.ContentType = new System.Net.Http.Headers.MediaTypeHeaderValue("application/json");
-            
+
             var response = await GraphHelper.PostAsync(connection, $"v1.0/users/{message.Sender.EmailAddress.Address}/sendMail", accessToken, stringContent);
 
             if (response.StatusCode != System.Net.HttpStatusCode.Accepted)
@@ -67,7 +69,7 @@ public static async Task SendSharePointEmail(ClientContext context, string subje
             if (bcc != null)
             {
                 properties.BCC = bcc;
-            }            
+            }
 
             properties.Subject = subject;
             properties.Body = body;
@@ -113,7 +115,7 @@ public static async Task SendSmtpEmail(string subject, string body, string fromA
                 IsBodyHtml = contentType == MessageBodyContentType.Html
             };
 
-            if(importance.HasValue)
+            if (importance.HasValue)
             {
                 switch (importance.Value)
                 {
@@ -132,7 +134,7 @@ public static async Task SendSmtpEmail(string subject, string body, string fromA
             foreach (string user in to)
             {
                 mail.To.Add(user);
-            }          
+            }
 
             if (cc != null)
             {
@@ -151,6 +153,43 @@ public static async Task SendSmtpEmail(string subject, string body, string fromA
             }
 
             await client.SendMailAsync(mail);
-        }        
+        }
+
+        /// <summary>
+        /// Gets the list of attachments to be sent via email
+        /// </summary>
+        /// <param name="attachments">The list of attachments to be sent</param>
+        /// <param name="currentPath">The current path of the directory</param>
+        /// <returns></returns>
+        public static List<MessageAttachmentOptions> GetListOfAttachments(string[] attachments, string currentPath)
+        {
+            if (attachments == null || attachments?.Length == 0)
+            {
+                return null;
+            }
+
+            List<MessageAttachmentOptions> messageAttachmentOptions = new List<MessageAttachmentOptions>();
+            foreach (var attachment in attachments)
+            {
+                MessageAttachmentOptions item = new MessageAttachmentOptions();
+                var file = attachment;
+                if (!System.IO.Path.IsPathRooted(attachment))
+                {
+                    file = System.IO.Path.Combine(currentPath, attachment);
+                }
+
+                FileInfo attachmentFile = new FileInfo(file);
+                item.Type = "#microsoft.graph.fileAttachment";
+                item.Name = attachmentFile.Name;
+                var fileByteArray = System.IO.File.ReadAllBytes(file);
+                item.ContentBytes = Convert.ToBase64String(fileByteArray);
+
+                MimeTypeMap.TryGetMimeType(attachmentFile.Name, out var mimeType);
+                item.ContentType = mimeType ?? "text/plain";
+                messageAttachmentOptions.Add(item);
+            }
+
+            return messageAttachmentOptions;
+        }
     }
 }