Skip to content

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

Add separate admin maintenance page (#2159)

Leendert de Borst8008577248e7
diff --git a/apps/server/AliasVault.Admin/Main/Layout/TopMenu.razor b/apps/server/AliasVault.Admin/Main/Layout/TopMenu.razor
index 33562821f..1cf8d8f44 100644
--- a/apps/server/AliasVault.Admin/Main/Layout/TopMenu.razor
+++ b/apps/server/AliasVault.Admin/Main/Layout/TopMenu.razor
@@ -25,6 +25,9 @@
<NavLink href="logging/auth" class="block text-gray-700 hover:text-primary-700 dark:text-gray-400 dark:hover:text-white" ActiveClass="text-primary-700 dark:text-primary-500" Match="NavLinkMatch.All">
Auth logs
</NavLink>
+ <NavLink href="maintenance" class="block text-gray-700 hover:text-primary-700 dark:text-gray-400 dark:hover:text-white" ActiveClass="text-primary-700 dark:text-primary-500" Match="NavLinkMatch.All">
+ Maintenance
+ </NavLink>
<NavLink href="settings/server" class="block text-gray-700 hover:text-primary-700 dark:text-gray-400 dark:hover:text-white" ActiveClass="text-primary-700 dark:text-primary-500" Match="NavLinkMatch.All">
Server settings
</NavLink>
@@ -32,14 +35,6 @@
</div>
</div>
<div class="flex justify-end items-center lg:order-2">
- <div class="hidden md:block">
- <ServiceControl ServiceNames="@(new List<string> { "AliasVault.SmtpService", "AliasVault.TaskRunner" })"
- ServiceDisplayNames="@(new Dictionary<string, string>
- {
- { "AliasVault.SmtpService", "Smtp" },
- { "AliasVault.TaskRunner", "Tasks" }
- })" />
- </div>
<button id="theme-toggle" data-tooltip-target="tooltip-toggle" type="button" class="hidden md:block text-gray-500 dark:text-gray-400 hover:bg-gray-100 dark:hover:bg-gray-700 focus:outline-none focus:ring-4 focus:ring-gray-200 dark:focus:ring-gray-700 rounded-lg text-sm p-2.5">
<svg id="theme-toggle-dark-icon" class="hidden w-5 h-5" fill="currentColor" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg"><path d="M17.293 13.293A8 8 0 016.707 2.707a8.001 8.001 0 1010.586 10.586z"></path></svg>
<svg id="theme-toggle-light-icon" class="hidden w-5 h-5" fill="currentColor" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg"><path d="M10 2a1 1 0 011 1v1a1 1 0 11-2 0V3a1 1 0 011-1zm4 8a4 4 0 11-8 0 4 4 0 018 0zm-.464 4.95l.707.707a1 1 0 001.414-1.414l-.707-.707a1 1 0 00-1.414 1.414zm2.12-10.607a1 1 0 010 1.414l-.706.707a1 1 0 11-1.414-1.414l.707-.707a1 1 0 011.414 0zM17 11a1 1 0 100-2h-1a1 1 0 100 2h1zm-7 4a1 1 0 011 1v1a1 1 0 11-2 0v-1a1 1 0 011-1zM5.05 6.464A1 1 0 106.465 5.05l-.708-.707a1 1 0 00-1.414 1.414l.707.707zm1.414 8.486l-.707.707a1 1 0 01-1.414-1.414l.707-.707a1 1 0 011.414 1.414zM4 11a1 1 0 100-2H3a1 1 0 000 2h1z" fill-rule="evenodd" clip-rule="evenodd"></path></svg>
@@ -111,6 +106,11 @@
Auth logs
</NavLink>
</li>
+ <li class="block border-b dark:border-gray-700">
+ <NavLink href="maintenance" class="block py-3 px-4 text-gray-900 lg:py-0 dark:text-white lg:hover:underline lg:px-0" ActiveClass="text-primary-700 dark:text-primary-500" Match="NavLinkMatch.All">
+ Maintenance
+ </NavLink>
+ </li>
<li class="block border-b dark:border-gray-700">
<NavLink href="settings/server" class="block py-3 px-4 text-gray-900 lg:py-0 dark:text-white lg:hover:underline lg:px-0" ActiveClass="text-primary-700 dark:text-primary-500" Match="NavLinkMatch.All">
Server settings
diff --git a/apps/server/AliasVault.Admin/Main/Pages/Settings/Components/TaskRunnerHistory.razor b/apps/server/AliasVault.Admin/Main/Pages/Maintenance/Components/TaskRunnerHistory.razor
similarity index 100%
rename from apps/server/AliasVault.Admin/Main/Pages/Settings/Components/TaskRunnerHistory.razor
rename to apps/server/AliasVault.Admin/Main/Pages/Maintenance/Components/TaskRunnerHistory.razor
diff --git a/apps/server/AliasVault.Admin/Main/Pages/Maintenance/Index.razor b/apps/server/AliasVault.Admin/Main/Pages/Maintenance/Index.razor
new file mode 100644
index 000000000..17cf9c9e7
--- /dev/null
+++ b/apps/server/AliasVault.Admin/Main/Pages/Maintenance/Index.razor
@@ -0,0 +1,146 @@
+@page "/maintenance"
+@inject ServerSettingsService SettingsService
+@inject ILogger<Index> Logger
+@using AliasVault.Shared.Models.Enums
+@using AliasVault.Shared.Server.Models
+@using AliasVault.Shared.Server.Services
+@using AliasVault.Admin.Main.Pages.Maintenance.Components
+@inherits MainBase
+
+<LayoutPageTitle>Maintenance</LayoutPageTitle>
+
+<PageHeader
+ BreadcrumbItems="@BreadcrumbItems"
+ Title="Maintenance"
+ Description="Configure when the task runner executes its maintenance tasks and view the history of past runs.">
+ <CustomActions>
+ <RefreshButton OnClick="RefreshData" ButtonText="Refresh" />
+ <ConfirmButton OnClick="SaveSchedule">Save changes</ConfirmButton>
+ </CustomActions>
+</PageHeader>
+
+<div class="p-4 mb-4 mx-4 bg-white border border-gray-200 rounded-lg shadow-sm dark:border-gray-700 sm:p-6 dark:bg-gray-800">
+ <h3 class="mb-4 text-lg font-medium text-gray-900 dark:text-white">Maintenance Schedule</h3>
+ <p class="mb-4 text-sm text-gray-500 dark:text-gray-400">
+ Maintenance tasks clean up logs, emails, expired tokens and unreferenced vault data according to the retention limits configured in <a href="settings/server" class="text-primary-700 hover:underline dark:text-primary-500">Server settings</a>.
+ </p>
+ <div class="mb-4">
+ <label for="schedule" class="block mb-2 text-sm font-medium text-gray-900 dark:text-white">Time</label>
+ <input type="time" @bind="Settings.MaintenanceTime" id="schedule" class="bg-gray-50 border border-gray-300 text-gray-900 text-sm rounded-lg focus:ring-primary-600 focus:border-primary-600 block w-full p-2.5 dark:bg-gray-700 dark:border-gray-600 dark:placeholder-gray-400 dark:text-white dark:focus:ring-primary-500 dark:focus:border-primary-500">
+ <p class="mt-1 text-sm text-gray-500 dark:text-gray-400">Time when maintenance tasks are run (server local time)</p>
+ </div>
+ <div class="mb-4">
+ <label class="block mb-2 text-sm font-medium text-gray-900 dark:text-white">Run on Days</label>
+ <div class="flex flex-wrap gap-4">
+ @foreach (var day in DaysOfWeek)
+ {
+ var isSelected = Settings.TaskRunnerDays.Contains(day.Key);
+ <div class="flex items-center">
+ <input type="checkbox" checked="@isSelected" @onchange="@(e => ToggleDay(day.Key))" id="@($"day_{day.Key}")" class="w-4 h-4 text-blue-600 bg-gray-100 border-gray-300 rounded focus:ring-blue-500 dark:focus:ring-blue-600 dark:ring-offset-gray-800 focus:ring-2 dark:bg-gray-700 dark:border-gray-600">
+ <label for="@($"day_{day.Key}")" class="ml-2 text-sm font-medium text-gray-900 dark:text-gray-300">@day.Value</label>
+ </div>
+ }
+ </div>
+ </div>
+
+ <div class="mb-4">
+ <h4 class="mb-2 text-md font-medium text-gray-900 dark:text-white">Manual Execution</h4>
+ <ConfirmButton OnClick="RunMaintenanceTasksNow">Run Maintenance Tasks Now</ConfirmButton>
+ </div>
+</div>
+
+<div class="p-4 mb-4 mx-4 bg-white border border-gray-200 rounded-lg shadow-sm dark:border-gray-700 sm:p-6 dark:bg-gray-800">
+ <h3 class="mb-4 text-lg font-medium text-gray-900 dark:text-white">Maintenance History</h3>
+ <TaskRunnerHistory @ref="_taskRunnerHistoryComponent" />
+</div>
+
+@code {
+ private TaskRunnerHistory? _taskRunnerHistoryComponent;
+
+ private ServerSettingsModel Settings { get; set; } = new();
+ private readonly Dictionary<int, string> DaysOfWeek = new()
+ {
+ { 1, "Monday" },
+ { 2, "Tuesday" },
+ { 3, "Wednesday" },
+ { 4, "Thursday" },
+ { 5, "Friday" },
+ { 6, "Saturday" },
+ { 7, "Sunday" }
+ };
+
+ /// <inheritdoc/>
+ protected override async Task OnInitializedAsync()
+ {
+ await base.OnInitializedAsync();
+ BreadcrumbItems.Add(new BreadcrumbItem { DisplayName = "Maintenance" });
+
+ Settings = await SettingsService.GetAllSettingsAsync();
+ }
+
+ private void ToggleDay(int day)
+ {
+ if (Settings.TaskRunnerDays.Contains(day))
+ {
+ Settings.TaskRunnerDays.Remove(day);
+ }
+ else
+ {
+ Settings.TaskRunnerDays.Add(day);
+ }
+ }
+
+ /// <summary>
+ /// Persists the schedule settings.
+ /// </summary>
+ private async Task SaveSchedule()
+ {
+ await SettingsService.SaveMaintenanceScheduleAsync(Settings.MaintenanceTime, Settings.TaskRunnerDays);
+ GlobalNotificationService.AddSuccessMessage("Settings saved successfully", true);
+ }
+
+ private async Task RunMaintenanceTasksNow()
+ {
+ try
+ {
+ await using var dbContext = await DbContextFactory.CreateDbContextAsync();
+ var job = new TaskRunnerJob
+ {
+ Name = nameof(TaskRunnerJobType.Maintenance),
+ RunDate = DateTime.UtcNow.Date,
+ StartTime = TimeOnly.FromDateTime(DateTime.UtcNow),
+ Status = TaskRunnerJobStatus.Pending,
+ IsOnDemand = true
+ };
+
+ dbContext.TaskRunnerJobs.Add(job);
+ await dbContext.SaveChangesAsync();
+
+ // Refresh the history component to show the new job
+ if (_taskRunnerHistoryComponent != null)
+ {
+ await _taskRunnerHistoryComponent.RefreshData();
+ }
+
+ Logger.LogInformation("Maintenance tasks manually queued.");
+ GlobalNotificationService.AddSuccessMessage("Maintenance tasks queued. They will be executed on the next polling cycle (default every minute). Check the logs for details.", true);
+ }
+ catch (Exception ex)
+ {
+ GlobalNotificationService.AddErrorMessage($"Failed to start maintenance tasks: {ex}", true);
+ }
+ }
+
+ /// <summary>
+ /// Refreshes the data displayed on the page.
+ /// </summary>
+ private async Task RefreshData()
+ {
+ Settings = await SettingsService.GetAllSettingsAsync();
+
+ if (_taskRunnerHistoryComponent != null)
+ {
+ await _taskRunnerHistoryComponent.RefreshData();
+ }
+ }
+}
diff --git a/apps/server/AliasVault.Admin/Main/Pages/Settings/Server.razor b/apps/server/AliasVault.Admin/Main/Pages/Settings/Server.razor
index 0ab3e11f2..d3d76954e 100644
--- a/apps/server/AliasVault.Admin/Main/Pages/Settings/Server.razor
+++ b/apps/server/AliasVault.Admin/Main/Pages/Settings/Server.razor
@@ -1,10 +1,7 @@
@page "/settings/server"
@inject ServerSettingsService SettingsService
-@inject ILogger<Server> Logger
-@using AliasVault.Shared.Models.Enums
@using AliasVault.Shared.Server.Models
@using AliasVault.Shared.Server.Services
-@using AliasVault.Admin.Main.Pages.Settings.Components
@inherits MainBase
<LayoutPageTitle>Server settings</LayoutPageTitle>
@@ -83,17 +80,6 @@
</div>
</div>
-<div class="p-4 mb-4 mx-4 bg-white border border-gray-200 rounded-lg shadow-sm dark:border-gray-700 sm:p-6 dark:bg-gray-800">
- <h3 class="mb-4 text-lg font-medium text-gray-900 dark:text-white">Inactive User Settings</h3>
- <div class="grid gap-4 mb-4 sm:grid-cols-1 sm:gap-6 sm:mb-5">
- <div>
- <label for="markInactiveDays" class="block mb-2 text-sm font-medium text-gray-900 dark:text-white">Mark User as Inactive After (days)</label>
- <input type="number" @bind="Settings.MarkUserInactiveAfterDays" id="markInactiveDays" class="bg-gray-50 border border-gray-300 text-gray-900 text-sm rounded-lg focus:ring-primary-600 focus:border-primary-600 block w-full p-2.5 dark:bg-gray-700 dark:border-gray-600 dark:placeholder-gray-400 dark:text-white dark:focus:ring-primary-500 dark:focus:border-primary-500">
- <p class="mt-1 text-sm text-gray-500 dark:text-gray-400">Users that have not logged in or had activity in the last number of days are marked as inactive. Other retention rules can act on this. Set to 0 to disable.</p>
- </div>
- </div>
-</div>
-
<div class="p-4 mb-4 mx-4 bg-white border border-gray-200 rounded-lg shadow-sm dark:border-gray-700 sm:p-6 dark:bg-gray-800">
<h3 class="mb-4 text-lg font-medium text-gray-900 dark:text-white">Email Settings</h3>
<div class="grid gap-4 mb-4 sm:grid-cols-2 sm:gap-6 sm:mb-5">
@@ -112,60 +98,11 @@
<input type="number" @bind="Settings.MaxEmailsPerUser" id="maxEmails" class="bg-gray-50 border border-gray-300 text-gray-900 text-sm rounded-lg focus:ring-primary-600 focus:border-primary-600 block w-full p-2.5 dark:bg-gray-700 dark:border-gray-600 dark:placeholder-gray-400 dark:text-white dark:focus:ring-primary-500 dark:focus:border-primary-500">
<p class="mt-1 text-sm text-gray-500 dark:text-gray-400">Number of emails a user can have in total. Emails exceeding this limit will be deleted, oldest first. Set to 0 for unlimited emails</p>
</div>
- <div>
- <label for="maxEmailsInactive" class="block mb-2 text-sm font-medium text-gray-900 dark:text-white">Max Emails per Inactive User</label>
- <input type="number" @bind="Settings.MaxEmailsPerInactiveUser" id="maxEmailsInactive" class="bg-gray-50 border border-gray-300 text-gray-900 text-sm rounded-lg focus:ring-primary-600 focus:border-primary-600 block w-full p-2.5 dark:bg-gray-700 dark:border-gray-600 dark:placeholder-gray-400 dark:text-white dark:focus:ring-primary-500 dark:focus:border-primary-500">
- <p class="mt-1 text-sm text-gray-500 dark:text-gray-400">This limit only applies to users that are marked as inactive per the Mark User as Inactive After (days) setting. Set to 0 for unlimited emails.</p>
- </div>
- </div>
-</div>
-
-<div class="p-4 mb-4 mx-4 bg-white border border-gray-200 rounded-lg shadow-sm dark:border-gray-700 sm:p-6 dark:bg-gray-800">
- <h3 class="mb-4 text-lg font-medium text-gray-900 dark:text-white">Maintenance Schedule</h3>
- <div class="mb-4">
- <label for="schedule" class="block mb-2 text-sm font-medium text-gray-900 dark:text-white">Time</label>
- <input type="time" @bind="Settings.MaintenanceTime" id="schedule" class="bg-gray-50 border border-gray-300 text-gray-900 text-sm rounded-lg focus:ring-primary-600 focus:border-primary-600 block w-full p-2.5 dark:bg-gray-700 dark:border-gray-600 dark:placeholder-gray-400 dark:text-white dark:focus:ring-primary-500 dark:focus:border-primary-500">
- <p class="mt-1 text-sm text-gray-500 dark:text-gray-400">Time when maintenance tasks are run (server local time)</p>
- </div>
- <div class="mb-4">
- <label class="block mb-2 text-sm font-medium text-gray-900 dark:text-white">Run on Days</label>
- <div class="flex flex-wrap gap-4">
- @foreach (var day in DaysOfWeek)
- {
- var isSelected = Settings.TaskRunnerDays.Contains(day.Key);
- <div class="flex items-center">
- <input type="checkbox" checked="@isSelected" @onchange="@(e => ToggleDay(day.Key))" id="@($"day_{day.Key}")" class="w-4 h-4 text-blue-600 bg-gray-100 border-gray-300 rounded focus:ring-blue-500 dark:focus:ring-blue-600 dark:ring-offset-gray-800 focus:ring-2 dark:bg-gray-700 dark:border-gray-600">
- <label for="@($"day_{day.Key}")" class="ml-2 text-sm font-medium text-gray-900 dark:text-gray-300">@day.Value</label>
- </div>
- }
- </div>
- </div>
-
- <div class="mb-4">
- <h4 class="mb-2 text-md font-medium text-gray-900 dark:text-white">Manual Execution</h4>
- <ConfirmButton OnClick="RunMaintenanceTasksNow">Run Maintenance Tasks Now</ConfirmButton>
</div>
</div>
-<div class="p-4 mb-4 mx-4 bg-white border border-gray-200 rounded-lg shadow-sm dark:border-gray-700 sm:p-6 dark:bg-gray-800">
- <h3 class="mb-4 text-lg font-medium text-gray-900 dark:text-white">Maintenance History</h3>
- <TaskRunnerHistory @ref="_taskRunnerHistoryComponent" />
-</div>
-
@code {
- private TaskRunnerHistory? _taskRunnerHistoryComponent;
-
private ServerSettingsModel Settings { get; set; } = new();
- private readonly Dictionary<int, string> DaysOfWeek = new()
- {
- { 1, "Monday" },
- { 2, "Tuesday" },
- { 3, "Wednesday" },
- { 4, "Thursday" },
- { 5, "Friday" },
- { 6, "Saturday" },
- { 7, "Sunday" }
- };
/// <inheritdoc/>
protected override async Task OnInitializedAsync()
@@ -176,67 +113,17 @@
Settings = await SettingsService.GetAllSettingsAsync();
}
- private void ToggleDay(int day)
- {
- if (Settings.TaskRunnerDays.Contains(day))
- {
- Settings.TaskRunnerDays.Remove(day);
- }
- else
- {
- Settings.TaskRunnerDays.Add(day);
- }
- }
-
private async Task SaveSettings()
{
await SettingsService.SaveSettingsAsync(Settings);
GlobalNotificationService.AddSuccessMessage("Settings saved successfully", true);
}
- private async Task RunMaintenanceTasksNow()
- {
- try
- {
- await using var dbContext = await DbContextFactory.CreateDbContextAsync();
- var job = new TaskRunnerJob
- {
- Name = nameof(TaskRunnerJobType.Maintenance),
- RunDate = DateTime.UtcNow.Date,
- StartTime = TimeOnly.FromDateTime(DateTime.UtcNow),
- Status = TaskRunnerJobStatus.Pending,
- IsOnDemand = true
- };
-
- dbContext.TaskRunnerJobs.Add(job);
- await dbContext.SaveChangesAsync();
-
- // Refresh the history component to show the new job
- if (_taskRunnerHistoryComponent != null)
- {
- await _taskRunnerHistoryComponent.RefreshData();
- }
-
- Logger.LogInformation("Maintenance tasks manually queued.");
- GlobalNotificationService.AddSuccessMessage("Maintenance tasks queued. They will be executed on the next polling cycle (default every minute). Check the logs for details.", true);
- }
- catch (Exception ex)
- {
- GlobalNotificationService.AddErrorMessage($"Failed to start maintenance tasks: {ex}", true);
- }
- }
-
/// <summary>
/// Refreshes the data displayed on the page.
/// </summary>
private async Task RefreshData()
{
Settings = await SettingsService.GetAllSettingsAsync();
-
- // Refresh the history component to show the new job
- if (_taskRunnerHistoryComponent != null)
- {
- await _taskRunnerHistoryComponent.RefreshData();
- }
}
}
diff --git a/apps/server/Shared/AliasVault.Shared.Server/Services/ServerSettingsService.cs b/apps/server/Shared/AliasVault.Shared.Server/Services/ServerSettingsService.cs
index 5fa1b8cff..585fe26d5 100644
--- a/apps/server/Shared/AliasVault.Shared.Server/Services/ServerSettingsService.cs
+++ b/apps/server/Shared/AliasVault.Shared.Server/Services/ServerSettingsService.cs
@@ -237,12 +237,23 @@ public class ServerSettingsService(IAliasServerDbContextFactory dbContextFactory
await SetSettingAsync("MaxEmailsPerUser", model.MaxEmailsPerUser.ToString());
await SetSettingAsync("MarkUserInactiveAfterDays", model.MarkUserInactiveAfterDays.ToString());
await SetSettingAsync("MaxEmailsPerInactiveUser", model.MaxEmailsPerInactiveUser.ToString());
- await SetSettingAsync("MaintenanceTime", model.MaintenanceTime.ToString("HH:mm", CultureInfo.InvariantCulture));
- await SetSettingAsync("TaskRunnerDays", string.Join(",", model.TaskRunnerDays));
+ await SaveMaintenanceScheduleAsync(model.MaintenanceTime, model.TaskRunnerDays);
await SetSettingAsync("RefreshTokenLifetimeShort", model.RefreshTokenLifetimeShort.ToString());
await SetSettingAsync("RefreshTokenLifetimeLong", model.RefreshTokenLifetimeLong.ToString());
await SetSettingAsync("MaxRegistrationsPerIpPer24Hours", model.MaxRegistrationsPerIpPer24Hours.ToString());
await SetSettingAsync("MaxMobileLoginRequestsPerIpPerMinute", model.MaxMobileLoginRequestsPerIpPerMinute.ToString());
await SetSettingAsync("MobileLoginLogRetentionDays", model.MobileLoginLogRetentionDays.ToString());
}
+
+ /// <summary>
+ /// Saves the maintenance schedule settings async.
+ /// </summary>
+ /// <param name="maintenanceTime">The time of day at which maintenance tasks run.</param>
+ /// <param name="taskRunnerDays">The days of the week (1 = Monday) on which maintenance tasks run.</param>
+ /// <returns>A task.</returns>
+ public async Task SaveMaintenanceScheduleAsync(TimeOnly maintenanceTime, IEnumerable<int> taskRunnerDays)
+ {
+ await SetSettingAsync("MaintenanceTime", maintenanceTime.ToString("HH:mm", CultureInfo.InvariantCulture));
+ await SetSettingAsync("TaskRunnerDays", string.Join(",", taskRunnerDays));
+ }
}
diff --git a/apps/server/Tests/AliasVault.E2ETests/Tests/Admin/MaintenanceTests.cs b/apps/server/Tests/AliasVault.E2ETests/Tests/Admin/MaintenanceTests.cs
new file mode 100644
index 000000000..ec0902ad3
--- /dev/null
+++ b/apps/server/Tests/AliasVault.E2ETests/Tests/Admin/MaintenanceTests.cs
@@ -0,0 +1,73 @@
+//-----------------------------------------------------------------------
+// <copyright file="MaintenanceTests.cs" company="aliasvault">
+// Copyright (c) aliasvault. All rights reserved.
+// Licensed under the AGPLv3 license. See LICENSE.md file in the project root for full license information.
+// </copyright>
+//-----------------------------------------------------------------------
+
+namespace AliasVault.E2ETests.Tests.Admin;
+
+using Microsoft.EntityFrameworkCore;
+
+/// <summary>
+/// End-to-end tests for the maintenance page.
+/// </summary>
+[Parallelizable(ParallelScope.Self)]
+[Category("AdminTests")]
+[TestFixture]
+public class MaintenanceTests : AdminPlaywrightTest
+{
+ /// <summary>
+ /// Test if mutating the maintenance schedule works correctly.
+ /// </summary>
+ /// <returns>Async task.</returns>
+ [Test]
+ public async Task MaintenanceScheduleMutationTest()
+ {
+ // Navigate to maintenance page
+ await NavigateBrowser("maintenance");
+ await WaitForUrlAsync("maintenance", "Maintenance Schedule");
+
+ // Set maintenance time
+ await Page.Locator("input[id='schedule']").FillAsync("03:30");
+
+ // Uncheck Sunday and Saturday from maintenance days
+ await Page.Locator("input[id='day_6']").UncheckAsync(); // Saturday
+ await Page.Locator("input[id='day_7']").UncheckAsync(); // Sunday
+
+ // Save changes
+ var saveButton = Page.Locator("text=Save changes");
+ await saveButton.ClickAsync();
+
+ // Wait for success message
+ await WaitForUrlAsync("maintenance", "Settings saved successfully");
+
+ // Verify settings in database
+ var settings = await DbContext.ServerSettings.ToListAsync();
+
+ var maintenanceTime = settings.Find(s => s.Key == "MaintenanceTime");
+ Assert.That(maintenanceTime?.Value, Is.EqualTo("03:30"), "Maintenance time not saved correctly");
+
+ var taskRunnerDays = settings.Find(s => s.Key == "TaskRunnerDays");
+ Assert.That(taskRunnerDays?.Value, Is.EqualTo("1,2,3,4,5"), "Task runner days not saved correctly");
+
+ // Refresh page and verify values persist
+ await Page.ReloadAsync();
+ await WaitForUrlAsync("maintenance", "Maintenance Schedule");
+
+ // Wait for 0.5sec to ensure the page is fully loaded.
+ await Task.Delay(500);
+
+ var maintenanceTimeValue = await Page.Locator("input[id='schedule']").InputValueAsync();
+ Assert.That(maintenanceTimeValue, Does.Contain("03:30"), "Maintenance time value not persisted after refresh");
+
+ // Verify weekend days are still unchecked
+ var sundayChecked = await Page.Locator("input[id='day_7']").IsCheckedAsync();
+ var saturdayChecked = await Page.Locator("input[id='day_6']").IsCheckedAsync();
+ Assert.Multiple(() =>
+ {
+ Assert.That(sundayChecked, Is.False, "Sunday checkbox should be unchecked");
+ Assert.That(saturdayChecked, Is.False, "Saturday checkbox should be unchecked");
+ });
+ }
+}
diff --git a/apps/server/Tests/AliasVault.E2ETests/Tests/Admin/ServerSettingsTests.cs b/apps/server/Tests/AliasVault.E2ETests/Tests/Admin/ServerSettingsTests.cs
index 9d2dc224e..49eeaf8fb 100644
--- a/apps/server/Tests/AliasVault.E2ETests/Tests/Admin/ServerSettingsTests.cs
+++ b/apps/server/Tests/AliasVault.E2ETests/Tests/Admin/ServerSettingsTests.cs
@@ -33,15 +33,6 @@ public class ServerSettingsTests : AdminPlaywrightTest
await Page.Locator("input[id='authLogRetention']").FillAsync("120");
await Page.Locator("input[id='emailRetention']").FillAsync("60");
await Page.Locator("input[id='maxEmails']").FillAsync("200");
- await Page.Locator("input[id='markInactiveDays']").FillAsync("180");
- await Page.Locator("input[id='maxEmailsInactive']").FillAsync("50");
-
- // Set maintenance time
- await Page.Locator("input[id='schedule']").FillAsync("03:30");
-
- // Uncheck Sunday and Saturday from maintenance days
- await Page.Locator("input[id='day_6']").UncheckAsync(); // Saturday
- await Page.Locator("input[id='day_7']").UncheckAsync(); // Sunday
// Save changes
var saveButton = Page.Locator("text=Save changes");
@@ -66,19 +57,6 @@ public class ServerSettingsTests : AdminPlaywrightTest
var maxEmails = settings.Find(s => s.Key == "MaxEmailsPerUser");
Assert.That(maxEmails?.Value, Is.EqualTo("200"), "Max emails per user not saved correctly");
- var markInactiveDays = settings.Find(s => s.Key == "MarkUserInactiveAfterDays");
- Assert.That(markInactiveDays?.Value, Is.EqualTo("180"), "Mark user inactive after days not saved correctly");
-
- var maxEmailsInactive = settings.Find(s => s.Key == "MaxEmailsPerInactiveUser");
- Assert.That(maxEmailsInactive?.Value, Is.EqualTo("50"), "Max emails per inactive user not saved correctly");
-
- // Check maintenance schedule
- var maintenanceTime = settings.Find(s => s.Key == "MaintenanceTime");
- Assert.That(maintenanceTime?.Value, Is.EqualTo("03:30"), "Maintenance time not saved correctly");
-
- var taskRunnerDays = settings.Find(s => s.Key == "TaskRunnerDays");
- Assert.That(taskRunnerDays?.Value, Is.EqualTo("1,2,3,4,5"), "Task runner days not saved correctly");
-
// Refresh page and verify values persist
await Page.ReloadAsync();
await WaitForUrlAsync("settings/server", "Server settings");
@@ -89,16 +67,7 @@ public class ServerSettingsTests : AdminPlaywrightTest
var generalLogRetentionValue = await Page.Locator("input[id='generalLogRetention']").InputValueAsync();
Assert.That(generalLogRetentionValue, Is.EqualTo("45"), "General log retention value not persisted after refresh");
- var maintenanceTimeValue = await Page.Locator("input[id='schedule']").InputValueAsync();
- Assert.That(maintenanceTimeValue, Does.Contain("03:30"), "Maintenance time value not persisted after refresh");
-
- // Verify weekend days are still unchecked
- var sundayChecked = await Page.Locator("input[id='day_7']").IsCheckedAsync();
- var saturdayChecked = await Page.Locator("input[id='day_6']").IsCheckedAsync();
- Assert.Multiple(() =>
- {
- Assert.That(sundayChecked, Is.False, "Sunday checkbox should be unchecked");
- Assert.That(saturdayChecked, Is.False, "Saturday checkbox should be unchecked");
- });
+ var maxEmailsValue = await Page.Locator("input[id='maxEmails']").InputValueAsync();
+ Assert.That(maxEmailsValue, Is.EqualTo("200"), "Max emails per user value not persisted after refresh");
}
}