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

Addressed final TODOs

Browse Source
This commit is contained in:
Scott Brady
2020-04-23 16:03:12 +01:00
parent d6036eb9f4
commit 42efb78fdd
2 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,4 +1,4 @@
using System; using System;
using System.Linq; using System.Linq;
using System.Net; using System.Net;
using System.Net.Http; using System.Net.Http;
@@ -327,7 +327,7 @@ namespace Umbraco.Web.Editors
UmbracoUserExtensions.GetUserCulture(identityUser.Culture, Services.TextService, GlobalSettings), UmbracoUserExtensions.GetUserCulture(identityUser.Culture, Services.TextService, GlobalSettings),
new[] { identityUser.UserName, callbackUrl }); new[] { identityUser.UserName, callbackUrl });
// TODO: SB: SendEmailAsync // TODO: Port email service to ASP.NET Core
/*await UserManager.SendEmailAsync(identityUser.Id, /*await UserManager.SendEmailAsync(identityUser.Id,
Services.TextService.Localize("login/resetPasswordEmailCopySubject", Services.TextService.Localize("login/resetPasswordEmailCopySubject",
// Ensure the culture of the found user is used for the email! // Ensure the culture of the found user is used for the email!
@@ -451,8 +451,6 @@ namespace Umbraco.Web.Editors
// if user was only invited, then they have not been approved // if user was only invited, then they have not been approved
// but a successful forgot password flow (e.g. if their token had expired and they did a forgot password instead of request new invite) // but a successful forgot password flow (e.g. if their token had expired and they did a forgot password instead of request new invite)
// means we have verified their email // means we have verified their email
// TODO: SB: ConfirmEmailAsync
if (!await UserManager.IsEmailConfirmedAsync(identityUser)) if (!await UserManager.IsEmailConfirmedAsync(identityUser))
{ {
await UserManager.ConfirmEmailAsync(identityUser, model.ResetCode); await UserManager.ConfirmEmailAsync(identityUser, model.ResetCode);

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

@@ -499,7 +499,7 @@ namespace Umbraco.Web.Editors
UmbracoUserExtensions.GetUserCulture(to.Language, Services.TextService, GlobalSettings), UmbracoUserExtensions.GetUserCulture(to.Language, Services.TextService, GlobalSettings),
new[] { userDisplay.Name, from, message, inviteUri.ToString(), fromEmail }); new[] { userDisplay.Name, from, message, inviteUri.ToString(), fromEmail });
// TODO: SB: EmailService.SendAsync // TODO: Port email service to ASP.NET Core
/*await UserManager.EmailService.SendAsync( /*await UserManager.EmailService.SendAsync(
//send the special UmbracoEmailMessage which configures it's own sender //send the special UmbracoEmailMessage which configures it's own sender
//to allow for events to handle sending the message if no smtp is configured //to allow for events to handle sending the message if no smtp is configured