From 4e0d2db73b127a859efe26f586b4ba0d7251e894 Mon Sep 17 00:00:00 2001
From: reven <john@reven.nz>
Date: Wed, 12 Jan 2022 19:48:34 +1300
Subject: [PATCH] switching to .net internal email

---
 EmailNodes/Communication/SendEmail.cs | 66 +++++++++++++++------------
 1 file changed, 38 insertions(+), 28 deletions(-)

diff --git a/EmailNodes/Communication/SendEmail.cs b/EmailNodes/Communication/SendEmail.cs
index bb99b35d..b43fb6a8 100644
--- a/EmailNodes/Communication/SendEmail.cs
+++ b/EmailNodes/Communication/SendEmail.cs
@@ -37,6 +37,44 @@ namespace FileFlows.Communication
             string sender = settings.Sender ?? "fileflows@" + Environment.MachineName;
             string subject = args.ReplaceVariables(this.Subject ?? String.Empty)?.EmptyAsNull() ?? "Email from FileFlows"; ;
 
+
+
+            //SendMailKit(args, settings, sender, subject, body);
+
+            SendDotNet(args, settings, sender, subject, body);
+
+            return 1;
+        }
+
+        private void SendDotNet(NodeParameters args, PluginSettings settings, string sender, string subject, string body)
+        {
+            args.Logger?.ILog($"Send using .NET internal mail library");
+            System.Net.Mail.MailMessage message = new ();
+            message.From = new System.Net.Mail.MailAddress(sender);
+            foreach (var recipient in Recipients)
+                message.To.Add(recipient);
+            message.Subject = subject;
+            message.Body = args.ReplaceVariables(body);
+
+
+            System.Net.Mail.SmtpClient smtp = new ();
+            smtp.Port = settings.SmtpPort;
+            smtp.Host = settings.SmtpServer;
+            if (string.IsNullOrEmpty(settings.SmtpUsername) == false)
+            {
+                args.Logger?.ILog("Sending using credientials");
+                smtp.EnableSsl = true;
+                smtp.UseDefaultCredentials = false;
+                smtp.Credentials = new System.Net.NetworkCredential(settings.SmtpUsername, settings.SmtpPassword);
+                //smtp.DeliveryMethod = SmtpDeliveryMethod.Network;
+            }
+            args.Logger?.ILog("About to send email");
+            smtp.Send(message);
+            args.Logger?.ILog("Email sent!");
+        }
+
+        private void SendMailKit(NodeParameters args, PluginSettings settings, string sender, string subject, string body)
+        {
             var message = new MimeMessage();
             message.From.Add(new MailboxAddress(sender, sender));
             foreach (var recipient in Recipients)
@@ -64,34 +102,6 @@ namespace FileFlows.Communication
                 args.Logger?.ILog($"Message sent");
                 client.Disconnect(true);
             }
-
-
-
-
-
-            //MailMessage message = new MailMessage();
-            //message.From = new MailAddress(sender);
-            //foreach (var recipient in Recipients)
-            //    message.To.Add(recipient);
-            //message.Subject = subject;
-            //message.Body = args.ReplaceVariables(body);
-
-
-
-            //SmtpClient smtp = new SmtpClient();
-            //smtp.Port = settings.SmtpPort;
-            //smtp.Host = settings.SmtpServer;
-            //if (string.IsNullOrEmpty(settings.SmtpUsername) == false)
-            //{
-            //    args.Logger?.ILog("Sending using credientials");
-            //    smtp.EnableSsl = true;
-            //    smtp.UseDefaultCredentials = false;
-            //    smtp.Credentials = new NetworkCredential(settings.SmtpUsername, settings.SmtpPassword);
-            //    //smtp.DeliveryMethod = SmtpDeliveryMethod.Network;
-            //}
-            //smtp.Send(message);
-
-            return 1;
         }
     }
 }