Skip to content

Commit 33cf489

Browse files
committed
Use password complexity rules on password reset
1 parent b9e1946 commit 33cf489

File tree

2 files changed

+39
-7
lines changed

2 files changed

+39
-7
lines changed

app/Http/Controllers/Auth/ResetPasswordController.php

Lines changed: 35 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
namespace App\Http\Controllers\Auth;
44

55
use App\Http\Controllers\Controller;
6+
use App\Models\Setting;
67
use Illuminate\Foundation\Auth\ResetsPasswords;
7-
use App\Models\User;
88
use Illuminate\Http\Request;
99

1010
class ResetPasswordController extends Controller
@@ -39,7 +39,39 @@ public function __construct()
3939
$this->middleware('guest');
4040
}
4141

42-
42+
protected function rules()
43+
{
44+
return [
45+
'token' => 'required',
46+
'username' => 'required',
47+
'password' => 'required|confirmed|'.Setting::passwordComplexityRulesSaving('update'),
48+
];
49+
}
50+
51+
52+
protected function credentials(Request $request)
53+
{
54+
return $request->only(
55+
'username', 'password', 'password_confirmation', 'token'
56+
);
57+
}
4358

4459

45-
}
60+
public function showResetForm(Request $request, $token = null)
61+
{
62+
return view('auth.passwords.reset')->with(
63+
[
64+
'token' => $token,
65+
'username' => $request->input('username')
66+
]
67+
);
68+
}
69+
70+
protected function sendResetFailedResponse(Request $request, $response)
71+
{
72+
return redirect()->back()
73+
->withInput(['username'=> $request->input('username')])
74+
->withErrors(['username' => trans($response)]);
75+
}
76+
77+
}

resources/views/auth/passwords/reset.blade.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,12 @@
3131

3232
<input type="hidden" name="token" value="{{ $token }}">
3333

34-
<div class="form-group{{ $errors->has('email') ? ' has-error' : '' }}">
35-
<label class="col-md-4 control-label" for="email">{{ trans('admin/users/table.email') }}</label>
34+
<div class="form-group{{ $errors->has('username') ? ' has-error' : '' }}">
35+
<label class="col-md-4 control-label" for="username">{{ trans('admin/users/table.username') }}</label>
3636

3737
<div class="col-md-6">
38-
<input type="email" class="form-control" name="email" maxlength="250" value="{{ $email or old('email') }}" aria-label="email">
39-
{!! $errors->first('email', '<span class="alert-msg" aria-hidden="true"><i class="fa fa-times" aria-hidden="true"></i> :message</span>') !!}
38+
<input type="username" class="form-control" name="username" maxlength="250" value="{{ old('username', $username) }}" aria-label="username">
39+
{!! $errors->first('username', '<span class="alert-msg" aria-hidden="true"><i class="fa fa-times" aria-hidden="true"></i> :message</span>') !!}
4040

4141
</div>
4242
</div>

0 commit comments

Comments
 (0)