From e85ccb0dabd0b488292f566afcbb1640980f5cb6 Mon Sep 17 00:00:00 2001
From: Elitsa Marinovska <elm@umbraco.dk>
Date: Wed, 20 May 2020 00:20:25 +0200
Subject: [PATCH] Removing TODOs with the actual implementation

---
 .../Editors/AuthenticationController.cs       | 21 +++++++++++++------
 src/Umbraco.Web/Editors/UsersController.cs    | 20 +++++++++---------
 2 files changed, 25 insertions(+), 16 deletions(-)

diff --git a/src/Umbraco.Web/Editors/AuthenticationController.cs b/src/Umbraco.Web/Editors/AuthenticationController.cs
index fc34a35566..50e9921154 100644
--- a/src/Umbraco.Web/Editors/AuthenticationController.cs
+++ b/src/Umbraco.Web/Editors/AuthenticationController.cs
@@ -3,6 +3,7 @@ using System.Linq;
 using System.Net;
 using System.Net.Http;
 using System.Collections.Generic;
+using System.Net.Mail;
 using System.Security.Principal;
 using System.Threading.Tasks;
 using System.Web;
@@ -328,12 +329,20 @@ namespace Umbraco.Web.Editors
                         UmbracoUserExtensions.GetUserCulture(identityUser.Culture, Services.TextService, GlobalSettings),
                         new[] { identityUser.UserName, callbackUrl });
 
-                    // TODO: Port email service to ASP.NET Core
-                    /*await UserManager.SendEmailAsync(identityUser.Id,
-                        Services.TextService.Localize("login/resetPasswordEmailCopySubject",
-                            // Ensure the culture of the found user is used for the email!
-                            UmbracoUserExtensions.GetUserCulture(identityUser.Culture, Services.TextService, GlobalSettings)),
-                        message);*/
+                    var subject = Services.TextService.Localize("login/resetPasswordEmailCopySubject",
+                        // Ensure the culture of the found user is used for the email!
+                        UmbracoUserExtensions.GetUserCulture(identityUser.Culture, Services.TextService, GlobalSettings));
+
+                    var emailSender = new EmailSender(GlobalSettings, true);
+                    var mailMessage = new MailMessage()
+                    {
+                        Subject = subject,
+                        Body = message,
+                        IsBodyHtml = true
+                    };
+                    mailMessage.To.Add(user.Email);
+
+                    await emailSender.SendAsync(mailMessage);
 
                     UserManager.RaiseForgotPasswordRequestedEvent(user.Id);
                 }
diff --git a/src/Umbraco.Web/Editors/UsersController.cs b/src/Umbraco.Web/Editors/UsersController.cs
index 7aa71b6e2e..029612dc90 100644
--- a/src/Umbraco.Web/Editors/UsersController.cs
+++ b/src/Umbraco.Web/Editors/UsersController.cs
@@ -4,6 +4,7 @@ using System.IO;
 using System.Linq;
 using System.Net;
 using System.Net.Http;
+using System.Net.Mail;
 using System.Runtime.Serialization;
 using System.Security.Cryptography;
 using System.Threading.Tasks;
@@ -500,17 +501,16 @@ namespace Umbraco.Web.Editors
                 UmbracoUserExtensions.GetUserCulture(to.Language, Services.TextService, GlobalSettings),
                 new[] { userDisplay.Name, from, message, inviteUri.ToString(), fromEmail });
 
-            // TODO: Port email service to ASP.NET Core
-            /*await UserManager.EmailService.SendAsync(
-                //send the special UmbracoEmailMessage which configures it's own sender
-                //to allow for events to handle sending the message if no smtp is configured
-                new UmbracoEmailMessage(new EmailSender(GlobalSettings, true))
-                {
-                    Body = emailBody,
-                    Destination = userDisplay.Email,
-                    Subject = emailSubject
-                });*/
+            var emailSender = new EmailSender(GlobalSettings, true);
+            var mailMessage = new MailMessage()
+            {
+                Subject = emailSubject,
+                Body = emailBody,
+                IsBodyHtml = true
+            };
+            mailMessage.To.Add(to.Email);
 
+            await emailSender.SendAsync(mailMessage);
         }
 
         /// <summary>