15
15
use Exception ;
16
16
use Illuminate \Http \Request ;
17
17
use Illuminate \Support \Arr ;
18
+ use Illuminate \Support \Facades \Artisan ;
18
19
use Illuminate \Support \Facades \Hash ;
19
20
use Illuminate \Support \Facades \Log ;
20
21
use Illuminate \Support \Str ;
@@ -217,7 +218,7 @@ public function store(Request $request)
217
218
'first_name ' => 'required|min:3|max:191 ' ,
218
219
'last_name ' => 'required|min:3|max:191 ' ,
219
220
'email ' => 'required|email|regex:/(.+)@(.+)\.(.+)/i|max:191|unique:users ' ,
220
- 'password ' => 'required|confirmed|min:4 ' ,
221
+ 'password ' => 'required|confirmed|min:6 ' ,
221
222
'roles ' => 'nullable|array ' ,
222
223
'permissions ' => 'nullable|array ' ,
223
224
]);
@@ -232,28 +233,16 @@ public function store(Request $request)
232
233
$ data_array = Arr::add ($ data_array , 'email_verified_at ' , null );
233
234
}
234
235
236
+ // Create a User
235
237
$ $ module_name_singular = User::create ($ data_array );
236
238
237
- $ roles = $ request ['roles ' ];
238
- $ permissions = $ request ['permissions ' ];
239
-
240
239
// 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 ' ] : []);
247
241
248
242
// 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 ' ] : []);
255
244
256
- // Username
245
+ // Set Username
257
246
$ id = $ $ module_name_singular ->id ;
258
247
$ username = config ('app.initial_username ' ) + $ id ;
259
248
$ $ module_name_singular ->username = $ username ;
@@ -272,6 +261,8 @@ public function store(Request $request)
272
261
flash ('Account Credentials Sent to User. ' )->success ()->important ();
273
262
}
274
263
264
+ Artisan::call ('cache:clear ' );
265
+
275
266
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 .') ' );
276
267
277
268
return redirect ("admin/ {$ module_name }" );
@@ -450,7 +441,7 @@ public function update(Request $request, $id)
450
441
]);
451
442
452
443
$ $ module_name_singular = User::findOrFail ($ id );
453
-
444
+
454
445
$ $ module_name_singular ->update ($ request ->except (['roles ' , 'permissions ' ]));
455
446
456
447
if ($ id === 1 ) {
@@ -461,27 +452,13 @@ public function update(Request $request, $id)
461
452
return redirect ("admin/ {$ module_name }" );
462
453
}
463
454
464
- $ roles = $ request ['roles ' ];
465
- $ permissions = $ request ['permissions ' ];
466
-
467
- dd ($ $ module_name_singular ->getRoleNames ());
468
455
// 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 ' ] : []);
475
457
476
- dd ($ $ module_name_singular ->getRoleNames ());
477
- dd ($ roles );
478
458
// 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 ' );
485
462
486
463
event (new UserUpdated ($ $ module_name_singular ));
487
464
0 commit comments