From 022370f79964da55b4e27cc5c5bc72aa09b4b4e2 Mon Sep 17 00:00:00 2001 From: Leendert de Borst Date: Mon, 22 Jul 2024 11:38:58 +0200 Subject: [PATCH] Update manage account page style (#113) --- ...tingIdentityAuthenticationStateProvider.cs | 22 +- .../Auth/Layout/AuthLayout.razor.css | 78 --- .../Auth/Pages/AccessDenied.razor | 8 - .../Auth/Pages/ForgotPassword.razor | 41 -- .../Pages/ForgotPasswordConfirmation.razor | 12 - .../Auth/Pages/InvalidPasswordReset.razor | 8 - .../Auth/Pages/InvalidUser.razor | 7 - .../Auth/Pages/Lockout.razor | 2 +- src/AliasVault.Admin2/Auth/Pages/Login.razor | 2 +- .../Auth/Pages/LoginWith2fa.razor | 2 +- .../Auth/Pages/LoginWithRecoveryCode.razor | 2 +- ...evalidatingAuthenticationStateProvider.cs} | 24 +- .../Main/Layout/Footer.razor.css | 83 --- .../Main/Layout/MainLayout.razor.css | 78 --- .../Main/Layout/TopMenu.razor.css | 83 --- .../Pages/Account/Manage/ChangePassword.razor | 64 +- .../Account/Manage/DeletePersonalData.razor | 77 --- .../Pages/Account/Manage/Disable2fa.razor | 14 +- .../Main/Pages/Account/Manage/Email.razor | 118 ---- .../Account/Manage/EnableAuthenticator.razor | 83 +-- .../Manage/GenerateRecoveryCodes.razor | 18 +- .../Main/Pages/Account/Manage/Index.razor | 40 +- .../Pages/Account/Manage/PersonalData.razor | 22 - .../Account/Manage/ResetAuthenticator.razor | 15 +- .../Pages/Account/Manage/SetPassword.razor | 2 +- .../Manage/TwoFactorAuthentication.razor | 86 +-- .../Main/Pages/Account/ManageNavMenu.razor | 12 - src/AliasVault.Admin2/Program.cs | 5 +- .../wwwroot/css/tailwind.css | 597 ++++++++++++------ 29 files changed, 610 insertions(+), 995 deletions(-) delete mode 100644 src/AliasVault.Admin2/Auth/Pages/AccessDenied.razor delete mode 100644 src/AliasVault.Admin2/Auth/Pages/ForgotPasswordConfirmation.razor delete mode 100644 src/AliasVault.Admin2/Auth/Pages/InvalidPasswordReset.razor delete mode 100644 src/AliasVault.Admin2/Auth/Pages/InvalidUser.razor rename src/AliasVault.Admin2/Auth/{IdentityRevalidatingAuthenticationStateProvider.cs => Providers/RevalidatingAuthenticationStateProvider.cs} (66%) delete mode 100644 src/AliasVault.Admin2/Main/Pages/Account/Manage/DeletePersonalData.razor delete mode 100644 src/AliasVault.Admin2/Main/Pages/Account/Manage/Email.razor delete mode 100644 src/AliasVault.Admin2/Main/Pages/Account/Manage/PersonalData.razor diff --git a/src/AliasVault.Admin/Auth/RevalidatingIdentityAuthenticationStateProvider.cs b/src/AliasVault.Admin/Auth/RevalidatingIdentityAuthenticationStateProvider.cs index 870ee6287..773ad8a01 100644 --- a/src/AliasVault.Admin/Auth/RevalidatingIdentityAuthenticationStateProvider.cs +++ b/src/AliasVault.Admin/Auth/RevalidatingIdentityAuthenticationStateProvider.cs @@ -6,12 +6,23 @@ using Microsoft.AspNetCore.Components.Server; using Microsoft.AspNetCore.Identity; using Microsoft.Extensions.Options; +/// +/// Revalidating identity authentication state provider. +/// +/// The user object. public class RevalidatingIdentityAuthenticationStateProvider - : RevalidatingServerAuthenticationStateProvider where TUser : class + : RevalidatingServerAuthenticationStateProvider + where TUser : class { private readonly IServiceScopeFactory _scopeFactory; private readonly IdentityOptions _options; + /// + /// Initializes a new instance of the class. + /// + /// ILoggerFactory instance. + /// IServiceScopeFactory instance. + /// IOptions instance. public RevalidatingIdentityAuthenticationStateProvider( ILoggerFactory loggerFactory, IServiceScopeFactory scopeFactory, @@ -22,8 +33,17 @@ public class RevalidatingIdentityAuthenticationStateProvider _options = optionsAccessor.Value; } + /// + /// The revalidation interval. + /// protected override TimeSpan RevalidationInterval => TimeSpan.FromMinutes(30); + /// + /// Validate the authentication state. + /// + /// AuthenticationState instance. + /// CancellationToken. + /// Boolean indicating whether the currently logged on user is still valid. protected override async Task ValidateAuthenticationStateAsync( AuthenticationState authenticationState, CancellationToken cancellationToken) { diff --git a/src/AliasVault.Admin2/Auth/Layout/AuthLayout.razor.css b/src/AliasVault.Admin2/Auth/Layout/AuthLayout.razor.css index d49e4b7e3..0d26cfc24 100644 --- a/src/AliasVault.Admin2/Auth/Layout/AuthLayout.razor.css +++ b/src/AliasVault.Admin2/Auth/Layout/AuthLayout.razor.css @@ -1,81 +1,3 @@ -.page { - position: relative; - display: flex; - flex-direction: column; -} - -main { - flex: 1; -} - -.sidebar { - background-image: linear-gradient(180deg, rgb(5, 39, 103) 0%, #3a0647 70%); -} - -.top-row { - background-color: #f7f7f7; - border-bottom: 1px solid #d6d5d5; - justify-content: flex-end; - height: 3.5rem; - display: flex; - align-items: center; -} - -.top-row ::deep a, .top-row ::deep .btn-link { - white-space: nowrap; - margin-left: 1.5rem; - text-decoration: none; -} - -.top-row ::deep a:hover, .top-row ::deep .btn-link:hover { - text-decoration: underline; -} - -.top-row ::deep a:first-child { - overflow: hidden; - text-overflow: ellipsis; -} - -@media (max-width: 640.98px) { - .top-row { - justify-content: space-between; - } - - .top-row ::deep a, .top-row ::deep .btn-link { - margin-left: 0; - } -} - -@media (min-width: 641px) { - .page { - flex-direction: row; - } - - .sidebar { - width: 250px; - height: 100vh; - position: sticky; - top: 0; - } - - .top-row { - position: sticky; - top: 0; - z-index: 1; - } - - .top-row.auth ::deep a:first-child { - flex: 1; - text-align: right; - width: 0; - } - - .top-row, article { - padding-left: 2rem !important; - padding-right: 1.5rem !important; - } -} - #blazor-error-ui { background: lightyellow; bottom: 0; diff --git a/src/AliasVault.Admin2/Auth/Pages/AccessDenied.razor b/src/AliasVault.Admin2/Auth/Pages/AccessDenied.razor deleted file mode 100644 index 34055f780..000000000 --- a/src/AliasVault.Admin2/Auth/Pages/AccessDenied.razor +++ /dev/null @@ -1,8 +0,0 @@ -@page "/Account/AccessDenied" - -Access denied - -
-

Access denied

-

You do not have access to this resource.

-
diff --git a/src/AliasVault.Admin2/Auth/Pages/ForgotPassword.razor b/src/AliasVault.Admin2/Auth/Pages/ForgotPassword.razor index a4daf6a9e..d53d3b129 100644 --- a/src/AliasVault.Admin2/Auth/Pages/ForgotPassword.razor +++ b/src/AliasVault.Admin2/Auth/Pages/ForgotPassword.razor @@ -1,49 +1,8 @@ @page "/user/forgot-password" -@using System.ComponentModel.DataAnnotations -@using System.Text -@using System.Text.Encodings.Web -@using Microsoft.AspNetCore.Identity -@using Microsoft.AspNetCore.WebUtilities - -@inject UserManager UserManager -@inject NavigationService NavigationService - Forgot your password?

Forgot your password?

If you have forgotten your password, please consult with the server admin.

- -@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 - NavigationService.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 = NavigationService.GetUriWithQueryParameters( - NavigationService.ToAbsoluteUri("Account/ResetPassword").AbsoluteUri, - new Dictionary { ["code"] = code }); - - // await EmailSender.SendPasswordResetLinkAsync(user, Input.Email, HtmlEncoder.Default.Encode(callbackUrl)); - - NavigationService.RedirectTo("user/forgot-password-confirm"); - } - - private sealed class InputModel - { - [Required] [EmailAddress] public string Email { get; set; } = ""; - } - -} diff --git a/src/AliasVault.Admin2/Auth/Pages/ForgotPasswordConfirmation.razor b/src/AliasVault.Admin2/Auth/Pages/ForgotPasswordConfirmation.razor deleted file mode 100644 index 6b1fca412..000000000 --- a/src/AliasVault.Admin2/Auth/Pages/ForgotPasswordConfirmation.razor +++ /dev/null @@ -1,12 +0,0 @@ -@page "/user/forgot-password-confirm" - -Forgot password confirmation - -
-

- Forgot password confirmation -

-

- Please check your email to reset your password. -

-
diff --git a/src/AliasVault.Admin2/Auth/Pages/InvalidPasswordReset.razor b/src/AliasVault.Admin2/Auth/Pages/InvalidPasswordReset.razor deleted file mode 100644 index 887c00082..000000000 --- a/src/AliasVault.Admin2/Auth/Pages/InvalidPasswordReset.razor +++ /dev/null @@ -1,8 +0,0 @@ -@page "/Account/InvalidPasswordReset" - -Invalid password reset - -

Invalid password reset

-

- The password reset link is invalid. -

diff --git a/src/AliasVault.Admin2/Auth/Pages/InvalidUser.razor b/src/AliasVault.Admin2/Auth/Pages/InvalidUser.razor deleted file mode 100644 index 780756f52..000000000 --- a/src/AliasVault.Admin2/Auth/Pages/InvalidUser.razor +++ /dev/null @@ -1,7 +0,0 @@ -@page "/Account/InvalidUser" - -Invalid user - -

Invalid user

- - diff --git a/src/AliasVault.Admin2/Auth/Pages/Lockout.razor b/src/AliasVault.Admin2/Auth/Pages/Lockout.razor index 5b9f86d69..b7cbc5108 100644 --- a/src/AliasVault.Admin2/Auth/Pages/Lockout.razor +++ b/src/AliasVault.Admin2/Auth/Pages/Lockout.razor @@ -1,4 +1,4 @@ -@page "/Account/Lockout" +@page "/user/lockout" Locked out diff --git a/src/AliasVault.Admin2/Auth/Pages/Login.razor b/src/AliasVault.Admin2/Auth/Pages/Login.razor index 7f0dee63b..761a6994f 100644 --- a/src/AliasVault.Admin2/Auth/Pages/Login.razor +++ b/src/AliasVault.Admin2/Auth/Pages/Login.razor @@ -77,7 +77,7 @@ else if (result.IsLockedOut) { Logger.LogWarning("User account locked out."); - NavigationService.RedirectTo("Account/Lockout"); + NavigationService.RedirectTo("user/lockout"); } else { diff --git a/src/AliasVault.Admin2/Auth/Pages/LoginWith2fa.razor b/src/AliasVault.Admin2/Auth/Pages/LoginWith2fa.razor index d0d8285f4..bdf9cd95a 100644 --- a/src/AliasVault.Admin2/Auth/Pages/LoginWith2fa.razor +++ b/src/AliasVault.Admin2/Auth/Pages/LoginWith2fa.razor @@ -74,7 +74,7 @@ else if (result.IsLockedOut) { Logger.LogWarning("User with ID '{UserId}' account locked out.", userId); - NavigationService.RedirectTo("Account/Lockout"); + NavigationService.RedirectTo("user/lockout"); } else { diff --git a/src/AliasVault.Admin2/Auth/Pages/LoginWithRecoveryCode.razor b/src/AliasVault.Admin2/Auth/Pages/LoginWithRecoveryCode.razor index c15223ae7..becd4045e 100644 --- a/src/AliasVault.Admin2/Auth/Pages/LoginWithRecoveryCode.razor +++ b/src/AliasVault.Admin2/Auth/Pages/LoginWithRecoveryCode.razor @@ -63,7 +63,7 @@ else if (result.IsLockedOut) { Logger.LogWarning("User account locked out."); - NavigationService.RedirectTo("Account/Lockout"); + NavigationService.RedirectTo("user/lockout"); } else { diff --git a/src/AliasVault.Admin2/Auth/IdentityRevalidatingAuthenticationStateProvider.cs b/src/AliasVault.Admin2/Auth/Providers/RevalidatingAuthenticationStateProvider.cs similarity index 66% rename from src/AliasVault.Admin2/Auth/IdentityRevalidatingAuthenticationStateProvider.cs rename to src/AliasVault.Admin2/Auth/Providers/RevalidatingAuthenticationStateProvider.cs index cfbac959c..8608915cd 100644 --- a/src/AliasVault.Admin2/Auth/IdentityRevalidatingAuthenticationStateProvider.cs +++ b/src/AliasVault.Admin2/Auth/Providers/RevalidatingAuthenticationStateProvider.cs @@ -1,3 +1,5 @@ +namespace AliasVault.Admin2.Auth.Providers; + using System.Security.Claims; using AliasServerDb; using Microsoft.AspNetCore.Components.Authorization; @@ -5,18 +7,30 @@ using Microsoft.AspNetCore.Components.Server; using Microsoft.AspNetCore.Identity; using Microsoft.Extensions.Options; -namespace AliasVault.Admin2.Auth; - -// This is a server-side AuthenticationStateProvider that revalidates the security stamp for the connected user -// every 30 minutes an interactive circuit is connected. -internal sealed class IdentityRevalidatingAuthenticationStateProvider( +/// +/// This is a server-side AuthenticationStateProvider that revalidates the security stamp for the connected user +/// every 30 minutes an interactive circuit is connected. +/// +/// +/// +/// +internal sealed class RevalidatingAuthenticationStateProvider( ILoggerFactory loggerFactory, IServiceScopeFactory scopeFactory, IOptions options) : RevalidatingServerAuthenticationStateProvider(loggerFactory) { + /// + /// The revalidation interval. + /// protected override TimeSpan RevalidationInterval => TimeSpan.FromMinutes(30); + /// + /// Validate the authentication state. + /// + /// AuthenticationState instance. + /// CancellationToken. + /// Boolean indicating whether the currently logged on user is still valid. protected override async Task ValidateAuthenticationStateAsync( AuthenticationState authenticationState, CancellationToken cancellationToken) { diff --git a/src/AliasVault.Admin2/Main/Layout/Footer.razor.css b/src/AliasVault.Admin2/Main/Layout/Footer.razor.css index 881d128a5..e69de29bb 100644 --- a/src/AliasVault.Admin2/Main/Layout/Footer.razor.css +++ b/src/AliasVault.Admin2/Main/Layout/Footer.razor.css @@ -1,83 +0,0 @@ -.navbar-toggler { - background-color: rgba(255, 255, 255, 0.1); -} - -.top-row { - height: 3.5rem; - background-color: rgba(0,0,0,0.4); -} - -.navbar-brand { - font-size: 1.1rem; -} - -.bi { - display: inline-block; - position: relative; - width: 1.25rem; - height: 1.25rem; - margin-right: 0.75rem; - top: -1px; - background-size: cover; -} - -.bi-house-door-fill-nav-menu { - background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='16' height='16' fill='white' class='bi bi-house-door-fill' viewBox='0 0 16 16'%3E%3Cpath d='M6.5 14.5v-3.505c0-.245.25-.495.5-.495h2c.25 0 .5.25.5.5v3.5a.5.5 0 0 0 .5.5h4a.5.5 0 0 0 .5-.5v-7a.5.5 0 0 0-.146-.354L13 5.793V2.5a.5.5 0 0 0-.5-.5h-1a.5.5 0 0 0-.5.5v1.293L8.354 1.146a.5.5 0 0 0-.708 0l-6 6A.5.5 0 0 0 1.5 7.5v7a.5.5 0 0 0 .5.5h4a.5.5 0 0 0 .5-.5Z'/%3E%3C/svg%3E"); -} - -.bi-plus-square-fill-nav-menu { - background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='16' height='16' fill='white' class='bi bi-plus-square-fill' viewBox='0 0 16 16'%3E%3Cpath d='M2 0a2 2 0 0 0-2 2v12a2 2 0 0 0 2 2h12a2 2 0 0 0 2-2V2a2 2 0 0 0-2-2H2zm6.5 4.5v3h3a.5.5 0 0 1 0 1h-3v3a.5.5 0 0 1-1 0v-3h-3a.5.5 0 0 1 0-1h3v-3a.5.5 0 0 1 1 0z'/%3E%3C/svg%3E"); -} - -.bi-list-nested-nav-menu { - background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='16' height='16' fill='white' class='bi bi-list-nested' viewBox='0 0 16 16'%3E%3Cpath fill-rule='evenodd' d='M4.5 11.5A.5.5 0 0 1 5 11h10a.5.5 0 0 1 0 1H5a.5.5 0 0 1-.5-.5zm-2-4A.5.5 0 0 1 3 7h10a.5.5 0 0 1 0 1H3a.5.5 0 0 1-.5-.5zm-2-4A.5.5 0 0 1 1 3h10a.5.5 0 0 1 0 1H1a.5.5 0 0 1-.5-.5z'/%3E%3C/svg%3E"); -} - -.nav-item { - font-size: 0.9rem; - padding-bottom: 0.5rem; -} - - .nav-item:first-of-type { - padding-top: 1rem; - } - - .nav-item:last-of-type { - padding-bottom: 1rem; - } - - .nav-item ::deep a { - color: #d7d7d7; - border-radius: 4px; - height: 3rem; - display: flex; - align-items: center; - line-height: 3rem; - } - -.nav-item ::deep a.active { - background-color: rgba(255,255,255,0.37); - color: white; -} - -.nav-item ::deep a:hover { - background-color: rgba(255,255,255,0.1); - color: white; -} - -@media (min-width: 641px) { - .navbar-toggler { - display: none; - } - - .collapse { - /* Never collapse the sidebar for wide screens */ - display: block; - } - - .nav-scrollable { - /* Allow sidebar to scroll for tall menus */ - height: calc(100vh - 3.5rem); - overflow-y: auto; - } -} diff --git a/src/AliasVault.Admin2/Main/Layout/MainLayout.razor.css b/src/AliasVault.Admin2/Main/Layout/MainLayout.razor.css index 038baf178..df8c10ff2 100644 --- a/src/AliasVault.Admin2/Main/Layout/MainLayout.razor.css +++ b/src/AliasVault.Admin2/Main/Layout/MainLayout.razor.css @@ -1,81 +1,3 @@ -.page { - position: relative; - display: flex; - flex-direction: column; -} - -main { - flex: 1; -} - -.sidebar { - background-image: linear-gradient(180deg, rgb(5, 39, 103) 0%, #3a0647 70%); -} - -.top-row { - background-color: #f7f7f7; - border-bottom: 1px solid #d6d5d5; - justify-content: flex-end; - height: 3.5rem; - display: flex; - align-items: center; -} - - .top-row ::deep a, .top-row ::deep .btn-link { - white-space: nowrap; - margin-left: 1.5rem; - text-decoration: none; - } - - .top-row ::deep a:hover, .top-row ::deep .btn-link:hover { - text-decoration: underline; - } - - .top-row ::deep a:first-child { - overflow: hidden; - text-overflow: ellipsis; - } - -@media (max-width: 640.98px) { - .top-row { - justify-content: space-between; - } - - .top-row ::deep a, .top-row ::deep .btn-link { - margin-left: 0; - } -} - -@media (min-width: 641px) { - .page { - flex-direction: row; - } - - .sidebar { - width: 250px; - height: 100vh; - position: sticky; - top: 0; - } - - .top-row { - position: sticky; - top: 0; - z-index: 1; - } - - .top-row.auth ::deep a:first-child { - flex: 1; - text-align: right; - width: 0; - } - - .top-row, article { - padding-left: 2rem !important; - padding-right: 1.5rem !important; - } -} - #blazor-error-ui { background: lightyellow; bottom: 0; diff --git a/src/AliasVault.Admin2/Main/Layout/TopMenu.razor.css b/src/AliasVault.Admin2/Main/Layout/TopMenu.razor.css index 881d128a5..e69de29bb 100644 --- a/src/AliasVault.Admin2/Main/Layout/TopMenu.razor.css +++ b/src/AliasVault.Admin2/Main/Layout/TopMenu.razor.css @@ -1,83 +0,0 @@ -.navbar-toggler { - background-color: rgba(255, 255, 255, 0.1); -} - -.top-row { - height: 3.5rem; - background-color: rgba(0,0,0,0.4); -} - -.navbar-brand { - font-size: 1.1rem; -} - -.bi { - display: inline-block; - position: relative; - width: 1.25rem; - height: 1.25rem; - margin-right: 0.75rem; - top: -1px; - background-size: cover; -} - -.bi-house-door-fill-nav-menu { - background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='16' height='16' fill='white' class='bi bi-house-door-fill' viewBox='0 0 16 16'%3E%3Cpath d='M6.5 14.5v-3.505c0-.245.25-.495.5-.495h2c.25 0 .5.25.5.5v3.5a.5.5 0 0 0 .5.5h4a.5.5 0 0 0 .5-.5v-7a.5.5 0 0 0-.146-.354L13 5.793V2.5a.5.5 0 0 0-.5-.5h-1a.5.5 0 0 0-.5.5v1.293L8.354 1.146a.5.5 0 0 0-.708 0l-6 6A.5.5 0 0 0 1.5 7.5v7a.5.5 0 0 0 .5.5h4a.5.5 0 0 0 .5-.5Z'/%3E%3C/svg%3E"); -} - -.bi-plus-square-fill-nav-menu { - background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='16' height='16' fill='white' class='bi bi-plus-square-fill' viewBox='0 0 16 16'%3E%3Cpath d='M2 0a2 2 0 0 0-2 2v12a2 2 0 0 0 2 2h12a2 2 0 0 0 2-2V2a2 2 0 0 0-2-2H2zm6.5 4.5v3h3a.5.5 0 0 1 0 1h-3v3a.5.5 0 0 1-1 0v-3h-3a.5.5 0 0 1 0-1h3v-3a.5.5 0 0 1 1 0z'/%3E%3C/svg%3E"); -} - -.bi-list-nested-nav-menu { - background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='16' height='16' fill='white' class='bi bi-list-nested' viewBox='0 0 16 16'%3E%3Cpath fill-rule='evenodd' d='M4.5 11.5A.5.5 0 0 1 5 11h10a.5.5 0 0 1 0 1H5a.5.5 0 0 1-.5-.5zm-2-4A.5.5 0 0 1 3 7h10a.5.5 0 0 1 0 1H3a.5.5 0 0 1-.5-.5zm-2-4A.5.5 0 0 1 1 3h10a.5.5 0 0 1 0 1H1a.5.5 0 0 1-.5-.5z'/%3E%3C/svg%3E"); -} - -.nav-item { - font-size: 0.9rem; - padding-bottom: 0.5rem; -} - - .nav-item:first-of-type { - padding-top: 1rem; - } - - .nav-item:last-of-type { - padding-bottom: 1rem; - } - - .nav-item ::deep a { - color: #d7d7d7; - border-radius: 4px; - height: 3rem; - display: flex; - align-items: center; - line-height: 3rem; - } - -.nav-item ::deep a.active { - background-color: rgba(255,255,255,0.37); - color: white; -} - -.nav-item ::deep a:hover { - background-color: rgba(255,255,255,0.1); - color: white; -} - -@media (min-width: 641px) { - .navbar-toggler { - display: none; - } - - .collapse { - /* Never collapse the sidebar for wide screens */ - display: block; - } - - .nav-scrollable { - /* Allow sidebar to scroll for tall menus */ - height: calc(100vh - 3.5rem); - overflow-y: auto; - } -} diff --git a/src/AliasVault.Admin2/Main/Pages/Account/Manage/ChangePassword.razor b/src/AliasVault.Admin2/Main/Pages/Account/Manage/ChangePassword.razor index c105e1fec..63c7f965b 100644 --- a/src/AliasVault.Admin2/Main/Pages/Account/Manage/ChangePassword.razor +++ b/src/AliasVault.Admin2/Main/Pages/Account/Manage/ChangePassword.razor @@ -1,46 +1,44 @@ @page "/account/manage/ChangePassword" @using System.ComponentModel.DataAnnotations -@using AliasVault.Admin2.Services @using Microsoft.AspNetCore.Identity @inject UserManager UserManager -@inject SignInManager SignInManager -@inject NavigationService NavigationService @inject ILogger Logger -Change password +Change password -

Change password

- -
-
- - - -
- - - -
-
- - - -
-
- - - -
- - -
+
+

Change password

+ + + + +
+ + + +
+
+ + + +
+
+ + + +
+
+ +
+
@code { private string? message; - private AdminUser user = default!; private bool hasPassword; [CascadingParameter] private HttpContext HttpContext { get; set; } = default!; @@ -58,17 +56,17 @@ private async Task OnValidSubmitAsync() { - var changePasswordResult = await UserManager.ChangePasswordAsync(user, Input.OldPassword, Input.NewPassword); + var changePasswordResult = await UserManager.ChangePasswordAsync(UserService.User(), Input.OldPassword, Input.NewPassword); if (!changePasswordResult.Succeeded) { message = $"Error: {string.Join(",", changePasswordResult.Errors.Select(error => error.Description))}"; return; } - await SignInManager.RefreshSignInAsync(user); + // await SignInManager.RefreshSignInAsync(user); Logger.LogInformation("User changed their password successfully."); - GlobalNotificationService.AddSuccessMessage("Your password has been changed."); + GlobalNotificationService.AddSuccessMessage("Your password has been changed.", true); NavigationService.RedirectToCurrentPage(); } diff --git a/src/AliasVault.Admin2/Main/Pages/Account/Manage/DeletePersonalData.razor b/src/AliasVault.Admin2/Main/Pages/Account/Manage/DeletePersonalData.razor deleted file mode 100644 index efa9a50fe..000000000 --- a/src/AliasVault.Admin2/Main/Pages/Account/Manage/DeletePersonalData.razor +++ /dev/null @@ -1,77 +0,0 @@ -@page "/account/manage/DeletePersonalData" - -@using System.ComponentModel.DataAnnotations -@using Microsoft.AspNetCore.Identity - -@inject UserManager UserManager -@inject SignInManager SignInManager -@inject ILogger Logger - -Delete Personal Data - - - -

Delete Personal Data

- - - -
- - - - @if (requirePassword) - { -
- - - -
- } - - -
- -@code { - private string? message; - private bool requirePassword; - - [CascadingParameter] private HttpContext HttpContext { get; set; } = default!; - - [SupplyParameterFromForm] private InputModel Input { get; set; } = new(); - - protected override async Task OnInitializedAsync() - { - Input ??= new(); - requirePassword = await UserManager.HasPasswordAsync(UserService.User()); - } - - private async Task OnValidSubmitAsync() - { - if (requirePassword && !await UserManager.CheckPasswordAsync(UserService.User(), Input.Password)) - { - message = "Error: Incorrect password."; - return; - } - - var result = await UserManager.DeleteAsync(UserService.User()); - if (!result.Succeeded) - { - throw new InvalidOperationException("Unexpected error occurred deleting user."); - } - - await SignInManager.SignOutAsync(); - - var userId = await UserManager.GetUserIdAsync(UserService.User()); - Logger.LogInformation("User with ID '{UserId}' deleted themselves.", userId); - } - - private sealed class InputModel - { - [DataType(DataType.Password)] public string Password { get; set; } = ""; - } - -} diff --git a/src/AliasVault.Admin2/Main/Pages/Account/Manage/Disable2fa.razor b/src/AliasVault.Admin2/Main/Pages/Account/Manage/Disable2fa.razor index b974dce4c..55488d067 100644 --- a/src/AliasVault.Admin2/Main/Pages/Account/Manage/Disable2fa.razor +++ b/src/AliasVault.Admin2/Main/Pages/Account/Manage/Disable2fa.razor @@ -5,24 +5,24 @@ @inject UserManager UserManager @inject ILogger Logger -Disable two-factor authentication (2FA) +Disable two-factor authentication (2FA) -

Disable two-factor authentication (2FA)

+

Disable two-factor authentication (2FA)

- } diff --git a/src/AliasVault.Admin2/Main/Pages/Account/Manage/GenerateRecoveryCodes.razor b/src/AliasVault.Admin2/Main/Pages/Account/Manage/GenerateRecoveryCodes.razor index 20dc15b8d..02b51f24c 100644 --- a/src/AliasVault.Admin2/Main/Pages/Account/Manage/GenerateRecoveryCodes.razor +++ b/src/AliasVault.Admin2/Main/Pages/Account/Manage/GenerateRecoveryCodes.razor @@ -5,7 +5,7 @@ @inject UserManager UserManager @inject ILogger Logger -Generate two-factor authentication (2FA) recovery codes +Generate two-factor authentication (2FA) recovery codes @if (recoveryCodes is not null) { @@ -13,22 +13,24 @@ } else { -

Generate two-factor authentication (2FA) recovery codes

-