diff --git a/Server/API/RemoteControlController.cs b/Server/API/RemoteControlController.cs index fe339e07f..8cd83ca16 100644 --- a/Server/API/RemoteControlController.cs +++ b/Server/API/RemoteControlController.cs @@ -27,10 +27,9 @@ public class RemoteControlController : ControllerBase private readonly IHubContext
-
- You are not authorized to access this resource.
-Hmm. It looks like there's nothing at this location.
-@ViewData["Title"]
-@ViewData["Title"]
-@ViewData["Title"]
-Enter your email.
--
-
-
-@section Scripts {
-
-
-
-Please reset your Remotely password by clicking here."); - - if (!emailResult) - { - ModelState.AddModelError("EmailError", "Error sending email."); - return Page(); - } - - return RedirectToPage("./ForgotPasswordConfirmation"); - } - - return Page(); - } -} diff --git a/Server/Areas/Identity/Pages/Account/Login.cshtml b/Server/Areas/Identity/Pages/Account/Login.cshtml deleted file mode 100644 index 45b1f0571..000000000 --- a/Server/Areas/Identity/Pages/Account/Login.cshtml +++ /dev/null @@ -1,85 +0,0 @@ -@page -@model LoginModel - -@{ - ViewData["Title"] = "Log in"; -} - -
@ViewData["Title"]
-
-
-
-@section Scripts {
-
-
-
-
-
- @*
-
-
- @{ - if ((Model.ExternalLogins?.Count ?? 0) == 0) - { -
-
*@
-Use another service to log in.
-- @{ - if ((Model.ExternalLogins?.Count ?? 0) == 0) - { -
-
- }
- else
- {
-
- }
- }
- - There are no external authentication services configured. See this article - for details on setting up this ASP.NET application to support logging in via external services. -
-@ViewData["Title"]
- -
-
-
-- Deleting this data will permanently remove your account, and this cannot be recovered. -
-
-
-
-
-@section Scripts {
- @ViewData["Title"]
-
-
-
-@section Scripts {
- To use an authenticator app go through the following steps:
--
-
-
-
- Download a two-factor authenticator app like Microsoft Authenticator for - Android and - iOS or - Google Authenticator for - Android and - iOS. -
-
- -
-
Scan the QR Code or enter this key @Model.SharedKey into your two factor authenticator app. Spaces and casing do not matter.
- - - -
- -
-
- Once you have scanned the QR code or input the key above, your two factor authentication app will provide you - with a unique code. Enter the code in the confirmation box below. -
---- --
-
@ViewData["Title"]
-
-
-
-@section Scripts {
-
-
-
-
-
- @Model
-
-}
diff --git a/Server/Areas/Identity/Pages/Account/Manage/_ViewImports.cshtml b/Server/Areas/Identity/Pages/Account/Manage/_ViewImports.cshtml
deleted file mode 100644
index de11ea2bd..000000000
--- a/Server/Areas/Identity/Pages/Account/Manage/_ViewImports.cshtml
+++ /dev/null
@@ -1,3 +0,0 @@
-@using Remotely.Server.Areas.Identity.Pages.Account.Manage
-@using Remotely.Shared.Models
-@using Remotely.Shared.Entities
\ No newline at end of file
diff --git a/Server/Areas/Identity/Pages/Account/Register.cshtml b/Server/Areas/Identity/Pages/Account/Register.cshtml
deleted file mode 100644
index 0e0a959c2..000000000
--- a/Server/Areas/Identity/Pages/Account/Register.cshtml
+++ /dev/null
@@ -1,78 +0,0 @@
-@page
-@model RegisterModel
-@inject Remotely.Server.Services.IApplicationConfig AppConfig
-@{
- ViewData["Title"] = "Register";
-}
-
-@ViewData["Title"]
- -
- @if (AppConfig.MaxOrganizationCount < 0 || Model.OrganizationCount < AppConfig.MaxOrganizationCount)
- {
-
-
-@section Scripts {
-
-
-
- }
- else
- {
-
-
- }
-
- @*Registration is disabled.
-
-
-
- @{ - if ((Model.ExternalLogins?.Count ?? 0) == 0) - { -
-
*@
-Use another service to register.
-- @{ - if ((Model.ExternalLogins?.Count ?? 0) == 0) - { -
-
- }
- else
- {
-
- }
- }
- - There are no external authentication services configured. See this article - for details on setting up this ASP.NET application to support logging in via external services. -
-
-
- @Model
-
-}
diff --git a/Server/Areas/Identity/Pages/Account/_ViewImports.cshtml b/Server/Areas/Identity/Pages/Account/_ViewImports.cshtml
deleted file mode 100644
index 68f6bc830..000000000
--- a/Server/Areas/Identity/Pages/Account/_ViewImports.cshtml
+++ /dev/null
@@ -1 +0,0 @@
-@using Remotely.Server.Areas.Identity.Pages.Account
\ No newline at end of file
diff --git a/Server/Areas/Identity/Pages/Shared/_LoginPartial.cshtml b/Server/Areas/Identity/Pages/Shared/_LoginPartial.cshtml
deleted file mode 100644
index 7285c71b7..000000000
--- a/Server/Areas/Identity/Pages/Shared/_LoginPartial.cshtml
+++ /dev/null
@@ -1,34 +0,0 @@
-@using Microsoft.AspNetCore.Identity
-@using Remotely.Shared.Entities
-@inject SignInManagerAccess denied
+You do not have access to this resource.
+Confirm email
+Confirm email change
+ +Register
+Associate your @ProviderDisplayName account.
++ +
+ You've successfully authenticated with @ProviderDisplayName.
+ Please enter an email address for this site below and click the Register button to finish
+ logging in.
+
+
+
+
+
+@code {
+ public const string LoginCallbackAction = "LoginCallback";
+
+ private string? message;
+ private ExternalLoginInfo externalLoginInfo = default!;
+
+ [CascadingParameter]
+ private HttpContext HttpContext { get; set; } = default!;
+
+ [SupplyParameterFromForm]
+ private InputModel Input { get; set; } = new();
+
+ [SupplyParameterFromQuery]
+ private string? RemoteError { get; set; }
+
+ [SupplyParameterFromQuery]
+ private string? ReturnUrl { get; set; }
+
+ [SupplyParameterFromQuery]
+ private string? Action { get; set; }
+
+ private string? ProviderDisplayName => externalLoginInfo.ProviderDisplayName;
+
+ protected override async Task OnInitializedAsync()
+ {
+ if (RemoteError is not null)
+ {
+ RedirectManager.RedirectToWithStatus("Account/Login", $"Error from external provider: {RemoteError}", HttpContext);
+ }
+
+ var info = await SignInManager.GetExternalLoginInfoAsync();
+ if (info is null)
+ {
+ RedirectManager.RedirectToWithStatus("Account/Login", "Error loading external login information.", HttpContext);
+ }
+
+ externalLoginInfo = info;
+
+ if (HttpMethods.IsGet(HttpContext.Request.Method))
+ {
+ if (Action == LoginCallbackAction)
+ {
+ await OnLoginCallbackAsync();
+ return;
+ }
+
+ // We should only reach this page via the login callback, so redirect back to
+ // the login page if we get here some other way.
+ RedirectManager.RedirectTo("Account/Login");
+ }
+ }
+
+ private async Task OnLoginCallbackAsync()
+ {
+ // Sign in the user with this external login provider if the user already has a login.
+ var result = await SignInManager.ExternalLoginSignInAsync(
+ externalLoginInfo.LoginProvider,
+ externalLoginInfo.ProviderKey,
+ isPersistent: false,
+ bypassTwoFactor: true);
+
+ if (result.Succeeded)
+ {
+ Logger.LogInformation(
+ "{Name} logged in with {LoginProvider} provider.",
+ externalLoginInfo.Principal.Identity?.Name,
+ externalLoginInfo.LoginProvider);
+ RedirectManager.RedirectTo(ReturnUrl);
+ }
+ else if (result.IsLockedOut)
+ {
+ RedirectManager.RedirectTo("Account/Lockout");
+ }
+
+ // If the user does not have an account, then ask the user to create an account.
+ if (externalLoginInfo.Principal.HasClaim(c => c.Type == ClaimTypes.Email))
+ {
+ Input.Email = externalLoginInfo.Principal.FindFirstValue(ClaimTypes.Email) ?? "";
+ }
+ }
+
+ private async Task OnValidSubmitAsync()
+ {
+ var emailStore = GetEmailStore();
+ var user = CreateUser();
+
+ await UserStore.SetUserNameAsync(user, Input.Email, CancellationToken.None);
+ await emailStore.SetEmailAsync(user, Input.Email, CancellationToken.None);
+
+ var result = await UserManager.CreateAsync(user);
+ if (result.Succeeded)
+ {
+ result = await UserManager.AddLoginAsync(user, externalLoginInfo);
+ if (result.Succeeded)
+ {
+ Logger.LogInformation("User created an account using {Name} provider.", externalLoginInfo.LoginProvider);
+
+ var userId = await UserManager.GetUserIdAsync(user);
+ var code = await UserManager.GenerateEmailConfirmationTokenAsync(user);
+ code = WebEncoders.Base64UrlEncode(Encoding.UTF8.GetBytes(code));
+
+ var callbackUrl = NavigationManager.GetUriWithQueryParameters(
+ NavigationManager.ToAbsoluteUri("Account/ConfirmEmail").AbsoluteUri,
+ new Dictionary
+
+
+
+
+
+
+ Forgot your password?
+Enter your email.
++
+
+
+@code {
+ [SupplyParameterFromForm]
+ private InputModel Input { get; set; } = new();
+
+ private async Task OnValidSubmitAsync()
+ {
+ var user = await UserManager.FindByEmailAsync(Input.Email);
+ if (user is null || !(await UserManager.IsEmailConfirmedAsync(user)))
+ {
+ // Don't reveal that the user does not exist or is not confirmed
+ RedirectManager.RedirectTo("Account/ForgotPasswordConfirmation");
+ }
+
+ // For more information on how to enable account confirmation and password reset please
+ // visit https://go.microsoft.com/fwlink/?LinkID=532713
+ var code = await UserManager.GeneratePasswordResetTokenAsync(user);
+ code = WebEncoders.Base64UrlEncode(Encoding.UTF8.GetBytes(code));
+ var callbackUrl = NavigationManager.GetUriWithQueryParameters(
+ NavigationManager.ToAbsoluteUri("Account/ResetPassword").AbsoluteUri,
+ new Dictionary
+
+
+
+
+
+
+ Forgot password confirmation
++ Please check your email to reset your password. +
diff --git a/Server/Components/Account/Pages/InvalidPasswordReset.razor b/Server/Components/Account/Pages/InvalidPasswordReset.razor new file mode 100644 index 000000000..509578bbf --- /dev/null +++ b/Server/Components/Account/Pages/InvalidPasswordReset.razor @@ -0,0 +1,8 @@ +@page "/Account/InvalidPasswordReset" + +Invalid password reset
++ The password reset link is invalid. +
diff --git a/Server/Components/Account/Pages/InvalidUser.razor b/Server/Components/Account/Pages/InvalidUser.razor new file mode 100644 index 000000000..e61fe5def --- /dev/null +++ b/Server/Components/Account/Pages/InvalidUser.razor @@ -0,0 +1,7 @@ +@page "/Account/InvalidUser" + +Invalid user
+ +Locked out
+This account has been locked out, please try again later.
+Log in
+
+
+
+@code {
+ private string? errorMessage;
+
+ [CascadingParameter]
+ private HttpContext HttpContext { get; set; } = default!;
+
+ [SupplyParameterFromForm]
+ private InputModel Input { get; set; } = new();
+
+ [SupplyParameterFromQuery]
+ private string? ReturnUrl { get; set; }
+
+ protected override async Task OnInitializedAsync()
+ {
+ if (HttpMethods.IsGet(HttpContext.Request.Method))
+ {
+ // Clear the existing external cookie to ensure a clean login process
+ await HttpContext.SignOutAsync(IdentityConstants.ExternalScheme);
+ }
+ }
+
+ public async Task LoginUser()
+ {
+ // This doesn't count login failures towards account lockout
+ // To enable password failures to trigger account lockout, set lockoutOnFailure: true
+ var result = await SignInManager.PasswordSignInAsync(Input.Email, Input.Password, Input.RememberMe, lockoutOnFailure: false);
+ if (result.Succeeded)
+ {
+ Logger.LogInformation("User logged in.");
+ RedirectManager.RedirectTo(ReturnUrl);
+ }
+ else if (result.RequiresTwoFactor)
+ {
+ RedirectManager.RedirectTo(
+ "Account/LoginWith2fa",
+ new() { ["returnUrl"] = ReturnUrl, ["rememberMe"] = Input.RememberMe });
+ }
+ else if (result.IsLockedOut)
+ {
+ Logger.LogWarning("User account locked out.");
+ RedirectManager.RedirectTo("Account/Lockout");
+ }
+ else
+ {
+ errorMessage = "Error: Invalid login attempt.";
+ }
+ }
+
+ private sealed class InputModel
+ {
+ [Required]
+ [EmailAddress]
+ public string Email { get; set; } = "";
+
+ [Required]
+ [DataType(DataType.Password)]
+ public string Password { get; set; } = "";
+
+ [Display(Name = "Remember me?")]
+ public bool RememberMe { get; set; }
+ }
+}
diff --git a/Server/Components/Account/Pages/LoginWith2fa.razor b/Server/Components/Account/Pages/LoginWith2fa.razor
new file mode 100644
index 000000000..d4aebc8d3
--- /dev/null
+++ b/Server/Components/Account/Pages/LoginWith2fa.razor
@@ -0,0 +1,101 @@
+@page "/Account/LoginWith2fa"
+
+@using System.ComponentModel.DataAnnotations
+@using Microsoft.AspNetCore.Identity
+@using Remotely.Server.Data
+
+@inject SignInManager
+
+
+
+
+
+
+@* Use a local account to log in.
++
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
*@
+Use another service to log in.
++
Two-factor authentication
++
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 RemotelyUser 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/Server/Components/Account/Pages/LoginWithRecoveryCode.razor b/Server/Components/Account/Pages/LoginWithRecoveryCode.razor new file mode 100644 index 000000000..b127a349f --- /dev/null +++ b/Server/Components/Account/Pages/LoginWithRecoveryCode.razor @@ -0,0 +1,85 @@ +@page "/Account/LoginWithRecoveryCode" + +@using System.ComponentModel.DataAnnotations +@using Microsoft.AspNetCore.Identity +@using Remotely.Server.Data + +@inject SignInManagerRecovery code verification
++
+ 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. +
+
+
+
+@code {
+ private string? message;
+ private RemotelyUser user = default!;
+
+ [SupplyParameterFromForm]
+ private InputModel Input { get; set; } = new();
+
+ [SupplyParameterFromQuery]
+ private string? ReturnUrl { 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 recoveryCode = Input.RecoveryCode.Replace(" ", string.Empty);
+
+ var result = await SignInManager.TwoFactorRecoveryCodeSignInAsync(recoveryCode);
+
+ var userId = await UserManager.GetUserIdAsync(user);
+
+ if (result.Succeeded)
+ {
+ Logger.LogInformation("User with ID '{UserId}' logged in with a recovery code.", userId);
+ RedirectManager.RedirectTo(ReturnUrl);
+ }
+ else if (result.IsLockedOut)
+ {
+ Logger.LogWarning("User account locked out.");
+ RedirectManager.RedirectTo("Account/Lockout");
+ }
+ else
+ {
+ Logger.LogWarning("Invalid recovery code entered for user with ID '{UserId}' ", userId);
+ message = "Error: Invalid recovery code entered.";
+ }
+ }
+
+ private sealed class InputModel
+ {
+ [Required]
+ [DataType(DataType.Text)]
+ [Display(Name = "Recovery Code")]
+ public string RecoveryCode { get; set; } = "";
+ }
+}
diff --git a/Server/Components/Account/Pages/Manage/ChangePassword.razor b/Server/Components/Account/Pages/Manage/ChangePassword.razor
new file mode 100644
index 000000000..91eed32c8
--- /dev/null
+++ b/Server/Components/Account/Pages/Manage/ChangePassword.razor
@@ -0,0 +1,96 @@
+@page "/Account/Manage/ChangePassword"
+
+@using System.ComponentModel.DataAnnotations
+@using Microsoft.AspNetCore.Identity
+@using Remotely.Server.Data
+
+@inject UserManager
+
+
+
+
+
+
+ Change password
+
+
+
+@code {
+ private string? message;
+ private RemotelyUser user = default!;
+ private bool hasPassword;
+
+ [CascadingParameter]
+ private HttpContext HttpContext { get; set; } = default!;
+
+ [SupplyParameterFromForm]
+ private InputModel Input { get; set; } = new();
+
+ protected override async Task OnInitializedAsync()
+ {
+ user = await UserAccessor.GetRequiredUserAsync(HttpContext);
+ hasPassword = await UserManager.HasPasswordAsync(user);
+ if (!hasPassword)
+ {
+ RedirectManager.RedirectTo("Account/Manage/SetPassword");
+ }
+ }
+
+ private async Task OnValidSubmitAsync()
+ {
+ var changePasswordResult = await UserManager.ChangePasswordAsync(user, Input.OldPassword, Input.NewPassword);
+ if (!changePasswordResult.Succeeded)
+ {
+ message = $"Error: {string.Join(",", changePasswordResult.Errors.Select(error => error.Description))}";
+ return;
+ }
+
+ await SignInManager.RefreshSignInAsync(user);
+ Logger.LogInformation("User changed their password successfully.");
+
+ RedirectManager.RedirectToCurrentPageWithStatus("Your password has been changed", HttpContext);
+ }
+
+ private sealed class InputModel
+ {
+ [Required]
+ [DataType(DataType.Password)]
+ [Display(Name = "Current password")]
+ public string OldPassword { get; set; } = "";
+
+ [Required]
+ [StringLength(100, ErrorMessage = "The {0} must be at least {2} and at max {1} characters long.", MinimumLength = 6)]
+ [DataType(DataType.Password)]
+ [Display(Name = "New password")]
+ public string NewPassword { get; set; } = "";
+
+ [DataType(DataType.Password)]
+ [Display(Name = "Confirm new password")]
+ [Compare("NewPassword", ErrorMessage = "The new password and confirmation password do not match.")]
+ public string ConfirmPassword { get; set; } = "";
+ }
+}
diff --git a/Server/Components/Account/Pages/Manage/DeletePersonalData.razor b/Server/Components/Account/Pages/Manage/DeletePersonalData.razor
new file mode 100644
index 000000000..6524f9e51
--- /dev/null
+++ b/Server/Components/Account/Pages/Manage/DeletePersonalData.razor
@@ -0,0 +1,86 @@
+@page "/Account/Manage/DeletePersonalData"
+
+@using System.ComponentModel.DataAnnotations
+@using Microsoft.AspNetCore.Identity
+@using Remotely.Server.Data
+
+@inject UserManager
+
+
+
+
+
+
+
+
+
+
+ Delete Personal Data
+ +
+
+
++ Deleting this data will permanently remove your account, and this cannot be recovered. +
+
+
+
+
+
+@code {
+ private string? message;
+ private RemotelyUser user = default!;
+ private bool requirePassword;
+
+ [CascadingParameter]
+ private HttpContext HttpContext { get; set; } = default!;
+
+ [SupplyParameterFromForm]
+ private InputModel Input { get; set; } = new();
+
+ protected override async Task OnInitializedAsync()
+ {
+ Input ??= new();
+ user = await UserAccessor.GetRequiredUserAsync(HttpContext);
+ requirePassword = await UserManager.HasPasswordAsync(user);
+ }
+
+ private async Task OnValidSubmitAsync()
+ {
+ if (requirePassword && !await UserManager.CheckPasswordAsync(user, Input.Password))
+ {
+ message = "Error: Incorrect password.";
+ return;
+ }
+
+ var result = await UserManager.DeleteAsync(user);
+ if (!result.Succeeded)
+ {
+ throw new InvalidOperationException("Unexpected error occurred deleting user.");
+ }
+
+ await SignInManager.SignOutAsync();
+
+ var userId = await UserManager.GetUserIdAsync(user);
+ Logger.LogInformation("User with ID '{UserId}' deleted themselves.", userId);
+
+ RedirectManager.RedirectToCurrentPage();
+ }
+
+ private sealed class InputModel
+ {
+ [DataType(DataType.Password)]
+ public string Password { get; set; } = "";
+ }
+}
diff --git a/Server/Components/Account/Pages/Manage/Disable2fa.razor b/Server/Components/Account/Pages/Manage/Disable2fa.razor
new file mode 100644
index 000000000..da2575d8f
--- /dev/null
+++ b/Server/Components/Account/Pages/Manage/Disable2fa.razor
@@ -0,0 +1,64 @@
+@page "/Account/Manage/Disable2fa"
+
+@using Microsoft.AspNetCore.Identity
+@using Remotely.Server.Data
+
+@inject UserManager
+
+ }
+
+ Disable two-factor authentication (2FA)
+ +
+
+
++ 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. +
+
+
+
+
+@code {
+ private RemotelyUser user = default!;
+
+ [CascadingParameter]
+ private HttpContext HttpContext { get; set; } = default!;
+
+ protected override async Task OnInitializedAsync()
+ {
+ user = await UserAccessor.GetRequiredUserAsync(HttpContext);
+
+ if (HttpMethods.IsGet(HttpContext.Request.Method) && !await UserManager.GetTwoFactorEnabledAsync(user))
+ {
+ throw new InvalidOperationException("Cannot disable 2FA for user as it's not currently enabled.");
+ }
+ }
+
+ private async Task OnSubmitAsync()
+ {
+ var disable2faResult = await UserManager.SetTwoFactorEnabledAsync(user, false);
+ if (!disable2faResult.Succeeded)
+ {
+ throw new InvalidOperationException("Unexpected error occurred disabling 2FA.");
+ }
+
+ var userId = await UserManager.GetUserIdAsync(user);
+ Logger.LogInformation("User with ID '{UserId}' has disabled 2fa.", userId);
+ RedirectManager.RedirectToWithStatus(
+ "Account/Manage/TwoFactorAuthentication",
+ "2fa has been disabled. You can reenable 2fa when you setup an authenticator app",
+ HttpContext);
+ }
+}
diff --git a/Server/Components/Account/Pages/Manage/Email.razor b/Server/Components/Account/Pages/Manage/Email.razor
new file mode 100644
index 000000000..ecebfeb4a
--- /dev/null
+++ b/Server/Components/Account/Pages/Manage/Email.razor
@@ -0,0 +1,123 @@
+@page "/Account/Manage/Email"
+
+@using System.ComponentModel.DataAnnotations
+@using System.Text
+@using System.Text.Encodings.Web
+@using Microsoft.AspNetCore.Identity
+@using Microsoft.AspNetCore.WebUtilities
+@using Remotely.Server.Data
+
+@inject UserManagerManage email
+ +
+
+
+@code {
+ private string? message;
+ private RemotelyUser user = default!;
+ private string? email;
+ private bool isEmailConfirmed;
+
+ [CascadingParameter]
+ private HttpContext HttpContext { get; set; } = default!;
+
+ [SupplyParameterFromForm(FormName = "change-email")]
+ private InputModel Input { get; set; } = new();
+
+ protected override async Task OnInitializedAsync()
+ {
+ user = await UserAccessor.GetRequiredUserAsync(HttpContext);
+ email = await UserManager.GetEmailAsync(user);
+ isEmailConfirmed = await UserManager.IsEmailConfirmedAsync(user);
+
+ Input.NewEmail ??= email;
+ }
+
+ private async Task OnValidSubmitAsync()
+ {
+ if (Input.NewEmail is null || Input.NewEmail == email)
+ {
+ message = "Your email is unchanged.";
+ return;
+ }
+
+ var userId = await UserManager.GetUserIdAsync(user);
+ var code = await UserManager.GenerateChangeEmailTokenAsync(user, Input.NewEmail);
+ code = WebEncoders.Base64UrlEncode(Encoding.UTF8.GetBytes(code));
+ var callbackUrl = NavigationManager.GetUriWithQueryParameters(
+ NavigationManager.ToAbsoluteUri("Account/ConfirmEmailChange").AbsoluteUri,
+ new Dictionary
+
+
+
+
+
+
+
+ }
+ else
+ {
+
+ ✓
+
+
+
+
+
+
+
+ }
+
+
+
+ Configure authenticator app
+
+
+}
+
+@code {
+ private const string AuthenticatorUriFormat = "otpauth://totp/{0}:{1}?secret={2}&issuer={0}&digits=6";
+
+ private string? message;
+ private RemotelyUser user = default!;
+ private string? sharedKey;
+ private string? authenticatorUri;
+ private string? _qrCodeDataUri;
+ private IEnumerableTo use an authenticator app go through the following steps:
+-
+
-
+
+ Download a two-factor authenticator app like Microsoft Authenticator for + Android and + iOS or + Google Authenticator for + Android and + iOS. +
+
+ -
+
Scan the QR Code or enter this key @sharedKey into your two factor authenticator app. Spaces and casing do not matter.
++ @if (!string.IsNullOrWhiteSpace(_qrCodeDataUri)) + { ++ ++ } + else + { +
Failed to generate QR code.+ } +
+ -
+
+ Once you have scanned the QR code or input the key above, your two factor authentication app will provide you + with a unique code. Enter the code in the confirmation box below. +
++++++ ++ ++ ++ + + +
+
Registered Logins
+| @login.ProviderDisplayName | ++ @if (showRemoveButton) + { + + } + else + { + @: + } + | +
Add another service to log in.
++ +} + +@code { + public const string LinkLoginCallbackAction = "LinkLoginCallback"; + + private RemotelyUser user = default!; + private IList
Generate two-factor authentication (2FA) recovery codes
+
+
+ + + 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. +
+
+
+
+}
+
+@code {
+ private string? message;
+ private RemotelyUser user = default!;
+ private IEnumerableProfile
+
+
+
+@code {
+ private RemotelyUser user = default!;
+ private string? username;
+ private string? phoneNumber;
+
+ [CascadingParameter]
+ private HttpContext HttpContext { get; set; } = default!;
+
+ [SupplyParameterFromForm]
+ private InputModel Input { get; set; } = new();
+
+ protected override async Task OnInitializedAsync()
+ {
+ user = await UserAccessor.GetRequiredUserAsync(HttpContext);
+ username = await UserManager.GetUserNameAsync(user);
+ phoneNumber = await UserManager.GetPhoneNumberAsync(user);
+
+ Input.PhoneNumber ??= phoneNumber;
+ }
+
+ private async Task OnValidSubmitAsync()
+ {
+ if (Input.PhoneNumber != phoneNumber)
+ {
+ var setPhoneResult = await UserManager.SetPhoneNumberAsync(user, Input.PhoneNumber);
+ if (!setPhoneResult.Succeeded)
+ {
+ RedirectManager.RedirectToCurrentPageWithStatus("Error: Failed to set phone number.", HttpContext);
+ }
+ }
+
+ await SignInManager.RefreshSignInAsync(user);
+ RedirectManager.RedirectToCurrentPageWithStatus("Your profile has been updated", HttpContext);
+ }
+
+ private sealed class InputModel
+ {
+ [Phone]
+ [Display(Name = "Phone number")]
+ public string? PhoneNumber { get; set; }
+ }
+}
diff --git a/Server/Components/Account/Pages/Manage/PersonalData.razor b/Server/Components/Account/Pages/Manage/PersonalData.razor
new file mode 100644
index 000000000..851eb54c8
--- /dev/null
+++ b/Server/Components/Account/Pages/Manage/PersonalData.razor
@@ -0,0 +1,34 @@
+@page "/Account/Manage/PersonalData"
+
+@inject IdentityUserAccessor UserAccessor
+
+
+
+
+
+
+
+
+
+
+
+
+ Personal Data
+ +
+
+
+@code {
+ [CascadingParameter]
+ private HttpContext HttpContext { get; set; } = default!;
+
+ protected override async Task OnInitializedAsync()
+ {
+ _ = await UserAccessor.GetRequiredUserAsync(HttpContext);
+ }
+}
diff --git a/Server/Components/Account/Pages/Manage/ResetAuthenticator.razor b/Server/Components/Account/Pages/Manage/ResetAuthenticator.razor
new file mode 100644
index 000000000..a0389026a
--- /dev/null
+++ b/Server/Components/Account/Pages/Manage/ResetAuthenticator.razor
@@ -0,0 +1,52 @@
+@page "/Account/Manage/ResetAuthenticator"
+
+@using Microsoft.AspNetCore.Identity
+@using Remotely.Server.Data
+
+@inject UserManager
+
+Your account contains personal data that you have given us. This page allows you to download or delete that data.
++ Deleting this data will permanently remove your account, and this cannot be recovered. +
+ ++ Delete +
+Reset authenticator key
+
+
++ + If you reset your authenticator key your authenticator app will not work until you reconfigure it. +
++ This process disables 2FA until you verify your authenticator app. + If you do not complete your authenticator app configuration you may lose access to your account. +
+
+
+
+
+@code {
+ [CascadingParameter]
+ private HttpContext HttpContext { get; set; } = default!;
+
+ private async Task OnSubmitAsync()
+ {
+ var user = await UserAccessor.GetRequiredUserAsync(HttpContext);
+ await UserManager.SetTwoFactorEnabledAsync(user, false);
+ await UserManager.ResetAuthenticatorKeyAsync(user);
+ var userId = await UserManager.GetUserIdAsync(user);
+ Logger.LogInformation("User with ID '{UserId}' has reset their authentication app key.", userId);
+
+ await SignInManager.RefreshSignInAsync(user);
+
+ RedirectManager.RedirectToWithStatus(
+ "Account/Manage/EnableAuthenticator",
+ "Your authenticator app key has been reset, you will need to configure your authenticator app using the new key.",
+ HttpContext);
+ }
+}
diff --git a/Server/Components/Account/Pages/Manage/SetPassword.razor b/Server/Components/Account/Pages/Manage/SetPassword.razor
new file mode 100644
index 000000000..36a49e4ca
--- /dev/null
+++ b/Server/Components/Account/Pages/Manage/SetPassword.razor
@@ -0,0 +1,87 @@
+@page "/Account/Manage/SetPassword"
+
+@using System.ComponentModel.DataAnnotations
+@using Microsoft.AspNetCore.Identity
+@using Remotely.Server.Data
+
+@inject UserManagerSet your password
++ You do not have a local username/password for this site. Add a local + account so you can log in without an external login. +
+
+
+
+@code {
+ private string? message;
+ private RemotelyUser user = default!;
+
+ [CascadingParameter]
+ private HttpContext HttpContext { get; set; } = default!;
+
+ [SupplyParameterFromForm]
+ private InputModel Input { get; set; } = new();
+
+ protected override async Task OnInitializedAsync()
+ {
+ user = await UserAccessor.GetRequiredUserAsync(HttpContext);
+
+ var hasPassword = await UserManager.HasPasswordAsync(user);
+ if (hasPassword)
+ {
+ RedirectManager.RedirectTo("Account/Manage/ChangePassword");
+ }
+ }
+
+ private async Task OnValidSubmitAsync()
+ {
+ var addPasswordResult = await UserManager.AddPasswordAsync(user, Input.NewPassword!);
+ if (!addPasswordResult.Succeeded)
+ {
+ message = $"Error: {string.Join(",", addPasswordResult.Errors.Select(error => error.Description))}";
+ return;
+ }
+
+ await SignInManager.RefreshSignInAsync(user);
+ RedirectManager.RedirectToCurrentPageWithStatus("Your password has been set.", HttpContext);
+ }
+
+ private sealed class InputModel
+ {
+ [Required]
+ [StringLength(100, ErrorMessage = "The {0} must be at least {2} and at max {1} characters long.", MinimumLength = 6)]
+ [DataType(DataType.Password)]
+ [Display(Name = "New password")]
+ public string? NewPassword { get; set; }
+
+ [DataType(DataType.Password)]
+ [Display(Name = "Confirm new password")]
+ [Compare("NewPassword", ErrorMessage = "The new password and confirmation password do not match.")]
+ public string? ConfirmPassword { get; set; }
+ }
+}
diff --git a/Server/Components/Account/Pages/Manage/TwoFactorAuthentication.razor b/Server/Components/Account/Pages/Manage/TwoFactorAuthentication.razor
new file mode 100644
index 000000000..baf495f78
--- /dev/null
+++ b/Server/Components/Account/Pages/Manage/TwoFactorAuthentication.razor
@@ -0,0 +1,101 @@
+@page "/Account/Manage/TwoFactorAuthentication"
+
+@using Microsoft.AspNetCore.Http.Features
+@using Microsoft.AspNetCore.Identity
+@using Remotely.Server.Data
+
+@inject UserManager
+
+
+
+
+
+
+
+
+ Two-factor authentication (2FA)
+@if (canTrack) +{ + if (is2faEnabled) + { + if (recoveryCodesLeft == 0) + { +
+ You have no recovery codes left.
+
+ }
+ else if (recoveryCodesLeft == 1)
+ {
+ You must generate a new set of recovery codes before you can log in with a recovery code.
+
+ You have 1 recovery code left.
+
+ }
+ else if (recoveryCodesLeft <= 3)
+ {
+ You can generate a new set of recovery codes.
+
+ You have @recoveryCodesLeft recovery codes left.
+
+ }
+
+ if (isMachineRemembered)
+ {
+
+ }
+
+ Disable 2FA
+ Reset recovery codes
+ }
+
+ You should generate a new set of recovery codes.
+Authenticator app
+ @if (!hasAuthenticator) + { + Add authenticator app + } + else + { + Set up authenticator app + Reset authenticator app + } +} +else +{ +
+ Privacy and cookie policy have not been accepted.
+
+}
+
+@code {
+ private bool canTrack;
+ private bool hasAuthenticator;
+ private int recoveryCodesLeft;
+ private bool is2faEnabled;
+ private bool isMachineRemembered;
+
+ [CascadingParameter]
+ private HttpContext HttpContext { get; set; } = default!;
+
+ protected override async Task OnInitializedAsync()
+ {
+ var user = await UserAccessor.GetRequiredUserAsync(HttpContext);
+ canTrack = HttpContext.Features.GetYou must accept the policy before you can enable two factor authentication.
+Register
+ +@if (!_registrationEnabled) +{ +Registration is disabled.
+} +else +{ + +
+
+}
+
+
+@code {
+ private IEnumerable
+
+
+
+
+ @*Create a new account.
++
+
+
+
+
+
+
+
+
+
+
+
*@
+ Use another service to register.
++
Register confirmation
+ ++ 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 DictionaryResend email confirmation
+Enter your email.
++
+
+
+@code {
+ private string? message;
+
+ [SupplyParameterFromForm]
+ private InputModel Input { get; set; } = new();
+
+ private async Task OnValidSubmitAsync()
+ {
+ var user = await UserManager.FindByEmailAsync(Input.Email!);
+ if (user is null)
+ {
+ message = "Verification email sent. Please check your email.";
+ return;
+ }
+
+ var userId = await UserManager.GetUserIdAsync(user);
+ var code = await UserManager.GenerateEmailConfirmationTokenAsync(user);
+ code = WebEncoders.Base64UrlEncode(Encoding.UTF8.GetBytes(code));
+ var callbackUrl = NavigationManager.GetUriWithQueryParameters(
+ NavigationManager.ToAbsoluteUri("Account/ConfirmEmail").AbsoluteUri,
+ new Dictionary
+
+
+
+
+
+
+ Reset password
+Reset your password.
++
+
+
+@code {
+ private IEnumerable
+
+
+
+
+
+
+
+
+
+
+ Reset password confirmation
++ Your password has been reset. Please click here to log in. +
diff --git a/Server/Components/Account/Pages/_Imports.razor b/Server/Components/Account/Pages/_Imports.razor new file mode 100644 index 000000000..b389ce16f --- /dev/null +++ b/Server/Components/Account/Pages/_Imports.razor @@ -0,0 +1,2 @@ +@using Remotely.Server.Components.Account.Shared +@layout AccountLayout diff --git a/Server/Components/Account/Shared/AccountLayout.razor b/Server/Components/Account/Shared/AccountLayout.razor new file mode 100644 index 000000000..9e74e3661 --- /dev/null +++ b/Server/Components/Account/Shared/AccountLayout.razor @@ -0,0 +1,28 @@ +@inherits LayoutComponentBase +@layout Remotely.Server.Components.Layout.MainLayout +@inject NavigationManager NavigationManager + +@if (HttpContext is null) +{ +Loading...
+} +else +{ + @Body +} + +@code { + [CascadingParameter] + private HttpContext? HttpContext { get; set; } + + protected override void OnParametersSet() + { + if (HttpContext is null) + { + // If this code runs, we're currently rendering in interactive mode, so there is no HttpContext. + // The identity pages need to set cookies, so they require an HttpContext. To achieve this we + // must transition back from interactive mode to a server-rendered page. + NavigationManager.Refresh(forceReload: true); + } + } +} diff --git a/Server/Components/Account/Shared/ExternalLoginPicker.razor b/Server/Components/Account/Shared/ExternalLoginPicker.razor new file mode 100644 index 000000000..548f8d967 --- /dev/null +++ b/Server/Components/Account/Shared/ExternalLoginPicker.razor @@ -0,0 +1,43 @@ +@using Microsoft.AspNetCore.Authentication +@using Microsoft.AspNetCore.Identity +@using Remotely.Server.Data + +@inject SignInManager
+
+}
+else
+{
+
+}
+
+@code {
+ private AuthenticationScheme[] externalLogins = [];
+
+ [SupplyParameterFromQuery]
+ private string? ReturnUrl { get; set; }
+
+ protected override async Task OnInitializedAsync()
+ {
+ externalLogins = (await SignInManager.GetExternalAuthenticationSchemesAsync()).ToArray();
+ }
+}
diff --git a/Server/Components/Account/Shared/ManageLayout.razor b/Server/Components/Account/Shared/ManageLayout.razor
new file mode 100644
index 000000000..949bc9221
--- /dev/null
+++ b/Server/Components/Account/Shared/ManageLayout.razor
@@ -0,0 +1,17 @@
+@inherits LayoutComponentBase
+@layout AccountLayout
+
++ There are no external authentication services configured. See this article + about setting up this ASP.NET application to support logging in via external services. +
+Manage your account
+ +
+
+
diff --git a/Server/Components/Account/Shared/ManageNavMenu.razor b/Server/Components/Account/Shared/ManageNavMenu.razor
new file mode 100644
index 000000000..249518e5c
--- /dev/null
+++ b/Server/Components/Account/Shared/ManageNavMenu.razor
@@ -0,0 +1,37 @@
+@using Microsoft.AspNetCore.Identity
+@using Remotely.Server.Data
+
+@inject SignInManagerChange your account settings
++
+
+
+
+
+ @Body
+
+ Recovery codes
+
+
++ 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. +
+
+
+
+@code {
+ [Parameter]
+ public string[] RecoveryCodes { get; set; } = [];
+
+ [Parameter]
+ public string? StatusMessage { get; set; }
+}
diff --git a/Server/Components/Account/Shared/StatusMessage.razor b/Server/Components/Account/Shared/StatusMessage.razor
new file mode 100644
index 000000000..12cd544cf
--- /dev/null
+++ b/Server/Components/Account/Shared/StatusMessage.razor
@@ -0,0 +1,29 @@
+@if (!string.IsNullOrEmpty(DisplayMessage))
+{
+ var statusMessageClass = DisplayMessage.StartsWith("Error") ? "danger" : "success";
+
+ @foreach (var recoveryCode in RecoveryCodes)
+ {
+
+
+
+ }
+ @recoveryCode
+
+ @DisplayMessage
+
+}
+
+@code {
+ private string? messageFromCookie;
+
+ [Parameter]
+ public string? Message { get; set; }
+
+ [CascadingParameter]
+ private HttpContext HttpContext { get; set; } = default!;
+
+ private string? DisplayMessage => Message ?? messageFromCookie;
+
+ protected override void OnInitialized()
+ {
+ messageFromCookie = HttpContext.Request.Cookies[IdentityRedirectManager.StatusCookieName];
+
+ if (messageFromCookie is not null)
+ {
+ HttpContext.Response.Cookies.Delete(IdentityRedirectManager.StatusCookieName);
+ }
+ }
+}
diff --git a/Server/Components/AlertBanner.razor b/Server/Components/AlertBanner.razor
index a1552ee1b..ede3b8847 100644
--- a/Server/Components/AlertBanner.razor
+++ b/Server/Components/AlertBanner.razor
@@ -1,7 +1,7 @@
@if (!string.IsNullOrEmpty(Message))
{
-
+
@Message
}
diff --git a/Server/Components/AlertsFrame.razor b/Server/Components/AlertsFrame.razor
index b76b564b4..6dcbd1fba 100644
--- a/Server/Components/AlertsFrame.razor
+++ b/Server/Components/AlertsFrame.razor
@@ -11,11 +11,11 @@
-
-