File tree Expand file tree Collapse file tree 2 files changed +16
-18
lines changed
src/Authentication/Actions Expand file tree Collapse file tree 2 files changed +16
-18
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 . ' ' . $ email ->printDebugger (['headers ' ]));
8281 }
8382
8483 return view (setting ('Auth.views ' )['action_email_2fa_verify ' ]);
@@ -115,7 +114,7 @@ public function afterLogin(User $user): void
115114 $ this ->createIdentity ($ user );
116115 }
117116
118- private function createIdentity (User $ user ): void
117+ protected function createIdentity (User $ user ): void
119118 {
120119 /** @var UserIdentityModel $identityModel */
121120 $ identityModel = model (UserIdentityModel::class);
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 . ' ' . $ email ->printDebugger (['headers ' ]));
5251 }
5352
5453 // Display the info page
@@ -101,7 +100,7 @@ public function afterRegister(User $user): void
101100 $ this ->createIdentity ($ user );
102101 }
103102
104- private function createIdentity (User $ user ): string
103+ protected function createIdentity (User $ user ): string
105104 {
106105 /** @var UserIdentityModel $identityModel */
107106 $ identityModel = model (UserIdentityModel::class);
You can’t perform that action at this time.
0 commit comments