Changes made to the Forget Email function.

UnivateProperties_API/Repository/Communication/MailRepository.cs

@@ -1,12 +1,13 @@
-using MailKit.Net.Smtp;
-using MimeKit;
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Linq.Dynamic.Core;
+using System.Net.Mail;
+using System.Text;
 using UnivateProperties_API.Context;
 using UnivateProperties_API.Helpers;
 using UnivateProperties_API.Model.Communication;
+using UnivateProperties_API.Model.Users;
 
 namespace UnivateProperties_API.Repository.Communication
 {
@@ -27,18 +28,12 @@ namespace UnivateProperties_API.Repository.Communication
 
         public MailRepository(DataContext db)
         {
-            _dbContext = db;
+            _dbContext = db;              
         }
 
         public MailRepository()
         {
-        }
-
-        MimeMessage messageObj = new MimeMessage();
-        MailboxAddress from;
-        MailboxAddress to;
-        BodyBuilder bodyBuilder = new BodyBuilder();
-        SmtpClient client = new SmtpClient();
+        }        
 
         public void ContactUs(MailModel mm)
         {
@@ -48,69 +43,63 @@ namespace UnivateProperties_API.Repository.Communication
             string email = mm.Email;
             string message = mm.Message;
             var recipients = _dbContext.MailRecipients.Where(x => x.RecipientUsage == "ContactUs").ToList();
-
-            from = new MailboxAddress("Admin", mm.FromAddress);
-
-            InternetAddressList list = new InternetAddressList();
+            string body = "<div style=\"margin: 5px\">" +
+                            "<h4>Contact from: " + name + "!</h4>" +
+                            "<h4>Email: " + email + "</h4>" +
+                            "<h4>Phone: " + phone + "</h4>" +
+                            "<h4>Property: " + property + "</h4>" +
+                            "<div>" +
+                            "<h4>Message: </h4>" +
+                            "<p>" + message + "</p>" +
+                            "</div>" +
+                            "</div>" +
+                            "</div>";
+
+            string toList = "";
+            int emailCount = 0;
             foreach (var recipient in recipients)
             {
-                list.Add(new MailboxAddress(recipient.RecipientName, recipient.RecipientMail));
+                toList += recipient.RecipientMail + ";, ";
+                emailCount++;
             }
-            //to = new MailboxAddress("User", mm.ToAddress);
-
-            messageObj.From.Add(from);
-            messageObj.To.AddRange(list);
-
-            messageObj.Subject = "Uni-Vate - New Contact Request";
-
-            bodyBuilder.HtmlBody = "<div style=\"margin: 5px\">" +
-                "<h4>Contact from: "+  name +"!</h4>" +
-                "<h4>Email: "+ email +"</h4>" +
-                "<h4>Phone: " + phone + "</h4>" +
-                "<h4>Property: " + property + "</h4>" +
-                "<div>" +
-                "<h4>Message: </h4>" +
-                "<p>" + message + "</p>" +
-                "</div>" +
-                "</div>" +
-                "</div>";
 
-            messageObj.Body = bodyBuilder.ToMessageBody();
-
-            client.Connect("smtp.gmail.com", 465, true);
-            client.Authenticate("jlouw365@gmail.com", "setskohatxpsceqo");
+            if (toList.Length > 0)
+            {
+                if (emailCount == 1)
+                    toList = toList.Substring(0, toList.Length - 3);
+                else
+                    toList = toList.Substring(0, toList.Length - 2);
+            }
 
-            client.Send(messageObj);
-            client.Disconnect(true);
-            client.Dispose();
+            var host = _dbContext.Hosts.FirstOrDefault();
+            using (SmtpClient smtp = new SmtpClient(host.Host))
+            {
+                MailMessage mail = new MailMessage();
+                mail.To.Add(toList);
+                mail.Subject = "Uni-Vate - New Contact Request";
+                mail.Body = body;
+                mail.IsBodyHtml = true;
+                mail.BodyEncoding = Encoding.ASCII;
+                mail.DeliveryNotificationOptions = DeliveryNotificationOptions.OnFailure;
+                mail.Sender = new MailAddress(host.User, "UniVate Properties");
+                mail.From = new MailAddress(mm.Email, mm.Name);
+
+                smtp.UseDefaultCredentials = host.NeedsAuthorize;
+                smtp.Credentials = host.GetNetworkCredential();
+                smtp.EnableSsl = host.UseSSL;
+                smtp.Send(mail);
+            }            
         }
 
         public void EnquireNow(MailModel mm)
-        {
+        {            
             string phone = mm.Phone;
             string name = mm.Name;
             string email = mm.Email;
             string message = mm.Message;
-            var props = _dbContext.Properties.ToList();
-            var prop = props.Where(x => x.Id == Convert.ToInt32(mm.Property)).FirstOrDefault();
+            var prop = _dbContext.Properties.Where(p => p.Id == int.Parse(mm.Property)).FirstOrDefault();
             var recipients = _dbContext.MailRecipients.Where(x => x.RecipientUsage == "EnquireNow").ToList();
-
-            
-            from = new MailboxAddress("Admin", mm.FromAddress);
-
-            InternetAddressList list = new InternetAddressList();
-            foreach (var recipient in recipients)
-            {
-                list.Add(new MailboxAddress(recipient.RecipientName, recipient.RecipientMail));
-            }
-            //to = new MailboxAddress("User", mm.ToAddress);
-
-            messageObj.From.Add(from);
-            messageObj.To.AddRange(list);
-
-            messageObj.Subject = "Uni-Vate - Enquiry to view property";
-
-            bodyBuilder.HtmlBody = "<div style=\"margin: 5px\">" +
+            string body = "<div style=\"margin: 5px\">" +
                 "<h4>Contact from: " + name + "!</h4>" +
                 "<h4>Email: " + email + "</h4>" +
                 "<h4>Phone: " + phone + "</h4>" +
@@ -124,52 +113,66 @@ namespace UnivateProperties_API.Repository.Communication
                 "</div>" +
                 "</div>";
 
-            messageObj.Body = bodyBuilder.ToMessageBody();
+            string toList = "";
+            foreach (var recipient in recipients)
+            {
+                toList += recipient.RecipientMail + ";, ";
+            }
 
-            client.Connect("smtp.gmail.com", 465, true);
-            client.Authenticate("jlouw365@gmail.com", "setskohatxpsceqo");
+            if (toList.Length > 0)
+                toList = toList.Substring(0, toList.Length - 2);
 
-            client.Send(messageObj);
-            client.Disconnect(true);
-            client.Dispose();
+            var host = _dbContext.Hosts.FirstOrDefault();
+            using (SmtpClient smtp = new SmtpClient(host.Host))
+            {
+                MailMessage mail = new MailMessage();
+                mail.To.Add(toList);
+                mail.Subject = "Uni-Vate - Enquiry to view property";
+                mail.Body = body;
+                mail.IsBodyHtml = true;
+                mail.BodyEncoding = Encoding.ASCII;
+                mail.DeliveryNotificationOptions = DeliveryNotificationOptions.OnFailure;
+                mail.Sender = new MailAddress(host.User, "UniVate Properties");
+                mail.From = new MailAddress(mm.ToAddress, "Admin");
+
+                smtp.UseDefaultCredentials = host.NeedsAuthorize;
+                smtp.Credentials = host.GetNetworkCredential();
+                smtp.EnableSsl = host.UseSSL;
+                smtp.Send(mail);
+            }            
         }
 
-        public void ForgotPassword(MailModel mm, string link)
+        public void ForgotPassword(Individual toPerson, string link)
         {
-            string name = mm.Name;
-            string email = mm.Email;
-
-            from = new MailboxAddress("Admin", mm.FromAddress);
-
-            to = new MailboxAddress("User", mm.ToAddress);
-
-            messageObj.From.Add(from);
-            messageObj.To.Add(to);
-
-            messageObj.Subject = "Uni-Vate - Password Reset Request";
-
-            bodyBuilder.HtmlBody = "<div style=\"margin: 5px\">" +
-                "<h4>Request to reset password</h4>" +
-                "<h4>Dear " + name + ", </h4>" +
-                "<h4>There has been a request to reset your password. If this is incorrect please send an email to info@univateproperties.co.za</h4>" +
-                "<div>" +
-                "<h5>Please follow the link below to reset your password:</h5>" +
-                "<h3>"+ link + "</h3>" +
-                "<br />"+
-                "<h4>Thank You</h4>" +
-                "<h4>Team Uni-Vate</h4>" +
-                "</div>" +
-                "</div>" +
-                "</div>";
-
-            messageObj.Body = bodyBuilder.ToMessageBody();
-
-            client.Connect("smtp.gmail.com", 465, true);
-            client.Authenticate("jlouw365@gmail.com", "setskohatxpsceqo");
-
-            client.Send(messageObj);
-            client.Disconnect(true);
-            client.Dispose();
+            string body = "<div style=\"margin: 5px\">" + 
+                           "<h4>Dear " + toPerson.FullName + "</h4>" +
+                           "<h4>There has been a request to reset your password. If this is incorrect please send an email to info@univateproperties.co.za</h4>" +
+                           "<div>" +
+                           "<h4><a href='" + link + "'>Click here</a> to reset your password.</h4>" +
+                           "<br />"+
+                           "<h4>Thank You</h4>" +
+                           "<h4>Team Uni-Vate</h4>" +
+                           "</div>" +
+                           "</div>";
+
+            var host = _dbContext.Hosts.FirstOrDefault();
+            using (SmtpClient smtp = new SmtpClient(host.Host))
+            {
+                MailMessage mail = new MailMessage();
+                mail.To.Add(new MailAddress(toPerson.Email, toPerson.FullName));
+                mail.Subject = "Uni-Vate - Password Reset Request";
+                mail.Body = body;
+                mail.IsBodyHtml = true;
+                mail.BodyEncoding = Encoding.ASCII;
+                mail.DeliveryNotificationOptions = DeliveryNotificationOptions.OnFailure;
+                mail.Sender = new MailAddress(host.User, "UniVate Properties");
+                mail.From = mail.Sender;
+
+                smtp.UseDefaultCredentials = host.NeedsAuthorize;
+                smtp.Credentials = host.GetNetworkCredential();
+                smtp.EnableSsl = host.UseSSL;
+                smtp.Send(mail);
+            }                        
         }
 
         public void AddRecipient(MailRecipient rec)

UnivateProperties_API/Repository/Users/RegisterRepository.cs

@@ -377,7 +377,7 @@ namespace UnivateProperties_API.Repository.Users
         public void ForgotPasswordMailCheck(string mail)
         {
             var indiv = _dbContext.Individuals.Where(x => x.Email.ToUpper() == mail.ToUpper()).FirstOrDefault();
-            var mailer = new MailRepository();
+            var mailer = new MailRepository(_dbContext);
             if (indiv != null)
             {
                 byte[] time = BitConverter.GetBytes(GetTime());
@@ -411,12 +411,7 @@ namespace UnivateProperties_API.Repository.Users
                 //string url = "http://training.provision-sa.com:122/#/forgotPasswordReset/" + linkStr;
                 string url = "https://www.pvsl.co.za:97/#/forgotPasswordReset/" + linkStr;
 
-                mailer.ForgotPassword(new MailModel
-                {
-                    ToAddress = mail,
-                    FromAddress = "jlouw365@gmail.com",
-                    Name = indiv.Name
-                }, url);
+                mailer.ForgotPassword(indiv, url);
             }
             else
             {