Add deliberate warning when Mail exception

Fix userfrosting/UserFrosting#1229
userfrosting · Dec 11, 2023 · 836a3a2 · 836a3a2
1 parent 36f573c
commit 836a3a2
Show file tree

Hide file tree

Showing 2 changed files with 53 additions and 1 deletion.
diff --git a/app/src/Controller/RegisterAction.php b/app/src/Controller/RegisterAction.php
@@ -13,6 +13,7 @@
 namespace UserFrosting\Sprinkle\Account\Controller;
 
 use Illuminate\Database\Connection;
+use PHPMailer\PHPMailer\Exception as PHPMailerException;
 use Psr\EventDispatcher\EventDispatcherInterface;
 use Psr\Http\Message\ResponseInterface as Response;
 use Psr\Http\Message\ServerRequestInterface as Request;
@@ -171,7 +172,14 @@ protected function handle(Request $request): ?array
 
             // Send activation email
             if ($this->requireEmailVerification() === true) {
-                $this->verificationEmail->send($user, 'mail/verify-account.html.twig');
+                try {
+                    $this->verificationEmail->send($user, 'mail/verify-account.html.twig');
+                } catch (PHPMailerException $e) {
+                    // Use abstract message for security reasons - We don't want to show email is not working
+                    $this->alert->addMessageTranslated('danger', 'REGISTRATION.UNKNOWN');
+
+                    throw $e;
+                }
             }
 
             return $user;

diff --git a/app/tests/Controller/RegisterActionTest.php b/app/tests/Controller/RegisterActionTest.php
@@ -21,6 +21,7 @@
 use UserFrosting\Sprinkle\Core\Testing\RefreshDatabase;
 use UserFrosting\Sprinkle\Core\Throttle\Throttler;
 use UserFrosting\Sprinkle\Core\Util\Captcha;
+use PHPMailer\PHPMailer\Exception as PHPMailerException;
 
 /**
  * Tests RegisterAction
@@ -266,6 +267,49 @@ public function testRegisterWithEmailVerification(): void
         ], $response);
     }
 
+    public function testRegisterWithFailedEmailVerification(): void
+    {
+        /** @var Mailer */
+        $mailer = Mockery::mock(Mailer::class)
+            ->makePartial()
+            ->shouldReceive('send')->once()
+            ->andThrow(PHPMailerException::class)
+            ->getMock();
+        $this->ci->set(Mailer::class, $mailer);
+
+        $this->setMasterUser();
+        $captcha = $this->getCaptcha();
+        $this->forceLocaleConfig();
+        $this->setRequireEmailVerification(true);
+
+        // Set POST data
+        $data = [
+            'spiderbro'     => 'http://',
+            'captcha'       => $captcha->getCaptcha(),
+            'user_name'     => 'RegisteredUser',
+            'first_name'    => 'Testing',
+            'last_name'     => 'Register',
+            'email'         => '[email protected]',
+            'password'      => 'FooBarFooBar123',
+            'passwordc'     => 'FooBarFooBar123',
+            'locale'        => '',
+        ];
+
+        // Create request with method and url and fetch response
+        $request = $this->createJsonRequest('POST', '/account/register', $data);
+        $response = $this->handleRequest($request);
+
+        // Assert response status & body
+        $this->assertResponseStatus(500, $response);
+        $this->assertJsonResponse('Fatal error attempting mail, contact your server administrator.  If you are the admin, please check the UserFrosting log.', $response, 'title');
+
+        // Assert alert
+        /** @var AlertStream */
+        $ms = $this->ci->get(AlertStream::class);
+        $messages = $ms->getAndClearMessages();
+        $this->assertSame('danger', array_reverse($messages)[0]['type']);
+    }
+
     public function testRegisterWithFailedThrottle(): void
     {
         // Create fake throttler