Mail: diagnose van SMTP-weigeringen en keuze bij een nieuwe uitnodigingslink
SMTP: bij een geweigerd commando logt de verzender fase, statuscode en de eerste regel van het serverantwoord (adressen vervangen, max 120 tekens); specifiekere foutcodes (rejected_sender, rejected_recipient, tls_failed, connection_failed) die de beheerder in het venster ziet; opstartlog met SMTP-host, poort en standaard afzenderdomein. Uit de property-test: besturingstekens worden eerst verwijderd, anders kon een adres weer aan elkaar plakken. Nieuwe uitnodigingslink: regenerate-invite mailt alleen met sendEmail=true (standaard false); eerst een keuzevenster 'Alleen link kopieren' / 'Link kopieren en mailen' (zonder mail alleen de link). Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
This commit is contained in:
@@ -174,6 +174,30 @@ public class UsersApiWithRealTokensTests : IAsyncLifetime
|
||||
(await RoleOfAsync(user.Id)).Should().Be("User");
|
||||
}
|
||||
|
||||
// ---- regenerate-invite: the body is optional and the mail is only sent on request
|
||||
|
||||
[Fact]
|
||||
public async Task RegenerateInvite_OverHttp_MailsOnlyWhenAskedTo_WhateverTheBodyLooksLike()
|
||||
{
|
||||
await AddUserAsync("andrea@test.nl", "Owner");
|
||||
var id = Guid.NewGuid();
|
||||
_invitations.GetAllPendingInvitationsAsync().Returns(new List<PendingInvitationInfo>
|
||||
{
|
||||
new(id, "invited@test.com", "User", "old", DateTimeOffset.UtcNow.AddDays(-2), true, "nl")
|
||||
});
|
||||
_invitations.RegenerateInvitationAsync(id).Returns("fresh");
|
||||
_mail.SendInvitationAsync(default!, default!, default, default, default).ReturnsForAnyArgs(MailSendResult.Ok);
|
||||
var token = await TokenAsync("andrea@test.nl");
|
||||
|
||||
(await SendAsync(token, HttpMethod.Post, $"/Users/{id}/regenerate-invite")).Should().Be(HttpStatusCode.OK); // no body at all
|
||||
(await SendAsync(token, HttpMethod.Post, $"/Users/{id}/regenerate-invite", new { })).Should().Be(HttpStatusCode.OK); // {}
|
||||
(await SendAsync(token, HttpMethod.Post, $"/Users/{id}/regenerate-invite", new { sendEmail = false })).Should().Be(HttpStatusCode.OK);
|
||||
await _mail.DidNotReceiveWithAnyArgs().SendInvitationAsync(default!, default!, default, default, default);
|
||||
|
||||
(await SendAsync(token, HttpMethod.Post, $"/Users/{id}/regenerate-invite", new { sendEmail = true })).Should().Be(HttpStatusCode.OK);
|
||||
await _mail.Received(1).SendInvitationAsync("invited@test.com", "fresh", "nl", true, Arg.Any<CancellationToken>());
|
||||
}
|
||||
|
||||
// ---- the Administrator is held to the hierarchy
|
||||
|
||||
[Fact]
|
||||
|
||||
@@ -154,19 +154,81 @@ public class UsersControllerMailTests : IDisposable
|
||||
// --- regenerate / resend ---
|
||||
|
||||
[Fact]
|
||||
public async Task Regenerate_SendsTheNewLinkMail_InTheLanguageOfTheInvitation()
|
||||
public async Task Regenerate_WithTheFlag_SendsTheNewLinkMail_InTheLanguageOfTheInvitation()
|
||||
{
|
||||
var owner = await Add("owner@test.com", "Owner");
|
||||
var id = Guid.NewGuid();
|
||||
Pending(id, language: "en");
|
||||
_invitations.RegenerateInvitationAsync(id).Returns("new-token");
|
||||
|
||||
var result = await As(owner).RegenerateInvite(id);
|
||||
var result = await As(owner).RegenerateInvite(id, new RegenerateInviteRequest(SendEmail: true));
|
||||
|
||||
Prop<string>(result.Should().BeOfType<OkObjectResult>().Subject.Value, "inviteLink").Should().Contain("new-token");
|
||||
var body = result.Should().BeOfType<OkObjectResult>().Subject.Value;
|
||||
Prop<string>(body, "inviteLink").Should().Contain("new-token");
|
||||
Prop<bool>(Prop<object>(body, "mail"), "sent").Should().BeTrue();
|
||||
await _mail.Received(1).SendInvitationAsync("invited@test.com", "new-token", "en", true, Arg.Any<CancellationToken>());
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task Regenerate_WithoutTheFlag_CreatesTheLink_ButSendsNoMail()
|
||||
{
|
||||
var owner = await Add("owner@test.com", "Owner");
|
||||
var id = Guid.NewGuid();
|
||||
Pending(id);
|
||||
_invitations.RegenerateInvitationAsync(id).Returns("new-token");
|
||||
|
||||
var result = await As(owner).RegenerateInvite(id, new RegenerateInviteRequest());
|
||||
|
||||
var body = result.Should().BeOfType<OkObjectResult>().Subject.Value;
|
||||
Prop<string>(body, "inviteLink").Should().Contain("new-token");
|
||||
Prop<object?>(body, "mail").Should().BeNull();
|
||||
await _invitations.Received(1).RegenerateInvitationAsync(id);
|
||||
await _mail.DidNotReceiveWithAnyArgs().SendInvitationAsync(default!, default!, default, default, default);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task Regenerate_WithNoBodyAtAll_IsTheSameAsWithoutTheFlag()
|
||||
{
|
||||
var owner = await Add("owner@test.com", "Owner");
|
||||
var id = Guid.NewGuid();
|
||||
Pending(id);
|
||||
_invitations.RegenerateInvitationAsync(id).Returns("new-token");
|
||||
|
||||
var result = await As(owner).RegenerateInvite(id); // an older client sends no flag
|
||||
|
||||
Prop<object?>(result.Should().BeOfType<OkObjectResult>().Subject.Value, "mail").Should().BeNull();
|
||||
await _mail.DidNotReceiveWithAnyArgs().SendInvitationAsync(default!, default!, default, default, default);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task Regenerate_WithTheFlag_OnASiteWithoutMail_HasNoMailResult()
|
||||
{
|
||||
var owner = await Add("owner@test.com", "Owner");
|
||||
var id = Guid.NewGuid();
|
||||
Pending(id);
|
||||
_invitations.RegenerateInvitationAsync(id).Returns("new-token");
|
||||
_mail.SendInvitationAsync(default!, default!, default, default, default).ReturnsForAnyArgs(MailSendResult.Fail(MailSendResult.Disabled));
|
||||
|
||||
var result = await As(owner).RegenerateInvite(id, new RegenerateInviteRequest(true));
|
||||
|
||||
Prop<object?>(result.Should().BeOfType<OkObjectResult>().Subject.Value, "mail").Should().BeNull();
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task Regenerate_WithTheFlag_ReportsAFailedMail_NextToTheLink()
|
||||
{
|
||||
var owner = await Add("owner@test.com", "Owner");
|
||||
var id = Guid.NewGuid();
|
||||
Pending(id);
|
||||
_invitations.RegenerateInvitationAsync(id).Returns("new-token");
|
||||
_mail.SendInvitationAsync(default!, default!, default, default, default).ReturnsForAnyArgs(MailSendResult.Fail(MailSendResult.RejectedSender));
|
||||
|
||||
var body = (await As(owner).RegenerateInvite(id, new RegenerateInviteRequest(true))).Should().BeOfType<OkObjectResult>().Subject.Value;
|
||||
|
||||
Prop<string>(Prop<object>(body, "mail"), "error").Should().Be("rejected_sender");
|
||||
Prop<string>(body, "inviteLink").Should().Contain("new-token");
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task Resend_OfAValidInvitation_SendsTheExistingLink_WithoutCreatingANewOne()
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user