merdan
/
sarga
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Issue #2114

This commit is contained in:
rahul shukla 2020-01-23 11:01:04 +05:30
parent 2d8f5f412e
commit 6147c3e5db
2 changed files with 50 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
packages/Webkul/Customer/src/Http/Controllers/ResetPasswordController.php
View File

@ -57,27 +57,33 @@ class ResetPasswordController extends Controller
*/
public function store()
{
$this->validate(request(), [
'token' => 'required',
'email' => 'required|email',
'password' => 'required|confirmed|min:6',
]);
$response = $this->broker()->reset(
request(['email', 'password', 'password_confirmation', 'token']), function ($customer, $password) {
$this->resetPassword($customer, $password);
}
);
if ($response == Password::PASSWORD_RESET) {
return redirect()->route($this->_config['redirect']);
}
return back()
->withInput(request(['email']))
->withErrors([
'email' => trans($response)
try {
$this->validate(request(), [
'token' => 'required',
'email' => 'required|email',
'password' => 'required|confirmed|min:6',
]);
$response = $this->broker()->reset(
request(['email', 'password', 'password_confirmation', 'token']), function ($customer, $password) {
$this->resetPassword($customer, $password);
}
);
if ($response == Password::PASSWORD_RESET) {
return redirect()->route($this->_config['redirect']);
}
return back()
->withInput(request(['email']))
->withErrors([
'email' => trans($response)
]);
} catch(\Exception $e) {
session()->flash('success', trans($e->getMessage()));
return redirect()->back();
}
}
/**

42
packages/Webkul/User/src/Http/Controllers/ForgetPasswordController.php
View File

@ -35,7 +35,7 @@ class ForgetPasswordController extends Controller
/**
* Show the form for creating a new resource.
*
* @return \Illuminate\View\View
* @return \Illuminate\View\View
*/
public function create()
{
@ -49,25 +49,31 @@ class ForgetPasswordController extends Controller
*/
public function store()
{
$this->validate(request(), [
'email' => 'required|email'
]);
try {
$this->validate(request(), [
'email' => 'required|email'
]);
$response = $this->broker()->sendResetLink(
request(['email'])
);
if ($response == Password::RESET_LINK_SENT) {
session()->flash('success', trans($response));
return back();
}
return back()
->withInput(request(['email']))
->withErrors(
['email' => trans($response)]
$response = $this->broker()->sendResetLink(
request(['email'])
);
if ($response == Password::RESET_LINK_SENT) {
session()->flash('success', trans($response));
return back();
}
return back()
->withInput(request(['email']))
->withErrors(
['email' => trans($response)]
);
} catch(\Exception $e) {
session()->flash('success', trans($e->getMessage()));
return redirect()->back();
}
}
/**