Skip to content

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

Refactor

Leendert de Borst28a8fde6c15a
diff --git a/apps/server/AliasVault.Api/Controllers/V1/Email/EmailBoxController.cs b/apps/server/AliasVault.Api/Controllers/V1/Email/EmailBoxController.cs
index 50ed40fdb..296405eee 100644
--- a/apps/server/AliasVault.Api/Controllers/V1/Email/EmailBoxController.cs
+++ b/apps/server/AliasVault.Api/Controllers/V1/Email/EmailBoxController.cs
@@ -85,9 +85,9 @@ public class EmailBoxController(IAliasServerDbContextFactory dbContextFactory, U
FromLocal = x.FromLocal,
ToDomain = x.ToDomain,
ToLocal = x.ToLocal,
- Date = x.Date.ToUniversalTime(),
- DateSystem = x.DateSystem.ToUniversalTime(),
- SecondsAgo = (int)DateTime.UtcNow.Subtract(x.DateSystem.ToUniversalTime()).TotalSeconds,
+ Date = x.Date,
+ DateSystem = x.DateSystem,
+ SecondsAgo = (int)DateTime.UtcNow.Subtract(x.DateSystem).TotalSeconds,
MessagePreview = x.MessagePreview ?? string.Empty,
EncryptedSymmetricKey = x.DecryptionKeys.Where(d => personalKeyIds.Contains(d.VaultManifestDeliveryKeyId)).OrderBy(d => d.VaultManifestDeliveryKeyId).Select(d => d.EncryptedSymmetricKey).First(),
EncryptionKey = x.DecryptionKeys.Where(d => personalKeyIds.Contains(d.VaultManifestDeliveryKeyId)).OrderBy(d => d.VaultManifestDeliveryKeyId).Select(d => d.VaultManifestDeliveryKey.PublicKey).First(),
@@ -184,9 +184,9 @@ public class EmailBoxController(IAliasServerDbContextFactory dbContextFactory, U
FromLocal = x.FromLocal,
ToDomain = x.ToDomain,
ToLocal = x.ToLocal,
- Date = x.Date.ToUniversalTime(),
- DateSystem = x.DateSystem.ToUniversalTime(),
- SecondsAgo = (int)DateTime.UtcNow.Subtract(x.DateSystem.ToUniversalTime()).TotalSeconds,
+ Date = x.Date,
+ DateSystem = x.DateSystem,
+ SecondsAgo = (int)DateTime.UtcNow.Subtract(x.DateSystem).TotalSeconds,
MessagePreview = x.MessagePreview ?? string.Empty,
EncryptedSymmetricKey = x.DecryptionKeys.Where(d => personalKeyIds.Contains(d.VaultManifestDeliveryKeyId)).OrderBy(d => d.VaultManifestDeliveryKeyId).Select(d => d.EncryptedSymmetricKey).First(),
EncryptionKey = x.DecryptionKeys.Where(d => personalKeyIds.Contains(d.VaultManifestDeliveryKeyId)).OrderBy(d => d.VaultManifestDeliveryKeyId).Select(d => d.VaultManifestDeliveryKey.PublicKey).First(),
diff --git a/apps/server/AliasVault.Api/Controllers/V1/Email/EmailController.cs b/apps/server/AliasVault.Api/Controllers/V1/Email/EmailController.cs
index 6d2d64340..ad9817c66 100644
--- a/apps/server/AliasVault.Api/Controllers/V1/Email/EmailController.cs
+++ b/apps/server/AliasVault.Api/Controllers/V1/Email/EmailController.cs
@@ -51,9 +51,9 @@ public class EmailController(ILogger<EmailController> logger, IAliasServerDbCont
FromLocal = email.FromLocal,
ToDomain = email.ToDomain,
ToLocal = email.ToLocal,
- Date = email.Date.ToUniversalTime(),
- DateSystem = email.DateSystem.ToUniversalTime(),
- SecondsAgo = (int)DateTime.UtcNow.Subtract(email.DateSystem.ToUniversalTime()).TotalSeconds,
+ Date = email.Date,
+ DateSystem = email.DateSystem,
+ SecondsAgo = (int)DateTime.UtcNow.Subtract(email.DateSystem).TotalSeconds,
MessageHtml = email.MessageHtml,
MessagePlain = email.MessagePlain,
MessageSource = email.MessageSourceBytes is not null ? Convert.ToBase64String(email.MessageSourceBytes) : email.MessageSource,
diff --git a/apps/server/AliasVault.Api/Controllers/V2/Email/EmailBoxController.cs b/apps/server/AliasVault.Api/Controllers/V2/Email/EmailBoxController.cs
index 33d0b9423..72f6fa4d1 100644
--- a/apps/server/AliasVault.Api/Controllers/V2/Email/EmailBoxController.cs
+++ b/apps/server/AliasVault.Api/Controllers/V2/Email/EmailBoxController.cs
@@ -113,9 +113,9 @@ public class EmailBoxController(IAliasServerDbContextFactory dbContextFactory, U
FromLocal = x.FromLocal,
ToDomain = x.ToDomain,
ToLocal = x.ToLocal,
- Date = x.Date.ToUniversalTime(),
- DateSystem = x.DateSystem.ToUniversalTime(),
- SecondsAgo = (int)DateTime.UtcNow.Subtract(x.DateSystem.ToUniversalTime()).TotalSeconds,
+ Date = x.Date,
+ DateSystem = x.DateSystem,
+ SecondsAgo = (int)DateTime.UtcNow.Subtract(x.DateSystem).TotalSeconds,
MessagePreview = x.MessagePreview ?? string.Empty,
HasAttachments = x.AttachmentCount > 0,
},
@@ -217,9 +217,9 @@ public class EmailBoxController(IAliasServerDbContextFactory dbContextFactory, U
FromLocal = x.FromLocal,
ToDomain = x.ToDomain,
ToLocal = x.ToLocal,
- Date = x.Date.ToUniversalTime(),
- DateSystem = x.DateSystem.ToUniversalTime(),
- SecondsAgo = (int)DateTime.UtcNow.Subtract(x.DateSystem.ToUniversalTime()).TotalSeconds,
+ Date = x.Date,
+ DateSystem = x.DateSystem,
+ SecondsAgo = (int)DateTime.UtcNow.Subtract(x.DateSystem).TotalSeconds,
MessagePreview = x.MessagePreview ?? string.Empty,
HasAttachments = x.AttachmentCount > 0,
},
diff --git a/apps/server/AliasVault.Api/Controllers/V2/Email/EmailController.cs b/apps/server/AliasVault.Api/Controllers/V2/Email/EmailController.cs
index f751b6805..b1ff003f9 100644
--- a/apps/server/AliasVault.Api/Controllers/V2/Email/EmailController.cs
+++ b/apps/server/AliasVault.Api/Controllers/V2/Email/EmailController.cs
@@ -59,9 +59,9 @@ public class EmailController(ILogger<EmailController> logger, IAliasServerDbCont
FromLocal = email.FromLocal,
ToDomain = email.ToDomain,
ToLocal = email.ToLocal,
- Date = email.Date.ToUniversalTime(),
- DateSystem = email.DateSystem.ToUniversalTime(),
- SecondsAgo = (int)DateTime.UtcNow.Subtract(email.DateSystem.ToUniversalTime()).TotalSeconds,
+ Date = email.Date,
+ DateSystem = email.DateSystem,
+ SecondsAgo = (int)DateTime.UtcNow.Subtract(email.DateSystem).TotalSeconds,
MessageSource = email.MessageSourceBytes is not null ? Convert.ToBase64String(email.MessageSourceBytes) : email.MessageSource,
PublicKeys = keyTable.PublicKeys,
DecryptionKeys = keyTable.ToApiModels(callerDecryptionKeys.Select(d => (d.VaultManifestDeliveryKeyId, d.EncryptedSymmetricKey))),
diff --git a/apps/server/AliasVault.Api/Controllers/V2/VaultKeyController.cs b/apps/server/AliasVault.Api/Controllers/V2/VaultKeyController.cs
index 323fef8db..2f62d3755 100644
--- a/apps/server/AliasVault.Api/Controllers/V2/VaultKeyController.cs
+++ b/apps/server/AliasVault.Api/Controllers/V2/VaultKeyController.cs
@@ -40,10 +40,10 @@ public class VaultKeyController(IAliasServerDbContextFactory dbContextFactory, U
return ApiError.Result(ApiErrorCode.NOT_AUTHENTICATED, 401);
}
- // Check if the unlock method type is valid.
+ // An unknown unlock method token is a malformed request; a null key is reserved for "no key stored for this method".
if (!UnlockMethodTypes.TryParse(type?.ToLowerInvariant(), out var parsedType))
{
- return Ok(new VaultKeyGetResponse { VaultKey = null });
+ return ApiError.Result(ApiErrorCode.INVALID_REQUEST, 400);
}
var unlockKey = await context.UserUnlockKeys.FirstOrDefaultAsync(x => x.UserId == user.Id && x.Type == parsedType);
diff --git a/apps/server/Databases/AliasServerDb/AliasServerDbContext.cs b/apps/server/Databases/AliasServerDb/AliasServerDbContext.cs
index 09bd9a0b0..9d64809f7 100644
--- a/apps/server/Databases/AliasServerDb/AliasServerDbContext.cs
+++ b/apps/server/Databases/AliasServerDb/AliasServerDbContext.cs
@@ -261,7 +261,10 @@ public class AliasServerDbContext : WorkerStatusDbContext, IDataProtectionKeyCon
{
base.OnModelCreating(modelBuilder);
- // Configure all DateTime properties to use timestamp with time zone in UTC
+ /*
+ * All DateTime properties are configured to use 'timestamp with time zone' in UTC and are returned as Kind.Utc.
+ * Avoid using ToUniversalTime() inside EF projections, as this bypasses the read converter and results in Kind.Local.
+ */
foreach (var entityType in modelBuilder.Model.GetEntityTypes())
{
foreach (var property in entityType.GetProperties())
diff --git a/apps/server/Shared/AliasVault.Shared/Models/Enums/ApiErrorCode.cs b/apps/server/Shared/AliasVault.Shared/Models/Enums/ApiErrorCode.cs
index 0f39f1ab4..9c0fdb04b 100644
--- a/apps/server/Shared/AliasVault.Shared/Models/Enums/ApiErrorCode.cs
+++ b/apps/server/Shared/AliasVault.Shared/Models/Enums/ApiErrorCode.cs
@@ -9,7 +9,6 @@ namespace AliasVault.Shared.Models.Enums;
/// <summary>
/// Enumeration of error codes returned by the API.
-/// The member name is the code on the wire, so a member is never renamed or removed; ApiErrorCodeTests pins the list.
/// </summary>
public enum ApiErrorCode
{
diff --git a/core/models/src/webapi/Groups.ts b/core/models/src/webapi/Groups.ts
index 73fc2cc9d..f354f31df 100644
--- a/core/models/src/webapi/Groups.ts
+++ b/core/models/src/webapi/Groups.ts
@@ -83,7 +83,7 @@ export type GroupOverviewResponse = {
export type CreateSharedManifestRequest = {
manifestId: string;
selfEncryptedVek: string;
- selfPublicKey: string;
+ selfAccountPublicKey: string;
algorithm: VaultKeyAlgorithmValue;
selfGrantSignature: string;
/** The name of the manifest, encrypted with the manifest's own key (base64). */
@@ -111,7 +111,7 @@ export type CreateSharedManifestResponse = {
*/
export type ManifestGrant = {
recipientUserId: string;
- recipientPublicKeyId: string;
+ recipientAccountPublicKeyId: string;
encryptedVek: string;
encryptedName?: string | null;
encryptedNameSignature?: string | null;