yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Abstracting MailMessage

Browse Source
This commit is contained in:
Elitsa Marinovska
2020-10-22 15:08:07 +02:00
parent e9ae1a93c3
commit d7eca3d0d5
9 changed files with 68 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/Umbraco.Web.BackOffice/Controllers/AuthenticationController.cs
View File

@@ -2,7 +2,6 @@
using System.Collections.Generic;
using System.Linq;
using System.Net;
using System.Net.Mail;
using System.Threading.Tasks;
using Microsoft.AspNetCore.Routing;
using Microsoft.AspNetCore.Authentication;
@@ -310,6 +309,7 @@ namespace Umbraco.Web.BackOffice.Controllers
var user = _userService.GetByEmail(model.Email);
if (user != null)
{
var from = _globalSettings.Smtp.From;
var code = await _userManager.GeneratePasswordResetTokenAsync(identityUser);
var callbackUrl = ConstructCallbackUrl(identityUser.Id, code);
@@ -322,12 +322,9 @@ namespace Umbraco.Web.BackOffice.Controllers
// Ensure the culture of the found user is used for the email!
UmbracoUserExtensions.GetUserCulture(identityUser.Culture, _textService, _globalSettings));
var mailMessage = new MailMessage()
var mailMessage = new EmailMessage(from, user.Email, subject, message)
{
Subject = subject,
Body = message,
IsBodyHtml = true,
To = { user.Email }
IsBodyHtml = true
};
await _emailSender.SendAsync(mailMessage);

8
src/Umbraco.Web.BackOffice/Controllers/UsersController.cs
View File

@@ -3,7 +3,6 @@ using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Net;
using System.Net.Mail;
using System.Runtime.Serialization;
using System.Security.Cryptography;
using System.Threading.Tasks;
@@ -543,12 +542,9 @@ namespace Umbraco.Web.BackOffice.Controllers
UmbracoUserExtensions.GetUserCulture(to.Language, _localizedTextService, _globalSettings),
new[] { userDisplay.Name, from, message, inviteUri.ToString(), fromEmail });
var mailMessage = new MailMessage()
var mailMessage = new EmailMessage(fromEmail, to.Email, emailSubject, emailBody)
{
Subject = emailSubject,
Body = emailBody,
IsBodyHtml = true,
To = { to.Email}
IsBodyHtml = true
};
await _emailSender.SendAsync(mailMessage);