Skip to content

Commit d5b1f08

Browse files
nasirkhannasirkhan
authored
Merge pull request #579 from nasirkhan/dev
Test cases added
2 parents f59faae + af3bed1 commit d5b1f08

File tree

14 files changed

+737
-270
lines changed

14 files changed

+737
-270
lines changed

‎app/Http/Controllers/Backend/UserController.php

Lines changed: 68 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ public function index()
7474

7575
$$module_name = $module_model::paginate();
7676

77-
Log::info("'{$title}' viewed by User:".auth()->user()->name.'(ID:'.auth()->user()->id.')');
77+
logUserAccess($module_title.' '.$module_action);
7878

7979
return view(
8080
"{$module_path}.{$module_name}.index",
@@ -148,7 +148,7 @@ public function index_list(Request $request)
148148
$module_model = $this->module_model;
149149
$module_name_singular = Str::singular($module_name);
150150

151-
$module_action = 'List';
151+
$module_action = 'Index List';
152152

153153
$page_heading = label_case($module_title);
154154
$title = $page_heading.' '.label_case($module_action);
@@ -170,6 +170,8 @@ public function index_list(Request $request)
170170
];
171171
}
172172

173+
logUserAccess($module_title.' '.$module_action);
174+
173175
return response()->json($$module_name);
174176
}
175177

@@ -192,6 +194,8 @@ public function create()
192194
$roles = Role::get();
193195
$permissions = Permission::select('name', 'id')->orderBy('id')->get();
194196

197+
logUserAccess($module_title.' '.$module_action);
198+
195199
return view(
196200
"{$module_path}.{$module_name}.create",
197201
compact('module_title', 'module_name', 'module_path', 'module_icon', 'module_action', 'module_name_singular', 'roles', 'permissions')
@@ -223,7 +227,8 @@ public function store(Request $request)
223227
'permissions' => 'nullable|array',
224228
]);
225229

226-
$data_array = $request->except('_token', 'roles', 'permissions', 'password_confirmation');
230+
$data_array = Arr::except($validated_data, ['_token', 'roles', 'permissions', 'password_confirmation']);
231+
227232
$data_array['name'] = $request->first_name.' '.$request->last_name;
228233
$data_array['password'] = Hash::make($request->password);
229234

@@ -263,7 +268,7 @@ public function store(Request $request)
263268

264269
Artisan::call('cache:clear');
265270

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.')');
271+
logUserAccess($module_title.' '.$module_action);
267272

268273
return redirect("admin/{$module_name}");
269274
}
@@ -287,7 +292,7 @@ public function show($id)
287292

288293
$$module_name_singular = $module_model::findOrFail($id);
289294

290-
Log::info(label_case($module_title.' '.$module_action).' | User:'.auth()->user()->name.'(ID:'.auth()->user()->id.')');
295+
logUserAccess(__METHOD__." | {$$module_name_singular->name} ($id)");
291296

292297
return view(
293298
"{$module_path}.{$module_name}.show",
@@ -323,6 +328,8 @@ public function changePassword($id)
323328

324329
$$module_name_singular = $module_model::findOrFail($id);
325330

331+
logUserAccess("{$module_title} {$module_action} {$$module_name_singular->name} ($id)");
332+
326333
return view(
327334
"{$module_path}.{$module_name}.changePassword",
328335
compact('module_title', 'module_name', 'module_path', 'module_icon', 'module_action', 'module_name_singular', "{$module_name_singular}")
@@ -365,6 +372,8 @@ public function changePasswordUpdate(Request $request, $id)
365372

366373
flash(Str::singular($module_title)."' Updated Successfully")->success()->important();
367374

375+
logUserAccess("{$module_title} {$module_action} {$$module_name_singular->name} ($id)");
376+
368377
return redirect("admin/{$module_name}");
369378
}
370379

@@ -399,7 +408,7 @@ public function edit($id)
399408
$roles = Role::get();
400409
$permissions = Permission::select('name', 'id')->orderBy('id')->get();
401410

402-
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.')');
411+
logUserAccess("{$module_title} {$module_action} {$$module_name_singular->name} ($id)");
403412

404413
return view(
405414
"{$module_path}.{$module_name}.edit",
@@ -439,33 +448,40 @@ public function update(Request $request, $id)
439448
'permissions' => 'nullable|array',
440449
]);
441450

451+
$validated_data['name'] = $validated_data['first_name'].' '.$validated_data['last_name'];
452+
442453
$$module_name_singular = User::findOrFail($id);
443454

444-
$$module_name_singular->update($request->except(['roles', 'permissions']));
455+
$$module_name_singular->update(Arr::except($validated_data, ['roles', 'permissions']));
445456

446457
if ($id === 1) {
447458
$user->syncRoles(['super admin']);
448459

449-
flash(Str::singular($module_title)."' Updated Successfully")->success()->important();
450-
460+
// Clear Cache
451461
Artisan::call('cache:clear');
452462

463+
flash(Str::singular($module_title)."' Updated Successfully")->success()->important();
464+
453465
return redirect("admin/{$module_name}");
454466
}
455467

468+
// Clear Cache
469+
Artisan::call('cache:clear');
470+
456471
// Sync Roles
457-
$$module_name_singular->syncRoles(isset($validated_data['roles']) ? $validated_data['roles'] : []);
472+
$$module_name_singular->syncRoles((isset($validated_data['roles'])) ? $validated_data['roles'] : []);
458473

459474
// Sync Permissions
460-
$$module_name_singular->syncPermissions(isset($validated_data['permissions']) ? $validated_data['permissions'] : []);
475+
$$module_name_singular->syncPermissions((isset($validated_data['permissions'])) ? $validated_data['permissions'] : []);
461476

477+
// Clear Cache
462478
Artisan::call('cache:clear');
463479

464480
event(new UserUpdated($$module_name_singular));
465481

466482
flash(Str::singular($module_title)."' Updated Successfully")->success()->important();
467483

468-
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.')');
484+
logUserAccess("{$module_title} {$module_action} {$$module_name_singular->name} ($id)");
469485

470486
return redirect("admin/{$module_name}");
471487
}
@@ -492,7 +508,7 @@ public function destroy($id)
492508
if (auth()->user()->id === $id || $id === 1) {
493509
flash('You can not delete this user!')->warning()->important();
494510

495-
Log::notice(label_case($module_title.' '.$module_action).' Failed | User:'.auth()->user()->name.'(ID:'.auth()->user()->id.')');
511+
logUserAccess("{$module_title} {$module_action} Failed! {$$module_name_singular->name} ($id)");
496512

497513
return redirect()->back();
498514
}
@@ -509,7 +525,7 @@ public function destroy($id)
509525

510526
flash($$module_name_singular->name.' User Successfully Deleted!')->success()->important();
511527

512-
Log::info(label_case($module_action)." '{$module_name}': '".$$module_name_singular->name.', ID:'.$$module_name_singular->id." ' by User:".auth()->user()->name);
528+
logUserAccess("{$module_title} {$module_action} ($id)");
513529

514530
return redirect("admin/{$module_name}");
515531
}
@@ -534,6 +550,8 @@ public function trashed()
534550

535551
logUserAccess($module_title.' '.$module_action);
536552

553+
logUserAccess("{$module_title} {$module_action}");
554+
537555
return view(
538556
"{$module_path}.{$module_name}.trash",
539557
compact('module_title', 'module_name', 'module_path', "{$module_name}", 'module_icon', 'module_name_singular', 'module_action')
@@ -569,7 +587,7 @@ public function restore($id)
569587

570588
flash($$module_name_singular->name.' Successfully Restoreded!')->success()->important();
571589

572-
Log::info(label_case($module_action)." '{$module_name}': '".$$module_name_singular->name.', ID:'.$$module_name_singular->id." ' by User:".auth()->user()->name);
590+
logUserAccess("{$module_title} {$module_action} {$$module_name_singular->name} ($id)");
573591

574592
return redirect("admin/{$module_name}");
575593
}
@@ -607,18 +625,16 @@ public function block($id)
607625

608626
$$module_name_singular = User::withTrashed()->find($id);
609627

610-
try {
611-
$$module_name_singular->status = 2;
612-
$$module_name_singular->save();
628+
$$module_name_singular->status = 2;
629+
$$module_name_singular->save();
630+
631+
event(new UserUpdated($$module_name_singular));
613632

614-
event(new UserUpdated($$module_name_singular));
633+
flash($$module_name_singular->name.' User Successfully Blocked!')->success()->important();
615634

616-
flash($$module_name_singular->name.' User Successfully Blocked!')->success()->important();
635+
logUserAccess("{$module_title} {$module_action} {$$module_name_singular->name} ($id)");
617636

618-
return redirect()->back();
619-
} catch (Exception $e) {
620-
throw new Exception('There was a problem updating this user. Please try again.');
621-
}
637+
return redirect()->back();
622638
}
623639

624640
/**
@@ -654,23 +670,16 @@ public function unblock($id)
654670

655671
$$module_name_singular = User::withTrashed()->find($id);
656672

657-
try {
658-
$$module_name_singular->status = 1;
659-
$$module_name_singular->save();
660-
661-
event(new UserUpdated($$module_name_singular));
673+
$$module_name_singular->status = 1;
674+
$$module_name_singular->save();
662675

663-
flash($$module_name_singular->name.' - User Successfully Unblocked!')->success()->important();
676+
event(new UserUpdated($$module_name_singular));
664677

665-
Log::notice(label_case($module_title.' '.$module_action).' Success | User:'.auth()->user()->name.'(ID:'.auth()->user()->id.')');
678+
flash($$module_name_singular->name.' - User Successfully Unblocked!')->success()->important();
666679

667-
return redirect()->back();
668-
} catch (Exception $e) {
669-
flash('There was a problem updating this user. Please try again.!')->error()->important();
680+
logUserAccess("{$module_title} {$module_action} {$$module_name_singular->name} ($id)");
670681

671-
Log::error(label_case($module_title.' '.$module_action).' | User:'.auth()->user()->name.'(ID:'.auth()->user()->id.')');
672-
Log::error($e);
673-
}
682+
return redirect()->back();
674683
}
675684

676685
/**
@@ -724,16 +733,29 @@ public function userProviderDestroy(Request $request)
724733
*/
725734
public function emailConfirmationResend($id)
726735
{
727-
if ($id !== auth()->user()->id) {
728-
if (auth()->user()->hasAnyRole(['administrator', 'super admin'])) {
729-
Log::info(auth()->user()->name.' ('.auth()->user()->id.') - User Requested for Email Verification.');
730-
} else {
731-
Log::warning(auth()->user()->name.' ('.auth()->user()->id.') - User trying to confirm another users email.');
736+
$module_title = $this->module_title;
737+
$module_name = $this->module_name;
738+
$module_path = $this->module_path;
739+
$module_icon = $this->module_icon;
740+
$module_model = $this->module_model;
741+
$module_name_singular = Str::singular($module_name);
732742

733-
abort('404');
734-
}
743+
$module_action = 'Email Confirmation Resend';
744+
745+
if (! auth()->user()->can('edit_users')) {
746+
$id = auth()->user()->id;
735747
}
736748

749+
// if ($id !== auth()->user()->id) {
750+
// if (auth()->user()->hasAnyRole(['administrator', 'super admin'])) {
751+
// Log::info(auth()->user()->name.' ('.auth()->user()->id.') - User Requested for Email Verification.');
752+
// } else {
753+
// Log::warning(auth()->user()->name.' ('.auth()->user()->id.') - User trying to confirm another users email.');
754+
755+
// abort('403');
756+
// }
757+
// }
758+
737759
$user = User::where('id', '=', $id)->first();
738760

739761
if ($user) {
@@ -751,6 +773,8 @@ public function emailConfirmationResend($id)
751773

752774
flash($user->name.', You already confirmed your email address at '.$user->email_verified_at->isoFormat('LL'))->success()->important();
753775

776+
logUserAccess($module_title.' '.$module_action);
777+
754778
return redirect()->back();
755779
}
756780
}

‎app/Listeners/Backend/UserProfileUpdated/UserProfileUpdatedNotifyUser.php

Lines changed: 0 additions & 28 deletions
This file was deleted.

‎app/Listeners/Backend/UserProfileUpdated/UserProfileUpdatedUserUpdate.php

Lines changed: 0 additions & 45 deletions
This file was deleted.

‎app/Listeners/Frontend/UserProfileUpdated/UserProfileUpdatedNotifyUser.php

Lines changed: 0 additions & 28 deletions
This file was deleted.

0 commit comments

Comments
 (0)