From 42efb78fddf460dc08de9f5cb34a795336291adc Mon Sep 17 00:00:00 2001 From: Scott Brady Date: Thu, 23 Apr 2020 16:03:12 +0100 Subject: [PATCH] Addressed final TODOs --- src/Umbraco.Web/Editors/AuthenticationController.cs | 6 ++---- src/Umbraco.Web/Editors/UsersController.cs | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/Umbraco.Web/Editors/AuthenticationController.cs b/src/Umbraco.Web/Editors/AuthenticationController.cs index b89f06897d..44f41a0114 100644 --- a/src/Umbraco.Web/Editors/AuthenticationController.cs +++ b/src/Umbraco.Web/Editors/AuthenticationController.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Linq; using System.Net; using System.Net.Http; @@ -327,7 +327,7 @@ namespace Umbraco.Web.Editors UmbracoUserExtensions.GetUserCulture(identityUser.Culture, Services.TextService, GlobalSettings), new[] { identityUser.UserName, callbackUrl }); - // TODO: SB: SendEmailAsync + // 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! @@ -451,8 +451,6 @@ namespace Umbraco.Web.Editors // 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) // means we have verified their email - - // TODO: SB: ConfirmEmailAsync if (!await UserManager.IsEmailConfirmedAsync(identityUser)) { await UserManager.ConfirmEmailAsync(identityUser, model.ResetCode); diff --git a/src/Umbraco.Web/Editors/UsersController.cs b/src/Umbraco.Web/Editors/UsersController.cs index dd6a1d32a6..8e73fa1d02 100644 --- a/src/Umbraco.Web/Editors/UsersController.cs +++ b/src/Umbraco.Web/Editors/UsersController.cs @@ -499,7 +499,7 @@ namespace Umbraco.Web.Editors UmbracoUserExtensions.GetUserCulture(to.Language, Services.TextService, GlobalSettings), new[] { userDisplay.Name, from, message, inviteUri.ToString(), fromEmail }); - // TODO: SB: EmailService.SendAsync + // 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