Skip to content

Privacy-first password manager with built-in email aliasing. Fully encrypted and self-hostable.

Add hide button to 2FA warning in admin

Leendert de Borstce44ebf94d94
diff --git a/apps/server/AliasVault.Admin/Main/Components/Alerts/AlertMessageWarning.razor b/apps/server/AliasVault.Admin/Main/Components/Alerts/AlertMessageWarning.razor
index 8a8a711b8..afe178280 100644
--- a/apps/server/AliasVault.Admin/Main/Components/Alerts/AlertMessageWarning.razor
+++ b/apps/server/AliasVault.Admin/Main/Components/Alerts/AlertMessageWarning.razor
@@ -2,8 +2,14 @@
@if (!string.IsNullOrEmpty(Message))
{
- <div class="p-4 mb-4 text-sm text-yellow-800 rounded-lg bg-yellow-50 border-2 dark:bg-yellow-800 dark:text-white dark:border-yellow-500 dark:border" role="alert">
- @Message
+ <div class="flex items-center gap-3 p-4 mb-4 text-sm text-yellow-800 rounded-lg bg-yellow-50 border-2 dark:bg-yellow-800 dark:text-white dark:border-yellow-500 dark:border" role="alert">
+ <div class="flex-1">@Message</div>
+ @if (OnDismiss.HasDelegate)
+ {
+ <button type="button" @onclick="OnDismiss" class="-m-1 p-1 rounded-md hover:bg-yellow-100 dark:hover:bg-yellow-700" aria-label="Dismiss" title="Dismiss">
+ <UiIcon Icon="UiIcons.X" class="w-4 h-4" />
+ </button>
+ }
</div>
}
@@ -13,4 +19,10 @@
/// </summary>
[Parameter]
public string Message { get; set; } = string.Empty;
+
+ /// <summary>
+ /// Called when the dismiss button is clicked; the button is only shown when this is set.
+ /// </summary>
+ [Parameter]
+ public EventCallback OnDismiss { get; set; }
}
diff --git a/apps/server/AliasVault.Admin/Main/Pages/Dashboard/Index.razor b/apps/server/AliasVault.Admin/Main/Pages/Dashboard/Index.razor
index fd6e50145..cb09d0ef2 100644
--- a/apps/server/AliasVault.Admin/Main/Pages/Dashboard/Index.razor
+++ b/apps/server/AliasVault.Admin/Main/Pages/Dashboard/Index.razor
@@ -4,6 +4,13 @@
<LayoutPageTitle>Home</LayoutPageTitle>
+@if (ShowTwoFactorWarning)
+{
+ <div class="grid px-4 pt-6 -mb-2 dark:bg-gray-900 [&>:last-child]:mb-0">
+ <AlertMessageWarning Message="Two-factor authentication is not enabled for this admin account. It is recommended to enable it in Account Settings for better security." OnDismiss="DismissTwoFactorWarning" />
+ </div>
+}
+
<PageHeader
BreadcrumbItems="@BreadcrumbItems"
Title="AliasVault Admin"
@@ -29,6 +36,13 @@
</div>
@code {
+ /// <summary>
+ /// The sessionStorage key that hides the 2FA warning until the browser tab is closed.
+ /// </summary>
+ private const string TwoFactorWarningDismissedKey = "twoFactorWarningDismissed";
+
+ private bool ShowTwoFactorWarning { get; set; }
+
private ServiceStatusCard? _serviceStatusCard;
private RecentActiveUsersCard? _recentActiveUsersCard;
private ActiveUsersCard? _activeUsersCard;
@@ -36,18 +50,6 @@
private EmailStatisticsCard? _emailStatisticsCard;
private EmailClaimsCard? _emailClaimsCard;
- /// <inheritdoc />
- protected override async Task OnInitializedAsync()
- {
- await base.OnInitializedAsync();
-
- // Check if 2FA is enabled. If not, show a one-time warning on the dashboard.
- if (!UserService.User().TwoFactorEnabled)
- {
- GlobalNotificationService.AddWarningMessage("Two-factor authentication is not enabled for this admin account. It is recommended to enable it in Account Settings for better security.", true);
- }
- }
-
/// <inheritdoc />
protected override async Task OnAfterRenderAsync(bool firstRender)
{
@@ -55,10 +57,25 @@
if (firstRender)
{
+ if (!UserService.User().TwoFactorEnabled)
+ {
+ ShowTwoFactorWarning = await Js.InvokeAsync<string?>("sessionStorage.getItem", TwoFactorWarningDismissedKey) != "true";
+ StateHasChanged();
+ }
+
await RefreshData();
}
}
+ /// <summary>
+ /// Hides the 2FA warning until this browser tab is closed.
+ /// </summary>
+ private async Task DismissTwoFactorWarning()
+ {
+ ShowTwoFactorWarning = false;
+ await Js.InvokeVoidAsync("sessionStorage.setItem", TwoFactorWarningDismissedKey, "true");
+ }
+
/// <summary>
/// Refreshes the data displayed on the cards.
/// </summary>
diff --git a/apps/server/AliasVault.Admin/wwwroot/css/tailwind.css b/apps/server/AliasVault.Admin/wwwroot/css/tailwind.css
index c857287e7..298071916 100644
--- a/apps/server/AliasVault.Admin/wwwroot/css/tailwind.css
+++ b/apps/server/AliasVault.Admin/wwwroot/css/tailwind.css
@@ -669,6 +669,10 @@ video {
grid-column: 1 / -1;
}
+.-m-1 {
+ margin: -0.25rem;
+}
+
.mx-3 {
margin-left: 0.75rem;
margin-right: 0.75rem;
@@ -689,6 +693,10 @@ video {
margin-bottom: 1rem;
}
+.-mb-2 {
+ margin-bottom: -0.5rem;
+}
+
.mb-1 {
margin-bottom: 0.25rem;
}
@@ -1101,6 +1109,10 @@ video {
gap: 0.5rem;
}
+.gap-3 {
+ gap: 0.75rem;
+}
+
.gap-4 {
gap: 1rem;
}
@@ -1473,6 +1485,10 @@ video {
fill: #d68338;
}
+.p-1 {
+ padding: 0.25rem;
+}
+
.p-2 {
padding: 0.5rem;
}
@@ -1984,6 +2000,11 @@ video {
background-color: rgb(153 27 27 / var(--tw-bg-opacity, 1));
}
+.hover\:bg-yellow-100:hover {
+ --tw-bg-opacity: 1;
+ background-color: rgb(254 249 195 / var(--tw-bg-opacity, 1));
+}
+
.hover\:text-blue-600:hover {
--tw-text-opacity: 1;
color: rgb(37 99 235 / var(--tw-text-opacity, 1));
@@ -2433,6 +2454,11 @@ video {
background-color: rgb(185 28 28 / var(--tw-bg-opacity, 1));
}
+.dark\:hover\:bg-yellow-700:hover:is(.dark *) {
+ --tw-bg-opacity: 1;
+ background-color: rgb(161 98 7 / var(--tw-bg-opacity, 1));
+}
+
.dark\:hover\:text-blue-400:hover:is(.dark *) {
--tw-text-opacity: 1;
color: rgb(96 165 250 / var(--tw-text-opacity, 1));
@@ -2763,3 +2789,7 @@ video {
padding-right: 0px;
}
}
+
+.\[\&\>\:last-child\]\:mb-0>:last-child {
+ margin-bottom: 0px;
+}