AzureEmailSender - Always Map Message ID in SendResponse Objects for Diagnostic Support (#26)

* Update AzureEmailSender.cs

Map MessageId always when is available

* Changed Async task completion

Author: Qualizorg

src/FluentEmail.Core/FluentEmail.Core.csproj

@@ -20,7 +20,7 @@
 
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="6.0.0" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.0" />
   </ItemGroup>
 
 </Project>

src/Senders/FluentEmail.Azure.Email/AzureEmailSender.cs

@@ -138,11 +138,12 @@ public async Task<SendResponse> SendAsync(IFluentEmail email, CancellationToken?
             _ => 3
         }).ToString());
 
+        string messageId = null;
 
         try
         {
             EmailSendOperation sendOperation = await _emailClient.SendAsync(WaitUntil.Started, emailMessage, token ?? CancellationToken.None);
-            var messageId = sendOperation.Id;
+            messageId = sendOperation.Id;
             if (string.IsNullOrWhiteSpace(messageId))
             {
                 return new SendResponse
@@ -153,10 +154,10 @@ public async Task<SendResponse> SendAsync(IFluentEmail email, CancellationToken?
 
             // We want to verify that the email was sent.
             // The maximum time we will wait for the message status to be sent/delivered is 2 minutes.
-            var cancellationToken = new CancellationTokenSource(TimeSpan.FromMinutes(2));
-            var sendStatusResult = sendOperation.WaitForCompletion(cancellationToken.Token).Value;
+            using var cancellationToken = new CancellationTokenSource(TimeSpan.FromMinutes(2));
+            var sendStatusResult = await sendOperation.WaitForCompletionAsync(cancellationToken.Token);
 
-            if (sendStatusResult.Status == EmailSendStatus.Succeeded)
+            if (sendStatusResult.Value.Status == EmailSendStatus.Succeeded)
             {
                 return new SendResponse
                 {
@@ -168,19 +169,22 @@ public async Task<SendResponse> SendAsync(IFluentEmail email, CancellationToken?
             {
                 return new SendResponse
                 {
+                    MessageId = messageId,
                     ErrorMessages = new List<string> { "Failed to send email, timed out while getting status." }
                 };
             }
 
             return new SendResponse
             {
+                MessageId = messageId,
                 ErrorMessages = new List<string> { "Failed to send email." }
             };
         }
         catch (Exception ex)
         {
             return new SendResponse
             {
+                MessageId = messageId,
                 ErrorMessages = new List<string> { ex.Message }
             };
         }