Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[8.x] Add extra method in PasswortReset for reset URL to match the structure of VerifyEmail #39652

Merged
merged 1 commit into from
Nov 17, 2021
Merged

[8.x] Add extra method in PasswortReset for reset URL to match the structure of VerifyEmail #39652

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 22 additions & 11 deletions src/Illuminate/Auth/Notifications/ResetPassword.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,20 +59,13 @@ public function via($notifiable)
*/
public function toMail($notifiable)
{
if (static::$toMailCallback) {
return call_user_func(static::$toMailCallback, $notifiable, $this->token);
}
$resetUrl = $this->resetUrl($notifiable);

if (static::$createUrlCallback) {
$url = call_user_func(static::$createUrlCallback, $notifiable, $this->token);
} else {
$url = url(route('password.reset', [
'token' => $this->token,
'email' => $notifiable->getEmailForPasswordReset(),
], false));
if (static::$toMailCallback) {
return call_user_func(static::$toMailCallback, $notifiable, $this->token, $resetUrl);
}

return $this->buildMailMessage($url);
return $this->buildMailMessage($resetUrl);
}

/**
Expand All @@ -91,6 +84,24 @@ protected function buildMailMessage($url)
->line(Lang::get('If you did not request a password reset, no further action is required.'));
}

/**
* Get the reset URL for the given notifiable.
*
* @param mixed $notifiable
* @return string
*/
protected function resetUrl($notifiable)
{
if (static::$createUrlCallback) {
return call_user_func(static::$createUrlCallback, $notifiable, $this->token);
}

return url(route('password.reset', [
'token' => $this->token,
'email' => $notifiable->getEmailForPasswordReset(),
], false));
}

/**
* Set a callback that should be used when creating the reset password button URL.
*
Expand Down