Skip to content

Commit dc9fafd

Browse files
committed
Fixed User Store
1 parent e6fe514 commit dc9fafd

File tree

5 files changed

+138
-156
lines changed

5 files changed

+138
-156
lines changed

.env.example

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ BROADCAST_CONNECTION=log
3333
FILESYSTEM_DISK=local
3434
QUEUE_CONNECTION=sync
3535

36-
CACHE_STORE=database
36+
CACHE_STORE=file
3737
CACHE_PREFIX=
3838

3939
MEMCACHED_HOST=127.0.0.1

app/Http/Controllers/Backend/UserController.php

+13-36
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
use Exception;
1616
use Illuminate\Http\Request;
1717
use Illuminate\Support\Arr;
18+
use Illuminate\Support\Facades\Artisan;
1819
use Illuminate\Support\Facades\Hash;
1920
use Illuminate\Support\Facades\Log;
2021
use Illuminate\Support\Str;
@@ -217,7 +218,7 @@ public function store(Request $request)
217218
'first_name' => 'required|min:3|max:191',
218219
'last_name' => 'required|min:3|max:191',
219220
'email' => 'required|email|regex:/(.+)@(.+)\.(.+)/i|max:191|unique:users',
220-
'password' => 'required|confirmed|min:4',
221+
'password' => 'required|confirmed|min:6',
221222
'roles' => 'nullable|array',
222223
'permissions' => 'nullable|array',
223224
]);
@@ -232,28 +233,16 @@ public function store(Request $request)
232233
$data_array = Arr::add($data_array, 'email_verified_at', null);
233234
}
234235

236+
// Create a User
235237
$$module_name_singular = User::create($data_array);
236238

237-
$roles = $request['roles'];
238-
$permissions = $request['permissions'];
239-
240239
// Sync Roles
241-
if (isset($roles)) {
242-
$$module_name_singular->syncRoles($roles);
243-
} else {
244-
$roles = [];
245-
$$module_name_singular->syncRoles($roles);
246-
}
240+
$$module_name_singular->syncRoles(isset($validated_data['roles']) ? $validated_data['roles'] : []);
247241

248242
// Sync Permissions
249-
if (isset($permissions)) {
250-
$$module_name_singular->syncPermissions($permissions);
251-
} else {
252-
$permissions = [];
253-
$$module_name_singular->syncPermissions($permissions);
254-
}
243+
$$module_name_singular->syncPermissions(isset($validated_data['permissions']) ? $validated_data['permissions'] : []);
255244

256-
// Username
245+
// Set Username
257246
$id = $$module_name_singular->id;
258247
$username = config('app.initial_username') + $id;
259248
$$module_name_singular->username = $username;
@@ -272,6 +261,8 @@ public function store(Request $request)
272261
flash('Account Credentials Sent to User.')->success()->important();
273262
}
274263

264+
Artisan::call('cache:clear');
265+
275266
Log::info(label_case($module_title.' '.$module_action)." | '".$$module_name_singular->name.'(ID:'.$$module_name_singular->id.") ' by User:".auth()->user()->name.'(ID:'.auth()->user()->id.')');
276267

277268
return redirect("admin/{$module_name}");
@@ -450,7 +441,7 @@ public function update(Request $request, $id)
450441
]);
451442

452443
$$module_name_singular = User::findOrFail($id);
453-
444+
454445
$$module_name_singular->update($request->except(['roles', 'permissions']));
455446

456447
if ($id === 1) {
@@ -461,27 +452,13 @@ public function update(Request $request, $id)
461452
return redirect("admin/{$module_name}");
462453
}
463454

464-
$roles = $request['roles'];
465-
$permissions = $request['permissions'];
466-
467-
dd($$module_name_singular->getRoleNames());
468455
// Sync Roles
469-
if (isset($roles)) {
470-
$$module_name_singular->syncRoles($roles);
471-
} else {
472-
$roles = [];
473-
$$module_name_singular->syncRoles($roles);
474-
}
456+
$$module_name_singular->syncRoles(isset($validated_data['roles']) ? $validated_data['roles'] : []);
475457

476-
dd($$module_name_singular->getRoleNames());
477-
dd($roles);
478458
// Sync Permissions
479-
if (isset($permissions)) {
480-
$$module_name_singular->syncPermissions($permissions);
481-
} else {
482-
$permissions = [];
483-
$$module_name_singular->syncPermissions($permissions);
484-
}
459+
$$module_name_singular->syncPermissions(isset($validated_data['permissions']) ? $validated_data['permissions'] : []);
460+
461+
Artisan::call('cache:clear');
485462

486463
event(new UserUpdated($$module_name_singular));
487464

config/permission.php

+1-2
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,6 @@
181181
* file. Using 'default' here means to use the `default` set in cache.php.
182182
*/
183183

184-
// 'store' => 'default',
185-
'store' => 'array',
184+
'store' => 'default',
186185
],
187186
];

database/seeders/Auth/UserRoleTableSeeder.php

+2-1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
use App\Models\User;
66
use Illuminate\Database\Seeder;
7+
use Illuminate\Support\Facades\Artisan;
78

89
/**
910
* Class UserRoleTableSeeder.
@@ -23,6 +24,6 @@ public function run()
2324
User::findOrFail(4)->assignRole('executive');
2425
User::findOrFail(5)->assignRole('user');
2526

26-
app()->make(\Spatie\Permission\PermissionRegistrar::class)->forgetCachedPermissions();
27+
Artisan::call('cache:clear');
2728
}
2829
}

0 commit comments

Comments
 (0)