Privacy-first password manager with built-in email aliasing. Fully encrypted and self-hostable.
Refactor existing API and models to use explicit v1 (#2159)
Leendert de Borst5f4eb2a0a2cd
diff --git a/apps/server/AliasVault.Admin/Main/Pages/Users/Users.razor b/apps/server/AliasVault.Admin/Main/Pages/Users/Users.razorindex e030ba33a..3184c2f81 100644--- a/apps/server/AliasVault.Admin/Main/Pages/Users/Users.razor+++ b/apps/server/AliasVault.Admin/Main/Pages/Users/Users.razor@@ -199,7 +199,7 @@ elseu.TwoFactorEnabled,u.Blocked,u.LastActivityDate,- Vaults = u.Vaults.Select(v => new+ Vaults = u.VaultManifests.Select(v => new{v.FileSize,v.CreatedAt,@@ -342,13 +342,13 @@ elsebreak;case "VaultCount":query = SortDirection == SortDirection.Ascending- ? query.OrderBy(x => x.Vaults.Count)- : query.OrderByDescending(x => x.Vaults.Count);+ ? query.OrderBy(x => x.VaultManifests.Count)+ : query.OrderByDescending(x => x.VaultManifests.Count);break;case "CredentialCount":query = SortDirection == SortDirection.Ascending- ? query.OrderBy(x => x.Vaults.OrderByDescending(x => x.RevisionNumber).First().CredentialsCount)- : query.OrderByDescending(x => x.Vaults.OrderByDescending(x => x.RevisionNumber).First().CredentialsCount);+ ? query.OrderBy(x => x.VaultManifests.OrderByDescending(x => x.RevisionNumber).First().CredentialsCount)+ : query.OrderByDescending(x => x.VaultManifests.OrderByDescending(x => x.RevisionNumber).First().CredentialsCount);break;case "EmailClaimCount":query = SortDirection == SortDirection.Ascending@@ -357,8 +357,8 @@ elsebreak;case "VaultStorageInKb":query = SortDirection == SortDirection.Ascending- ? query.OrderBy(x => x.Vaults.Sum(v => v.FileSize))- : query.OrderByDescending(x => x.Vaults.Sum(v => v.FileSize));+ ? query.OrderBy(x => x.VaultManifests.Sum(v => v.FileSize))+ : query.OrderByDescending(x => x.VaultManifests.Sum(v => v.FileSize));break;case "LastActivityDate":query = SortDirection == SortDirection.Ascendingdiff --git a/apps/server/AliasVault.Admin/Main/Pages/Users/View/Components/RelatedUsersTable.razor b/apps/server/AliasVault.Admin/Main/Pages/Users/View/Components/RelatedUsersTable.razorindex 5107c750a..c0d00de2d 100644--- a/apps/server/AliasVault.Admin/Main/Pages/Users/View/Components/RelatedUsersTable.razor+++ b/apps/server/AliasVault.Admin/Main/Pages/Users/View/Components/RelatedUsersTable.razor@@ -156,9 +156,9 @@ else// Get vault statistics for all related users (from their latest vault)var userIds = users.Select(u => u.Id).ToList();- var vaultStats = await dbContext.Vaults- .Where(v => userIds.Contains(v.UserId))- .GroupBy(v => v.UserId)+ var vaultStats = await dbContext.VaultManifests+ .Where(v => userIds.Contains(v.OwnerUserId))+ .GroupBy(v => v.OwnerUserId).Select(g => new{UserId = g.Key,diff --git a/apps/server/AliasVault.Admin/Main/Pages/Users/View/Components/VaultTable.razor b/apps/server/AliasVault.Admin/Main/Pages/Users/View/Components/VaultTable.razorindex 5bdbfd4ce..8473d86fa 100644--- a/apps/server/AliasVault.Admin/Main/Pages/Users/View/Components/VaultTable.razor+++ b/apps/server/AliasVault.Admin/Main/Pages/Users/View/Components/VaultTable.razor@@ -4,7 +4,7 @@@foreach (var entry in SortedVaultList){<SortableTableRow>- <SortableTableColumn IsPrimary="true">@entry.Id</SortableTableColumn>+ <SortableTableColumn IsPrimary="true">@entry.RevisionId</SortableTableColumn><SortableTableColumn>@entry.CreatedAt.ToString("yyyy-MM-dd HH:mm")</SortableTableColumn><SortableTableColumn>@Math.Round((double)entry.FileSize / 1024, 1) MB</SortableTableColumn><SortableTableColumn>@entry.Version</SortableTableColumn>@@ -38,20 +38,20 @@/// Gets or sets the list of vaults to display./// </summary>[Parameter]- public List<Vault> VaultList { get; set; } = [];+ public List<VaultManifest> VaultList { get; set; } = [];/// <summary>/// Gets or sets the event callback to make a vault current./// </summary>[Parameter]- public EventCallback<Vault> OnMakeCurrent { get; set; }+ public EventCallback<VaultManifest> OnMakeCurrent { get; set; }private string SortColumn { get; set; } = "RevisionNumber";private SortDirection SortDirection { get; set; } = SortDirection.Descending;- private Vault? _previousEntry;+ private VaultManifest? _previousEntry;private readonly List<TableColumn> _vaultTableColumns = [- new TableColumn { Title = "ID", PropertyName = "Id" },+ new TableColumn { Title = "ID", PropertyName = "RevisionId" },new TableColumn { Title = "Created", PropertyName = "CreatedAt" },new TableColumn { Title = "Filesize", PropertyName = "FileSize" },new TableColumn { Title = "DB version", PropertyName = "Version" },@@ -63,9 +63,9 @@new TableColumn { Title = "Actions", Sortable = false },];- private IEnumerable<Vault> SortedVaultList => SortList(VaultList, SortColumn, SortDirection);+ private IEnumerable<VaultManifest> SortedVaultList => SortList(VaultList, SortColumn, SortDirection);- private Vault? LatestVault => VaultList.MaxBy(v => v.RevisionNumber);+ private VaultManifest? LatestVault => VaultList.MaxBy(v => v.RevisionNumber);private void HandleSortChanged((string column, SortDirection direction) sort){@@ -74,11 +74,11 @@StateHasChanged();}- private static IEnumerable<Vault> SortList(List<Vault> vaults, string sortColumn, SortDirection sortDirection)+ private static IEnumerable<VaultManifest> SortList(List<VaultManifest> vaults, string sortColumn, SortDirection sortDirection){return sortColumn switch{- "Id" => SortableTable.SortListByProperty(vaults, v => v.Id, sortDirection),+ "RevisionId" => SortableTable.SortListByProperty(vaults, v => v.RevisionId, sortDirection),"CreatedAt" => SortableTable.SortListByProperty(vaults, v => v.CreatedAt, sortDirection),"UpdatedAt" => SortableTable.SortListByProperty(vaults, v => v.UpdatedAt, sortDirection),"FileSize" => SortableTable.SortListByProperty(vaults, v => v.FileSize, sortDirection),@@ -94,7 +94,7 @@/// <summary>/// Checks if the password has changed between the current and previous vault entry based on revision number../// </summary>- private static bool HasPasswordChanged(Vault current, IEnumerable<Vault> vaultList)+ private static bool HasPasswordChanged(VaultManifest current, IEnumerable<VaultManifest> vaultList){// Get the previous vault entry to compare to based on revision number.var previousEntry = vaultList.FirstOrDefault(v => v.RevisionNumber == current.RevisionNumber - 1);@@ -108,7 +108,7 @@return current.Salt != previousEntry.Salt || current.Verifier != previousEntry.Verifier;}- private async Task MakeCurrentAsync(Vault vault)+ private async Task MakeCurrentAsync(VaultManifest vault){await OnMakeCurrent.InvokeAsync(vault);}diff --git a/apps/server/AliasVault.Admin/Main/Pages/Users/View/Index.razor b/apps/server/AliasVault.Admin/Main/Pages/Users/View/Index.razorindex 1fd0b24a4..392680d61 100644--- a/apps/server/AliasVault.Admin/Main/Pages/Users/View/Index.razor+++ b/apps/server/AliasVault.Admin/Main/Pages/Users/View/Index.razor@@ -303,7 +303,7 @@ elseprivate AliasVaultUser? User { get; set; } = new();private int TwoFactorKeysCount { get; set; }private List<AliasVaultUserRefreshToken> RefreshTokenList { get; set; } = [];- private List<Vault> VaultList { get; set; } = [];+ private List<VaultManifest> VaultList { get; set; } = [];private List<AuthLog> AuthLogList { get; set; } = [];private UserUsageStatistics? UserUsageStats { get; set; }private bool IsEditingEmailLimits { get; set; }@@ -383,9 +383,12 @@ else.ToListAsync();// Load all vaults for this user (do not load the actual file content for performance reasons).- VaultList = await dbContext.Vaults.Where(x => x.UserId == User.Id).Select(x => new Vault+ VaultList = await dbContext.VaultManifests.Where(x => x.OwnerUserId == User.Id).Select(x => new VaultManifest{- Id = x.Id,+ RevisionId = x.RevisionId,+ ManifestId = x.ManifestId,+ Category = x.Category,+ StorageFormat = x.StorageFormat,Version = x.Version,RevisionNumber = x.RevisionNumber,FileSize = x.FileSize,@@ -502,7 +505,7 @@ else/// Handles the action of making a vault the current one./// </summary>/// <param name="vault">The vault to make current.</param>- private async Task MakeCurrentAsync(Vault vault)+ private async Task MakeCurrentAsync(VaultManifest vault){await using var dbContext = await DbContextFactory.CreateDbContextAsync();if (await ConfirmModalService.ShowConfirmation(@@ -516,7 +519,7 @@ Important notes:Do you want to proceed with the restoration?")) {// Load vault- var currentVault = await dbContext.Vaults.FindAsync(vault.Id);+ var currentVault = await dbContext.VaultManifests.FindAsync(vault.RevisionId);if (currentVault == null){return;diff --git a/apps/server/AliasVault.Admin/Services/StatisticsService.cs b/apps/server/AliasVault.Admin/Services/StatisticsService.csindex 426f0b718..626b7746c 100644--- a/apps/server/AliasVault.Admin/Services/StatisticsService.cs+++ b/apps/server/AliasVault.Admin/Services/StatisticsService.cs@@ -137,13 +137,13 @@ public class StatisticsServiceawait using var context = await _contextFactory.CreateDbContextAsync();// Get total count- var totalCount = await context.Vaults- .GroupBy(v => v.UserId)+ var totalCount = await context.VaultManifests+ .GroupBy(v => v.OwnerUserId).CountAsync();// Get paginated data- var topUsers = await context.Vaults- .GroupBy(v => v.UserId)+ var topUsers = await context.VaultManifests+ .GroupBy(v => v.OwnerUserId).Select(g => new{UserId = g.Key,@@ -272,13 +272,13 @@ public class StatisticsServiceawait using var context = await _contextFactory.CreateDbContextAsync();// Get total count - using latest vault for each user- var totalCount = await context.Vaults- .GroupBy(v => v.UserId)+ var totalCount = await context.VaultManifests+ .GroupBy(v => v.OwnerUserId).CountAsync();// Get paginated data - using latest vault version for each user- var topUsers = await context.Vaults- .GroupBy(v => v.UserId)+ var topUsers = await context.VaultManifests+ .GroupBy(v => v.OwnerUserId).Select(g => new{UserId = g.Key,@@ -318,8 +318,8 @@ public class StatisticsServicevar cutoffDate = DateTime.UtcNow.AddHours(-72);// Get latest vault for this user to get credential and email claim counts- var latestVault = await context.Vaults- .Where(v => v.UserId == userId)+ var latestVault = await context.VaultManifests+ .Where(v => v.OwnerUserId == userId).OrderByDescending(v => v.RevisionNumber).FirstOrDefaultAsync();@@ -345,8 +345,8 @@ public class StatisticsService// Get recent statistics (last 72 hours) - this is approximated since we don't have creation timestamps on individual credentials// For recent credentials and email claims, we'll use vault versions created in the last 72h as a proxy- var recentVaultVersions = await context.Vaults- .Where(v => v.UserId == userId && v.CreatedAt >= cutoffDate)+ var recentVaultVersions = await context.VaultManifests+ .Where(v => v.OwnerUserId == userId && v.CreatedAt >= cutoffDate).ToListAsync();if (recentVaultVersions.Count > 0)diff --git a/apps/server/AliasVault.Api/Controllers/Tests/TestController.cs b/apps/server/AliasVault.Api/Controllers/Tests/TestController.csindex 153e8ac2e..b09bb6aa4 100644--- a/apps/server/AliasVault.Api/Controllers/Tests/TestController.cs+++ b/apps/server/AliasVault.Api/Controllers/Tests/TestController.cs@@ -100,8 +100,8 @@ public class TestController(await using var context = await dbContextFactory.CreateDbContextAsync();// Get the newest revisions to delete- var revisionsToDelete = await context.Vaults- .Where(v => v.UserId == user.Id)+ var revisionsToDelete = await context.VaultManifests+ .Where(v => v.OwnerUserId == user.Id).OrderByDescending(v => v.RevisionNumber).Take(count).ToListAsync();@@ -112,7 +112,7 @@ public class TestController(}// Delete the revisions- context.Vaults.RemoveRange(revisionsToDelete);+ context.VaultManifests.RemoveRange(revisionsToDelete);var deletedCount = await context.SaveChangesAsync();return Ok(new@@ -144,8 +144,8 @@ public class TestController(await using var context = await dbContextFactory.CreateDbContextAsync();- var revisions = await context.Vaults- .Where(v => v.UserId == user.Id)+ var revisions = await context.VaultManifests+ .Where(v => v.OwnerUserId == user.Id).OrderByDescending(v => v.RevisionNumber).Select(v => new{@@ -268,8 +268,8 @@ public class TestController(return NotFound($"User '{username}' not found");}- var revisions = await context.Vaults- .Where(v => v.UserId == user.Id)+ var revisions = await context.VaultManifests+ .Where(v => v.OwnerUserId == user.Id).OrderByDescending(v => v.RevisionNumber).Select(v => new{@@ -320,8 +320,8 @@ public class TestController(}// Get the newest revisions to delete- var revisionsToDelete = await context.Vaults- .Where(v => v.UserId == user.Id)+ var revisionsToDelete = await context.VaultManifests+ .Where(v => v.OwnerUserId == user.Id).OrderByDescending(v => v.RevisionNumber).Take(count).ToListAsync();@@ -332,7 +332,7 @@ public class TestController(}// Delete the revisions- context.Vaults.RemoveRange(revisionsToDelete);+ context.VaultManifests.RemoveRange(revisionsToDelete);await context.SaveChangesAsync();return Ok(newdiff --git a/apps/server/AliasVault.Api/Controllers/AuthController.cs b/apps/server/AliasVault.Api/Controllers/V1/AuthController.cssimilarity index 99%rename from apps/server/AliasVault.Api/Controllers/AuthController.csrename to apps/server/AliasVault.Api/Controllers/V1/AuthController.csindex 0df87a46d..27ffe8d64 100644--- a/apps/server/AliasVault.Api/Controllers/AuthController.cs+++ b/apps/server/AliasVault.Api/Controllers/V1/AuthController.cs@@ -5,7 +5,7 @@// </copyright>//------------------------------------------------------------------------namespace AliasVault.Api.Controllers;+namespace AliasVault.Api.Controllers.V1;using System.IdentityModel.Tokens.Jwt;using System.Security.Claims;@@ -21,8 +21,8 @@ using AliasVault.Cryptography.Server;using AliasVault.Shared.Core;using AliasVault.Shared.Models.Enums;using AliasVault.Shared.Models.WebApi;-using AliasVault.Shared.Models.WebApi.Auth;-using AliasVault.Shared.Models.WebApi.PasswordChange;+using AliasVault.Shared.Models.WebApi.V1.Auth;+using AliasVault.Shared.Models.WebApi.V1.PasswordChange;using AliasVault.Shared.Providers.Time;using AliasVault.Shared.Server.Services;using AliasVault.Shared.Server.Utilities;@@ -98,7 +98,7 @@ public class AuthController(IAliasServerDbContextFactory dbContextFactory, UserM}// Get latest vault revision number- var latestVault = user.Vaults.OrderByDescending(x => x.RevisionNumber).FirstOrDefault();+ var latestVault = user.VaultManifests.OrderByDescending(x => x.RevisionNumber).FirstOrDefault();var latestRevision = latestVault?.RevisionNumber ?? 0;// Check client version compatibility if header is provided@@ -475,9 +475,12 @@ public class AuthController(IAliasServerDbContextFactory dbContextFactory, UserMPasswordChangedAt = timeProvider.UtcNow,};- user.Vaults.Add(new AliasServerDb.Vault+ user.VaultManifests.Add(new AliasServerDb.VaultManifest{+ ManifestId = Guid.NewGuid(),+ Category = AliasVault.Shared.Models.WebApi.V2.Vault.VaultManifestCategory.Main,VaultBlob = string.Empty,+ StorageFormat = "sqlite-blob",Version = "0.0.0",RevisionNumber = 0,Salt = model.Salt,diff --git a/apps/server/AliasVault.Api/Controllers/Email/EmailBoxController.cs b/apps/server/AliasVault.Api/Controllers/V1/Email/EmailBoxController.cssimilarity index 98%rename from apps/server/AliasVault.Api/Controllers/Email/EmailBoxController.csrename to apps/server/AliasVault.Api/Controllers/V1/Email/EmailBoxController.csindex bc34d4964..710b8b919 100644--- a/apps/server/AliasVault.Api/Controllers/Email/EmailBoxController.cs+++ b/apps/server/AliasVault.Api/Controllers/V1/Email/EmailBoxController.cs@@ -5,14 +5,14 @@// </copyright>//------------------------------------------------------------------------namespace AliasVault.Api.Controllers.Email;+namespace AliasVault.Api.Controllers.V1.Email;using AliasServerDb;using AliasVault.Api.Controllers.Abstracts;using AliasVault.Auth.IpAddress;using AliasVault.Shared.Models.Spamok;using AliasVault.Shared.Models.WebApi;-using AliasVault.Shared.Models.WebApi.Email;+using AliasVault.Shared.Models.WebApi.V1.Email;using Asp.Versioning;using Microsoft.AspNetCore.Identity;using Microsoft.AspNetCore.Mvc;diff --git a/apps/server/AliasVault.Api/Controllers/Email/EmailController.cs b/apps/server/AliasVault.Api/Controllers/V1/Email/EmailController.cssimilarity index 98%rename from apps/server/AliasVault.Api/Controllers/Email/EmailController.csrename to apps/server/AliasVault.Api/Controllers/V1/Email/EmailController.csindex 81543937f..28d9cbd3a 100644--- a/apps/server/AliasVault.Api/Controllers/Email/EmailController.cs+++ b/apps/server/AliasVault.Api/Controllers/V1/Email/EmailController.cs@@ -5,7 +5,7 @@// </copyright>//------------------------------------------------------------------------namespace AliasVault.Api.Controllers.Email;+namespace AliasVault.Api.Controllers.V1.Email;using AliasServerDb;using AliasVault.Api.Controllers.Abstracts;@@ -24,7 +24,7 @@ using Microsoft.EntityFrameworkCore;/// <param name="userManager">UserManager instance.</param>/// <param name="ipBlockListService">IpBlockListService used to shadow-block email retrieval from blocked IPs.</param>[ApiVersion("1")]-public class EmailController(ILogger<VaultController> logger, IAliasServerDbContextFactory dbContextFactory, UserManager<AliasVaultUser> userManager, IpBlockListService ipBlockListService) : AuthenticatedRequestController(userManager)+public class EmailController(ILogger<EmailController> logger, IAliasServerDbContextFactory dbContextFactory, UserManager<AliasVaultUser> userManager, IpBlockListService ipBlockListService) : AuthenticatedRequestController(userManager){/// <summary>/// Get the email with the specified ID.diff --git a/apps/server/AliasVault.Api/Controllers/FaviconController.cs b/apps/server/AliasVault.Api/Controllers/V1/FaviconController.cssimilarity index 97%rename from apps/server/AliasVault.Api/Controllers/FaviconController.csrename to apps/server/AliasVault.Api/Controllers/V1/FaviconController.csindex 7ad6f2d52..23c8d8984 100644--- a/apps/server/AliasVault.Api/Controllers/FaviconController.cs+++ b/apps/server/AliasVault.Api/Controllers/V1/FaviconController.cs@@ -5,12 +5,12 @@// </copyright>//------------------------------------------------------------------------namespace AliasVault.Api.Controllers;+namespace AliasVault.Api.Controllers.V1;using AliasServerDb;using AliasVault.Api.Controllers.Abstracts;using AliasVault.Api.Services;-using AliasVault.Shared.Models.WebApi.Favicon;+using AliasVault.Shared.Models.WebApi.V1.Favicon;using Asp.Versioning;using Microsoft.AspNetCore.Identity;using Microsoft.AspNetCore.Mvc;diff --git a/apps/server/AliasVault.Api/Controllers/IdentityController.cs b/apps/server/AliasVault.Api/Controllers/V1/IdentityController.cssimilarity index 98%rename from apps/server/AliasVault.Api/Controllers/IdentityController.csrename to apps/server/AliasVault.Api/Controllers/V1/IdentityController.csindex d4388de5b..1d52df9e7 100644--- a/apps/server/AliasVault.Api/Controllers/IdentityController.cs+++ b/apps/server/AliasVault.Api/Controllers/V1/IdentityController.cs@@ -5,7 +5,7 @@// </copyright>//------------------------------------------------------------------------namespace AliasVault.Api.Controllers;+namespace AliasVault.Api.Controllers.V1;using AliasServerDb;using AliasVault.Api.Controllers.Abstracts;diff --git a/apps/server/AliasVault.Api/Controllers/Security/SecurityController.cs b/apps/server/AliasVault.Api/Controllers/V1/Security/SecurityController.cssimilarity index 97%rename from apps/server/AliasVault.Api/Controllers/Security/SecurityController.csrename to apps/server/AliasVault.Api/Controllers/V1/Security/SecurityController.csindex b4545cb8b..93aac602e 100644--- a/apps/server/AliasVault.Api/Controllers/Security/SecurityController.cs+++ b/apps/server/AliasVault.Api/Controllers/V1/Security/SecurityController.cs@@ -5,12 +5,12 @@// </copyright>//------------------------------------------------------------------------namespace AliasVault.Api.Controllers.Security;+namespace AliasVault.Api.Controllers.V1.Security;using AliasServerDb;using AliasVault.Api.Controllers.Abstracts;using AliasVault.Shared.Models.Enums;-using AliasVault.Shared.Models.WebApi.Security;+using AliasVault.Shared.Models.WebApi.V1.Security;using Asp.Versioning;using Microsoft.AspNetCore.Identity;using Microsoft.AspNetCore.Mvc;diff --git a/apps/server/AliasVault.Api/Controllers/Security/TwoFactorAuthController.cs b/apps/server/AliasVault.Api/Controllers/V1/Security/TwoFactorAuthController.cssimilarity index 99%rename from apps/server/AliasVault.Api/Controllers/Security/TwoFactorAuthController.csrename to apps/server/AliasVault.Api/Controllers/V1/Security/TwoFactorAuthController.csindex 2ccf38509..719dc1615 100644--- a/apps/server/AliasVault.Api/Controllers/Security/TwoFactorAuthController.cs+++ b/apps/server/AliasVault.Api/Controllers/V1/Security/TwoFactorAuthController.cs@@ -5,7 +5,7 @@// </copyright>//------------------------------------------------------------------------namespace AliasVault.Api.Controllers.Security;+namespace AliasVault.Api.Controllers.V1.Security;using System.Text.Encodings.Web;using AliasServerDb;diff --git a/apps/server/AliasVault.Api/Controllers/VaultController.cs b/apps/server/AliasVault.Api/Controllers/V1/VaultController.cssimilarity index 86%rename from apps/server/AliasVault.Api/Controllers/VaultController.csrename to apps/server/AliasVault.Api/Controllers/V1/VaultController.csindex 22809505a..fee8ad2da 100644--- a/apps/server/AliasVault.Api/Controllers/VaultController.cs+++ b/apps/server/AliasVault.Api/Controllers/V1/VaultController.cs@@ -5,7 +5,7 @@// </copyright>//------------------------------------------------------------------------namespace AliasVault.Api.Controllers;+namespace AliasVault.Api.Controllers.V1;using System.ComponentModel.DataAnnotations;using AliasServerDb;@@ -17,8 +17,8 @@ using AliasVault.Auth;using AliasVault.Cryptography.Client;using AliasVault.Shared.Models.Enums;using AliasVault.Shared.Models.WebApi;-using AliasVault.Shared.Models.WebApi.PasswordChange;-using AliasVault.Shared.Models.WebApi.Vault;+using AliasVault.Shared.Models.WebApi.V1.PasswordChange;+using AliasVault.Shared.Models.WebApi.V1.Vault;using AliasVault.Shared.Providers.Time;using AliasVault.Shared.Server.Services;using Asp.Versioning;@@ -72,9 +72,16 @@ public class VaultController(ILogger<VaultController> logger, IAliasServerDbContreturn Unauthorized();}+ // v2 storage-format guard: once the user has migrated to manifest-v1, v1 vault endpoints refuse to serve so+ // outdated clients can't accidentally overwrite the new format with a legacy SQLite blob.+ if (await HasMigratedToV2(context, user.Id))+ {+ return UpgradeRequired();+ }+// Logic to retrieve vault for the user.- var vault = await context.Vaults- .Where(x => x.UserId == user.Id)+ var vault = await context.VaultManifests+ .Where(x => x.OwnerUserId == user.Id).OrderByDescending(x => x.RevisionNumber).FirstOrDefaultAsync();@@ -82,10 +89,10 @@ public class VaultController(ILogger<VaultController> logger, IAliasServerDbCont// as starting point.if (vault == null){- return Ok(new Shared.Models.WebApi.Vault.VaultGetResponse+ return Ok(new Shared.Models.WebApi.V1.Vault.VaultGetResponse{Status = VaultStatus.Ok,- Vault = new Shared.Models.WebApi.Vault.Vault+ Vault = new Shared.Models.WebApi.V1.Vault.Vault{Username = user.UserName!,Blob = string.Empty,@@ -106,10 +113,10 @@ public class VaultController(ILogger<VaultController> logger, IAliasServerDbContvar publicEmailDomainList = new List<string>(["spamok.com", "solarflarecorp.com", "spamok.nl", "3060.nl","landmail.nl", "asdasd.nl", "spamok.de", "spamok.com.ua", "spamok.es", "spamok.fr"]);- return Ok(new Shared.Models.WebApi.Vault.VaultGetResponse+ return Ok(new Shared.Models.WebApi.V1.Vault.VaultGetResponse{Status = VaultStatus.Ok,- Vault = new Shared.Models.WebApi.Vault.Vault+ Vault = new Shared.Models.WebApi.V1.Vault.Vault{Username = user.UserName!,Blob = vault.VaultBlob,@@ -133,7 +140,7 @@ public class VaultController(ILogger<VaultController> logger, IAliasServerDbCont/// <param name="clientHeader">Client header.</param>/// <returns>IActionResult.</returns>[HttpPost("")]- public async Task<IActionResult> Update([FromBody] Shared.Models.WebApi.Vault.Vault model, [FromHeader(Name = "X-AliasVault-Client")] string? clientHeader)+ public async Task<IActionResult> Update([FromBody] Shared.Models.WebApi.V1.Vault.Vault model, [FromHeader(Name = "X-AliasVault-Client")] string? clientHeader){await using var context = await dbContextFactory.CreateDbContextAsync();@@ -143,6 +150,11 @@ public class VaultController(ILogger<VaultController> logger, IAliasServerDbContreturn Unauthorized();}+ if (await HasMigratedToV2(context, user.Id))+ {+ return UpgradeRequired();+ }+// Compare the logged-in username with the username in the provided vault model.// If they do not match reject the request. This is important because it's// possible that a user has logged in with a different username than the one@@ -153,7 +165,7 @@ public class VaultController(ILogger<VaultController> logger, IAliasServerDbCont}// Retrieve latest vault of user which contains the current encryption settings.- var latestVault = user.Vaults.OrderByDescending(x => x.RevisionNumber).Select(x => new { x.Salt, x.Verifier, x.EncryptionType, x.EncryptionSettings, x.RevisionNumber, x.Version }).First();+ var latestVault = user.VaultManifests.OrderByDescending(x => x.RevisionNumber).Select(x => new { x.Salt, x.Verifier, x.EncryptionType, x.EncryptionSettings, x.RevisionNumber, x.Version, x.ManifestId }).First();// Reject vaults with a version that is lower than the last vault version.if (VersionHelper.IsVersionOlder(model.Version, latestVault.Version))@@ -172,10 +184,15 @@ public class VaultController(ILogger<VaultController> logger, IAliasServerDbCont}// Create new vault entry with salt and verifier of current vault.- var newVault = new AliasServerDb.Vault+ var newVault = new AliasServerDb.VaultManifest{- UserId = user.Id,+ OwnerUserId = user.Id,++ // Legacy revision of the same logical main manifest — reuse the existing ManifestId to keep it grouped.+ ManifestId = latestVault.ManifestId,+ Category = AliasVault.Shared.Models.WebApi.V2.Vault.VaultManifestCategory.Main,VaultBlob = model.Blob,+ StorageFormat = "sqlite-blob",Version = model.Version,RevisionNumber = newRevisionNumber,FileSize = FileHelper.Base64StringToKilobytes(model.Blob),@@ -194,7 +211,7 @@ public class VaultController(ILogger<VaultController> logger, IAliasServerDbContawait ApplyVaultRetention(context, user.Id, newVault);// Add the new vault and commit to database.- context.Vaults.Add(newVault);+ context.VaultManifests.Add(newVault);await context.SaveChangesAsync();// Update user email claims if email addresses have been supplied.@@ -231,6 +248,11 @@ public class VaultController(ILogger<VaultController> logger, IAliasServerDbContreturn Unauthorized();}+ if (await HasMigratedToV2(context, user.Id))+ {+ return UpgradeRequired();+ }+// Compare the logged-in username with the username in the provided vault model.// If they do not match reject the request. This is important because it's// possible that a user has logged in with a different username than the one@@ -253,7 +275,7 @@ public class VaultController(ILogger<VaultController> logger, IAliasServerDbCont// Check if the provided revision number is equal to the latest revision number.// If not, then the client is trying to update an older vault which we don't allow to prevent data loss.- var latestVault = user.Vaults.OrderByDescending(x => x.RevisionNumber).First();+ var latestVault = user.VaultManifests.OrderByDescending(x => x.RevisionNumber).First();if (VersionHelper.IsVersionOlder(model.Version, latestVault.Version)){return BadRequest(ApiErrorCodeHelper.CreateValidationErrorResponse(ApiErrorCode.VAULT_NOT_UP_TO_DATE, 400));@@ -270,10 +292,15 @@ public class VaultController(ILogger<VaultController> logger, IAliasServerDbCont}// Create new vault entry with salt and verifier of current vault.- var newVault = new AliasServerDb.Vault+ var newVault = new AliasServerDb.VaultManifest{- UserId = user.Id,+ OwnerUserId = user.Id,++ // Legacy revision of the same logical main manifest — reuse the existing ManifestId to keep it grouped.+ ManifestId = latestVault.ManifestId,+ Category = AliasVault.Shared.Models.WebApi.V2.Vault.VaultManifestCategory.Main,VaultBlob = model.Blob,+ StorageFormat = "sqlite-blob",Version = model.Version,RevisionNumber = newRevisionNumber,CredentialsCount = model.CredentialsCount,@@ -292,7 +319,7 @@ public class VaultController(ILogger<VaultController> logger, IAliasServerDbContawait ApplyVaultRetention(context, user.Id, newVault);// Add the new vault and commit to database.- context.Vaults.Add(newVault);+ context.VaultManifests.Add(newVault);await context.SaveChangesAsync();// Update the password last changed at timestamp for user.@@ -310,6 +337,30 @@ public class VaultController(ILogger<VaultController> logger, IAliasServerDbContreturn Ok(new VaultUpdateResponse { Status = VaultStatus.Ok, NewRevisionNumber = newRevisionNumber });}+ /// <summary>+ /// True once the user has any vault row in the v2 (manifest-v1) storage format. Used by the legacy v1+ /// endpoints to refuse to serve outdated clients and stop them from clobbering the new format with a+ /// legacy SQLite blob.+ /// </summary>+ private static async Task<bool> HasMigratedToV2(AliasServerDbContext context, string userId)+ {+ return await context.VaultManifests.AnyAsync(x => x.OwnerUserId == userId && x.StorageFormat == "manifest-v1");+ }++ /// <summary>+ /// HTTP 426 Upgrade Required — returned to legacy v1 clients hitting a migrated user.+ /// </summary>+ private IActionResult UpgradeRequired()+ {+ return StatusCode(+ 426,+ new+ {+ error = "upgrade_required",+ message = "Your client is out of date. Please update to access this vault.",+ });+ }+/// <summary>/// Apply vault retention policies to the user's vaults and delete the ones that are not covered/// by the retention policies.@@ -317,19 +368,22 @@ public class VaultController(ILogger<VaultController> logger, IAliasServerDbCont/// <param name="context">Database context.</param>/// <param name="userId">User ID.</param>/// <param name="newVault">New vault object.</param>- private async Task ApplyVaultRetention(AliasServerDbContext context, string userId, AliasServerDb.Vault newVault)+ private async Task ApplyVaultRetention(AliasServerDbContext context, string userId, AliasServerDb.VaultManifest newVault){// Run the vault retention manager to keep the required vaults according// to the applied retention policies and delete the rest.// We only select the Id and UpdatedAt fields to reduce the amount of data transferred from the database.- var existingVaults = await context.Vaults- .Where(x => x.UserId == userId)+ var existingVaults = await context.VaultManifests+ .Where(x => x.OwnerUserId == userId).OrderByDescending(v => v.UpdatedAt)- .Select(x => new AliasServerDb.Vault+ .Select(x => new AliasServerDb.VaultManifest{- Id = x.Id,- UserId = x.UserId,+ RevisionId = x.RevisionId,+ ManifestId = x.ManifestId,+ Category = x.Category,+ OwnerUserId = x.OwnerUserId,VaultBlob = string.Empty,+ StorageFormat = x.StorageFormat,Version = x.Version,RevisionNumber = x.RevisionNumber,FileSize = x.FileSize,@@ -348,7 +402,7 @@ public class VaultController(ILogger<VaultController> logger, IAliasServerDbContvar vaultsToDelete = VaultRetentionManager.ApplyRetention(_retentionPolicy, existingVaults, timeProvider.UtcNow, newVault);// Delete vaults that are not needed anymore.- context.Vaults.RemoveRange(vaultsToDelete);+ context.VaultManifests.RemoveRange(vaultsToDelete);}/// <summary>diff --git a/apps/server/AliasVault.Api/Helpers/AuthHelper.cs b/apps/server/AliasVault.Api/Helpers/AuthHelper.csindex d79b263ae..e0e1aac4d 100644--- a/apps/server/AliasVault.Api/Helpers/AuthHelper.cs+++ b/apps/server/AliasVault.Api/Helpers/AuthHelper.cs@@ -75,7 +75,7 @@ public static class AuthHelperpublic static (string Salt, string Verifier, string EncryptionType, string EncryptionSettings) GetUserLatestVaultEncryptionSettings(AliasVaultUser user){// Retrieve latest vault of user which contains the encryption settings.- var latestVault = user.Vaults.OrderByDescending(x => x.RevisionNumber).Select(x => new { x.Salt, x.Verifier, x.EncryptionType, x.EncryptionSettings }).First();+ var latestVault = user.VaultManifests.OrderByDescending(x => x.RevisionNumber).Select(x => new { x.Salt, x.Verifier, x.EncryptionType, x.EncryptionSettings }).First();return (latestVault.Salt, latestVault.Verifier, latestVault.EncryptionType, latestVault.EncryptionSettings);}diff --git a/apps/server/AliasVault.Api/Vault/RetentionRules/DailyRetentionRule.cs b/apps/server/AliasVault.Api/Vault/RetentionRules/DailyRetentionRule.csindex e70741697..0a084f6cc 100644--- a/apps/server/AliasVault.Api/Vault/RetentionRules/DailyRetentionRule.cs+++ b/apps/server/AliasVault.Api/Vault/RetentionRules/DailyRetentionRule.cs@@ -20,7 +20,7 @@ public class DailyRetentionRule : IRetentionRulepublic int DaysToKeep { get; init; }/// <inheritdoc cref="IRetentionRule.ApplyRule"/>- public IEnumerable<Vault> ApplyRule(List<Vault> vaults, DateTime now)+ public IEnumerable<VaultManifest> ApplyRule(List<VaultManifest> vaults, DateTime now){// For the specified amount of days, take last vault per day.return vaultsdiff --git a/apps/server/AliasVault.Api/Vault/RetentionRules/DbVersionRetentionRule.cs b/apps/server/AliasVault.Api/Vault/RetentionRules/DbVersionRetentionRule.csindex 25e034489..953eac2ca 100644--- a/apps/server/AliasVault.Api/Vault/RetentionRules/DbVersionRetentionRule.cs+++ b/apps/server/AliasVault.Api/Vault/RetentionRules/DbVersionRetentionRule.cs@@ -20,7 +20,7 @@ public class DbVersionRetentionRule : IRetentionRulepublic int VersionsToKeep { get; init; }/// <inheritdoc cref="IRetentionRule.ApplyRule"/>- public IEnumerable<Vault> ApplyRule(List<Vault> vaults, DateTime now)+ public IEnumerable<VaultManifest> ApplyRule(List<VaultManifest> vaults, DateTime now){// For the specified amount of versions, take last vault per version.return vaultsdiff --git a/apps/server/AliasVault.Api/Vault/RetentionRules/IRetentionRule.cs b/apps/server/AliasVault.Api/Vault/RetentionRules/IRetentionRule.csindex b0a9e9d85..ba62c72e1 100644--- a/apps/server/AliasVault.Api/Vault/RetentionRules/IRetentionRule.cs+++ b/apps/server/AliasVault.Api/Vault/RetentionRules/IRetentionRule.cs@@ -20,5 +20,5 @@ public interface IRetentionRule/// <param name="vaults">List of existing vaults to apply the retention rule to.</param>/// <param name="now">Current DateTime.</param>/// <returns>Vaults that should be kept according to the retention rule.</returns>- IEnumerable<Vault> ApplyRule(List<Vault> vaults, DateTime now);+ IEnumerable<VaultManifest> ApplyRule(List<VaultManifest> vaults, DateTime now);}diff --git a/apps/server/AliasVault.Api/Vault/RetentionRules/LoginCredentialRetentionRule.cs b/apps/server/AliasVault.Api/Vault/RetentionRules/LoginCredentialRetentionRule.csindex b9939b4eb..e0ae03eb1 100644--- a/apps/server/AliasVault.Api/Vault/RetentionRules/LoginCredentialRetentionRule.cs+++ b/apps/server/AliasVault.Api/Vault/RetentionRules/LoginCredentialRetentionRule.cs@@ -20,7 +20,7 @@ public class LoginCredentialRetentionRule : IRetentionRulepublic int CredentialsToKeep { get; set; }/// <inheritdoc cref="IRetentionRule.ApplyRule"/>- public IEnumerable<Vault> ApplyRule(List<Vault> vaults, DateTime now)+ public IEnumerable<VaultManifest> ApplyRule(List<VaultManifest> vaults, DateTime now){// For the specified amount of versions, take last vault per version.return vaultsdiff --git a/apps/server/AliasVault.Api/Vault/RetentionRules/MonthlyRetentionRule.cs b/apps/server/AliasVault.Api/Vault/RetentionRules/MonthlyRetentionRule.csindex f13342e1c..210c0f8ed 100644--- a/apps/server/AliasVault.Api/Vault/RetentionRules/MonthlyRetentionRule.cs+++ b/apps/server/AliasVault.Api/Vault/RetentionRules/MonthlyRetentionRule.cs@@ -20,7 +20,7 @@ public class MonthlyRetentionRule : IRetentionRulepublic int MonthsToKeep { get; init; }/// <inheritdoc cref="IRetentionRule.ApplyRule"/>- public IEnumerable<Vault> ApplyRule(List<Vault> vaults, DateTime now)+ public IEnumerable<VaultManifest> ApplyRule(List<VaultManifest> vaults, DateTime now){return vaults.GroupBy(x => x.UpdatedAt.Month)diff --git a/apps/server/AliasVault.Api/Vault/RetentionRules/RevisionRetentionRule.cs b/apps/server/AliasVault.Api/Vault/RetentionRules/RevisionRetentionRule.csindex 098360b82..f15e26486 100644--- a/apps/server/AliasVault.Api/Vault/RetentionRules/RevisionRetentionRule.cs+++ b/apps/server/AliasVault.Api/Vault/RetentionRules/RevisionRetentionRule.cs@@ -20,7 +20,7 @@ public class RevisionRetentionRule : IRetentionRulepublic int RevisionsToKeep { get; init; }/// <inheritdoc cref="IRetentionRule.ApplyRule"/>- public IEnumerable<Vault> ApplyRule(List<Vault> vaults, DateTime now)+ public IEnumerable<VaultManifest> ApplyRule(List<VaultManifest> vaults, DateTime now){// For the specified amount of versions, take last vault per version.return vaultsdiff --git a/apps/server/AliasVault.Api/Vault/RetentionRules/WeeklyRetentionRule.cs b/apps/server/AliasVault.Api/Vault/RetentionRules/WeeklyRetentionRule.csindex 802b4dde5..8f64063c9 100644--- a/apps/server/AliasVault.Api/Vault/RetentionRules/WeeklyRetentionRule.cs+++ b/apps/server/AliasVault.Api/Vault/RetentionRules/WeeklyRetentionRule.cs@@ -20,7 +20,7 @@ public class WeeklyRetentionRule : IRetentionRulepublic int WeeksToKeep { get; init; }/// <inheritdoc cref="IRetentionRule.ApplyRule"/>- public IEnumerable<Vault> ApplyRule(List<Vault> vaults, DateTime now)+ public IEnumerable<VaultManifest> ApplyRule(List<VaultManifest> vaults, DateTime now){// Helper function to get the start of the week with Monday as the first day of the week.DateTime GetStartOfWeek(DateTime date)diff --git a/apps/server/AliasVault.Api/Vault/VaultRetentionManager.cs b/apps/server/AliasVault.Api/Vault/VaultRetentionManager.csindex 688d03222..d3a24b01d 100644--- a/apps/server/AliasVault.Api/Vault/VaultRetentionManager.cs+++ b/apps/server/AliasVault.Api/Vault/VaultRetentionManager.cs@@ -27,18 +27,18 @@ public static class VaultRetentionManager/// <param name="now">DateTime which represents current time.</param>/// <param name="newVault">New encrypted vault to be added that is also taken into account for calculating retention policy.</param>/// <returns>List of vaults to delete according to the retention policies.</returns>- public static List<Vault> ApplyRetention(RetentionPolicy retentionPolicy, List<Vault> existingVaults, DateTime now, Vault? newVault = null)+ public static List<VaultManifest> ApplyRetention(RetentionPolicy retentionPolicy, List<VaultManifest> existingVaults, DateTime now, VaultManifest? newVault = null){// Add the new vault to the list of existing vaults if providedif (newVault is not null){- existingVaults = new List<Vault>(existingVaults) { newVault };+ existingVaults = new List<VaultManifest>(existingVaults) { newVault };}// Sort vaults by UpdatedAt in descending orderexistingVaults = existingVaults.OrderByDescending(v => v.UpdatedAt).ToList();- var vaultsToKeep = new HashSet<Vault>();+ var vaultsToKeep = new HashSet<VaultManifest>();// Process retention rulesforeach (var rule in retentionPolicy.Rules)diff --git a/apps/server/AliasVault.Client/Auth/Pages/Login.razor b/apps/server/AliasVault.Client/Auth/Pages/Login.razorindex 7efa7230e..b0c5c33ec 100644--- a/apps/server/AliasVault.Client/Auth/Pages/Login.razor+++ b/apps/server/AliasVault.Client/Auth/Pages/Login.razor@@ -4,7 +4,7 @@@inject Config Config@attribute [AllowAnonymous]@using System.Text.Json-@using AliasVault.Shared.Models.WebApi.Auth+@using AliasVault.Shared.Models.WebApi.V1.Auth@using AliasVault.Client.Auth.Components@using AliasVault.Client.Auth.Models@using AliasVault.Client.Servicesdiff --git a/apps/server/AliasVault.Client/Auth/Pages/Setup/Components/CreatingStep.razor b/apps/server/AliasVault.Client/Auth/Pages/Setup/Components/CreatingStep.razorindex 0d7488a48..017bc13b8 100644--- a/apps/server/AliasVault.Client/Auth/Pages/Setup/Components/CreatingStep.razor+++ b/apps/server/AliasVault.Client/Auth/Pages/Setup/Components/CreatingStep.razor@@ -4,7 +4,7 @@@using System.Text.Json@using AliasVault.Client.Utilities@using AliasVault.Cryptography.Client-@using AliasVault.Shared.Models.WebApi.Auth+@using AliasVault.Shared.Models.WebApi.V1.Auth<div class="w-full mx-auto"><div class="relative inset-0 mt-10 z-10">diff --git a/apps/server/AliasVault.Client/Auth/Pages/Unlock.razor b/apps/server/AliasVault.Client/Auth/Pages/Unlock.razorindex 058bc592a..e332d6178 100644--- a/apps/server/AliasVault.Client/Auth/Pages/Unlock.razor+++ b/apps/server/AliasVault.Client/Auth/Pages/Unlock.razor@@ -9,7 +9,7 @@@using AliasVault.Client.Auth.Models@using AliasVault.Client.Services@using AliasVault.Client.Utilities-@using AliasVault.Shared.Models.WebApi.Auth+@using AliasVault.Shared.Models.WebApi.V1.Auth@using AliasVault.Cryptography.Client@using Microsoft.Extensions.Localizationdiff --git a/apps/server/AliasVault.Client/Auth/Services/MobileLoginUtility.cs b/apps/server/AliasVault.Client/Auth/Services/MobileLoginUtility.csindex f1b9446f6..bfea8cfa1 100644--- a/apps/server/AliasVault.Client/Auth/Services/MobileLoginUtility.cs+++ b/apps/server/AliasVault.Client/Auth/Services/MobileLoginUtility.cs@@ -16,7 +16,7 @@ using System.Threading.Tasks;using AliasVault.Client.Auth.Models;using AliasVault.Client.Services.JsInterop;using AliasVault.Client.Utilities;-using AliasVault.Shared.Models.WebApi.Auth;+using AliasVault.Shared.Models.WebApi.V1.Auth;using Microsoft.Extensions.Logging;/// <summary>diff --git a/apps/server/AliasVault.Client/Main/Models/Validation/PasswordChangeFormModel.cs b/apps/server/AliasVault.Client/Main/Models/Validation/PasswordChangeFormModel.csindex 7be90cff7..6febf8aea 100644--- a/apps/server/AliasVault.Client/Main/Models/Validation/PasswordChangeFormModel.cs+++ b/apps/server/AliasVault.Client/Main/Models/Validation/PasswordChangeFormModel.cs@@ -11,7 +11,7 @@ using System.ComponentModel.DataAnnotations;using AliasVault.Client.Main.Constants;using AliasVault.Client.Resources;using AliasVault.Shared.Models.Validation;-using AliasVault.Shared.Models.WebApi.PasswordChange;+using AliasVault.Shared.Models.WebApi.V1.PasswordChange;/// <summary>/// Password change form model with validation.diff --git a/apps/server/AliasVault.Client/Main/Pages/Emails/Home.razor b/apps/server/AliasVault.Client/Main/Pages/Emails/Home.razorindex 72f0665fb..7a9243b0f 100644--- a/apps/server/AliasVault.Client/Main/Pages/Emails/Home.razor+++ b/apps/server/AliasVault.Client/Main/Pages/Emails/Home.razor@@ -5,7 +5,7 @@@using AliasVault.Client.Main.Pages.Emails.Models@using AliasVault.Shared.Models.Spamok@using AliasVault.Shared.Models.WebApi-@using AliasVault.Shared.Models.WebApi.Email+@using AliasVault.Shared.Models.WebApi.V1.Email@using AliasVault.Client.Main.Components@using AliasVault.Client.Main.Components.Email@using AliasVault.Client.Main.Servicesdiff --git a/apps/server/AliasVault.Client/Main/Pages/Settings/Security/ChangePassword.razor b/apps/server/AliasVault.Client/Main/Pages/Settings/Security/ChangePassword.razorindex 6f12d7d3c..d8223e234 100644--- a/apps/server/AliasVault.Client/Main/Pages/Settings/Security/ChangePassword.razor+++ b/apps/server/AliasVault.Client/Main/Pages/Settings/Security/ChangePassword.razor@@ -1,8 +1,8 @@@page "/settings/security/change-password"@using AliasVault.Client.Utilities@using AliasVault.Client.Main.Models.Validation-@using AliasVault.Shared.Models.WebApi.PasswordChange-@using AliasVault.Shared.Models.WebApi.Vault;+@using AliasVault.Shared.Models.WebApi.V1.PasswordChange+@using AliasVault.Shared.Models.WebApi.V1.Vault;@using AliasVault.Cryptography.Client@using AliasVault.Client.Services.JsInterop.RustCore@using AliasVault.Client.Main.Components.Shareddiff --git a/apps/server/AliasVault.Client/Main/Pages/Settings/Security/Components/ActiveSessionsSection.razor b/apps/server/AliasVault.Client/Main/Pages/Settings/Security/Components/ActiveSessionsSection.razorindex 49a4a240e..2e784ef69 100644--- a/apps/server/AliasVault.Client/Main/Pages/Settings/Security/Components/ActiveSessionsSection.razor+++ b/apps/server/AliasVault.Client/Main/Pages/Settings/Security/Components/ActiveSessionsSection.razor@@ -1,4 +1,4 @@-@using AliasVault.Shared.Models.WebApi.Security+@using AliasVault.Shared.Models.WebApi.V1.Security@inject HttpClient Http@inject GlobalNotificationService GlobalNotificationService@inject IStringLocalizerFactory LocalizerFactorydiff --git a/apps/server/AliasVault.Client/Main/Pages/Settings/Security/Components/RecentAuthLogsSection.razor b/apps/server/AliasVault.Client/Main/Pages/Settings/Security/Components/RecentAuthLogsSection.razorindex b32587907..ffbd80d84 100644--- a/apps/server/AliasVault.Client/Main/Pages/Settings/Security/Components/RecentAuthLogsSection.razor+++ b/apps/server/AliasVault.Client/Main/Pages/Settings/Security/Components/RecentAuthLogsSection.razor@@ -1,4 +1,4 @@-@using AliasVault.Shared.Models.WebApi.Security+@using AliasVault.Shared.Models.WebApi.V1.Security@inject HttpClient Http@inject GlobalNotificationService GlobalNotificationService@inject IStringLocalizerFactory LocalizerFactorydiff --git a/apps/server/AliasVault.Client/Main/Pages/Settings/Security/DeleteAccount.razor b/apps/server/AliasVault.Client/Main/Pages/Settings/Security/DeleteAccount.razorindex 5b5b56f61..9254a1040 100644--- a/apps/server/AliasVault.Client/Main/Pages/Settings/Security/DeleteAccount.razor+++ b/apps/server/AliasVault.Client/Main/Pages/Settings/Security/DeleteAccount.razor@@ -2,7 +2,7 @@@inherits MainBase@using System.Text.Json@using AliasVault.Client.Utilities-@using AliasVault.Shared.Models.WebApi.Auth+@using AliasVault.Shared.Models.WebApi.V1.Auth@using AliasVault.Cryptography.Client@using AliasVault.Client.Services.JsInterop.RustCore@using System.ComponentModel.DataAnnotationsdiff --git a/apps/server/AliasVault.Client/Services/Auth/AuthService.cs b/apps/server/AliasVault.Client/Services/Auth/AuthService.csindex 041b9ca0b..205e60417 100644--- a/apps/server/AliasVault.Client/Services/Auth/AuthService.cs+++ b/apps/server/AliasVault.Client/Services/Auth/AuthService.cs@@ -11,7 +11,7 @@ using System.Net.Http.Json;using System.Text.Json;using AliasVault.Client.Services.Auth.Enums;using AliasVault.Cryptography.Client;-using AliasVault.Shared.Models.WebApi.Auth;+using AliasVault.Shared.Models.WebApi.V1.Auth;using Blazored.LocalStorage;using Microsoft.AspNetCore.Components.WebAssembly.Hosting;diff --git a/apps/server/AliasVault.Client/Services/Auth/UserRegistrationService.cs b/apps/server/AliasVault.Client/Services/Auth/UserRegistrationService.csindex 44d15d9f8..84a79d4ec 100644--- a/apps/server/AliasVault.Client/Services/Auth/UserRegistrationService.cs+++ b/apps/server/AliasVault.Client/Services/Auth/UserRegistrationService.cs@@ -12,7 +12,7 @@ using System.Text.Json;using AliasVault.Client.Services.JsInterop.RustCore;using AliasVault.Client.Utilities;using AliasVault.Cryptography.Client;-using AliasVault.Shared.Models.WebApi.Auth;+using AliasVault.Shared.Models.WebApi.V1.Auth;using Microsoft.AspNetCore.Components.Authorization;using Microsoft.Extensions.Localization;diff --git a/apps/server/AliasVault.Client/Services/Database/DbService.cs b/apps/server/AliasVault.Client/Services/Database/DbService.csindex 0026d91be..6a7100ca3 100644--- a/apps/server/AliasVault.Client/Services/Database/DbService.cs+++ b/apps/server/AliasVault.Client/Services/Database/DbService.cs@@ -19,7 +19,7 @@ using AliasVault.Client.Services.JsInterop.Models;using AliasVault.Client.Services.JsInterop.RustCore;using AliasVault.Client.Utilities;using AliasVault.Shared.Models.Enums;-using AliasVault.Shared.Models.WebApi.Vault;+using AliasVault.Shared.Models.WebApi.V1.Vault;using Microsoft.Data.Sqlite;using Microsoft.EntityFrameworkCore;using Microsoft.Extensions.Localization;diff --git a/apps/server/AliasVault.Client/Services/FaviconService.cs b/apps/server/AliasVault.Client/Services/FaviconService.csindex afd903ea6..e2e6f9ecb 100644--- a/apps/server/AliasVault.Client/Services/FaviconService.cs+++ b/apps/server/AliasVault.Client/Services/FaviconService.cs@@ -15,7 +15,7 @@ using System.Net.Http;using System.Net.Http.Json;using System.Threading;using System.Threading.Tasks;-using AliasVault.Shared.Models.WebApi.Favicon;+using AliasVault.Shared.Models.WebApi.V1.Favicon;/// <summary>/// Wraps calls to the server-side favicon API. Centralizes the single-URL and batcheddiff --git a/apps/server/Shared/AliasVault.Shared/Models/WebApi/Auth/AuthFinishModel.cs b/apps/server/Shared/AliasVault.Shared/Models/WebApi/V1/Auth/AuthFinishModel.cssimilarity index 96%rename from apps/server/Shared/AliasVault.Shared/Models/WebApi/Auth/AuthFinishModel.csrename to apps/server/Shared/AliasVault.Shared/Models/WebApi/V1/Auth/AuthFinishModel.csindex 322763aea..22b83616e 100644--- a/apps/server/Shared/AliasVault.Shared/Models/WebApi/Auth/AuthFinishModel.cs+++ b/apps/server/Shared/AliasVault.Shared/Models/WebApi/V1/Auth/AuthFinishModel.cs@@ -5,7 +5,7 @@// </copyright>//------------------------------------------------------------------------namespace AliasVault.Shared.Models.WebApi.Auth;+namespace AliasVault.Shared.Models.WebApi.V1.Auth;/// <summary>/// Auth finish model using SRP (Secure Remote Password) protocol.diff --git a/apps/server/Shared/AliasVault.Shared/Models/WebApi/Auth/AuthStartModel.cs b/apps/server/Shared/AliasVault.Shared/Models/WebApi/V1/Auth/AuthStartModel.cssimilarity index 94%rename from apps/server/Shared/AliasVault.Shared/Models/WebApi/Auth/AuthStartModel.csrename to apps/server/Shared/AliasVault.Shared/Models/WebApi/V1/Auth/AuthStartModel.csindex 630ea8626..22d2b067f 100644--- a/apps/server/Shared/AliasVault.Shared/Models/WebApi/Auth/AuthStartModel.cs+++ b/apps/server/Shared/AliasVault.Shared/Models/WebApi/V1/Auth/AuthStartModel.cs@@ -5,7 +5,7 @@// </copyright>//------------------------------------------------------------------------namespace AliasVault.Shared.Models.WebApi.Auth;+namespace AliasVault.Shared.Models.WebApi.V1.Auth;/// <summary>/// Auth start model using SRP (Secure Remote Password) protocol.diff --git a/apps/server/Shared/AliasVault.Shared/Models/WebApi/Auth/DeleteAccountRequest.cs b/apps/server/Shared/AliasVault.Shared/Models/WebApi/V1/Auth/DeleteAccountRequest.cssimilarity index 96%rename from apps/server/Shared/AliasVault.Shared/Models/WebApi/Auth/DeleteAccountRequest.csrename to apps/server/Shared/AliasVault.Shared/Models/WebApi/V1/Auth/DeleteAccountRequest.csindex 3da54ed47..f5f0270a4 100644--- a/apps/server/Shared/AliasVault.Shared/Models/WebApi/Auth/DeleteAccountRequest.cs+++ b/apps/server/Shared/AliasVault.Shared/Models/WebApi/V1/Auth/DeleteAccountRequest.cs@@ -5,7 +5,7 @@// </copyright>//------------------------------------------------------------------------namespace AliasVault.Shared.Models.WebApi.Auth;+namespace AliasVault.Shared.Models.WebApi.V1.Auth;/// <summary>/// Request model for deleting an account.diff --git a/apps/server/Shared/AliasVault.Shared/Models/WebApi/Auth/LoginInitiateRequest.cs b/apps/server/Shared/AliasVault.Shared/Models/WebApi/V1/Auth/LoginInitiateRequest.cssimilarity index 94%rename from apps/server/Shared/AliasVault.Shared/Models/WebApi/Auth/LoginInitiateRequest.csrename to apps/server/Shared/AliasVault.Shared/Models/WebApi/V1/Auth/LoginInitiateRequest.csindex e510d9b2b..d0d09bf7e 100644--- a/apps/server/Shared/AliasVault.Shared/Models/WebApi/Auth/LoginInitiateRequest.cs+++ b/apps/server/Shared/AliasVault.Shared/Models/WebApi/V1/Auth/LoginInitiateRequest.cs@@ -5,7 +5,7 @@// </copyright>//------------------------------------------------------------------------namespace AliasVault.Shared.Models.WebApi.Auth;+namespace AliasVault.Shared.Models.WebApi.V1.Auth;/// <summary>/// Represents a login request.diff --git a/apps/server/Shared/AliasVault.Shared/Models/WebApi/Auth/LoginInitiateResponse.cs b/apps/server/Shared/AliasVault.Shared/Models/WebApi/V1/Auth/LoginInitiateResponse.cssimilarity index 97%rename from apps/server/Shared/AliasVault.Shared/Models/WebApi/Auth/LoginInitiateResponse.csrename to apps/server/Shared/AliasVault.Shared/Models/WebApi/V1/Auth/LoginInitiateResponse.csindex e16890bdc..56d330bb6 100644--- a/apps/server/Shared/AliasVault.Shared/Models/WebApi/Auth/LoginInitiateResponse.cs+++ b/apps/server/Shared/AliasVault.Shared/Models/WebApi/V1/Auth/LoginInitiateResponse.cs@@ -5,7 +5,7 @@// </copyright>//------------------------------------------------------------------------namespace AliasVault.Shared.Models.WebApi.Auth;+namespace AliasVault.Shared.Models.WebApi.V1.Auth;using System.Text.Json.Serialization;diff --git a/apps/server/Shared/AliasVault.Shared/Models/WebApi/Auth/MobileLoginInitiateRequest.cs b/apps/server/Shared/AliasVault.Shared/Models/WebApi/V1/Auth/MobileLoginInitiateRequest.cssimilarity index 93%rename from apps/server/Shared/AliasVault.Shared/Models/WebApi/Auth/MobileLoginInitiateRequest.csrename to apps/server/Shared/AliasVault.Shared/Models/WebApi/V1/Auth/MobileLoginInitiateRequest.csindex f08cedb6f..95da7d193 100644--- a/apps/server/Shared/AliasVault.Shared/Models/WebApi/Auth/MobileLoginInitiateRequest.cs+++ b/apps/server/Shared/AliasVault.Shared/Models/WebApi/V1/Auth/MobileLoginInitiateRequest.cs@@ -5,7 +5,7 @@// </copyright>//------------------------------------------------------------------------namespace AliasVault.Shared.Models.WebApi.Auth;+namespace AliasVault.Shared.Models.WebApi.V1.Auth;/// <summary>/// Request model for initiating a mobile login request.diff --git a/apps/server/Shared/AliasVault.Shared/Models/WebApi/Auth/MobileLoginInitiateResponse.cs b/apps/server/Shared/AliasVault.Shared/Models/WebApi/V1/Auth/MobileLoginInitiateResponse.cssimilarity index 93%rename from apps/server/Shared/AliasVault.Shared/Models/WebApi/Auth/MobileLoginInitiateResponse.csrename to apps/server/Shared/AliasVault.Shared/Models/WebApi/V1/Auth/MobileLoginInitiateResponse.csindex 59a02e534..45326c6a8 100644--- a/apps/server/Shared/AliasVault.Shared/Models/WebApi/Auth/MobileLoginInitiateResponse.cs+++ b/apps/server/Shared/AliasVault.Shared/Models/WebApi/V1/Auth/MobileLoginInitiateResponse.cs@@ -5,7 +5,7 @@// </copyright>//------------------------------------------------------------------------namespace AliasVault.Shared.Models.WebApi.Auth;+namespace AliasVault.Shared.Models.WebApi.V1.Auth;/// <summary>/// Response model for mobile login initiate request.diff --git a/apps/server/Shared/AliasVault.Shared/Models/WebApi/Auth/MobileLoginPollResponse.cs b/apps/server/Shared/AliasVault.Shared/Models/WebApi/V1/Auth/MobileLoginPollResponse.cssimilarity index 97%rename from apps/server/Shared/AliasVault.Shared/Models/WebApi/Auth/MobileLoginPollResponse.csrename to apps/server/Shared/AliasVault.Shared/Models/WebApi/V1/Auth/MobileLoginPollResponse.csindex ec09c1e52..a2c3a3a74 100644--- a/apps/server/Shared/AliasVault.Shared/Models/WebApi/Auth/MobileLoginPollResponse.cs+++ b/apps/server/Shared/AliasVault.Shared/Models/WebApi/V1/Auth/MobileLoginPollResponse.cs@@ -5,7 +5,7 @@// </copyright>//------------------------------------------------------------------------namespace AliasVault.Shared.Models.WebApi.Auth;+namespace AliasVault.Shared.Models.WebApi.V1.Auth;/// <summary>/// Response model for polling mobile login status.diff --git a/apps/server/Shared/AliasVault.Shared/Models/WebApi/Auth/MobileLoginSubmitRequest.cs b/apps/server/Shared/AliasVault.Shared/Models/WebApi/V1/Auth/MobileLoginSubmitRequest.cssimilarity index 94%rename from apps/server/Shared/AliasVault.Shared/Models/WebApi/Auth/MobileLoginSubmitRequest.csrename to apps/server/Shared/AliasVault.Shared/Models/WebApi/V1/Auth/MobileLoginSubmitRequest.csindex da5c87b8b..01c195977 100644--- a/apps/server/Shared/AliasVault.Shared/Models/WebApi/Auth/MobileLoginSubmitRequest.cs+++ b/apps/server/Shared/AliasVault.Shared/Models/WebApi/V1/Auth/MobileLoginSubmitRequest.cs@@ -5,7 +5,7 @@// </copyright>//------------------------------------------------------------------------namespace AliasVault.Shared.Models.WebApi.Auth;+namespace AliasVault.Shared.Models.WebApi.V1.Auth;/// <summary>/// Request model for submitting mobile login response from mobile app.diff --git a/apps/server/Shared/AliasVault.Shared/Models/WebApi/Auth/RegisterRequest.cs b/apps/server/Shared/AliasVault.Shared/Models/WebApi/V1/Auth/RegisterRequest.cssimilarity index 97%rename from apps/server/Shared/AliasVault.Shared/Models/WebApi/Auth/RegisterRequest.csrename to apps/server/Shared/AliasVault.Shared/Models/WebApi/V1/Auth/RegisterRequest.csindex 5ca5807c9..cf0d7882f 100644--- a/apps/server/Shared/AliasVault.Shared/Models/WebApi/Auth/RegisterRequest.cs+++ b/apps/server/Shared/AliasVault.Shared/Models/WebApi/V1/Auth/RegisterRequest.cs@@ -5,7 +5,7 @@// </copyright>//------------------------------------------------------------------------namespace AliasVault.Shared.Models.WebApi.Auth;+namespace AliasVault.Shared.Models.WebApi.V1.Auth;/// <summary>/// Register request model.diff --git a/apps/server/Shared/AliasVault.Shared/Models/WebApi/Auth/StatusResponse.cs b/apps/server/Shared/AliasVault.Shared/Models/WebApi/V1/Auth/StatusResponse.cssimilarity index 97%rename from apps/server/Shared/AliasVault.Shared/Models/WebApi/Auth/StatusResponse.csrename to apps/server/Shared/AliasVault.Shared/Models/WebApi/V1/Auth/StatusResponse.csindex a2241c0f3..685137bec 100644--- a/apps/server/Shared/AliasVault.Shared/Models/WebApi/Auth/StatusResponse.cs+++ b/apps/server/Shared/AliasVault.Shared/Models/WebApi/V1/Auth/StatusResponse.cs@@ -5,7 +5,7 @@// </copyright>//------------------------------------------------------------------------namespace AliasVault.Shared.Models.WebApi.Auth;+namespace AliasVault.Shared.Models.WebApi.V1.Auth;/// <summary>/// Response model for the status endpoint.diff --git a/apps/server/Shared/AliasVault.Shared/Models/WebApi/Auth/TokenModel.cs b/apps/server/Shared/AliasVault.Shared/Models/WebApi/V1/Auth/TokenModel.cssimilarity index 94%rename from apps/server/Shared/AliasVault.Shared/Models/WebApi/Auth/TokenModel.csrename to apps/server/Shared/AliasVault.Shared/Models/WebApi/V1/Auth/TokenModel.csindex 313b237c4..2b64bb61c 100644--- a/apps/server/Shared/AliasVault.Shared/Models/WebApi/Auth/TokenModel.cs+++ b/apps/server/Shared/AliasVault.Shared/Models/WebApi/V1/Auth/TokenModel.cs@@ -5,7 +5,7 @@// </copyright>//------------------------------------------------------------------------namespace AliasVault.Shared.Models.WebApi.Auth;+namespace AliasVault.Shared.Models.WebApi.V1.Auth;using System.Text.Json.Serialization;diff --git a/apps/server/Shared/AliasVault.Shared/Models/WebApi/Auth/ValidateLoginRequest.cs b/apps/server/Shared/AliasVault.Shared/Models/WebApi/V1/Auth/ValidateLoginRequest.cssimilarity index 97%rename from apps/server/Shared/AliasVault.Shared/Models/WebApi/Auth/ValidateLoginRequest.csrename to apps/server/Shared/AliasVault.Shared/Models/WebApi/V1/Auth/ValidateLoginRequest.csindex 9a9b1690d..60d42021e 100644--- a/apps/server/Shared/AliasVault.Shared/Models/WebApi/Auth/ValidateLoginRequest.cs+++ b/apps/server/Shared/AliasVault.Shared/Models/WebApi/V1/Auth/ValidateLoginRequest.cs@@ -5,7 +5,7 @@// </copyright>//------------------------------------------------------------------------namespace AliasVault.Shared.Models.WebApi.Auth+namespace AliasVault.Shared.Models.WebApi.V1.Auth{/// <summary>/// Represents a request to validate a login.diff --git a/apps/server/Shared/AliasVault.Shared/Models/WebApi/Auth/ValidateLoginRequest2Fa.cs b/apps/server/Shared/AliasVault.Shared/Models/WebApi/V1/Auth/ValidateLoginRequest2Fa.cssimilarity index 96%rename from apps/server/Shared/AliasVault.Shared/Models/WebApi/Auth/ValidateLoginRequest2Fa.csrename to apps/server/Shared/AliasVault.Shared/Models/WebApi/V1/Auth/ValidateLoginRequest2Fa.csindex 9b9383225..ebe4110bd 100644--- a/apps/server/Shared/AliasVault.Shared/Models/WebApi/Auth/ValidateLoginRequest2Fa.cs+++ b/apps/server/Shared/AliasVault.Shared/Models/WebApi/V1/Auth/ValidateLoginRequest2Fa.cs@@ -5,7 +5,7 @@// </copyright>//------------------------------------------------------------------------namespace AliasVault.Shared.Models.WebApi.Auth+namespace AliasVault.Shared.Models.WebApi.V1.Auth{/// <summary>/// Represents a request to validate a login with added 2-factor authentication code.diff --git a/apps/server/Shared/AliasVault.Shared/Models/WebApi/Auth/ValidateLoginRequestRecoveryCode.cs b/apps/server/Shared/AliasVault.Shared/Models/WebApi/V1/Auth/ValidateLoginRequestRecoveryCode.cssimilarity index 97%rename from apps/server/Shared/AliasVault.Shared/Models/WebApi/Auth/ValidateLoginRequestRecoveryCode.csrename to apps/server/Shared/AliasVault.Shared/Models/WebApi/V1/Auth/ValidateLoginRequestRecoveryCode.csindex 770656633..b06a8b1fe 100644--- a/apps/server/Shared/AliasVault.Shared/Models/WebApi/Auth/ValidateLoginRequestRecoveryCode.cs+++ b/apps/server/Shared/AliasVault.Shared/Models/WebApi/V1/Auth/ValidateLoginRequestRecoveryCode.cs@@ -5,7 +5,7 @@// </copyright>//------------------------------------------------------------------------namespace AliasVault.Shared.Models.WebApi.Auth+namespace AliasVault.Shared.Models.WebApi.V1.Auth{/// <summary>/// Represents a request to validate a login with added 2-factor authentication code.diff --git a/apps/server/Shared/AliasVault.Shared/Models/WebApi/Auth/ValidateLoginResponse.cs b/apps/server/Shared/AliasVault.Shared/Models/WebApi/V1/Auth/ValidateLoginResponse.cssimilarity index 97%rename from apps/server/Shared/AliasVault.Shared/Models/WebApi/Auth/ValidateLoginResponse.csrename to apps/server/Shared/AliasVault.Shared/Models/WebApi/V1/Auth/ValidateLoginResponse.csindex 73621329d..e51e87270 100644--- a/apps/server/Shared/AliasVault.Shared/Models/WebApi/Auth/ValidateLoginResponse.cs+++ b/apps/server/Shared/AliasVault.Shared/Models/WebApi/V1/Auth/ValidateLoginResponse.cs@@ -5,7 +5,7 @@// </copyright>//------------------------------------------------------------------------namespace AliasVault.Shared.Models.WebApi.Auth;+namespace AliasVault.Shared.Models.WebApi.V1.Auth;using System.Text.Json.Serialization;diff --git a/apps/server/Shared/AliasVault.Shared/Models/WebApi/Auth/ValidateUsernameRequest.cs b/apps/server/Shared/AliasVault.Shared/Models/WebApi/V1/Auth/ValidateUsernameRequest.cssimilarity index 92%rename from apps/server/Shared/AliasVault.Shared/Models/WebApi/Auth/ValidateUsernameRequest.csrename to apps/server/Shared/AliasVault.Shared/Models/WebApi/V1/Auth/ValidateUsernameRequest.csindex 9a0f63555..5826e6dd2 100644--- a/apps/server/Shared/AliasVault.Shared/Models/WebApi/Auth/ValidateUsernameRequest.cs+++ b/apps/server/Shared/AliasVault.Shared/Models/WebApi/V1/Auth/ValidateUsernameRequest.cs@@ -5,7 +5,7 @@// </copyright>//------------------------------------------------------------------------namespace AliasVault.Shared.Models.WebApi.Auth;+namespace AliasVault.Shared.Models.WebApi.V1.Auth;/// <summary>/// A request to validate a username.diff --git a/apps/server/Shared/AliasVault.Shared/Models/WebApi/Email/MailboxBulkRequest.cs b/apps/server/Shared/AliasVault.Shared/Models/WebApi/V1/Email/MailboxBulkRequest.cssimilarity index 94%rename from apps/server/Shared/AliasVault.Shared/Models/WebApi/Email/MailboxBulkRequest.csrename to apps/server/Shared/AliasVault.Shared/Models/WebApi/V1/Email/MailboxBulkRequest.csindex 36f9e0e2b..cc5346718 100644--- a/apps/server/Shared/AliasVault.Shared/Models/WebApi/Email/MailboxBulkRequest.cs+++ b/apps/server/Shared/AliasVault.Shared/Models/WebApi/V1/Email/MailboxBulkRequest.cs@@ -5,7 +5,7 @@// </copyright>//------------------------------------------------------------------------namespace AliasVault.Shared.Models.WebApi.Email;+namespace AliasVault.Shared.Models.WebApi.V1.Email;/// <summary>/// MailboxBulkRequest model for retrieving recent emails from multiple emailboxes.diff --git a/apps/server/Shared/AliasVault.Shared/Models/WebApi/Email/MailboxBulkResponse.cs b/apps/server/Shared/AliasVault.Shared/Models/WebApi/V1/Email/MailboxBulkResponse.cssimilarity index 95%rename from apps/server/Shared/AliasVault.Shared/Models/WebApi/Email/MailboxBulkResponse.csrename to apps/server/Shared/AliasVault.Shared/Models/WebApi/V1/Email/MailboxBulkResponse.csindex e922a62a3..51c2bb3de 100644--- a/apps/server/Shared/AliasVault.Shared/Models/WebApi/Email/MailboxBulkResponse.cs+++ b/apps/server/Shared/AliasVault.Shared/Models/WebApi/V1/Email/MailboxBulkResponse.cs@@ -5,7 +5,7 @@// </copyright>//------------------------------------------------------------------------namespace AliasVault.Shared.Models.WebApi.Email;+namespace AliasVault.Shared.Models.WebApi.V1.Email;using AliasVault.Shared.Models.Spamok;diff --git a/apps/server/Shared/AliasVault.Shared/Models/WebApi/Favicon/FaviconExtractBatchRequest.cs b/apps/server/Shared/AliasVault.Shared/Models/WebApi/V1/Favicon/FaviconExtractBatchRequest.cssimilarity index 93%rename from apps/server/Shared/AliasVault.Shared/Models/WebApi/Favicon/FaviconExtractBatchRequest.csrename to apps/server/Shared/AliasVault.Shared/Models/WebApi/V1/Favicon/FaviconExtractBatchRequest.csindex a8062eb97..b1abfe739 100644--- a/apps/server/Shared/AliasVault.Shared/Models/WebApi/Favicon/FaviconExtractBatchRequest.cs+++ b/apps/server/Shared/AliasVault.Shared/Models/WebApi/V1/Favicon/FaviconExtractBatchRequest.cs@@ -5,7 +5,7 @@// </copyright>//------------------------------------------------------------------------namespace AliasVault.Shared.Models.WebApi.Favicon;+namespace AliasVault.Shared.Models.WebApi.V1.Favicon;using System.Collections.Generic;diff --git a/apps/server/Shared/AliasVault.Shared/Models/WebApi/Favicon/FaviconExtractBatchResponse.cs b/apps/server/Shared/AliasVault.Shared/Models/WebApi/V1/Favicon/FaviconExtractBatchResponse.cssimilarity index 94%rename from apps/server/Shared/AliasVault.Shared/Models/WebApi/Favicon/FaviconExtractBatchResponse.csrename to apps/server/Shared/AliasVault.Shared/Models/WebApi/V1/Favicon/FaviconExtractBatchResponse.csindex 238356ce5..bdbb577a3 100644--- a/apps/server/Shared/AliasVault.Shared/Models/WebApi/Favicon/FaviconExtractBatchResponse.cs+++ b/apps/server/Shared/AliasVault.Shared/Models/WebApi/V1/Favicon/FaviconExtractBatchResponse.cs@@ -5,7 +5,7 @@// </copyright>//------------------------------------------------------------------------namespace AliasVault.Shared.Models.WebApi.Favicon;+namespace AliasVault.Shared.Models.WebApi.V1.Favicon;using System.Collections.Generic;diff --git a/apps/server/Shared/AliasVault.Shared/Models/WebApi/Favicon/FaviconExtractBatchResult.cs b/apps/server/Shared/AliasVault.Shared/Models/WebApi/V1/Favicon/FaviconExtractBatchResult.cssimilarity index 94%rename from apps/server/Shared/AliasVault.Shared/Models/WebApi/Favicon/FaviconExtractBatchResult.csrename to apps/server/Shared/AliasVault.Shared/Models/WebApi/V1/Favicon/FaviconExtractBatchResult.csindex c54d6cd1d..22f7347fe 100644--- a/apps/server/Shared/AliasVault.Shared/Models/WebApi/Favicon/FaviconExtractBatchResult.cs+++ b/apps/server/Shared/AliasVault.Shared/Models/WebApi/V1/Favicon/FaviconExtractBatchResult.cs@@ -5,7 +5,7 @@// </copyright>//------------------------------------------------------------------------namespace AliasVault.Shared.Models.WebApi.Favicon;+namespace AliasVault.Shared.Models.WebApi.V1.Favicon;/// <summary>/// Per-URL favicon extraction result.diff --git a/apps/server/Shared/AliasVault.Shared/Models/WebApi/Favicon/FaviconExtractModel.cs b/apps/server/Shared/AliasVault.Shared/Models/WebApi/V1/Favicon/FaviconExtractModel.cssimilarity index 92%rename from apps/server/Shared/AliasVault.Shared/Models/WebApi/Favicon/FaviconExtractModel.csrename to apps/server/Shared/AliasVault.Shared/Models/WebApi/V1/Favicon/FaviconExtractModel.csindex 58fb5020e..e372c315d 100644--- a/apps/server/Shared/AliasVault.Shared/Models/WebApi/Favicon/FaviconExtractModel.cs+++ b/apps/server/Shared/AliasVault.Shared/Models/WebApi/V1/Favicon/FaviconExtractModel.cs@@ -5,7 +5,7 @@// </copyright>//------------------------------------------------------------------------namespace AliasVault.Shared.Models.WebApi.Favicon;+namespace AliasVault.Shared.Models.WebApi.V1.Favicon;/// <summary>/// FaviconExtractModel model.diff --git a/apps/server/Shared/AliasVault.Shared/Models/WebApi/PasswordChange/PasswordChangeInitiateResponse.cs b/apps/server/Shared/AliasVault.Shared/Models/WebApi/V1/PasswordChange/PasswordChangeInitiateResponse.cssimilarity index 97%rename from apps/server/Shared/AliasVault.Shared/Models/WebApi/PasswordChange/PasswordChangeInitiateResponse.csrename to apps/server/Shared/AliasVault.Shared/Models/WebApi/V1/PasswordChange/PasswordChangeInitiateResponse.csindex e6a68d8ef..11efafdc6 100644--- a/apps/server/Shared/AliasVault.Shared/Models/WebApi/PasswordChange/PasswordChangeInitiateResponse.cs+++ b/apps/server/Shared/AliasVault.Shared/Models/WebApi/V1/PasswordChange/PasswordChangeInitiateResponse.cs@@ -5,7 +5,7 @@// </copyright>//------------------------------------------------------------------------namespace AliasVault.Shared.Models.WebApi.PasswordChange;+namespace AliasVault.Shared.Models.WebApi.V1.PasswordChange;using System.Text.Json.Serialization;diff --git a/apps/server/Shared/AliasVault.Shared/Models/WebApi/PasswordChange/PasswordChangeModel.cs b/apps/server/Shared/AliasVault.Shared/Models/WebApi/V1/PasswordChange/PasswordChangeModel.cssimilarity index 93%rename from apps/server/Shared/AliasVault.Shared/Models/WebApi/PasswordChange/PasswordChangeModel.csrename to apps/server/Shared/AliasVault.Shared/Models/WebApi/V1/PasswordChange/PasswordChangeModel.csindex 41b291bac..95def98bc 100644--- a/apps/server/Shared/AliasVault.Shared/Models/WebApi/PasswordChange/PasswordChangeModel.cs+++ b/apps/server/Shared/AliasVault.Shared/Models/WebApi/V1/PasswordChange/PasswordChangeModel.cs@@ -5,7 +5,7 @@// </copyright>//------------------------------------------------------------------------namespace AliasVault.Shared.Models.WebApi.PasswordChange;+namespace AliasVault.Shared.Models.WebApi.V1.PasswordChange;/// <summary>/// Password change model.diff --git a/apps/server/Shared/AliasVault.Shared/Models/WebApi/PasswordChange/VaultPasswordChangeRequest.cs b/apps/server/Shared/AliasVault.Shared/Models/WebApi/V1/PasswordChange/VaultPasswordChangeRequest.cssimilarity index 92%rename from apps/server/Shared/AliasVault.Shared/Models/WebApi/PasswordChange/VaultPasswordChangeRequest.csrename to apps/server/Shared/AliasVault.Shared/Models/WebApi/V1/PasswordChange/VaultPasswordChangeRequest.csindex 66565293e..c436ba092 100644--- a/apps/server/Shared/AliasVault.Shared/Models/WebApi/PasswordChange/VaultPasswordChangeRequest.cs+++ b/apps/server/Shared/AliasVault.Shared/Models/WebApi/V1/PasswordChange/VaultPasswordChangeRequest.cs@@ -5,9 +5,9 @@// </copyright>//------------------------------------------------------------------------namespace AliasVault.Shared.Models.WebApi.PasswordChange;+namespace AliasVault.Shared.Models.WebApi.V1.PasswordChange;-using AliasVault.Shared.Models.WebApi.Vault;+using AliasVault.Shared.Models.WebApi.V1.Vault;/// <summary>/// Represents a request to change the users password including a new vault that is encrypted with the new password.diff --git a/apps/server/Shared/AliasVault.Shared/Models/WebApi/Security/AuthLogModel.cs b/apps/server/Shared/AliasVault.Shared/Models/WebApi/V1/Security/AuthLogModel.cssimilarity index 96%rename from apps/server/Shared/AliasVault.Shared/Models/WebApi/Security/AuthLogModel.csrename to apps/server/Shared/AliasVault.Shared/Models/WebApi/V1/Security/AuthLogModel.csindex 4d551883e..be104e972 100644--- a/apps/server/Shared/AliasVault.Shared/Models/WebApi/Security/AuthLogModel.cs+++ b/apps/server/Shared/AliasVault.Shared/Models/WebApi/V1/Security/AuthLogModel.cs@@ -5,7 +5,7 @@// </copyright>//------------------------------------------------------------------------namespace AliasVault.Shared.Models.WebApi.Security;+namespace AliasVault.Shared.Models.WebApi.V1.Security;using AliasVault.Shared.Models.Enums;diff --git a/apps/server/Shared/AliasVault.Shared/Models/WebApi/Security/RefreshTokenModel.cs b/apps/server/Shared/AliasVault.Shared/Models/WebApi/V1/Security/RefreshTokenModel.cssimilarity index 95%rename from apps/server/Shared/AliasVault.Shared/Models/WebApi/Security/RefreshTokenModel.csrename to apps/server/Shared/AliasVault.Shared/Models/WebApi/V1/Security/RefreshTokenModel.csindex c2c598a0d..3de5f4300 100644--- a/apps/server/Shared/AliasVault.Shared/Models/WebApi/Security/RefreshTokenModel.cs+++ b/apps/server/Shared/AliasVault.Shared/Models/WebApi/V1/Security/RefreshTokenModel.cs@@ -5,7 +5,7 @@// </copyright>//------------------------------------------------------------------------namespace AliasVault.Shared.Models.WebApi.Security;+namespace AliasVault.Shared.Models.WebApi.V1.Security;/// <summary>/// RefreshToken (user session) model.diff --git a/apps/server/Shared/AliasVault.Shared/Models/WebApi/Vault/Vault.cs b/apps/server/Shared/AliasVault.Shared/Models/WebApi/V1/Vault/Vault.cssimilarity index 98%rename from apps/server/Shared/AliasVault.Shared/Models/WebApi/Vault/Vault.csrename to apps/server/Shared/AliasVault.Shared/Models/WebApi/V1/Vault/Vault.csindex f5ea508b8..3e26af971 100644--- a/apps/server/Shared/AliasVault.Shared/Models/WebApi/Vault/Vault.cs+++ b/apps/server/Shared/AliasVault.Shared/Models/WebApi/V1/Vault/Vault.cs@@ -5,7 +5,7 @@// </copyright>//------------------------------------------------------------------------namespace AliasVault.Shared.Models.WebApi.Vault;+namespace AliasVault.Shared.Models.WebApi.V1.Vault;/// <summary>/// Vault model.diff --git a/apps/server/Shared/AliasVault.Shared/Models/WebApi/Vault/VaultGetResponse.cs b/apps/server/Shared/AliasVault.Shared/Models/WebApi/V1/Vault/VaultGetResponse.cssimilarity index 93%rename from apps/server/Shared/AliasVault.Shared/Models/WebApi/Vault/VaultGetResponse.csrename to apps/server/Shared/AliasVault.Shared/Models/WebApi/V1/Vault/VaultGetResponse.csindex b8a02e86e..6965cad40 100644--- a/apps/server/Shared/AliasVault.Shared/Models/WebApi/Vault/VaultGetResponse.cs+++ b/apps/server/Shared/AliasVault.Shared/Models/WebApi/V1/Vault/VaultGetResponse.cs@@ -5,7 +5,7 @@// </copyright>//------------------------------------------------------------------------namespace AliasVault.Shared.Models.WebApi.Vault;+namespace AliasVault.Shared.Models.WebApi.V1.Vault;using AliasVault.Shared.Models.Enums;diff --git a/apps/server/Shared/AliasVault.Shared/Models/WebApi/Vault/VaultUpdateResponse.cs b/apps/server/Shared/AliasVault.Shared/Models/WebApi/V1/Vault/VaultUpdateResponse.cssimilarity index 95%rename from apps/server/Shared/AliasVault.Shared/Models/WebApi/Vault/VaultUpdateResponse.csrename to apps/server/Shared/AliasVault.Shared/Models/WebApi/V1/Vault/VaultUpdateResponse.csindex 5b53a4183..cdd4537e8 100644--- a/apps/server/Shared/AliasVault.Shared/Models/WebApi/Vault/VaultUpdateResponse.cs+++ b/apps/server/Shared/AliasVault.Shared/Models/WebApi/V1/Vault/VaultUpdateResponse.cs@@ -5,7 +5,7 @@// </copyright>//------------------------------------------------------------------------namespace AliasVault.Shared.Models.WebApi.Vault;+namespace AliasVault.Shared.Models.WebApi.V1.Vault;using AliasVault.Shared.Models.Enums;diff --git a/apps/server/Tests/AliasVault.E2ETests/Tests/Admin/UserManagementTests.cs b/apps/server/Tests/AliasVault.E2ETests/Tests/Admin/UserManagementTests.csindex b263f0253..a94680a64 100644--- a/apps/server/Tests/AliasVault.E2ETests/Tests/Admin/UserManagementTests.cs+++ b/apps/server/Tests/AliasVault.E2ETests/Tests/Admin/UserManagementTests.cs@@ -52,10 +52,12 @@ public class UserManagementTests : AdminPlaywrightTest_testUserId = testUser.Id;// Create a vault for the test user (required by the Users list page)- var testVault = new Vault+ var testVault = new VaultManifest{- Id = Guid.NewGuid(),- UserId = _testUserId,+ RevisionId = Guid.NewGuid(),+ Category = AliasVault.Shared.Models.WebApi.V2.Vault.VaultManifestCategory.Main,+ OwnerUserId = _testUserId,+ StorageFormat = "sqlite-blob",Version = "1.0.0",RevisionNumber = 1,FileSize = 1024,@@ -71,7 +73,7 @@ public class UserManagementTests : AdminPlaywrightTestClient = "test-client",};- DbContext.Vaults.Add(testVault);+ DbContext.VaultManifests.Add(testVault);await DbContext.SaveChangesAsync();}diff --git a/apps/server/Tests/AliasVault.E2ETests/Tests/Client/Shard2/DbPersistTests.cs b/apps/server/Tests/AliasVault.E2ETests/Tests/Client/Shard2/DbPersistTests.csindex 53162cdda..5e60500f8 100644--- a/apps/server/Tests/AliasVault.E2ETests/Tests/Client/Shard2/DbPersistTests.cs+++ b/apps/server/Tests/AliasVault.E2ETests/Tests/Client/Shard2/DbPersistTests.cs@@ -59,14 +59,14 @@ public class DbPersistTests : ClientPlaywrightTest// Assert that the vault revision number is 2 in the server database.// Account registration will create a new vault with revision number 1, first item save will increment to 2.// Note: for this we expect the previous test to have run first and created a first item.- var firstUpdateVault = await ApiDbContext.Vaults.OrderByDescending(x => x.RevisionNumber).FirstAsync();+ var firstUpdateVault = await ApiDbContext.VaultManifests.OrderByDescending(x => x.RevisionNumber).FirstAsync();Assert.That(firstUpdateVault.RevisionNumber, Is.EqualTo(2), "Vault revision number is not at 2 after creating the first item in a new vault.");// Create a new item which will trigger a vault save to the server.await CreateItemEntry();// Assert that the vault revision number is now 3 in the server database.- var secondUpdateVault = await ApiDbContext.Vaults.OrderByDescending(x => x.RevisionNumber).FirstAsync();+ var secondUpdateVault = await ApiDbContext.VaultManifests.OrderByDescending(x => x.RevisionNumber).FirstAsync();Assert.That(secondUpdateVault.RevisionNumber, Is.EqualTo(3), "Vault revision number is not 3 after the second item save.");}}diff --git a/apps/server/Tests/AliasVault.E2ETests/Tests/Client/Shard2/DbSyncTests.cs b/apps/server/Tests/AliasVault.E2ETests/Tests/Client/Shard2/DbSyncTests.csindex 754c8ff02..63e8dea07 100644--- a/apps/server/Tests/AliasVault.E2ETests/Tests/Client/Shard2/DbSyncTests.cs+++ b/apps/server/Tests/AliasVault.E2ETests/Tests/Client/Shard2/DbSyncTests.cs@@ -46,8 +46,8 @@ public class DbSyncTests : ClientPlaywrightTestawait SimulateClient(baselineVault, async () =>{// Re-add client1 vault to simulate conflict when this second client updates the same vault.- client1Vault.Id = Guid.NewGuid();- ApiDbContext.Vaults.Add(client1Vault);+ client1Vault.RevisionId = Guid.NewGuid();+ ApiDbContext.VaultManifests.Add(client1Vault);await ApiDbContext.SaveChangesAsync();await NavigateUsingBlazorRouter("items");@@ -97,8 +97,8 @@ public class DbSyncTests : ClientPlaywrightTestvar client2Vault = await SimulateClient(baselineVault, async () =>{// Re-add client1 vault to simulate conflict when this second client updates the same vault.- client1Vault.Id = Guid.NewGuid();- ApiDbContext.Vaults.Add(client1Vault);+ client1Vault.RevisionId = Guid.NewGuid();+ ApiDbContext.VaultManifests.Add(client1Vault);await ApiDbContext.SaveChangesAsync();await UpdateItemEntry("PropTestBaseline3", new Dictionary<string, string> { { "service-name", "PropTestMutate3" }, { "username", "propmutate3" }, { "email", "[email protected]" } });@@ -108,8 +108,8 @@ public class DbSyncTests : ClientPlaywrightTestawait SimulateClient(client1Vault, async () =>{// Re-add client2 vault to simulate conflict when this third client updates the same vault.- client2Vault.Id = Guid.NewGuid();- ApiDbContext.Vaults.Add(client2Vault);+ client2Vault.RevisionId = Guid.NewGuid();+ ApiDbContext.VaultManifests.Add(client2Vault);await ApiDbContext.SaveChangesAsync();// Update username to test that field-level merge works correctly.@@ -192,8 +192,8 @@ public class DbSyncTests : ClientPlaywrightTestawait SimulateClient(baselineVault, async () =>{// Re-add client1 vault to simulate conflict when this second client updates the same vault.- client1Vault.Id = Guid.NewGuid();- ApiDbContext.Vaults.Add(client1Vault);+ client1Vault.RevisionId = Guid.NewGuid();+ ApiDbContext.VaultManifests.Add(client1Vault);await ApiDbContext.SaveChangesAsync();await NavigateUsingBlazorRouter("items");@@ -215,11 +215,11 @@ public class DbSyncTests : ClientPlaywrightTest/// </summary>/// <param name="clientActions">Optional client actions to execute after creating the baseline vault.</param>/// <returns>The baseline vault.</returns>- private async Task<AliasServerDb.Vault> CreateBaselineVault(Func<Task> clientActions)+ private async Task<AliasServerDb.VaultManifest> CreateBaselineVault(Func<Task> clientActions){ApiTimeProvider.AdvanceBy(TimeSpan.FromSeconds(1));await clientActions();- return await ApiDbContext.Vaults.OrderByDescending(x => x.RevisionNumber).FirstAsync();+ return await ApiDbContext.VaultManifests.OrderByDescending(x => x.RevisionNumber).FirstAsync();}/// <summary>@@ -228,15 +228,15 @@ public class DbSyncTests : ClientPlaywrightTest/// <param name="baselineVault">The baseline vault to add back.</param>/// <param name="clientActions">Optional client actions to execute after simulating the client.</param>/// <returns>The baseline vault.</returns>- private async Task<AliasServerDb.Vault> SimulateClient(AliasServerDb.Vault baselineVault, Func<Task> clientActions)+ private async Task<AliasServerDb.VaultManifest> SimulateClient(AliasServerDb.VaultManifest baselineVault, Func<Task> clientActions){ApiTimeProvider.AdvanceBy(TimeSpan.FromSeconds(1));// Remove all vaults and add the baseline vault back.- ApiDbContext.Vaults.RemoveRange(ApiDbContext.Vaults);+ ApiDbContext.VaultManifests.RemoveRange(ApiDbContext.VaultManifests);await ApiDbContext.SaveChangesAsync();- baselineVault.Id = Guid.NewGuid();- ApiDbContext.Vaults.Add(baselineVault);+ baselineVault.RevisionId = Guid.NewGuid();+ ApiDbContext.VaultManifests.Add(baselineVault);await ApiDbContext.SaveChangesAsync();// Simulate new client.@@ -246,6 +246,6 @@ public class DbSyncTests : ClientPlaywrightTest// Execute custom client actions.await clientActions();- return await ApiDbContext.Vaults.OrderByDescending(x => x.RevisionNumber).FirstAsync();+ return await ApiDbContext.VaultManifests.OrderByDescending(x => x.RevisionNumber).FirstAsync();}}diff --git a/apps/server/Tests/AliasVault.E2ETests/Tests/Client/Shard2/DbUpgradeTests.cs b/apps/server/Tests/AliasVault.E2ETests/Tests/Client/Shard2/DbUpgradeTests.csindex 53081fe50..5b5b8e4c6 100644--- a/apps/server/Tests/AliasVault.E2ETests/Tests/Client/Shard2/DbUpgradeTests.cs+++ b/apps/server/Tests/AliasVault.E2ETests/Tests/Client/Shard2/DbUpgradeTests.cs@@ -48,11 +48,13 @@ public class DbUpgradeTests : ClientPlaywrightTestawait ApiDbContext.SaveChangesAsync();// Insert static 1.0.0 vault into the database for the current user.- ApiDbContext.Vaults.Add(- new Vault+ ApiDbContext.VaultManifests.Add(+ new VaultManifest{- Id = Guid.NewGuid(),- UserId = ApiDbContext.AliasVaultUsers.First().Id,+ RevisionId = Guid.NewGuid(),+ Category = AliasVault.Shared.Models.WebApi.V2.Vault.VaultManifestCategory.Main,+ OwnerUserId = ApiDbContext.AliasVaultUsers.First().Id,+ StorageFormat = "sqlite-blob",Version = "1.0.0",RevisionNumber = 2,CreatedAt = DateTime.UtcNow,diff --git a/apps/server/Tests/AliasVault.E2ETests/Tests/Client/Shard5/ResetVaultTests.cs b/apps/server/Tests/AliasVault.E2ETests/Tests/Client/Shard5/ResetVaultTests.csindex 6eb810a89..36648c805 100644--- a/apps/server/Tests/AliasVault.E2ETests/Tests/Client/Shard5/ResetVaultTests.cs+++ b/apps/server/Tests/AliasVault.E2ETests/Tests/Client/Shard5/ResetVaultTests.cs@@ -74,7 +74,7 @@ public class ResetVaultTests : ClientPlaywrightTestawait WaitForUrlAsync("items", "successfully reset");// Check API that the latest vault has no items.- var latestVault = await ApiDbContext.Vaults.Where(x => x.User.UserName == TestUserUsername).OrderByDescending(x => x.CreatedAt).FirstAsync();+ var latestVault = await ApiDbContext.VaultManifests.Where(x => x.User.UserName == TestUserUsername).OrderByDescending(x => x.CreatedAt).FirstAsync();Assert.That(latestVault.CredentialsCount, Is.EqualTo(0), "Latest vault should have no items after reset.");// Create a new item entry.@@ -87,7 +87,7 @@ public class ResetVaultTests : ClientPlaywrightTest});// Check that the now latest vault has one item, and only one active claimed alias.- latestVault = await ApiDbContext.Vaults.Where(x => x.User.UserName == TestUserUsername).OrderByDescending(x => x.CreatedAt).FirstAsync();+ latestVault = await ApiDbContext.VaultManifests.Where(x => x.User.UserName == TestUserUsername).OrderByDescending(x => x.CreatedAt).FirstAsync();Assert.Multiple(() =>{Assert.That(latestVault.CredentialsCount, Is.EqualTo(1), "Latest vault should have one item after reset.");diff --git a/apps/server/Tests/AliasVault.E2ETests/Tests/Extensions/ChromeExtensionTests.cs b/apps/server/Tests/AliasVault.E2ETests/Tests/Extensions/ChromeExtensionTests.csindex f8a71bd99..9a67b20a7 100644--- a/apps/server/Tests/AliasVault.E2ETests/Tests/Extensions/ChromeExtensionTests.cs+++ b/apps/server/Tests/AliasVault.E2ETests/Tests/Extensions/ChromeExtensionTests.cs@@ -73,7 +73,7 @@ public class ChromeExtensionTests : BrowserExtensionPlaywrightTest});// Get the current vault revision from the database (should be 3)- var vaultBeforeRollback = await ApiDbContext.Vaults+ var vaultBeforeRollback = await ApiDbContext.VaultManifests.OrderByDescending(v => v.RevisionNumber).FirstOrDefaultAsync();@@ -84,7 +84,7 @@ public class ChromeExtensionTests : BrowserExtensionPlaywrightTestAssert.That(revisionBeforeRollback, Is.GreaterThanOrEqualTo(3), "Should have at least 3 revisions");// SIMULATE SERVER DATA LOSS: Delete the last 2 vault revisions from the server database- var revisionsToDelete = await ApiDbContext.Vaults+ var revisionsToDelete = await ApiDbContext.VaultManifests.Where(v => v.RevisionNumber > revisionBeforeRollback - 2).OrderByDescending(v => v.RevisionNumber).Take(2)@@ -93,13 +93,13 @@ public class ChromeExtensionTests : BrowserExtensionPlaywrightTestforeach (var revision in revisionsToDelete){Console.WriteLine($"Deleting vault revision: {revision.RevisionNumber}");- ApiDbContext.Vaults.Remove(revision);+ ApiDbContext.VaultManifests.Remove(revision);}await ApiDbContext.SaveChangesAsync();// Verify the server now has a lower revision- var vaultAfterRollback = await ApiDbContext.Vaults+ var vaultAfterRollback = await ApiDbContext.VaultManifests.OrderByDescending(v => v.RevisionNumber).FirstOrDefaultAsync();@@ -117,7 +117,7 @@ public class ChromeExtensionTests : BrowserExtensionPlaywrightTestawait Task.Delay(2000);// Verify the server now has the recovered vault with a new revision number- var vaultAfterRecovery = await ApiDbContext.Vaults+ var vaultAfterRecovery = await ApiDbContext.VaultManifests.OrderByDescending(v => v.RevisionNumber).FirstOrDefaultAsync();@@ -169,7 +169,7 @@ public class ChromeExtensionTests : BrowserExtensionPlaywrightTestawait CreateCredentialInExtension(extensionPopup, serviceName2);// 2. Record client's vault revision before rollback- var vaultBeforeRollback = await ApiDbContext.Vaults+ var vaultBeforeRollback = await ApiDbContext.VaultManifests.OrderByDescending(v => v.RevisionNumber).FirstOrDefaultAsync();@@ -178,10 +178,10 @@ public class ChromeExtensionTests : BrowserExtensionPlaywrightTestConsole.WriteLine($"Client vault revision before rollback: {clientRevision}");// 3. Simulate server data loss by deleting latest vault revision- ApiDbContext.Vaults.Remove(vaultBeforeRollback);+ ApiDbContext.VaultManifests.Remove(vaultBeforeRollback);await ApiDbContext.SaveChangesAsync();- var serverRevisionAfterRollback = (await ApiDbContext.Vaults+ var serverRevisionAfterRollback = (await ApiDbContext.VaultManifests.OrderByDescending(v => v.RevisionNumber).FirstOrDefaultAsync())?.RevisionNumber ?? 0;Console.WriteLine($"Server vault revision after rollback: {serverRevisionAfterRollback}");@@ -213,7 +213,7 @@ public class ChromeExtensionTests : BrowserExtensionPlaywrightTestawait Task.Delay(3000); // Wait for sync to complete// 9. Verify server recovered- var recoveredVault = await ApiDbContext.Vaults+ var recoveredVault = await ApiDbContext.VaultManifests.OrderByDescending(v => v.RevisionNumber).FirstOrDefaultAsync();@@ -258,7 +258,7 @@ public class ChromeExtensionTests : BrowserExtensionPlaywrightTestvar extensionPopup = await LoginToExtension();// 2. Get initial vault revision from server- var initialVault = await ApiDbContext.Vaults+ var initialVault = await ApiDbContext.VaultManifests.OrderByDescending(v => v.RevisionNumber).FirstOrDefaultAsync();var initialRevision = initialVault?.RevisionNumber ?? 0;@@ -286,7 +286,7 @@ public class ChromeExtensionTests : BrowserExtensionPlaywrightTestConsole.WriteLine("Credential created locally while offline - vault is now dirty");// 5. Verify server revision hasn't changed- var vaultAfterOfflineCreate = await ApiDbContext.Vaults+ var vaultAfterOfflineCreate = await ApiDbContext.VaultManifests.OrderByDescending(v => v.RevisionNumber).FirstOrDefaultAsync();Assert.That(@@ -322,7 +322,7 @@ public class ChromeExtensionTests : BrowserExtensionPlaywrightTestawait Task.Delay(2000);// 12. Verify vault was uploaded to server- var recoveredVault = await ApiDbContext.Vaults+ var recoveredVault = await ApiDbContext.VaultManifests.OrderByDescending(v => v.RevisionNumber).FirstOrDefaultAsync();diff --git a/apps/server/Tests/AliasVault.E2ETests/Tests/Extensions/TestVaultGeneratorTests.cs b/apps/server/Tests/AliasVault.E2ETests/Tests/Extensions/TestVaultGeneratorTests.csindex 73f19bbd0..e8a3ae099 100644--- a/apps/server/Tests/AliasVault.E2ETests/Tests/Extensions/TestVaultGeneratorTests.cs+++ b/apps/server/Tests/AliasVault.E2ETests/Tests/Extensions/TestVaultGeneratorTests.cs@@ -124,15 +124,15 @@ public class TestVaultGeneratorTests : BrowserExtensionPlaywrightTest// Get the user's vault from the databasevar user = await ApiDbContext.AliasVaultUsers- .Include(u => u.Vaults)+ .Include(u => u.VaultManifests).FirstOrDefaultAsync(u => u.UserName == TestUserUsername);- if (user == null || !user.Vaults.Any())+ if (user == null || !user.VaultManifests.Any()){throw new Exception("Could not find user or vault in database");}- var vault = user.Vaults.OrderByDescending(x => x.RevisionNumber).First();+ var vault = user.VaultManifests.OrderByDescending(x => x.RevisionNumber).First();var outputDir = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location) ?? string.Empty;var vaultOutputDir = Path.Combine(outputDir, "output");diff --git a/apps/server/Tests/AliasVault.E2ETests/Tests/Extensions/VaultUpgradeTests.cs b/apps/server/Tests/AliasVault.E2ETests/Tests/Extensions/VaultUpgradeTests.csindex 81ad71cbe..9c6903643 100644--- a/apps/server/Tests/AliasVault.E2ETests/Tests/Extensions/VaultUpgradeTests.cs+++ b/apps/server/Tests/AliasVault.E2ETests/Tests/Extensions/VaultUpgradeTests.cs@@ -51,11 +51,13 @@ public class VaultUpgradeTests : BrowserExtensionPlaywrightTestawait ApiDbContext.SaveChangesAsync();// Insert static 1.0.0 vault into the database for the current user.- ApiDbContext.Vaults.Add(- new Vault+ ApiDbContext.VaultManifests.Add(+ new VaultManifest{- Id = Guid.NewGuid(),- UserId = ApiDbContext.AliasVaultUsers.First().Id,+ RevisionId = Guid.NewGuid(),+ Category = AliasVault.Shared.Models.WebApi.V2.Vault.VaultManifestCategory.Main,+ OwnerUserId = ApiDbContext.AliasVaultUsers.First().Id,+ StorageFormat = "sqlite-blob",Version = "1.0.0",RevisionNumber = 2,CreatedAt = DateTime.UtcNow,diff --git a/apps/server/Tests/AliasVault.UnitTests/Vault/RetentionManager/GeneralRetentionTests.cs b/apps/server/Tests/AliasVault.UnitTests/Vault/RetentionManager/GeneralRetentionTests.csindex 4a418be1a..791b4d21c 100644--- a/apps/server/Tests/AliasVault.UnitTests/Vault/RetentionManager/GeneralRetentionTests.cs+++ b/apps/server/Tests/AliasVault.UnitTests/Vault/RetentionManager/GeneralRetentionTests.cs@@ -18,7 +18,7 @@ using AliasVault.Api.Vault.RetentionRules;/// </summary>public class GeneralRetentionTests{- private List<Vault> testVaults;+ private List<VaultManifest> testVaults;private DateTime now;/// <summary>@@ -30,15 +30,15 @@ public class GeneralRetentionTestsnow = new DateTime(2023, 6, 1, 12, 0, 0); // Set a fixed "now" date for testing: June 1, 2023, 12:00 PMtestVaults =[- new Vault { Version = "1.1.0", UpdatedAt = new DateTime(2023, 5, 31, 12, 0, 0), Salt = "abc", Verifier = "abc", VaultBlob = string.Empty, EncryptionType = string.Empty, EncryptionSettings = string.Empty, RevisionNumber = 9 },- new Vault { Version = "1.1.0", UpdatedAt = new DateTime(2023, 5, 31, 4, 0, 0), Salt = "abc", Verifier = "abc", VaultBlob = string.Empty, EncryptionType = string.Empty, EncryptionSettings = string.Empty, RevisionNumber = 8 },- new Vault { Version = "1.1.0", UpdatedAt = new DateTime(2023, 5, 30, 12, 0, 0), Salt = "abc", Verifier = "abc", VaultBlob = string.Empty, EncryptionType = string.Empty, EncryptionSettings = string.Empty, RevisionNumber = 7 }, // 2 days ago- new Vault { Version = "1.1.0", UpdatedAt = new DateTime(2023, 5, 29, 12, 0, 0), Salt = "abc", Verifier = "abc", VaultBlob = string.Empty, EncryptionType = string.Empty, EncryptionSettings = string.Empty, RevisionNumber = 6 }, // 3 days ago- new Vault { Version = "1.0.3", UpdatedAt = new DateTime(2023, 5, 28, 12, 0, 0), Salt = "abc", Verifier = "abc", VaultBlob = string.Empty, EncryptionType = string.Empty, EncryptionSettings = string.Empty, RevisionNumber = 5 }, // 4 days ago- new Vault { Version = "1.0.3", UpdatedAt = new DateTime(2023, 5, 18, 12, 0, 0), Salt = "def", Verifier = "def", VaultBlob = string.Empty, EncryptionType = string.Empty, EncryptionSettings = string.Empty, RevisionNumber = 4 }, // 2 weeks ago- new Vault { Version = "1.0.3", UpdatedAt = new DateTime(2023, 5, 11, 12, 0, 0), Salt = "def", Verifier = "def", VaultBlob = string.Empty, EncryptionType = string.Empty, EncryptionSettings = string.Empty, RevisionNumber = 3 }, // 3 weeks ago- new Vault { Version = "1.0.2", UpdatedAt = new DateTime(2023, 5, 1, 12, 0, 0), Salt = "def", Verifier = "def", VaultBlob = string.Empty, EncryptionType = string.Empty, EncryptionSettings = string.Empty, RevisionNumber = 2 }, // 1 month ago- new Vault { Version = "1.0.1", UpdatedAt = new DateTime(2023, 4, 1, 12, 0, 0), Salt = "ghi", Verifier = "ghi", VaultBlob = string.Empty, EncryptionType = string.Empty, EncryptionSettings = string.Empty, RevisionNumber = 1 }, // 2 months ago+ new VaultManifest { Category = AliasVault.Shared.Models.WebApi.V2.Vault.VaultManifestCategory.Main, Version = "1.1.0", UpdatedAt = new DateTime(2023, 5, 31, 12, 0, 0), Salt = "abc", Verifier = "abc", VaultBlob = string.Empty, StorageFormat = "sqlite-blob", EncryptionType = string.Empty, EncryptionSettings = string.Empty, RevisionNumber = 9 },+ new VaultManifest { Category = AliasVault.Shared.Models.WebApi.V2.Vault.VaultManifestCategory.Main, Version = "1.1.0", UpdatedAt = new DateTime(2023, 5, 31, 4, 0, 0), Salt = "abc", Verifier = "abc", VaultBlob = string.Empty, StorageFormat = "sqlite-blob", EncryptionType = string.Empty, EncryptionSettings = string.Empty, RevisionNumber = 8 },+ new VaultManifest { Category = AliasVault.Shared.Models.WebApi.V2.Vault.VaultManifestCategory.Main, Version = "1.1.0", UpdatedAt = new DateTime(2023, 5, 30, 12, 0, 0), Salt = "abc", Verifier = "abc", VaultBlob = string.Empty, StorageFormat = "sqlite-blob", EncryptionType = string.Empty, EncryptionSettings = string.Empty, RevisionNumber = 7 }, // 2 days ago+ new VaultManifest { Category = AliasVault.Shared.Models.WebApi.V2.Vault.VaultManifestCategory.Main, Version = "1.1.0", UpdatedAt = new DateTime(2023, 5, 29, 12, 0, 0), Salt = "abc", Verifier = "abc", VaultBlob = string.Empty, StorageFormat = "sqlite-blob", EncryptionType = string.Empty, EncryptionSettings = string.Empty, RevisionNumber = 6 }, // 3 days ago+ new VaultManifest { Category = AliasVault.Shared.Models.WebApi.V2.Vault.VaultManifestCategory.Main, Version = "1.0.3", UpdatedAt = new DateTime(2023, 5, 28, 12, 0, 0), Salt = "abc", Verifier = "abc", VaultBlob = string.Empty, StorageFormat = "sqlite-blob", EncryptionType = string.Empty, EncryptionSettings = string.Empty, RevisionNumber = 5 }, // 4 days ago+ new VaultManifest { Category = AliasVault.Shared.Models.WebApi.V2.Vault.VaultManifestCategory.Main, Version = "1.0.3", UpdatedAt = new DateTime(2023, 5, 18, 12, 0, 0), Salt = "def", Verifier = "def", VaultBlob = string.Empty, StorageFormat = "sqlite-blob", EncryptionType = string.Empty, EncryptionSettings = string.Empty, RevisionNumber = 4 }, // 2 weeks ago+ new VaultManifest { Category = AliasVault.Shared.Models.WebApi.V2.Vault.VaultManifestCategory.Main, Version = "1.0.3", UpdatedAt = new DateTime(2023, 5, 11, 12, 0, 0), Salt = "def", Verifier = "def", VaultBlob = string.Empty, StorageFormat = "sqlite-blob", EncryptionType = string.Empty, EncryptionSettings = string.Empty, RevisionNumber = 3 }, // 3 weeks ago+ new VaultManifest { Category = AliasVault.Shared.Models.WebApi.V2.Vault.VaultManifestCategory.Main, Version = "1.0.2", UpdatedAt = new DateTime(2023, 5, 1, 12, 0, 0), Salt = "def", Verifier = "def", VaultBlob = string.Empty, StorageFormat = "sqlite-blob", EncryptionType = string.Empty, EncryptionSettings = string.Empty, RevisionNumber = 2 }, // 1 month ago+ new VaultManifest { Category = AliasVault.Shared.Models.WebApi.V2.Vault.VaultManifestCategory.Main, Version = "1.0.1", UpdatedAt = new DateTime(2023, 4, 1, 12, 0, 0), Salt = "ghi", Verifier = "ghi", VaultBlob = string.Empty, StorageFormat = "sqlite-blob", EncryptionType = string.Empty, EncryptionSettings = string.Empty, RevisionNumber = 1 }, // 2 months ago];}@@ -185,7 +185,7 @@ public class GeneralRetentionTestsvar vaultsToDelete = VaultRetentionManager.ApplyRetention(retentionPolicy, testVaults, DateTime.UtcNow).ToList();// Remove the vaults from the list of test vaults that are expected to be kept- var vaultsToKeep = new List<Vault>(testVaults);+ var vaultsToKeep = new List<VaultManifest>(testVaults);vaultsToKeep.RemoveAll(v => vaultsToDelete.Contains(v));Assert.Multiple(() =>@@ -215,9 +215,11 @@ public class GeneralRetentionTests// New vault created now.var now = DateTime.Now;- var newVault = new Vault+ var newVault = new VaultManifest{+ Category = AliasVault.Shared.Models.WebApi.V2.Vault.VaultManifestCategory.Main,VaultBlob = string.Empty,+ StorageFormat = "sqlite-blob",Version = string.Empty,Salt = string.Empty,Verifier = string.Empty,@@ -233,7 +235,7 @@ public class GeneralRetentionTestsvar vaultsToDelete = VaultRetentionManager.ApplyRetention(retentionPolicy, testVaults, DateTime.UtcNow, newVault).ToList();// Remove the vaults from the list of test vaults that are expected to be kept- var vaultsToKeep = new List<Vault>(testVaults);+ var vaultsToKeep = new List<VaultManifest>(testVaults);vaultsToKeep.RemoveAll(v => vaultsToDelete.Contains(v));Assert.Multiple(() =>@@ -259,7 +261,7 @@ public class GeneralRetentionTestsvar vaultsToDelete = VaultRetentionManager.ApplyRetention(retentionPolicy, testVaults, DateTime.UtcNow).ToList();// Remove the vaults from the list of test vaults that are expected to be kept- var vaultsToKeep = new List<Vault>(testVaults);+ var vaultsToKeep = new List<VaultManifest>(testVaults);vaultsToKeep.RemoveAll(v => vaultsToDelete.Contains(v));Assert.Multiple(() =>