Fix email sending issue with outlook response

Author: Ruben Bisharyan

src/Communicator/Communicator.csproj

@@ -8,7 +8,7 @@
         <PackageReadmeFile>Readme.md</PackageReadmeFile>
         <Authors>Pandatech</Authors>
         <Copyright>MIT</Copyright>
-        <Version>1.0.3</Version>
+        <Version>1.0.4</Version>
         <PackageId>Pandatech.Communicator</PackageId>
         <Title>SMS and Email Communication helper</Title>
         <PackageTags>Pandatech, library, Sms, Email, Messages</PackageTags>

src/Communicator/Models/GeneralResponses/GeneralEmailResponse.cs

@@ -6,40 +6,62 @@ public class GeneralEmailResponse
 {
     public string Status { get; set; } = null!;
     public string Code { get; set; } = null!;
-    public string TrackingId { get; set; } = null!;
+    public string? TrackingId { get; set; }
     public string Id { get; set; } = null!;
     public string Service { get; set; } = null!;
 
     // Define a regular expression pattern to extract relevant parts of the response
-    private const string Pattern = @"^(\d+\.\d+\.\d+)\s+(\w+)\s+(\d+)\s+(\S+)\s+\-\s+(\w+)$";
+    private const string GmailPattern = @"^(\d+\.\d+\.\d+)\s+(\w+)\s+(\d+)\s+(\S+)\s+\-\s+(\w+)$";
+
+    private const string OutlookPattern =
+        @"^(?<Version>\d+\.\d+\.\d+)\s(?<Status>\w+)\s<(?<EmailId>[^>]+)>\s\[Hostname=(?<Hostname>[^\]]+)\]$";
 
     public static GeneralEmailResponse Parse(string response)
     {
-        // Match the response string against the pattern
-        var match = Regex.Match(response, Pattern);
+        var match = Regex.Match(response, GmailPattern);
+        
+        if (!match.Success)
+        {
+            match = Regex.Match(response, OutlookPattern);
 
-        // Check if the response string matches the expected format
-        if (!match.Success || match.Groups.Count != 6)
+            if (!match.Success)
+            {
+                throw new ArgumentException("Invalid response string format.");
+            }
+        }
+        
+        if (match.Groups.Count == 5)
         {
-            throw new ArgumentException("Invalid response string format.");
+            return new GeneralEmailResponse
+            {
+                Status = match.Groups[1].Value,
+                Code = match.Groups[2].Value,
+                TrackingId = null,
+                Id = match.Groups[3].Value,
+                Service = match.Groups[4].Value
+            };
         }
 
-        // Create a new instance of EmailSendResponse and populate its properties
-        return new GeneralEmailResponse
+        if (match.Groups.Count == 6)
         {
-            Status = match.Groups[1].Value,
-            Code = match.Groups[2].Value,
-            TrackingId = match.Groups[3].Value,
-            Id = match.Groups[4].Value,
-            Service = match.Groups[5].Value
-        };
+            return new GeneralEmailResponse
+            {
+                Status = match.Groups[1].Value,
+                Code = match.Groups[2].Value,
+                TrackingId = match.Groups[3].Value,
+                Id = match.Groups[4].Value,
+                Service = match.Groups[5].Value
+            };
+        }
+
+        throw new ArgumentException("Invalid response string format.");
     }
 
     public static List<GeneralEmailResponse> Parse(IEnumerable<string> responses)
     {
         var responseList = new List<GeneralEmailResponse>();
 
-        foreach (var match in responses.Select(response => Regex.Match(response, Pattern)))
+        foreach (var match in responses.Select(response => Regex.Match(response, GmailPattern)))
         {
             // Check if the response string matches the expected format
             if (!match.Success || match.Groups.Count != 6)

test/Communicator.Demo/Program.cs

@@ -7,67 +7,42 @@
 
 var builder = WebApplication.CreateBuilder(args);
 
-builder.AddCommunicator();
-// builder.AddCommunicator(options =>
-// {
-//     options.SmsFake = false;
-//     options.SmsConfigurations = new Dictionary<string, SmsConfiguration>
-//     {
-//         {
-//             "GeneralSender", new SmsConfiguration
-//             {
-//                 Provider = "Dexatel",
-//                 From = "sender_name",
-//                 Properties = new Dictionary<string, string>
-//                 {
-//                     { "X-Dexatel-Key", "key" }
-//                 },
-//                 TimeoutMs = 10000
-//             }
-//         },
-//         {
-//             "TransactionalSender", new SmsConfiguration
-//             {
-//                 Provider = "Twilio",
-//                 From = "sender_number",
-//                 Properties = new Dictionary<string, string>
-//                 {
-//                     { "SID", "key" },
-//                     { "AUTH_TOKEN", "token" }
-//                 },
-//                 TimeoutMs = 10000
-//             }
-//         }
-//     };
-//     options.EmailFake = false;
-//     options.EmailConfigurations = new Dictionary<string, EmailConfiguration>
-//     {
-//         {
-//             "GeneralSender2", new EmailConfiguration
-//             {
-//                 SmtpServer = "smtp.test.com",
-//                 SmtpPort = 465, // 587
-//                 SmtpUsername = "test",
-//                 SmtpPassword = "test123",
-//                 SenderEmail = "[email protected]",
-//                 UseSsl = true, // false
-//                 TimeoutMs = 10000
-//             }
-//         },
-//         {
-//             "TransactionalSender", new EmailConfiguration
-//             {
-//                 SmtpServer = "smtp.gmail.com",
-//                 SmtpPort = 465, // 587
-//                 SmtpUsername = "vazgen",
-//                 SmtpPassword = "vazgen123",
-//                 SenderEmail = "[email protected]",
-//                 UseSsl = true, // false
-//                 TimeoutMs = 10000
-//             }
-//         }
-//     };
-// });
+// builder.AddCommunicator();
+builder.AddCommunicator(options =>
+{
+    options.SmsFake = false;
+    options.SmsConfigurations = new Dictionary<string, SmsConfiguration>
+    {
+        {
+            "GeneralSender", new SmsConfiguration
+            {
+                Provider = "Dexatel",
+                From = "sender_name",
+                Properties = new Dictionary<string, string>
+                {
+                    { "X-Dexatel-Key", "key" }
+                },
+                TimeoutMs = 10000
+            }
+        }
+    };
+    options.EmailFake = false;
+    options.EmailConfigurations = new Dictionary<string, EmailConfiguration>
+    {
+        {
+            "GeneralSender", new EmailConfiguration
+            {
+                SmtpServer = "smtp-mail.outlook.com",
+                SmtpPort = 587, // 587
+                SmtpUsername = "[email protected]",
+                SmtpPassword = "rbmpbzsytkvqfzdv",
+                SenderEmail = "[email protected]",
+                UseSsl = false, // false
+                TimeoutMs = 10000
+            }
+        }
+    };
+});
 
 builder.Services.AddEndpointsApiExplorer();
 builder.Services.AddSwaggerGen();