fix(rbac): resolve custom role blank view and clarify default vs direct permissions

This commit is contained in:
Ray1111-aa
2026-10-20 14:41:57 +07:00
parent 33d72889be
commit dc1b117922
8 changed files with 338 additions and 157 deletions
+25 -16
View File
@@ -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 = [];
+36 -19
View File
@@ -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');
}
}