Cleared the shared email service within the calling controller/action instead of the �mailer() helper

Author: sammyskills

src/Authentication/Actions/Email2FA.php

@@ -80,6 +80,9 @@ public function handle(IncomingRequest $request)
             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

@@ -50,6 +50,9 @@ public function show(): string
             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

@@ -101,6 +101,9 @@ public function loginAction()
             return redirect()->route('magic-link')->with('error', lang('Auth.unableSendEmailToUser', [$user->email]));
         }
 
+        // Clear the email
+        $email->clear();
+
         return $this->displayMessage();
     }
 

src/Helpers/email_helper.php

@@ -41,7 +41,7 @@ function emailer(array $overrides = []): Email
         }
 
         /** @var Email $email */
-        $email = service('email', false);
+        $email = service('email');
 
         return $email->initialize($config);
     }