From dc1b1179222a3d3413271ed483e320e16c494567 Mon Sep 17 00:00:00 2001 From: Ray1111-aa Date: Tue, 20 Oct 2026 14:41:57 +0700 Subject: [PATCH] fix(rbac): resolve custom role blank view and clarify default vs direct permissions --- app/Http/Controllers/Admin/UserController.php | 41 +++-- app/Http/Controllers/Auth/LoginController.php | 55 ++++--- app/Models/User.php | 10 +- resources/views/admin/users/index.blade.php | 144 ++++++++++++++---- resources/views/errors/403.blade.php | 23 ++- resources/views/home.blade.php | 46 +++--- resources/views/layouts/app.blade.php | 92 +++++------ tests/Feature/SuperAdminRbacTest.php | 84 ++++++++++ 8 files changed, 338 insertions(+), 157 deletions(-) diff --git a/app/Http/Controllers/Admin/UserController.php b/app/Http/Controllers/Admin/UserController.php index 0588803..960cea9 100644 --- a/app/Http/Controllers/Admin/UserController.php +++ b/app/Http/Controllers/Admin/UserController.php @@ -51,11 +51,14 @@ class UserController extends Controller }; $users = $query->with('permissions')->paginate(15)->withQueryString(); - $roles = Role::orderBy('name')->get(); + $roles = Role::with('permissions')->orderBy('name')->get(); + $rolePermissionsMap = $roles->mapWithKeys(function ($r) { + return [$r->name => $r->permissions->pluck('name')->toArray()]; + }); $gates = Gate::where('is_active', true)->orderBy('name')->get(); $modules = config('rbac_permissions.modules', []); - return view('admin.users.index', compact('users', 'roles', 'gates', 'modules')); + return view('admin.users.index', compact('users', 'roles', 'gates', 'modules', 'rolePermissionsMap')); } /** @@ -94,19 +97,22 @@ class UserController extends Controller // Assign Spatie Role $user->assignRole($validated['role']); - // Jika role employee, sinkronkan atau buat data master Employee - if ($validated['role'] === 'employee') { - $user->getOrCreateEmployee(); - } - - // Sync Direct Permissions (jika ada izin khusus tambahan) + // Sync Direct Permissions (jika ada izin khusus tambahan di luar bawaan role) if ($request->has('direct_permissions')) { - $user->syncPermissions($request->input('direct_permissions', [])); + $role = Role::findByName($validated['role']); + $rolePermNames = $role ? $role->permissions->pluck('name')->toArray() : []; + $directPerms = array_diff($request->input('direct_permissions', []), $rolePermNames); + $user->syncPermissions(array_values($directPerms)); } // Reset permission cache Spatie app()[PermissionRegistrar::class]->forgetCachedPermissions(); + // Jika user berstatus employee (role employee atau memiliki wewenang operasional karyawan), pastikan profil master Employee ada + if ($user->isEmployee()) { + $user->getOrCreateEmployee(); + } + // Rekam ke Log Riwayat Aktivitas Super Admin $roleTitle = $this->getFriendlyRoleName($validated['role']); AdminActivityLog::record( @@ -179,22 +185,25 @@ class UserController extends Controller // Sync Spatie Role $user->syncRoles([$validated['role']]); + // Sync Direct Permissions (hanya simpan izin khusus yang bukan bawaan role) + $role = Role::findByName($validated['role']); + $rolePermNames = $role ? $role->permissions->pluck('name')->toArray() : []; + $directPerms = array_diff($request->input('direct_permissions', []), $rolePermNames); + $user->syncPermissions(array_values($directPerms)); + + // Reset permission cache Spatie + app()[PermissionRegistrar::class]->forgetCachedPermissions(); + // Sinkronkan data master Employee jika pengguna berstatus employee if ($user->employee) { $user->employee->update([ 'name' => $user->name, 'nik' => $user->username, ]); - } elseif ($validated['role'] === 'employee') { + } elseif ($user->isEmployee()) { $user->getOrCreateEmployee(); } - // Sync Direct Permissions - $user->syncPermissions($request->input('direct_permissions', [])); - - // Reset permission cache Spatie - app()[PermissionRegistrar::class]->forgetCachedPermissions(); - // Susun deskripsi perubahan yang mudah dipahami non-IT $roleChanged = $oldRole !== $validated['role']; $changes = []; diff --git a/app/Http/Controllers/Auth/LoginController.php b/app/Http/Controllers/Auth/LoginController.php index 8c1e57d..23a4568 100644 --- a/app/Http/Controllers/Auth/LoginController.php +++ b/app/Http/Controllers/Auth/LoginController.php @@ -75,7 +75,7 @@ class LoginController extends Controller } /** - * Redirect cerdas berdasarkan role pengguna setelah login. + * Redirect cerdas berdasarkan wewenang hak akses (permissions) dan role pengguna setelah login. */ private function redirectBasedOnRole($user): RedirectResponse { @@ -83,25 +83,42 @@ class LoginController extends Controller return redirect()->route('admin.dashboard'); } - if ($user->role === 'employee') { - if ($user->can('employee.dashboard')) { - return redirect()->route('employee.dashboard'); - } elseif ($user->can('employee.p2h')) { - return redirect()->route('p2h.index'); - } elseif ($user->can('employee.timesheet')) { - return redirect()->route('timesheet.index'); - } else { - return redirect()->route('profile.index'); - } + // 1. Cek Wewenang Super Admin / Manajemen RBAC + if ($user->can('admin.dashboard') || $user->can('roles.view') || $user->can('users.view')) { + return redirect()->route('admin.dashboard'); } - return match ($user->role) { - 'super_admin', 'superadmin', 'admin' => redirect()->route('admin.dashboard'), - 'hse_admin' => redirect()->route('hse.dashboard'), - 'qma_admin' => redirect()->route('qma.dashboard'), - 'pg_admin' => redirect()->route('pg.dashboard'), - 'gate_officer' => redirect()->route('pg.gate.inspection'), - default => redirect()->route('profile.index'), - }; + // 2. Cek Wewenang QMA + if ($user->can('qma.vehicles.view') || $user->isQmaAdmin()) { + return redirect()->route('qma.dashboard'); + } + + // 3. Cek Wewenang HSE + if ($user->can('hse.employees.view') || $user->isHseAdmin()) { + return redirect()->route('hse.dashboard'); + } + + // 4. Cek Wewenang Private Guard (PG Admin) + if ($user->can('pg.guards.view') || $user->isPgAdmin()) { + return redirect()->route('pg.dashboard'); + } + + // 5. Cek Wewenang Pos Gerbang Satpam + if ($user->can('gate.inspect') || $user->isGateOfficer()) { + return redirect()->route('pg.gate.inspection'); + } + + // 6. Cek Wewenang Operasional Karyawan (Termasuk Role Baru Custom seperti Sukon, Vendor, Operator) + if ($user->can('employee.dashboard')) { + return redirect()->route('employee.dashboard'); + } + if ($user->can('employee.p2h')) { + return redirect()->route('p2h.index'); + } + if ($user->can('employee.timesheet')) { + return redirect()->route('timesheet.index'); + } + + return redirect()->route('profile.index'); } } diff --git a/app/Models/User.php b/app/Models/User.php index 9eecbd4..c9ab3e4 100644 --- a/app/Models/User.php +++ b/app/Models/User.php @@ -120,8 +120,8 @@ class User extends Authenticatable return $emp; } - // Jika user memiliki role employee atau admin yang memerlukan profil operasional - if ($this->isEmployee() || $this->isSuperAdmin()) { + // Jika user memiliki role employee, wewenang operasional karyawan, atau admin + if ($this->isEmployee() || $this->can('employee.dashboard') || $this->can('employee.timesheet') || $this->can('employee.p2h') || $this->isSuperAdmin()) { return Employee::create([ 'user_id' => $this->id, 'nik' => $this->username, @@ -139,7 +139,11 @@ class User extends Authenticatable public function isEmployee(): bool { - return $this->role === 'employee' || $this->hasRole('employee'); + return $this->role === 'employee' + || $this->hasRole('employee') + || $this->can('employee.dashboard') + || $this->can('employee.timesheet') + || $this->can('employee.p2h'); } public function isGateOfficer(): bool diff --git a/resources/views/admin/users/index.blade.php b/resources/views/admin/users/index.blade.php index 156a079..bdfd3f3 100644 --- a/resources/views/admin/users/index.blade.php +++ b/resources/views/admin/users/index.blade.php @@ -402,7 +402,7 @@
- @foreach($roles as $role) @endforeach @@ -431,10 +431,16 @@ -