File tree Expand file tree Collapse file tree 4 files changed +22
-23
lines changed Expand file tree Collapse file tree 4 files changed +22
-23
lines changed Original file line number Diff line number Diff line change @@ -71,14 +71,13 @@ public function handle(IncomingRequest $request)
7171
7272 // Send the user an email with the code
7373 helper ('email ' );
74- $ return = emailer ()->setFrom (setting ('Email.fromEmail ' ), setting ('Email.fromName ' ) ?? '' )
75- ->setTo ($ user ->email )
76- ->setSubject (lang ('Auth.email2FASubject ' ))
77- ->setMessage (view (setting ('Auth.views ' )['action_email_2fa_email ' ], ['code ' => $ identity ->secret ]))
78- ->send ();
79-
80- if ($ return === false ) {
81- throw new RuntimeException ('Cannot send email for user: ' . $ user ->email );
74+ $ email = emailer ()->setFrom (setting ('Email.fromEmail ' ), setting ('Email.fromName ' ) ?? '' );
75+ $ email ->setTo ($ user ->email );
76+ $ email ->setSubject (lang ('Auth.email2FASubject ' ));
77+ $ email ->setMessage (view (setting ('Auth.views ' )['action_email_2fa_email ' ], ['code ' => $ identity ->secret ]));
78+
79+ if ($ email ->send (false ) === false ) {
80+ throw new RuntimeException ('Cannot send email for user: ' . $ user ->email . "\n" . $ email ->printDebugger (['headers ' ]));
8281 }
8382
8483 return view (setting ('Auth.views ' )['action_email_2fa_verify ' ]);
Original file line number Diff line number Diff line change @@ -41,14 +41,13 @@ public function show(): string
4141
4242 // Send the email
4343 helper ('email ' );
44- $ return = emailer ()->setFrom (setting ('Email.fromEmail ' ), setting ('Email.fromName ' ) ?? '' )
45- ->setTo ($ userEmail )
46- ->setSubject (lang ('Auth.emailActivateSubject ' ))
47- ->setMessage (view (setting ('Auth.views ' )['action_email_activate_email ' ], ['code ' => $ code ]))
48- ->send ();
49-
50- if ($ return === false ) {
51- throw new RuntimeException ('Cannot send email for user: ' . $ user ->email );
44+ $ email = emailer ()->setFrom (setting ('Email.fromEmail ' ), setting ('Email.fromName ' ) ?? '' );
45+ $ email ->setTo ($ userEmail );
46+ $ email ->setSubject (lang ('Auth.emailActivateSubject ' ));
47+ $ email ->setMessage (view (setting ('Auth.views ' )['action_email_activate_email ' ], ['code ' => $ code ]));
48+
49+ if ($ email ->send (false ) === false ) {
50+ throw new RuntimeException ('Cannot send email for user: ' . $ user ->email . "\n" . $ email ->printDebugger (['headers ' ]));
5251 }
5352
5453 // Display the info page
Original file line number Diff line number Diff line change @@ -90,13 +90,14 @@ public function loginAction()
9090
9191 // Send the user an email with the code
9292 helper ('email ' );
93- $ return = emailer ()->setFrom (setting ('Email.fromEmail ' ), setting ('Email.fromName ' ) ?? '' )
94- ->setTo ($ user ->email )
95- ->setSubject (lang ('Auth.magicLinkSubject ' ))
96- ->setMessage (view (setting ('Auth.views ' )['magic-link-email ' ], ['token ' => $ token ]))
97- ->send ();
93+ $ email = emailer ()->setFrom (setting ('Email.fromEmail ' ), setting ('Email.fromName ' ) ?? '' );
94+ $ email ->setTo ($ user ->email );
95+ $ email ->setSubject (lang ('Auth.magicLinkSubject ' ));
96+ $ email ->setMessage (view (setting ('Auth.views ' )['magic-link-email ' ], ['token ' => $ token ]));
97+
98+ if ($ email ->send (false ) === false ) {
99+ log_message ('error ' , $ email ->printDebugger (['headers ' ]));
98100
99- if ($ return === false ) {
100101 return redirect ()->route ('magic-link ' )->with ('error ' , lang ('Auth.unableSendEmailToUser ' , [$ user ->email ]));
101102 }
102103
Original file line number Diff line number Diff line change @@ -41,7 +41,7 @@ function emailer(array $overrides = []): Email
4141 }
4242
4343 /** @var Email $email */
44- $ email = service ('email ' );
44+ $ email = service ('email ' , false );
4545
4646 return $ email ->initialize ($ config );
4747 }
You can’t perform that action at this time.
0 commit comments