diff --git a/app/Http/Controllers/AuditLogsController.php b/app/Http/Controllers/AuditLogsController.php index b96777d..176dfd1 100644 --- a/app/Http/Controllers/AuditLogsController.php +++ b/app/Http/Controllers/AuditLogsController.php @@ -6,6 +6,7 @@ use Illuminate\Http\Request; use Modules\Usermanagement\Models\User; use Spatie\Activitylog\Models\Activity; + use Illuminate\Support\Facades\Auth; class AuditLogsController extends Controller { @@ -13,7 +14,14 @@ public function __construct() { - $this->user = Auth::guard('web')->user(); + // Mengatur middleware auth + $this->middleware('auth'); + + // Mengatur user setelah middleware auth dijalankan + $this->middleware(function ($request, $next) { + $this->user = Auth::user(); + return $next($request); + }); } /** diff --git a/app/Http/Controllers/SystemLogsController.php b/app/Http/Controllers/SystemLogsController.php index 9b8b408..9f2891a 100644 --- a/app/Http/Controllers/SystemLogsController.php +++ b/app/Http/Controllers/SystemLogsController.php @@ -6,6 +6,7 @@ use App\Http\Controllers\Controller; use Illuminate\Http\Request; use Jackiedo\LogReader\Exceptions\UnableToRetrieveLogFilesException; use Jackiedo\LogReader\LogReader; +use Illuminate\Support\Facades\Auth; class SystemLogsController extends Controller { @@ -15,7 +16,14 @@ class SystemLogsController extends Controller public function __construct(LogReader $reader) { $this->reader = $reader; - $this->user = Auth::guard('web')->user(); + // Mengatur middleware auth + $this->middleware('auth'); + + // Mengatur user setelah middleware auth dijalankan + $this->middleware(function ($request, $next) { + $this->user = Auth::user(); + return $next($request); + }); } /** diff --git a/database/seeders/PermissionSeeder.php b/database/seeders/PermissionSeeder.php index 350aa06..d83fe28 100644 --- a/database/seeders/PermissionSeeder.php +++ b/database/seeders/PermissionSeeder.php @@ -16,14 +16,10 @@ $data = $this->data(); foreach ($data as $value) { - $group = PermissionGroup::updateOrCreate([ + PermissionGroup::updateOrCreate([ 'name' => $value['name'], 'slug' => Str::slug($value['name']) ]); - - foreach ($this->crudActions($group->name) as $action) { - $data[] = ['name' => $action, 'group' => $group->id]; - } } } @@ -34,18 +30,4 @@ ['name' => 'audit-logs'], ]; } - - public function crudActions($name) - { - $actions = []; - // list of permission actions - $crud = ['create', 'read', 'update', 'delete','export', 'authorize', 'report','restore']; - - - foreach ($crud as $value) { - $actions[] = $name . '.' . $value; - } - - return $actions; - } }