🔀 ✨ feat: add support for passing headers (#175)

* ✨ feat: add support for passing headers

* codeql

* update targets

* test app

* update packages

* minver

* minver

* update action

Author: DavidDeSloovere

.github/workflows/ci.yml

@@ -16,7 +16,7 @@ jobs:
 
     steps:
       - name: ☁ Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           fetch-depth: 0
 

.github/workflows/codeql-analysis.yml

@@ -39,7 +39,7 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL

.github/workflows/publish.yml

@@ -13,7 +13,7 @@ jobs:
 
     steps:
       - name: ☁ Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           fetch-depth: 0
 

sample/SendMailTestApp/Program.cs

@@ -47,6 +47,7 @@ static async Task Main(string[] args)
             .To(destinationAddress)
             .Subject("Test Email Graph API")
             .Body("This is the <b>body</b> of the mail.");
+        email.Header("X-CustomHeader", "Some value");
         email.Data.IsHtml = true;
 
         if (addAttachment)

sample/SendMailTestApp/README.md

@@ -1,6 +1,9 @@
 Set up the config:
 
 ```
+cd sample
+cd SendMailTestApp
+
 dotnet user-secrets init
 
 dotnet user-secrets set "GraphSenderOptions:TenantId" "your value"

sample/SendMailTestApp/SendMailTestApp.csproj

@@ -6,6 +6,7 @@
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
       <UserSecretsId>4eba8463-a290-440f-b079-62d74334211a</UserSecretsId>
+      <LangVersion>latestmajor</LangVersion>
   </PropertyGroup>
 
     <ItemGroup>

src/FluentEmail.Graph/FluentEmail.Graph.csproj

@@ -20,8 +20,9 @@
         <Version>0.0.1</Version>
         <PackageLicenseExpression>MIT</PackageLicenseExpression>
         <MinVerVerbosity>detailed</MinVerVerbosity>
-        <MinVerDefaultPreReleasePhase>preview</MinVerDefaultPreReleasePhase>
-        <MinVerMinimumMajorMinor>2.0</MinVerMinimumMajorMinor>
+        <MinVerMinimumMajorMinor>2.3</MinVerMinimumMajorMinor>
+        <PackageReleaseNotes>v2.2 Added support for Headers
+v2.1 Added support for Inline images</PackageReleaseNotes>
     </PropertyGroup>
 
     <ItemGroup>
@@ -43,15 +44,15 @@
           <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
         <PackageReference Include="FluentEmail.Core" Version="3.0.2" />
-        <PackageReference Include="JetBrains.Annotations" Version="2022.1.0">
+        <PackageReference Include="JetBrains.Annotations" Version="2022.3.1">
             <PrivateAssets>all</PrivateAssets>
         </PackageReference>
         <PackageReference Include="Microsoft.Graph" Version="4.39.0" />
         <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1">
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
             <PrivateAssets>all</PrivateAssets>
         </PackageReference>
-        <PackageReference Include="MinVer" Version="4.2.0">
+        <PackageReference Include="MinVer" Version="4.3.0">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>

src/FluentEmail.Graph/GraphSender.cs

@@ -64,6 +64,14 @@ public async Task<SendResponse> SendAsync(IFluentEmail email, CancellationToken?
             }
         }
 
+        private static byte[] GetAttachmentBytes(Stream stream)
+        {
+            using var m = new MemoryStream();
+            stream.CopyTo(m);
+
+            return m.ToArray();
+        }
+
         private async Task<Message> SendWithoutAttachments(IFluentEmail email)
         {
             // https://docs.microsoft.com/en-us/graph/api/user-sendmail?view=graph-rest-1.0&tabs=http
@@ -89,14 +97,6 @@ await this.graphClient.Users[email.Data.FromAddress.EmailAddress]
             return draftMessage;
         }
 
-        private static byte[] GetAttachmentBytes(Stream stream)
-        {
-            using var m = new MemoryStream();
-            stream.CopyTo(m);
-
-            return m.ToArray();
-        }
-
         private async Task<Message> CreateDraftMessage(IFluentEmail email)
         {
             var template = MessageCreation.CreateGraphMessageFromFluentEmail(email);

src/FluentEmail.Graph/MessageCreation.cs

@@ -29,6 +29,7 @@ internal static Message CreateGraphMessageFromFluentEmail(IFluentEmail email)
         };
 
         SetPriority(email, message);
+        AddHeaders(email, message);
 
         return message;
     }
@@ -82,4 +83,17 @@ private static void SetPriority(IFluentEmail email, Message draftMessage)
                 break;
         }
     }
+
+    private static void AddHeaders(IFluentEmail email, Message message)
+    {
+        if (!email.Data.Headers.Any())
+        {
+            return;
+        }
+
+        var headers = email.Data.Headers
+            .Select(header => new InternetMessageHeader { Name = header.Key, Value = header.Value, })
+            .ToList();
+        message.InternetMessageHeaders = headers;
+    }
 }

tests/FluentEmail.Graph.Tests/FluentEmail.Graph.Tests.csproj

@@ -1,10 +1,11 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <IsPackable>false</IsPackable>
     <EnableNETAnalyzers>true</EnableNETAnalyzers>
     <EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
+    <LangVersion>latestmajor</LangVersion>
   </PropertyGroup>
 
   <ItemGroup>