Allow any user to manage two-factor

src/OrchardCore.Modules/OrchardCore.Notifications/Views/UserNotificationNavbar.cshtml

@@ -2,6 +2,7 @@
 @using OrchardCore.DisplayManagement.ModelBinding
 @using Microsoft.AspNetCore.Authorization
 @using OrchardCore.Admin
+@using OrchardCore.Notifications.Endpoints.Management
 
 @inject IDisplayManager<Notification> NotificationDisplayDriver
 @inject IUpdateModelAccessor UpdateModelAccessor
@@ -52,10 +53,13 @@
             {
                 <li class="text-center">@T["You have no unread notifications."]</li>
             }
+            <li>
+                <hr class="dropdown-divider">
+            </li>
             @if (await AuthorizationService.AuthorizeAsync(ViewContext.HttpContext.User, AdminPermissions.AccessAdminPanel))
             {
                 <li>
-                    <a class="dropdown-item fw-bold" asp-action="List" asp-controller="Admin" asp-area="OrchardCore.Notifications">@T["Notification Center"]</a>
+                    <a class="dropdown-item fw-bold" asp-action="List" asp-controller="Admin" asp-area="@NotificationConstants.Features.Notifications">@T["Notification Center"]</a>
                 </li>
             }
         </ul>

src/OrchardCore.Modules/OrchardCore.Users/Controllers/SmsAuthenticatorController.cs

@@ -107,9 +107,9 @@ public async Task<IActionResult> IndexPost(RequestCodeSmsAuthenticatorViewModel
 
         var currentPhoneNumber = await UserManager.GetPhoneNumberAsync(user);
 
-        var canSetNewPhone = settings.AllowChangingPhoneNumber
-            || string.IsNullOrEmpty(currentPhoneNumber)
-            || !_phoneFormatValidator.IsValid(currentPhoneNumber);
+        var canSetNewPhone = settings.AllowChangingPhoneNumber ||
+            string.IsNullOrEmpty(currentPhoneNumber) ||
+            !_phoneFormatValidator.IsValid(currentPhoneNumber);
 
         model.AllowChangingPhoneNumber = canSetNewPhone;
 
@@ -206,43 +206,6 @@ public async Task<IActionResult> ValidateCode(EnableSmsAuthenticatorViewModel mo
         return View(model);
     }
 
-    // TODO: move this action into minimal API.
-    [HttpPost]
-    [Produces("application/json")]
-    [AllowAnonymous]
-    public async Task<IActionResult> SendCode()
-    {
-        var user = await SignInManager.GetTwoFactorAuthenticationUserAsync();
-        var errorMessage = S["The SMS message could not be sent. Please attempt to request the code at a later time."];
-
-        if (user == null)
-        {
-            return BadRequest(new
-            {
-                success = false,
-                message = errorMessage.Value,
-            });
-        }
-
-        var settings = (await SiteService.GetSiteSettingsAsync()).As<SmsAuthenticatorLoginSettings>();
-        var code = await UserManager.GenerateTwoFactorTokenAsync(user, _identityOptions.Tokens.ChangePhoneNumberTokenProvider);
-
-        var message = new SmsMessage()
-        {
-            To = await UserManager.GetPhoneNumberAsync(user),
-            Body = await GetBodyAsync(settings, user, code),
-        };
-
-        var result = await _smsService.SendAsync(message);
-
-        return Ok(new
-        {
-            success = result.Succeeded,
-            message = result.Succeeded ? S["A verification code has been sent to your phone number. Please check your device for the code."].Value
-            : errorMessage.Value,
-        });
-    }
-
     private Task<string> GetBodyAsync(SmsAuthenticatorLoginSettings settings, IUser user, string code)
     {
         var message = string.IsNullOrWhiteSpace(settings.Body)

src/OrchardCore.Modules/OrchardCore.Users/Controllers/ControllerExtensions.cs → src/OrchardCore.Modules/OrchardCore.Users/Extensions/ControllerExtensions.cs

@@ -78,7 +78,7 @@ internal static async Task<IUser> RegisterUser(this Controller controller, Regis
                         UserName = model.UserName,
                         Email = model.Email,
                         EmailConfirmed = !settings.UsersMustValidateEmail,
-                        IsEnabled = !settings.UsersAreModerated
+                        IsEnabled = !settings.UsersAreModerated,
                     }, model.Password, controller.ModelState.AddModelError) as User;
 
                     if (user != null && controller.ModelState.IsValid)
@@ -114,11 +114,15 @@ internal static async Task<string> SendEmailConfirmationTokenAsync(this Controll
                 new
                 {
                     userId = user.UserId,
-                    code
+                    code,
                 },
                 protocol: controller.HttpContext.Request.Scheme);
 
-            await SendEmailAsync(controller, user.Email, subject, new ConfirmEmailViewModel() { User = user, ConfirmEmailUrl = callbackUrl });
+            await SendEmailAsync(controller, user.Email, subject, new ConfirmEmailViewModel()
+            {
+                User = user,
+                ConfirmEmailUrl = callbackUrl,
+            });
 
             return callbackUrl;
         }

src/OrchardCore.Modules/OrchardCore.Users/Filters/TwoFactorAuthenticationAuthorizationFilter.cs

@@ -17,7 +17,6 @@ public class TwoFactorAuthenticationAuthorizationFilter : IAsyncAuthorizationFil
     [
         typeof(EmailConfirmationController).ControllerName(),
         typeof(TwoFactorAuthenticationController).ControllerName(),
-        typeof(EmailAuthenticatorController).ControllerName(),
         typeof(AuthenticatorAppController).ControllerName(),
         typeof(SmsAuthenticatorController).ControllerName(),
     ];
@@ -42,7 +41,8 @@ public async Task OnAuthorizationAsync(AuthorizationFilterContext context)
 
         if (context.HttpContext?.User?.Identity?.IsAuthenticated == false ||
             context.HttpContext.Request.Path.Equals("/" + _userOptions.LogoffPath, StringComparison.OrdinalIgnoreCase) ||
-            context.HttpContext.Request.Path.Equals("/" + _userOptions.TwoFactorAuthenticationPath, StringComparison.OrdinalIgnoreCase))
+            context.HttpContext.Request.Path.Equals("/" + _userOptions.TwoFactorAuthenticationPath, StringComparison.OrdinalIgnoreCase) ||
+            context.HttpContext.Request.Path.Equals("/TwoFactor-Authenticator/", StringComparison.OrdinalIgnoreCase))
         {
             return;
         }

src/OrchardCore.Modules/OrchardCore.Users/Services/UsersThemeSelector.cs

@@ -10,7 +10,8 @@ namespace OrchardCore.Users.Services
 {
     /// <summary>
     /// Provides the theme defined in the site configuration for the current scope (request).
-    /// This selector provides AdminTheme as default or fallback for Account|Registration|ResetPassword
+    /// This selector provides AdminTheme as default or fallback for Account for Registration,
+    /// ResetPassword, TwoFactorAuthentication, SmsAuthenticator and AuthenticatorApp
     /// controllers based on SiteSettings.
     /// The same <see cref="ThemeSelectorResult"/> is returned if called multiple times
     /// during the same scope.