Privacy-first password manager with built-in email aliasing. Fully encrypted and self-hostable.
Prevent loading unnecessary data (#2268)
Leendert de Borst697040e86f92
diff --git a/apps/server/AliasVault.Api/Controllers/AuthController.cs b/apps/server/AliasVault.Api/Controllers/AuthController.csindex 0df87a46d..f81576865 100644--- a/apps/server/AliasVault.Api/Controllers/AuthController.cs+++ b/apps/server/AliasVault.Api/Controllers/AuthController.cs@@ -97,9 +97,13 @@ public class AuthController(IAliasServerDbContextFactory dbContextFactory, UserMreturn Unauthorized(ApiErrorCodeHelper.CreateErrorResponse(ApiErrorCode.ACCOUNT_BLOCKED, 401));}- // Get latest vault revision number- var latestVault = user.Vaults.OrderByDescending(x => x.RevisionNumber).FirstOrDefault();- var latestRevision = latestVault?.RevisionNumber ?? 0;+ // Get latest vault revision number and salt.+ await using var context = await dbContextFactory.CreateDbContextAsync();+ var latestVault = await context.Vaults+ .Where(x => x.UserId == user.Id)+ .OrderByDescending(x => x.RevisionNumber)+ .Select(x => new { x.RevisionNumber, x.Salt })+ .FirstOrDefaultAsync();// Check client version compatibility if header is providedvar clientSupported = false;@@ -116,7 +120,7 @@ public class AuthController(IAliasServerDbContextFactory dbContextFactory, UserM{ClientVersionSupported = clientSupported,ServerVersion = AppInfo.GetFullVersion(),- VaultRevision = latestRevision,+ VaultRevision = latestVault?.RevisionNumber ?? 0,SrpSalt = latestVault?.Salt ?? string.Empty,});}diff --git a/apps/server/AliasVault.Api/Controllers/VaultController.cs b/apps/server/AliasVault.Api/Controllers/VaultController.csindex 70fbdd958..6efd11c8e 100644--- a/apps/server/AliasVault.Api/Controllers/VaultController.cs+++ b/apps/server/AliasVault.Api/Controllers/VaultController.cs@@ -155,7 +155,11 @@ 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 = await context.Vaults+ .Where(x => x.UserId == user.Id)+ .OrderByDescending(x => x.RevisionNumber)+ .Select(x => new { x.Salt, x.Verifier, x.EncryptionType, x.EncryptionSettings, x.RevisionNumber, x.Version })+ .FirstAsync();// Reject vaults with a version that is lower than the last vault version.if (VersionHelper.IsVersionOlder(model.Version, latestVault.Version))@@ -255,7 +259,11 @@ 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 = await context.Vaults+ .Where(x => x.UserId == user.Id)+ .OrderByDescending(x => x.RevisionNumber)+ .Select(x => new { x.RevisionNumber, x.Version })+ .FirstAsync();if (VersionHelper.IsVersionOlder(model.Version, latestVault.Version)){return BadRequest(ApiErrorCodeHelper.CreateValidationErrorResponse(ApiErrorCode.VAULT_NOT_UP_TO_DATE, 400));