Add email claim disabled check to email retrieval (#2014)

This commit is contained in:
Leendert de Borst
2026-05-15 07:06:47 +02:00
committed by Leendert de Borst
parent 8164f69360
commit e55a114073
2 changed files with 3 additions and 3 deletions

View File

@@ -47,7 +47,7 @@ public class EmailBoxController(IAliasServerDbContextFactory dbContextFactory, U
var emailClaim = await context.UserEmailClaims
.FirstOrDefaultAsync(x => x.Address == sanitizedEmail);
if (emailClaim is null)
if (emailClaim is null || emailClaim.Disabled)
{
return BadRequest(new ApiErrorResponse
{
@@ -126,7 +126,7 @@ public class EmailBoxController(IAliasServerDbContextFactory dbContextFactory, U
// Load all email addresses that the user has a claim to where the address is in the list.
var validAddresses = await context.UserEmailClaims
.Where(claim => claim.UserId == user.Id && model.Addresses.Contains(claim.Address))
.Where(claim => claim.UserId == user.Id && model.Addresses.Contains(claim.Address) && !claim.Disabled)
.Select(claim => claim.Address)
.ToListAsync();

View File

@@ -161,7 +161,7 @@ public class EmailController(ILogger<VaultController> logger, IAliasServerDbCont
// See if this user has a valid claim to the email address.
var normalizedEmailAddress = email.To.Trim().ToLower();
var emailClaim = await context.UserEmailClaims.FirstOrDefaultAsync(x => x.UserId == user.Id && x.Address == normalizedEmailAddress);
var emailClaim = await context.UserEmailClaims.FirstOrDefaultAsync(x => x.UserId == user.Id && x.Address == normalizedEmailAddress && !x.Disabled);
if (emailClaim is null)
{