DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-02-21 03:15:45 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Only bcrypt passwords on user save if the password value is passed

Browse source
This commit is contained in:
snipe 2017-08-08 14:41:58 -07:00
parent 241bf0cd4b
commit de18e2a887
1 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/Http/Controllers/Api/UsersController.php
View file

@ -107,6 +107,7 @@ class UsersController extends Controller
$this->authorize('view', User::class);
$user = new User;
$user->fill($request->all());
$user->password = bcrypt($request->input('password'));
if ($user->save()) {
return response()->json(Helper::formatStandardApiResponse('success', (new UsersTransformer)->transformUser($user), trans('admin/users/message.create.success')));
@ -144,6 +145,11 @@ class UsersController extends Controller
$user = User::findOrFail($id);
$user->fill($request->all());
if ($request->has('password')) {
$user->password = bcrypt($request->input('password'));
}
if ($user->save()) {
return response()->json(Helper::formatStandardApiResponse('success', (new UsersTransformer)->transformUser($user), trans('admin/users/message.success.update')));
}