mirror of
https://github.com/appwrite/appwrite.git
synced 2026-11-18 20:36:03 +00:00
fix: fall back to top-level mail adapter error
When deliveredTo is 0 and results is empty, prefer a top-level result error message before the Unknown error fallback. Co-authored-by: Chirag Aggarwal <chiragaggarwal5k@gmail.com>
This commit is contained in:
1 parent
da8ba47d7e
commit
25148db5d8
2 files changed
+35
-7
No files matched your search
@@ -219,7 +219,7 @@ class Mails extends Action
|
||||
$result = $adapter->send($emailMessage);
|
||||
|
||||
if (($result['deliveredTo'] ?? 0) === 0) {
|
||||
$error = $result['results'][0]['error'] ?? 'Unknown error';
|
||||
$error = $result['results'][0]['error'] ?? ($result['error'] ?? 'Unknown error');
|
||||
throw new Exception($error);
|
||||
}
|
||||
} catch (\Throwable $error) {
|
||||
|
||||
@@ -19,6 +19,7 @@ final class SpyMailAdapter extends EmailAdapter
|
||||
public ?EmailMessage $captured = null;
|
||||
public int $deliveredTo = 1;
|
||||
public ?string $error = null;
|
||||
public bool $emptyResults = false;
|
||||
public int $sendCount = 0;
|
||||
|
||||
public function getName(): string
|
||||
@@ -36,6 +37,20 @@ final class SpyMailAdapter extends EmailAdapter
|
||||
$this->sendCount++;
|
||||
$this->captured = $message;
|
||||
|
||||
$response = [
|
||||
'deliveredTo' => $this->deliveredTo,
|
||||
'type' => $this->getType(),
|
||||
'results' => [],
|
||||
];
|
||||
|
||||
if ($this->emptyResults) {
|
||||
if ($this->error !== null) {
|
||||
$response['error'] = $this->error;
|
||||
}
|
||||
|
||||
return $response;
|
||||
}
|
||||
|
||||
$result = [
|
||||
'recipient' => $message->getTo()[0]['email'] ?? '',
|
||||
'status' => $this->deliveredTo === 0 ? 'failure' : 'success',
|
||||
@@ -45,11 +60,9 @@ final class SpyMailAdapter extends EmailAdapter
|
||||
$result['error'] = $this->error;
|
||||
}
|
||||
|
||||
return [
|
||||
'deliveredTo' => $this->deliveredTo,
|
||||
'type' => $this->getType(),
|
||||
'results' => [$result],
|
||||
];
|
||||
$response['results'] = [$result];
|
||||
|
||||
return $response;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -115,6 +128,21 @@ final class MailsTest extends TestCase
|
||||
$adapter->deliveredTo = 0;
|
||||
$adapter->error = 'Domain not verified';
|
||||
|
||||
$this->assertMailWorkerThrows($adapter, 'Error sending mail: Domain not verified');
|
||||
}
|
||||
|
||||
public function testMailDeliveryFailureUsesTopLevelErrorWhenResultsEmpty(): void
|
||||
{
|
||||
$adapter = new SpyMailAdapter();
|
||||
$adapter->deliveredTo = 0;
|
||||
$adapter->emptyResults = true;
|
||||
$adapter->error = 'Provider rejected request';
|
||||
|
||||
$this->assertMailWorkerThrows($adapter, 'Error sending mail: Provider rejected request');
|
||||
}
|
||||
|
||||
private function assertMailWorkerThrows(SpyMailAdapter $adapter, string $expectedMessage): void
|
||||
{
|
||||
$registry = new Registry();
|
||||
$registry->set('smtp', static fn () => $adapter);
|
||||
|
||||
@@ -123,7 +151,7 @@ final class MailsTest extends TestCase
|
||||
|
||||
try {
|
||||
$this->expectException(\Exception::class);
|
||||
$this->expectExceptionMessage('Error sending mail: Domain not verified');
|
||||
$this->expectExceptionMessage($expectedMessage);
|
||||
|
||||
$worker = new Mails();
|
||||
$worker->action(
|
||||
|
||||
Reference in new issue
Block a user