Privacy-first password manager with built-in email aliasing. Fully encrypted and self-hostable.
Restore reverted email fetch logic and minor fixes (#196)
Leendert de Borstad0124b9b764
diff --git a/apps/server/AliasVault.Api/Controllers/Email/EmailController.cs b/apps/server/AliasVault.Api/Controllers/Email/EmailController.csindex 6c05d0127..3a927fc29 100644--- a/apps/server/AliasVault.Api/Controllers/Email/EmailController.cs+++ b/apps/server/AliasVault.Api/Controllers/Email/EmailController.cs@@ -37,13 +37,7 @@ public class EmailController(ILogger<VaultController> logger, IAliasServerDbCont{await using var context = await dbContextFactory.CreateDbContextAsync();- var user = await GetCurrentUserAsync();- if (user is null)- {- return Unauthorized("Not authenticated.");- }-- var (email, errorResult) = await RetrieveEmailAsync(id, user, context);+ var (email, errorResult) = await AuthenticateAndRetrieveEmailAsync(id, context);if (errorResult != null){return errorResult;@@ -93,13 +87,7 @@ public class EmailController(ILogger<VaultController> logger, IAliasServerDbCont{await using var context = await dbContextFactory.CreateDbContextAsync();- var user = await GetCurrentUserAsync();- if (user is null)- {- return Unauthorized("Not authenticated.");- }-- var (email, errorResult) = await RetrieveEmailAsync(id, user, context);+ var (email, errorResult) = await AuthenticateAndRetrieveEmailAsync(id, context);if (errorResult != null){return errorResult;@@ -132,13 +120,7 @@ public class EmailController(ILogger<VaultController> logger, IAliasServerDbCont{await using var context = await dbContextFactory.CreateDbContextAsync();- var user = await GetCurrentUserAsync();- if (user is null)- {- return Unauthorized("Not authenticated.");- }-- var (email, errorResult) = await RetrieveEmailAsync(id, user, context);+ var (email, errorResult) = await AuthenticateAndRetrieveEmailAsync(id, context);if (errorResult != null){return errorResult;@@ -175,7 +157,7 @@ public class EmailController(ILogger<VaultController> logger, IAliasServerDbCont}// Sanitize input- model.Ids = [.. model.Ids.Distinct().ToList().FindAll(id => id > 0)];+ model.Ids = [.. model.Ids.Where(id => id > 0).Distinct()];if (model.Ids.Count == 0){@@ -193,10 +175,12 @@ public class EmailController(ILogger<VaultController> logger, IAliasServerDbCont}}- List<int> deletedEmails = [];try{- await context.Emails.Where(e => model.Ids.Contains(e.Id)).ExecuteDeleteAsync();+ await context.Emails+ .Where(e => model.Ids.Contains(e.Id))+ .Where(e => context.UserEmailClaims.Any(c => c.UserId == user.Id && !c.Disabled && c.Address == e.To.Trim().ToLower()))+ .ExecuteDeleteAsync();}catch (Exception ex){@@ -212,10 +196,27 @@ public class EmailController(ILogger<VaultController> logger, IAliasServerDbCont}/// <summary>- /// Retrieves the requested email.+ /// Authenticates the user and retrieves the requested email.+ /// </summary>+ /// <param name="id">The email ID to retrieve.</param>+ /// <param name="context">The database context.</param>+ /// <returns>A tuple containing the email, and an IActionResult if there's an error.</returns>+ private async Task<(Email? Email, IActionResult? ErrorResult)> AuthenticateAndRetrieveEmailAsync(int id, AliasServerDbContext context)+ {+ var user = await GetCurrentUserAsync();+ if (user is null)+ {+ return (null, Unauthorized("Not authenticated."));+ }++ return await RetrieveEmailAsync(id, user, context);+ }++ /// <summary>+ /// Retrieves the requested email for an already authenticated user./// </summary>/// <param name="id">The email ID to retrieve.</param>- /// <param name="user">The authenticated Alis Vault user.</param>+ /// <param name="user">The authenticated AliasVault user.</param>/// <param name="context">The database context.</param>/// <returns>A tuple containing the email, and an IActionResult if there's an error.</returns>private async Task<(Email? Email, IActionResult? ErrorResult)> RetrieveEmailAsync(int id, AliasVaultUser user, AliasServerDbContext context)diff --git a/apps/server/AliasVault.Client/Main/Components/Email/EmailRow.razor b/apps/server/AliasVault.Client/Main/Components/Email/EmailRow.razorindex aabc74fb5..ca3f8d652 100644--- a/apps/server/AliasVault.Client/Main/Components/Email/EmailRow.razor+++ b/apps/server/AliasVault.Client/Main/Components/Email/EmailRow.razor@@ -7,7 +7,6 @@<div class="pl-4 mr-2 flex-shrink-0" ><input class="form-checkbox h-4 w-4 text-blue-600 bg-gray-100 border-gray-300 rounded focus:ring-blue-500 dark:focus:ring-blue-600 dark:ring-offset-gray-800 focus:ring-2 dark:bg-gray-700 dark:border-gray-600"type="checkbox"- id="[email protected]"value="@Email.IsChecked"checked="@IsChecked"@onclick="@(() => OnEmailCheck.InvokeAsync(Email.Id))" />diff --git a/apps/server/AliasVault.Client/Main/Pages/Emails/Home.razor b/apps/server/AliasVault.Client/Main/Pages/Emails/Home.razorindex 2fbf28e23..7688041c0 100644--- a/apps/server/AliasVault.Client/Main/Pages/Emails/Home.razor+++ b/apps/server/AliasVault.Client/Main/Pages/Emails/Home.razor@@ -110,6 +110,7 @@ else{<EmailRowEmail="email"+ OnEmailCheck="CheckEmail"OnEmailClick="ShowAliasVaultEmailInModal"IsChecked="@(CheckedEmailIds.Contains(email.Id))"IsSelected="false"@@ -673,7 +674,7 @@ else}/// <summary>- /// Check an email for bulk actions (desktop layout).+ /// Check an email for bulk actions./// </summary>private void CheckEmail(int emailId){diff --git a/apps/server/AliasVault.Client/wwwroot/css/tailwind.css b/apps/server/AliasVault.Client/wwwroot/css/tailwind.cssindex df5847248..62a364b95 100644--- a/apps/server/AliasVault.Client/wwwroot/css/tailwind.css+++ b/apps/server/AliasVault.Client/wwwroot/css/tailwind.css@@ -2342,10 +2342,6 @@ video {padding-left: 1.25rem;}-.pl-4 {- padding-left: 1rem;-}-.pr-10 {padding-right: 2.5rem;}@@ -2378,10 +2374,6 @@ video {padding-top: 0px;}-.pt-1 {- padding-top: 0.25rem;-}-.pt-16 {padding-top: 4rem;}@@ -2406,6 +2398,10 @@ video {padding-top: 2rem;}+.pl-4 {+ padding-left: 1rem;+}+.text-left {text-align: left;}@@ -2807,7 +2803,9 @@ video {}.transition {+ transition-property: color, background-color, border-color, text-decoration-color, fill, stroke, opacity, box-shadow, transform, filter, -webkit-backdrop-filter;transition-property: color, background-color, border-color, text-decoration-color, fill, stroke, opacity, box-shadow, transform, filter, backdrop-filter;+ transition-property: color, background-color, border-color, text-decoration-color, fill, stroke, opacity, box-shadow, transform, filter, backdrop-filter, -webkit-backdrop-filter;transition-timing-function: cubic-bezier(0.4, 0, 0.2, 1);transition-duration: 150ms;}