Fixed User CRUD for admin
This commit is contained in:
parent
d669a19287
commit
f762ee8be1
@ -10,10 +10,10 @@ use Illuminate\Support\Facades\Hash;
|
||||
|
||||
class UserController extends Controller
|
||||
{
|
||||
private const FIELD_RULES = [
|
||||
private const ADMIN_FIELD_RULES = [
|
||||
'username' => 'required|max:100|unique:users',
|
||||
'email' => 'required|max:100|unique:users',
|
||||
'password' => 'required|min:6|confirmed',
|
||||
'password' => 'required|min:6',
|
||||
'type' => 'required|in:admin,user,creator,banned',
|
||||
'email_verified_at' => 'nullable|date'
|
||||
];
|
||||
@ -100,7 +100,7 @@ class UserController extends Controller
|
||||
public function store(Request $request)
|
||||
{
|
||||
$this->authorize('create', User::class);
|
||||
$fields = $request->validate(self::FIELD_RULES);
|
||||
$fields = $request->validate(self::ADMIN_FIELD_RULES);
|
||||
$fields['password'] = Hash::make($fields['password']);
|
||||
|
||||
$user = User::create($fields);
|
||||
@ -207,7 +207,7 @@ class UserController extends Controller
|
||||
public function update(Request $request, User $user)
|
||||
{
|
||||
$this->authorize('update', $user);
|
||||
$fields = $request->validate(self::FIELD_RULES);
|
||||
$fields = $request->validate(self::ADMIN_FIELD_RULES);
|
||||
|
||||
if(!Hash::check($fields['password'], $user->password)) {
|
||||
$fields['password'] = Hash::make($fields['password']);
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user