Merge remote-tracking branch 'origin/netcore/netcore' into netcore/feature/AB6586-migrate_controllers

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;
@@ -53,6 +54,7 @@ namespace Umbraco.Web.Editors
         private readonly IImageUrlGenerator _imageUrlGenerator;
         private readonly ISecuritySettings _securitySettings;
         private readonly IRequestAccessor _requestAccessor;
+        private readonly IEmailSender _emailSender;
 
         public UsersController(
             IGlobalSettings globalSettings,
@@ -70,7 +72,8 @@ namespace Umbraco.Web.Editors
             IImageUrlGenerator imageUrlGenerator,
             IPublishedUrlProvider publishedUrlProvider,
             ISecuritySettings securitySettings,
-            IRequestAccessor requestAccessor)
+            IRequestAccessor requestAccessor,
+            IEmailSender emailSender)
             : base(globalSettings, umbracoContextAccessor, sqlContext, services, appCaches, logger, runtimeState, shortStringHelper, umbracoMapper, publishedUrlProvider)
         {
             _mediaFileSystem = mediaFileSystem;
@@ -80,6 +83,7 @@ namespace Umbraco.Web.Editors
             _imageUrlGenerator = imageUrlGenerator;
             _securitySettings = securitySettings;
             _requestAccessor = requestAccessor;
+            _emailSender = emailSender;
         }
 
         /// <summary>
@@ -503,17 +507,15 @@ 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 mailMessage = new MailMessage()
+            {
+                Subject = emailSubject,
+                Body = emailBody,
+                IsBodyHtml = true,
+                To = { to.Email}
+            };
 
+            await _emailSender.SendAsync(mailMessage);
         }
 
         /// <summary>