Merge pull request #345 from sammyskills/fix-email-delivery-error-log

Author: MGatner

src/Authentication/Actions/Email2FA.php

@@ -71,16 +71,18 @@ public function handle(IncomingRequest $request)
 
         // Send the user an email with the code
         helper('email');
-        $return = emailer()->setFrom(setting('Email.fromEmail'), setting('Email.fromName') ?? '')
-            ->setTo($user->email)
-            ->setSubject(lang('Auth.email2FASubject'))
-            ->setMessage(view(setting('Auth.views')['action_email_2fa_email'], ['code' => $identity->secret]))
-            ->send();
-
-        if ($return === false) {
-            throw new RuntimeException('Cannot send email for user: ' . $user->email);
+        $email = emailer()->setFrom(setting('Email.fromEmail'), setting('Email.fromName') ?? '');
+        $email->setTo($user->email);
+        $email->setSubject(lang('Auth.email2FASubject'));
+        $email->setMessage(view(setting('Auth.views')['action_email_2fa_email'], ['code' => $identity->secret]));
+
+        if ($email->send(false) === false) {
+            throw new RuntimeException('Cannot send email for user: ' . $user->email . "\n" . $email->printDebugger(['headers']));
         }
 
+        // Clear the email
+        $email->clear();
+
         return view(setting('Auth.views')['action_email_2fa_verify']);
     }
 

src/Authentication/Actions/EmailActivator.php

@@ -41,16 +41,18 @@ public function show(): string
 
         // Send the email
         helper('email');
-        $return = emailer()->setFrom(setting('Email.fromEmail'), setting('Email.fromName') ?? '')
-            ->setTo($userEmail)
-            ->setSubject(lang('Auth.emailActivateSubject'))
-            ->setMessage(view(setting('Auth.views')['action_email_activate_email'], ['code' => $code]))
-            ->send();
-
-        if ($return === false) {
-            throw new RuntimeException('Cannot send email for user: ' . $user->email);
+        $email = emailer()->setFrom(setting('Email.fromEmail'), setting('Email.fromName') ?? '');
+        $email->setTo($userEmail);
+        $email->setSubject(lang('Auth.emailActivateSubject'));
+        $email->setMessage(view(setting('Auth.views')['action_email_activate_email'], ['code' => $code]));
+
+        if ($email->send(false) === false) {
+            throw new RuntimeException('Cannot send email for user: ' . $user->email . "\n" . $email->printDebugger(['headers']));
         }
 
+        // Clear the email
+        $email->clear();
+
         // Display the info page
         return view(setting('Auth.views')['action_email_activate_show'], ['user' => $user]);
     }

src/Controllers/MagicLinkController.php

@@ -90,16 +90,20 @@ public function loginAction()
 
         // Send the user an email with the code
         helper('email');
-        $return = emailer()->setFrom(setting('Email.fromEmail'), setting('Email.fromName') ?? '')
-            ->setTo($user->email)
-            ->setSubject(lang('Auth.magicLinkSubject'))
-            ->setMessage(view(setting('Auth.views')['magic-link-email'], ['token' => $token]))
-            ->send();
+        $email = emailer()->setFrom(setting('Email.fromEmail'), setting('Email.fromName') ?? '');
+        $email->setTo($user->email);
+        $email->setSubject(lang('Auth.magicLinkSubject'));
+        $email->setMessage(view(setting('Auth.views')['magic-link-email'], ['token' => $token]));
+
+        if ($email->send(false) === false) {
+            log_message('error', $email->printDebugger(['headers']));
 
-        if ($return === false) {
             return redirect()->route('magic-link')->with('error', lang('Auth.unableSendEmailToUser', [$user->email]));
         }
 
+        // Clear the email
+        $email->clear();
+
         return $this->displayMessage();
     }