Skip to content

Commit 9e20792

Browse files
committed
Improve reset password logic
1 parent 4d67f0b commit 9e20792

File tree

3 files changed

+7
-11
lines changed

3 files changed

+7
-11
lines changed

app/Http/Controllers/UsersController.php

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ public function store(Request $request)
5656
$user = User::create([
5757
'name' => $request->name,
5858
'email' => $request->email,
59-
'password' => $request->password,
59+
'password' => bcrypt($request->password),
6060
]);
6161

6262
$this->sendEmailConfirmationTo($user);
@@ -81,10 +81,11 @@ public function update($id, Request $request)
8181
$user = User::findOrFail($id);
8282
$this->authorize('update', $user);
8383

84-
$data = array_filter([
85-
'name' => $request->name,
86-
'password' => $request->password,
87-
]);
84+
$data = [];
85+
$data['name'] = $request->name;
86+
if ($request->password) {
87+
$data['password'] = bcrypt($request->password);
88+
}
8889
$user->update($data);
8990

9091
session()->flash('success', '个人资料更新成功!');

app/Models/User.php

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -54,11 +54,6 @@ public function gravatar($size = '100')
5454
return "http://www.gravatar.com/avatar/$hash?s=$size";
5555
}
5656

57-
public function setPasswordAttribute($password)
58-
{
59-
$this->attributes['password'] = bcrypt($password);
60-
}
61-
6257
public function statuses()
6358
{
6459
return $this->hasMany(Status::class);

database/seeds/UsersTableSeeder.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ public function run()
1818
$user = User::find(1);
1919
$user->name = 'Aufree';
2020
$user->email = '[email protected]';
21-
$user->password = 'password';
21+
$user->password = bcrypt('password');
2222
$user->is_admin = true;
2323
$user->activated = true;
2424
$user->save();

0 commit comments

Comments
 (0)