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.

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

[5.2] More flexible to customize password reset #13818

Merged
merged 2 commits into from
Jun 6, 2016
Merged
Changes from all commits
Commits
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
44 changes: 39 additions & 5 deletions src/Illuminate/Foundation/Auth/ResetsPasswords.php
Original file line number Diff line number Diff line change
Expand Up @@ -71,12 +71,13 @@ public function postEmail(Request $request)
*/
public function sendResetLinkEmail(Request $request)
{
$this->validate($request, ['email' => 'required|email']);
$this->validateSendResetLinkEmail($request);

$broker = $this->getBroker();

$response = Password::broker($broker)->sendResetLink(
$request->only('email'), $this->resetEmailBuilder()
$this->getSendResetLinkEmailCredentials($request),
$this->resetEmailBuilder()
);

switch ($response) {
Expand All @@ -88,6 +89,28 @@ public function sendResetLinkEmail(Request $request)
}
}

/**
* Validate the request of sending reset link.
*
* @param \Illuminate\Http\Request $request
* @return void
*/
protected function validateSendResetLinkEmail(Request $request)
{
$this->validate($request, ['email' => 'required|email']);
}

/**
* Get the needed credentials for sending reset link.
*
* @param \Illuminate\Http\Request $request
* @return array
*/
protected function getSendResetLinkEmailCredentials(Request $request)
{
return $request->only('email');
}

/**
* Get the Closure which is used to build the password reset email message.
*
Expand Down Expand Up @@ -200,9 +223,7 @@ public function reset(Request $request)
$this->getResetValidationCustomAttributes()
);

$credentials = $request->only(
'email', 'password', 'password_confirmation', 'token'
);
$credentials = $this->getResetCredentials($request);

$broker = $this->getBroker();

Expand Down Expand Up @@ -252,6 +273,19 @@ protected function getResetValidationCustomAttributes()
return [];
}

/**
* Get the password reset credentials from request.
*
* @param \Illuminate\Http\Request $request
* @return array
*/
protected function getResetCredentials(Request $request)
{
return $request->only(
'email', 'password', 'password_confirmation', 'token'
);
}

/**
* Reset the given user's password.
*
Expand Down