- The password reset link is invalid. -
diff --git a/IntegryControlPanel/IntegryControlPanel/Components/Account/Pages/Lockout.razor b/IntegryControlPanel/IntegryControlPanel/Components/Account/Pages/Lockout.razor deleted file mode 100644 index 017e31d..0000000 --- a/IntegryControlPanel/IntegryControlPanel/Components/Account/Pages/Lockout.razor +++ /dev/null @@ -1,8 +0,0 @@ -@page "/Account/Lockout" - -This account has been locked out, please try again later.
-Your login is protected with an authenticator app. Enter your authenticator code below.
-- Don't have access to your authenticator device? You can - log in with a recovery code. -
- -@code { - private string? message; - private ApplicationUser user = default!; - - [SupplyParameterFromForm] - private InputModel Input { get; set; } = new(); - - [SupplyParameterFromQuery] - private string? ReturnUrl { get; set; } - - [SupplyParameterFromQuery] - private bool RememberMe { get; set; } - - protected override async Task OnInitializedAsync() - { - // Ensure the user has gone through the username & password screen first - user = await SignInManager.GetTwoFactorAuthenticationUserAsync() ?? - throw new InvalidOperationException("Unable to load two-factor authentication user."); - } - - private async Task OnValidSubmitAsync() - { - var authenticatorCode = Input.TwoFactorCode!.Replace(" ", string.Empty).Replace("-", string.Empty); - var result = await SignInManager.TwoFactorAuthenticatorSignInAsync(authenticatorCode, RememberMe, Input.RememberMachine); - var userId = await UserManager.GetUserIdAsync(user); - - if (result.Succeeded) - { - Logger.LogInformation("User with ID '{UserId}' logged in with 2fa.", userId); - RedirectManager.RedirectTo(ReturnUrl); - } - else if (result.IsLockedOut) - { - Logger.LogWarning("User with ID '{UserId}' account locked out.", userId); - RedirectManager.RedirectTo("Account/Lockout"); - } - else - { - Logger.LogWarning("Invalid authenticator code entered for user with ID '{UserId}'.", userId); - message = "Error: Invalid authenticator code."; - } - } - - private sealed class InputModel - { - [Required] - [StringLength(7, ErrorMessage = "The {0} must be at least {2} and at max {1} characters long.", MinimumLength = 6)] - [DataType(DataType.Text)] - [Display(Name = "Authenticator code")] - public string? TwoFactorCode { get; set; } - - [Display(Name = "Remember this machine")] - public bool RememberMachine { get; set; } - } -} diff --git a/IntegryControlPanel/IntegryControlPanel/Components/Account/Pages/LoginWithRecoveryCode.razor b/IntegryControlPanel/IntegryControlPanel/Components/Account/Pages/LoginWithRecoveryCode.razor deleted file mode 100644 index 51fff5f..0000000 --- a/IntegryControlPanel/IntegryControlPanel/Components/Account/Pages/LoginWithRecoveryCode.razor +++ /dev/null @@ -1,85 +0,0 @@ -@page "/Account/LoginWithRecoveryCode" - -@using System.ComponentModel.DataAnnotations -@using Microsoft.AspNetCore.Identity -@using IntegryControlPanel.Data - -@inject SignInManager- You have requested to log in with a recovery code. This login will not be remembered until you provide - an authenticator app code at log in or disable 2FA and log in again. -
-- This action only disables 2FA. -
-- Disabling 2FA does not change the keys used in authenticator apps. If you wish to change the key - used in an authenticator app you should reset your authenticator keys. -
-| @login.ProviderDisplayName | -- @if (showRemoveButton) - { - - } - else - { - @: - } - | -
- - Put these codes in a safe place. -
-- If you lose your device and don't have the recovery codes you will lose access to your account. -
-- Generating new recovery codes does not change the keys used in authenticator apps. If you wish to change the key - used in an authenticator app you should reset your authenticator keys. -
-- You do not have a local username/password for this site. Add a local - account so you can log in without an external login. -
-- This app does not currently have a real email sender registered, see these docs for how to configure a real email sender. - Normally this would be emailed: Click here to confirm your account -
-} -else -{ -Please check your email to confirm your account.
-} - -@code { - private string? emailConfirmationLink; - private string? statusMessage; - - [CascadingParameter] - private HttpContext HttpContext { get; set; } = default!; - - [SupplyParameterFromQuery] - private string? Email { get; set; } - - [SupplyParameterFromQuery] - private string? ReturnUrl { get; set; } - - protected override async Task OnInitializedAsync() - { - if (Email is null) - { - RedirectManager.RedirectTo(""); - } - - var user = await UserManager.FindByEmailAsync(Email); - if (user is null) - { - HttpContext.Response.StatusCode = StatusCodes.Status404NotFound; - statusMessage = "Error finding user for unspecified email"; - } - else if (EmailSender is IdentityNoOpEmailSender) - { - // Once you add a real email sender, you should remove this code that lets you confirm the account - var userId = await UserManager.GetUserIdAsync(user); - var code = await UserManager.GenerateEmailConfirmationTokenAsync(user); - code = WebEncoders.Base64UrlEncode(Encoding.UTF8.GetBytes(code)); - emailConfirmationLink = NavigationManager.GetUriWithQueryParameters( - NavigationManager.ToAbsoluteUri("Account/ConfirmEmail").AbsoluteUri, - new Dictionary- Your password has been reset. Please click here to log in. -
diff --git a/IntegryControlPanel/IntegryControlPanel/Components/App.razor b/IntegryControlPanel/IntegryControlPanel/Components/App.razor index a4ec36a..571bc27 100644 --- a/IntegryControlPanel/IntegryControlPanel/Components/App.razor +++ b/IntegryControlPanel/IntegryControlPanel/Components/App.razor @@ -5,7 +5,7 @@