Commit 9e20792

committed

Improve reset password logic

1 parent 4d67f0b commit 9e20792Copy full SHA for 9e20792

File tree

-11

lines changed

-11

lines changed

Lines changed: 6 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@ public function store(Request $request)`
`56`	`56`	`$user = User::create([`
`57`	`57`	`'name' => $request->name,`
`58`	`58`	`'email' => $request->email,`
`59`		`- 'password' => $request->password,`
	`59`	`+ 'password' => bcrypt($request->password),`
`60`	`60`	`]);`
`61`	`61`
`62`	`62`	`$this->sendEmailConfirmationTo($user);`
`@@ -81,10 +81,11 @@ public function update($id, Request $request)`
`81`	`81`	`$user = User::findOrFail($id);`
`82`	`82`	`$this->authorize('update', $user);`
`83`	`83`
`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`	`+ }`
`88`	`89`	`$user->update($data);`
`89`	`90`
`90`	`91`	`session()->flash('success', '个人资料更新成功!');`

Lines changed: 0 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -54,11 +54,6 @@ public function gravatar($size = '100')`
`54`	`54`	`return "http://www.gravatar.com/avatar/$hash?s=$size";`
`55`	`55`	`}`
`56`	`56`
`57`		`- public function setPasswordAttribute($password)`
`58`		`- {`
`59`		`- $this->attributes['password'] = bcrypt($password);`
`60`		`- }`
`61`		`-`
`62`	`57`	`public function statuses()`
`63`	`58`	`{`
`64`	`59`	`return $this->hasMany(Status::class);`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ public function run()`
`18`	`18`	`$user = User::find(1);`
`19`	`19`	`$user->name = 'Aufree';`
`20`	`20`	`$user->email = 'aufree@estgroupe.com';`
`21`		`- $user->password = 'password';`
	`21`	`+ $user->password = bcrypt('password');`
`22`	`22`	`$user->is_admin = true;`
`23`	`23`	`$user->activated = true;`
`24`	`24`	`$user->save();`

Comments

(0)