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

#8142 - Small cleanup, and bugfix

Browse Source
This commit is contained in:
Bjarke Berg
2020-05-20 11:42:23 +02:00
parent 65fa1efc9c
commit 2b4dfbca9d
12 changed files with 85 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/Umbraco.Web/Editors/AuthenticationController.cs
View File

@@ -48,6 +48,7 @@ namespace Umbraco.Web.Editors
private readonly IHostingEnvironment _hostingEnvironment;
private readonly IRuntimeState _runtimeState;
private readonly ISecuritySettings _securitySettings;
private readonly IEmailSender _emailSender;
public AuthenticationController(
IUserPasswordConfiguration passwordConfiguration,
@@ -61,13 +62,15 @@ namespace Umbraco.Web.Editors
IRuntimeState runtimeState,
UmbracoMapper umbracoMapper,
ISecuritySettings securitySettings,
IPublishedUrlProvider publishedUrlProvider)
IPublishedUrlProvider publishedUrlProvider,
IEmailSender emailSender)
: base(globalSettings, umbracoContextAccessor, sqlContext, services, appCaches, logger, runtimeState, umbracoMapper, publishedUrlProvider)
{
_passwordConfiguration = passwordConfiguration ?? throw new ArgumentNullException(nameof(passwordConfiguration));
_hostingEnvironment = hostingEnvironment ?? throw new ArgumentNullException(nameof(hostingEnvironment));
_runtimeState = runtimeState ?? throw new ArgumentNullException(nameof(runtimeState));
_securitySettings = securitySettings ?? throw new ArgumentNullException(nameof(securitySettings));
_emailSender = emailSender;
}
protected BackOfficeUserManager<BackOfficeIdentityUser> UserManager => _userManager
@@ -333,16 +336,15 @@ namespace Umbraco.Web.Editors
// 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
IsBodyHtml = true,
To = { user.Email}
};
mailMessage.To.Add(user.Email);
await emailSender.SendAsync(mailMessage);
await _emailSender.SendAsync(mailMessage);
UserManager.RaiseForgotPasswordRequestedEvent(user.Id);
}

12
src/Umbraco.Web/Editors/UsersController.cs
View File

@@ -53,6 +53,7 @@ namespace Umbraco.Web.Editors
private readonly ISqlContext _sqlContext;
private readonly IImageUrlGenerator _imageUrlGenerator;
private readonly ISecuritySettings _securitySettings;
private readonly IEmailSender _emailSender;
public UsersController(
IGlobalSettings globalSettings,
@@ -69,7 +70,8 @@ namespace Umbraco.Web.Editors
IHostingEnvironment hostingEnvironment,
IImageUrlGenerator imageUrlGenerator,
IPublishedUrlProvider publishedUrlProvider,
ISecuritySettings securitySettings)
ISecuritySettings securitySettings,
IEmailSender emailSender)
: base(globalSettings, umbracoContextAccessor, sqlContext, services, appCaches, logger, runtimeState, shortStringHelper, umbracoMapper, publishedUrlProvider)
{
_mediaFileSystem = mediaFileSystem;
@@ -78,6 +80,7 @@ namespace Umbraco.Web.Editors
_sqlContext = sqlContext;
_imageUrlGenerator = imageUrlGenerator;
_securitySettings = securitySettings;
_emailSender = emailSender;
}
/// <summary>
@@ -501,16 +504,15 @@ namespace Umbraco.Web.Editors
UmbracoUserExtensions.GetUserCulture(to.Language, Services.TextService, GlobalSettings),
new[] { userDisplay.Name, from, message, inviteUri.ToString(), fromEmail });
var emailSender = new EmailSender(GlobalSettings, true);
var mailMessage = new MailMessage()
{
Subject = emailSubject,
Body = emailBody,
IsBodyHtml = true
IsBodyHtml = true,
To = { to.Email}
};
mailMessage.To.Add(to.Email);
await emailSender.SendAsync(mailMessage);
await _emailSender.SendAsync(mailMessage);
}
/// <summary>