fix(rbac): resolve custom role blank view and clarify default vs direct permissions
This commit is contained in:
@@ -51,11 +51,14 @@ class UserController extends Controller
|
|||||||
};
|
};
|
||||||
|
|
||||||
$users = $query->with('permissions')->paginate(15)->withQueryString();
|
$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();
|
$gates = Gate::where('is_active', true)->orderBy('name')->get();
|
||||||
$modules = config('rbac_permissions.modules', []);
|
$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
|
// Assign Spatie Role
|
||||||
$user->assignRole($validated['role']);
|
$user->assignRole($validated['role']);
|
||||||
|
|
||||||
// Jika role employee, sinkronkan atau buat data master Employee
|
// Sync Direct Permissions (jika ada izin khusus tambahan di luar bawaan role)
|
||||||
if ($validated['role'] === 'employee') {
|
|
||||||
$user->getOrCreateEmployee();
|
|
||||||
}
|
|
||||||
|
|
||||||
// Sync Direct Permissions (jika ada izin khusus tambahan)
|
|
||||||
if ($request->has('direct_permissions')) {
|
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
|
// Reset permission cache Spatie
|
||||||
app()[PermissionRegistrar::class]->forgetCachedPermissions();
|
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
|
// Rekam ke Log Riwayat Aktivitas Super Admin
|
||||||
$roleTitle = $this->getFriendlyRoleName($validated['role']);
|
$roleTitle = $this->getFriendlyRoleName($validated['role']);
|
||||||
AdminActivityLog::record(
|
AdminActivityLog::record(
|
||||||
@@ -179,22 +185,25 @@ class UserController extends Controller
|
|||||||
// Sync Spatie Role
|
// Sync Spatie Role
|
||||||
$user->syncRoles([$validated['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
|
// Sinkronkan data master Employee jika pengguna berstatus employee
|
||||||
if ($user->employee) {
|
if ($user->employee) {
|
||||||
$user->employee->update([
|
$user->employee->update([
|
||||||
'name' => $user->name,
|
'name' => $user->name,
|
||||||
'nik' => $user->username,
|
'nik' => $user->username,
|
||||||
]);
|
]);
|
||||||
} elseif ($validated['role'] === 'employee') {
|
} elseif ($user->isEmployee()) {
|
||||||
$user->getOrCreateEmployee();
|
$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
|
// Susun deskripsi perubahan yang mudah dipahami non-IT
|
||||||
$roleChanged = $oldRole !== $validated['role'];
|
$roleChanged = $oldRole !== $validated['role'];
|
||||||
$changes = [];
|
$changes = [];
|
||||||
|
|||||||
@@ -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
|
private function redirectBasedOnRole($user): RedirectResponse
|
||||||
{
|
{
|
||||||
@@ -83,25 +83,42 @@ class LoginController extends Controller
|
|||||||
return redirect()->route('admin.dashboard');
|
return redirect()->route('admin.dashboard');
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($user->role === 'employee') {
|
// 1. Cek Wewenang Super Admin / Manajemen RBAC
|
||||||
if ($user->can('employee.dashboard')) {
|
if ($user->can('admin.dashboard') || $user->can('roles.view') || $user->can('users.view')) {
|
||||||
return redirect()->route('employee.dashboard');
|
return redirect()->route('admin.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');
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return match ($user->role) {
|
// 2. Cek Wewenang QMA
|
||||||
'super_admin', 'superadmin', 'admin' => redirect()->route('admin.dashboard'),
|
if ($user->can('qma.vehicles.view') || $user->isQmaAdmin()) {
|
||||||
'hse_admin' => redirect()->route('hse.dashboard'),
|
return redirect()->route('qma.dashboard');
|
||||||
'qma_admin' => redirect()->route('qma.dashboard'),
|
}
|
||||||
'pg_admin' => redirect()->route('pg.dashboard'),
|
|
||||||
'gate_officer' => redirect()->route('pg.gate.inspection'),
|
// 3. Cek Wewenang HSE
|
||||||
default => redirect()->route('profile.index'),
|
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');
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+7
-3
@@ -120,8 +120,8 @@ class User extends Authenticatable
|
|||||||
return $emp;
|
return $emp;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Jika user memiliki role employee atau admin yang memerlukan profil operasional
|
// Jika user memiliki role employee, wewenang operasional karyawan, atau admin
|
||||||
if ($this->isEmployee() || $this->isSuperAdmin()) {
|
if ($this->isEmployee() || $this->can('employee.dashboard') || $this->can('employee.timesheet') || $this->can('employee.p2h') || $this->isSuperAdmin()) {
|
||||||
return Employee::create([
|
return Employee::create([
|
||||||
'user_id' => $this->id,
|
'user_id' => $this->id,
|
||||||
'nik' => $this->username,
|
'nik' => $this->username,
|
||||||
@@ -139,7 +139,11 @@ class User extends Authenticatable
|
|||||||
|
|
||||||
public function isEmployee(): bool
|
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
|
public function isGateOfficer(): bool
|
||||||
|
|||||||
@@ -402,7 +402,7 @@
|
|||||||
<div class="grid grid-cols-2 gap-3">
|
<div class="grid grid-cols-2 gap-3">
|
||||||
<div>
|
<div>
|
||||||
<label class="block text-xs font-bold text-slate-700 mb-1">Role RBAC *</label>
|
<label class="block text-xs font-bold text-slate-700 mb-1">Role RBAC *</label>
|
||||||
<select id="edit_role" name="role" required class="w-full px-3 py-2 bg-slate-50 border border-slate-200 rounded-xl text-xs focus:ring-2 focus:ring-indigo-500 focus:bg-white">
|
<select id="edit_role" name="role" required onchange="updatePermissionCheckboxes()" class="w-full px-3 py-2 bg-slate-50 border border-slate-200 rounded-xl text-xs focus:ring-2 focus:ring-indigo-500 focus:bg-white">
|
||||||
@foreach($roles as $role)
|
@foreach($roles as $role)
|
||||||
<option value="{{ $role->name }}">{{ ucwords(str_replace('_', ' ', $role->name)) }}</option>
|
<option value="{{ $role->name }}">{{ ucwords(str_replace('_', ' ', $role->name)) }}</option>
|
||||||
@endforeach
|
@endforeach
|
||||||
@@ -431,10 +431,16 @@
|
|||||||
<i id="directPermsChevron" class="fa-solid fa-chevron-down text-[10px] text-slate-400 transition-transform duration-200"></i>
|
<i id="directPermsChevron" class="fa-solid fa-chevron-down text-[10px] text-slate-400 transition-transform duration-200"></i>
|
||||||
</button>
|
</button>
|
||||||
|
|
||||||
<div id="directPermsContainer" class="hidden p-4 space-y-4 max-h-56 overflow-y-auto bg-white border-t border-slate-200 text-xs">
|
<div id="directPermsContainer" class="hidden p-4 space-y-4 max-h-64 overflow-y-auto bg-white border-t border-slate-200 text-xs">
|
||||||
<p class="text-[11px] text-slate-500 mb-1">
|
<!-- Panduan Visual Matriks Izin -->
|
||||||
Pilih izin individual tambahan di luar wewenang role bawaan pengguna ini:
|
<div class="p-2.5 rounded-xl bg-slate-50 border border-slate-200 flex items-start gap-2.5 text-[11px] text-slate-600">
|
||||||
</p>
|
<i class="fa-solid fa-circle-info text-indigo-600 text-sm mt-0.5 flex-shrink-0"></i>
|
||||||
|
<div class="leading-relaxed">
|
||||||
|
<span class="font-bold text-slate-800 block mb-0.5">Panduan Wewenang Pengguna:</span>
|
||||||
|
Wewenang dengan tanda <span class="inline-flex items-center px-1.5 py-0.2 rounded text-[10px] font-bold bg-emerald-100 text-emerald-800 border border-emerald-200">✓ Bawaan Role</span> otomatis aktif dari Role utama yang dipilih di atas. Anda dapat mencentang kotak lainnya untuk memberikan <span class="inline-flex items-center px-1.5 py-0.2 rounded text-[10px] font-bold bg-indigo-100 text-indigo-800 border border-indigo-200">+ Izin Khusus</span> tambahan secara individual.
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
@foreach($modules as $moduleKey => $module)
|
@foreach($modules as $moduleKey => $module)
|
||||||
<div class="space-y-1.5 pb-2.5 border-b border-slate-100 last:border-0">
|
<div class="space-y-1.5 pb-2.5 border-b border-slate-100 last:border-0">
|
||||||
<p class="font-bold text-[11px] text-indigo-950 flex items-center gap-1.5">
|
<p class="font-bold text-[11px] text-indigo-950 flex items-center gap-1.5">
|
||||||
@@ -443,18 +449,24 @@
|
|||||||
</p>
|
</p>
|
||||||
<div class="grid grid-cols-1 sm:grid-cols-2 gap-1.5 pl-3">
|
<div class="grid grid-cols-1 sm:grid-cols-2 gap-1.5 pl-3">
|
||||||
@foreach($module['permissions'] as $permKey => $permMeta)
|
@foreach($module['permissions'] as $permKey => $permMeta)
|
||||||
<label class="flex items-start gap-2 text-[11px] text-slate-700 cursor-pointer select-none group">
|
<label class="perm-item-wrapper flex items-start justify-between gap-2 text-[11px] text-slate-700 cursor-pointer select-none p-1.5 rounded-lg border border-transparent transition">
|
||||||
|
<div class="flex items-start gap-2 min-w-0">
|
||||||
<input type="checkbox"
|
<input type="checkbox"
|
||||||
name="direct_permissions[]"
|
name="direct_permissions[]"
|
||||||
value="{{ $permKey }}"
|
value="{{ $permKey }}"
|
||||||
id="edit_perm_{{ str_replace('.', '_', $permKey) }}"
|
id="edit_perm_{{ str_replace('.', '_', $permKey) }}"
|
||||||
class="mt-0.5 rounded border-slate-300 text-indigo-600 focus:ring-indigo-500 user-direct-perm-checkbox">
|
onchange="onDirectPermCheckboxChange(this)"
|
||||||
<div>
|
class="mt-0.5 rounded border-slate-300 text-indigo-600 focus:ring-indigo-500 user-direct-perm-checkbox flex-shrink-0">
|
||||||
<span class="font-medium text-slate-800 group-hover:text-indigo-600 transition block">
|
<div class="min-w-0">
|
||||||
|
<span class="font-medium text-slate-800 transition block truncate">
|
||||||
{{ $permMeta['label'] }}
|
{{ $permMeta['label'] }}
|
||||||
</span>
|
</span>
|
||||||
<span class="font-mono text-[9px] text-slate-400 block">{{ $permKey }}</span>
|
<span class="font-mono text-[9px] text-slate-400 block">{{ $permKey }}</span>
|
||||||
</div>
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="flex-shrink-0 pt-0.5">
|
||||||
|
<span id="badge_edit_perm_{{ str_replace('.', '_', $permKey) }}" class="hidden"></span>
|
||||||
|
</div>
|
||||||
</label>
|
</label>
|
||||||
@endforeach
|
@endforeach
|
||||||
</div>
|
</div>
|
||||||
@@ -504,6 +516,9 @@
|
|||||||
</div>
|
</div>
|
||||||
|
|
||||||
<script>
|
<script>
|
||||||
|
const rolePermissionsMap = @json($rolePermissionsMap ?? []);
|
||||||
|
let currentUserDirectPerms = [];
|
||||||
|
|
||||||
function openCreateUserModal() {
|
function openCreateUserModal() {
|
||||||
document.getElementById('createUserModal').classList.remove('hidden');
|
document.getElementById('createUserModal').classList.remove('hidden');
|
||||||
document.documentElement.classList.add('modal-open');
|
document.documentElement.classList.add('modal-open');
|
||||||
@@ -525,6 +540,91 @@
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function updatePermissionCheckboxes() {
|
||||||
|
const roleSelect = document.getElementById('edit_role');
|
||||||
|
const selectedRole = roleSelect ? roleSelect.value : '';
|
||||||
|
const rolePerms = (rolePermissionsMap && rolePermissionsMap[selectedRole]) ? rolePermissionsMap[selectedRole] : [];
|
||||||
|
|
||||||
|
document.querySelectorAll('.user-direct-perm-checkbox').forEach(cb => {
|
||||||
|
const permKey = cb.value;
|
||||||
|
const safeKey = permKey.replace(/\./g, '_');
|
||||||
|
const badge = document.getElementById('badge_edit_perm_' + safeKey);
|
||||||
|
const wrapper = cb.closest('.perm-item-wrapper');
|
||||||
|
|
||||||
|
if (rolePerms.includes(permKey)) {
|
||||||
|
// Izin merupakan bawaan role utama
|
||||||
|
cb.checked = true;
|
||||||
|
cb.disabled = true;
|
||||||
|
cb.title = "Izin bawaan dari role " + selectedRole;
|
||||||
|
if (badge) {
|
||||||
|
badge.className = "inline-flex items-center px-1.5 py-0.5 rounded text-[9px] font-bold bg-emerald-100 text-emerald-800 border border-emerald-200";
|
||||||
|
badge.textContent = "✓ Bawaan Role";
|
||||||
|
badge.classList.remove('hidden');
|
||||||
|
}
|
||||||
|
if (wrapper) {
|
||||||
|
wrapper.classList.add('bg-emerald-50/50');
|
||||||
|
wrapper.classList.remove('bg-indigo-50/50');
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
// Bukan bawaan role, bisa diaktifkan/dinonaktifkan sebagai izin khusus
|
||||||
|
cb.disabled = false;
|
||||||
|
cb.title = "";
|
||||||
|
const isDirect = currentUserDirectPerms.includes(permKey);
|
||||||
|
cb.checked = isDirect;
|
||||||
|
if (badge) {
|
||||||
|
if (isDirect) {
|
||||||
|
badge.className = "inline-flex items-center px-1.5 py-0.5 rounded text-[9px] font-bold bg-indigo-100 text-indigo-800 border border-indigo-200";
|
||||||
|
badge.textContent = "+ Izin Khusus";
|
||||||
|
badge.classList.remove('hidden');
|
||||||
|
} else {
|
||||||
|
badge.className = "hidden";
|
||||||
|
badge.textContent = "";
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (wrapper) {
|
||||||
|
if (isDirect) {
|
||||||
|
wrapper.classList.add('bg-indigo-50/50');
|
||||||
|
wrapper.classList.remove('bg-emerald-50/50');
|
||||||
|
} else {
|
||||||
|
wrapper.classList.remove('bg-emerald-50/50', 'bg-indigo-50/50');
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
function onDirectPermCheckboxChange(cb) {
|
||||||
|
if (cb.disabled) return;
|
||||||
|
const permKey = cb.value;
|
||||||
|
const safeKey = permKey.replace(/\./g, '_');
|
||||||
|
const badge = document.getElementById('badge_edit_perm_' + safeKey);
|
||||||
|
const wrapper = cb.closest('.perm-item-wrapper');
|
||||||
|
|
||||||
|
if (cb.checked) {
|
||||||
|
if (!currentUserDirectPerms.includes(permKey)) {
|
||||||
|
currentUserDirectPerms.push(permKey);
|
||||||
|
}
|
||||||
|
if (badge) {
|
||||||
|
badge.className = "inline-flex items-center px-1.5 py-0.5 rounded text-[9px] font-bold bg-indigo-100 text-indigo-800 border border-indigo-200";
|
||||||
|
badge.textContent = "+ Izin Khusus";
|
||||||
|
badge.classList.remove('hidden');
|
||||||
|
}
|
||||||
|
if (wrapper) {
|
||||||
|
wrapper.classList.add('bg-indigo-50/50');
|
||||||
|
wrapper.classList.remove('bg-emerald-50/50');
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
currentUserDirectPerms = currentUserDirectPerms.filter(p => p !== permKey);
|
||||||
|
if (badge) {
|
||||||
|
badge.className = "hidden";
|
||||||
|
badge.textContent = "";
|
||||||
|
}
|
||||||
|
if (wrapper) {
|
||||||
|
wrapper.classList.remove('bg-indigo-50/50');
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
function openEditUserModal(user, primaryRole, userDirectPerms) {
|
function openEditUserModal(user, primaryRole, userDirectPerms) {
|
||||||
document.getElementById('editUserForm').action = `/admin/users/${user.id}`;
|
document.getElementById('editUserForm').action = `/admin/users/${user.id}`;
|
||||||
document.getElementById('edit_name').value = user.name;
|
document.getElementById('edit_name').value = user.name;
|
||||||
@@ -533,16 +633,8 @@
|
|||||||
document.getElementById('edit_role').value = primaryRole;
|
document.getElementById('edit_role').value = primaryRole;
|
||||||
document.getElementById('edit_gate_id').value = user.gate_id || '';
|
document.getElementById('edit_gate_id').value = user.gate_id || '';
|
||||||
|
|
||||||
// Uncheck all direct permission checkboxes first
|
currentUserDirectPerms = Array.isArray(userDirectPerms) ? [...userDirectPerms] : [];
|
||||||
document.querySelectorAll('.user-direct-perm-checkbox').forEach(cb => cb.checked = false);
|
updatePermissionCheckboxes();
|
||||||
|
|
||||||
// Check assigned direct permissions
|
|
||||||
if (Array.isArray(userDirectPerms)) {
|
|
||||||
userDirectPerms.forEach(permName => {
|
|
||||||
const el = document.getElementById('edit_perm_' + permName.replace(/\./g, '_'));
|
|
||||||
if (el) el.checked = true;
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
document.getElementById('editUserModal').classList.remove('hidden');
|
document.getElementById('editUserModal').classList.remove('hidden');
|
||||||
document.documentElement.classList.add('modal-open');
|
document.documentElement.classList.add('modal-open');
|
||||||
|
|||||||
@@ -85,19 +85,16 @@
|
|||||||
|
|
||||||
@auth
|
@auth
|
||||||
@php
|
@php
|
||||||
$roleRoute = match(auth()->user()->role) {
|
$u = auth()->user();
|
||||||
'super_admin', 'superadmin', 'admin' => route('admin.dashboard'),
|
$roleRoute = match(true) {
|
||||||
'hse_admin' => route('hse.dashboard'),
|
$u->isSuperAdmin() || $u->can('admin.dashboard') => route('admin.dashboard'),
|
||||||
'qma_admin' => route('qma.dashboard'),
|
$u->can('qma.vehicles.view') => route('qma.dashboard'),
|
||||||
'pg_admin' => route('pg.dashboard'),
|
$u->can('hse.employees.view') => route('hse.dashboard'),
|
||||||
'gate_officer' => route('pg.gate.inspection'),
|
$u->can('pg.guards.view') => route('pg.dashboard'),
|
||||||
'employee' => (auth()->user()->can('employee.dashboard')
|
$u->can('gate.inspect') => route('pg.gate.inspection'),
|
||||||
? route('employee.dashboard')
|
$u->can('employee.dashboard') => route('employee.dashboard'),
|
||||||
: (auth()->user()->can('employee.p2h')
|
$u->can('employee.p2h') => route('p2h.index'),
|
||||||
? route('p2h.index')
|
$u->can('employee.timesheet') => route('timesheet.index'),
|
||||||
: (auth()->user()->can('employee.timesheet')
|
|
||||||
? route('timesheet.index')
|
|
||||||
: route('profile.index')))),
|
|
||||||
default => route('profile.index'),
|
default => route('profile.index'),
|
||||||
};
|
};
|
||||||
@endphp
|
@endphp
|
||||||
|
|||||||
@@ -100,19 +100,16 @@
|
|||||||
<!-- Tombol Auth: Login / Dashboard -->
|
<!-- Tombol Auth: Login / Dashboard -->
|
||||||
@auth
|
@auth
|
||||||
@php
|
@php
|
||||||
$roleRoute = match(auth()->user()->role) {
|
$u = auth()->user();
|
||||||
'super_admin', 'superadmin', 'admin' => route('admin.dashboard'),
|
$roleRoute = match(true) {
|
||||||
'hse_admin' => route('hse.dashboard'),
|
$u->isSuperAdmin() || $u->can('admin.dashboard') => route('admin.dashboard'),
|
||||||
'qma_admin' => route('qma.dashboard'),
|
$u->can('qma.vehicles.view') => route('qma.dashboard'),
|
||||||
'pg_admin' => route('pg.dashboard'),
|
$u->can('hse.employees.view') => route('hse.dashboard'),
|
||||||
'gate_officer' => route('pg.gate.inspection'),
|
$u->can('pg.guards.view') => route('pg.dashboard'),
|
||||||
'employee' => (auth()->user()->can('employee.dashboard')
|
$u->can('gate.inspect') => route('pg.gate.inspection'),
|
||||||
? route('employee.dashboard')
|
$u->can('employee.dashboard') => route('employee.dashboard'),
|
||||||
: (auth()->user()->can('employee.p2h')
|
$u->can('employee.p2h') => route('p2h.index'),
|
||||||
? route('p2h.index')
|
$u->can('employee.timesheet') => route('timesheet.index'),
|
||||||
: (auth()->user()->can('employee.timesheet')
|
|
||||||
? route('timesheet.index')
|
|
||||||
: route('profile.index')))),
|
|
||||||
default => route('profile.index'),
|
default => route('profile.index'),
|
||||||
};
|
};
|
||||||
@endphp
|
@endphp
|
||||||
@@ -196,19 +193,16 @@
|
|||||||
<!-- BUTTON LOGIN -->
|
<!-- BUTTON LOGIN -->
|
||||||
@auth
|
@auth
|
||||||
@php
|
@php
|
||||||
$roleRoute = match(auth()->user()->role) {
|
$u = auth()->user();
|
||||||
'super_admin', 'superadmin', 'admin' => route('admin.dashboard'),
|
$roleRoute = match(true) {
|
||||||
'hse_admin' => route('hse.dashboard'),
|
$u->isSuperAdmin() || $u->can('admin.dashboard') => route('admin.dashboard'),
|
||||||
'qma_admin' => route('qma.dashboard'),
|
$u->can('qma.vehicles.view') => route('qma.dashboard'),
|
||||||
'pg_admin' => route('pg.dashboard'),
|
$u->can('hse.employees.view') => route('hse.dashboard'),
|
||||||
'gate_officer' => route('pg.gate.inspection'),
|
$u->can('pg.guards.view') => route('pg.dashboard'),
|
||||||
'employee' => (auth()->user()->can('employee.dashboard')
|
$u->can('gate.inspect') => route('pg.gate.inspection'),
|
||||||
? route('employee.dashboard')
|
$u->can('employee.dashboard') => route('employee.dashboard'),
|
||||||
: (auth()->user()->can('employee.p2h')
|
$u->can('employee.p2h') => route('p2h.index'),
|
||||||
? route('p2h.index')
|
$u->can('employee.timesheet') => route('timesheet.index'),
|
||||||
: (auth()->user()->can('employee.timesheet')
|
|
||||||
? route('timesheet.index')
|
|
||||||
: route('profile.index')))),
|
|
||||||
default => route('profile.index'),
|
default => route('profile.index'),
|
||||||
};
|
};
|
||||||
@endphp
|
@endphp
|
||||||
|
|||||||
@@ -175,8 +175,7 @@
|
|||||||
</svg>
|
</svg>
|
||||||
<span>Dashboard Admin</span>
|
<span>Dashboard Admin</span>
|
||||||
</a>
|
</a>
|
||||||
@elseif(auth()->user()->isHseAdmin())
|
@elseif(auth()->user()->can('hse.employees.view') && !auth()->user()->canAny(['qma.vehicles.view', 'pg.guards.view', 'employee.dashboard']))
|
||||||
@can('hse.employees.view')
|
|
||||||
<a href="{{ route('hse.dashboard') }}"
|
<a href="{{ route('hse.dashboard') }}"
|
||||||
class="flex items-center space-x-3 px-3.5 py-2.5 text-sm {{ request()->routeIs('hse.dashboard') ? 'sidebar-item-active' : 'sidebar-item-inactive' }}">
|
class="flex items-center space-x-3 px-3.5 py-2.5 text-sm {{ request()->routeIs('hse.dashboard') ? 'sidebar-item-active' : 'sidebar-item-inactive' }}">
|
||||||
<svg class="w-5 h-5 flex-shrink-0" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2.2" stroke-linecap="round" stroke-linejoin="round">
|
<svg class="w-5 h-5 flex-shrink-0" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2.2" stroke-linecap="round" stroke-linejoin="round">
|
||||||
@@ -187,9 +186,7 @@
|
|||||||
</svg>
|
</svg>
|
||||||
<span>Dashboard</span>
|
<span>Dashboard</span>
|
||||||
</a>
|
</a>
|
||||||
@endcan
|
@elseif(auth()->user()->can('qma.vehicles.view') && !auth()->user()->canAny(['pg.guards.view', 'employee.dashboard']))
|
||||||
@elseif(auth()->user()->isQmaAdmin())
|
|
||||||
@can('qma.vehicles.view')
|
|
||||||
<a href="{{ route('qma.dashboard') }}"
|
<a href="{{ route('qma.dashboard') }}"
|
||||||
class="flex items-center space-x-3 px-3.5 py-2.5 text-sm {{ request()->routeIs('qma.dashboard') ? 'sidebar-item-active' : 'sidebar-item-inactive' }}">
|
class="flex items-center space-x-3 px-3.5 py-2.5 text-sm {{ request()->routeIs('qma.dashboard') ? 'sidebar-item-active' : 'sidebar-item-inactive' }}">
|
||||||
<svg class="w-5 h-5 flex-shrink-0" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2.2" stroke-linecap="round" stroke-linejoin="round">
|
<svg class="w-5 h-5 flex-shrink-0" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2.2" stroke-linecap="round" stroke-linejoin="round">
|
||||||
@@ -200,9 +197,7 @@
|
|||||||
</svg>
|
</svg>
|
||||||
<span>Dashboard</span>
|
<span>Dashboard</span>
|
||||||
</a>
|
</a>
|
||||||
@endcan
|
@elseif(auth()->user()->can('pg.guards.view') && !auth()->user()->can('employee.dashboard'))
|
||||||
@elseif(auth()->user()->isPgAdmin())
|
|
||||||
@can('pg.guards.view')
|
|
||||||
<a href="{{ route('pg.dashboard') }}"
|
<a href="{{ route('pg.dashboard') }}"
|
||||||
class="flex items-center space-x-3 px-3.5 py-2.5 text-sm {{ request()->routeIs('pg.dashboard') ? 'sidebar-item-active' : 'sidebar-item-inactive' }}">
|
class="flex items-center space-x-3 px-3.5 py-2.5 text-sm {{ request()->routeIs('pg.dashboard') ? 'sidebar-item-active' : 'sidebar-item-inactive' }}">
|
||||||
<svg class="w-5 h-5 flex-shrink-0" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2.2" stroke-linecap="round" stroke-linejoin="round">
|
<svg class="w-5 h-5 flex-shrink-0" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2.2" stroke-linecap="round" stroke-linejoin="round">
|
||||||
@@ -213,9 +208,7 @@
|
|||||||
</svg>
|
</svg>
|
||||||
<span>Dashboard</span>
|
<span>Dashboard</span>
|
||||||
</a>
|
</a>
|
||||||
@endcan
|
@elseif(auth()->user()->can('employee.dashboard') || auth()->user()->isEmployee())
|
||||||
@elseif(auth()->user()->isEmployee())
|
|
||||||
@can('employee.dashboard')
|
|
||||||
<a href="{{ route('employee.dashboard') }}"
|
<a href="{{ route('employee.dashboard') }}"
|
||||||
class="flex items-center space-x-3 px-3.5 py-2.5 text-sm {{ request()->routeIs('employee.dashboard') ? 'sidebar-item-active' : 'sidebar-item-inactive' }}">
|
class="flex items-center space-x-3 px-3.5 py-2.5 text-sm {{ request()->routeIs('employee.dashboard') ? 'sidebar-item-active' : 'sidebar-item-inactive' }}">
|
||||||
<svg class="w-5 h-5 flex-shrink-0" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2.2" stroke-linecap="round" stroke-linejoin="round">
|
<svg class="w-5 h-5 flex-shrink-0" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2.2" stroke-linecap="round" stroke-linejoin="round">
|
||||||
@@ -226,7 +219,7 @@
|
|||||||
</svg>
|
</svg>
|
||||||
<span>Dashboard</span>
|
<span>Dashboard</span>
|
||||||
</a>
|
</a>
|
||||||
@endcan
|
@endif
|
||||||
|
|
||||||
@can('employee.p2h')
|
@can('employee.p2h')
|
||||||
<a href="{{ route('p2h.index') }}"
|
<a href="{{ route('p2h.index') }}"
|
||||||
@@ -243,7 +236,6 @@
|
|||||||
<span>Timesheet</span>
|
<span>Timesheet</span>
|
||||||
</a>
|
</a>
|
||||||
@endcan
|
@endcan
|
||||||
@endif
|
|
||||||
</nav>
|
</nav>
|
||||||
</div>
|
</div>
|
||||||
@endif
|
@endif
|
||||||
@@ -487,8 +479,7 @@
|
|||||||
</svg>
|
</svg>
|
||||||
<span>Dashboard Admin</span>
|
<span>Dashboard Admin</span>
|
||||||
</a>
|
</a>
|
||||||
@elseif(auth()->user()->isHseAdmin())
|
@elseif(auth()->user()->can('hse.employees.view') && !auth()->user()->canAny(['qma.vehicles.view', 'pg.guards.view', 'employee.dashboard']))
|
||||||
@can('hse.employees.view')
|
|
||||||
<a href="{{ route('hse.dashboard') }}" class="flex items-center space-x-3 px-3 py-2.5 rounded-xl text-sm {{ request()->routeIs('hse.dashboard') ? 'sidebar-item-active' : 'sidebar-item-inactive' }}">
|
<a href="{{ route('hse.dashboard') }}" class="flex items-center space-x-3 px-3 py-2.5 rounded-xl text-sm {{ request()->routeIs('hse.dashboard') ? 'sidebar-item-active' : 'sidebar-item-inactive' }}">
|
||||||
<svg class="w-5 h-5 flex-shrink-0" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2.2" stroke-linecap="round" stroke-linejoin="round">
|
<svg class="w-5 h-5 flex-shrink-0" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2.2" stroke-linecap="round" stroke-linejoin="round">
|
||||||
<rect x="3" y="3" width="7" height="7" rx="2"></rect>
|
<rect x="3" y="3" width="7" height="7" rx="2"></rect>
|
||||||
@@ -498,9 +489,7 @@
|
|||||||
</svg>
|
</svg>
|
||||||
<span>Dashboard</span>
|
<span>Dashboard</span>
|
||||||
</a>
|
</a>
|
||||||
@endcan
|
@elseif(auth()->user()->can('qma.vehicles.view') && !auth()->user()->canAny(['pg.guards.view', 'employee.dashboard']))
|
||||||
@elseif(auth()->user()->isQmaAdmin())
|
|
||||||
@can('qma.vehicles.view')
|
|
||||||
<a href="{{ route('qma.dashboard') }}" class="flex items-center space-x-3 px-3 py-2.5 rounded-xl text-sm {{ request()->routeIs('qma.dashboard') ? 'sidebar-item-active' : 'sidebar-item-inactive' }}">
|
<a href="{{ route('qma.dashboard') }}" class="flex items-center space-x-3 px-3 py-2.5 rounded-xl text-sm {{ request()->routeIs('qma.dashboard') ? 'sidebar-item-active' : 'sidebar-item-inactive' }}">
|
||||||
<svg class="w-5 h-5 flex-shrink-0" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2.2" stroke-linecap="round" stroke-linejoin="round">
|
<svg class="w-5 h-5 flex-shrink-0" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2.2" stroke-linecap="round" stroke-linejoin="round">
|
||||||
<rect x="3" y="3" width="7" height="7" rx="2"></rect>
|
<rect x="3" y="3" width="7" height="7" rx="2"></rect>
|
||||||
@@ -510,9 +499,7 @@
|
|||||||
</svg>
|
</svg>
|
||||||
<span>Dashboard</span>
|
<span>Dashboard</span>
|
||||||
</a>
|
</a>
|
||||||
@endcan
|
@elseif(auth()->user()->can('pg.guards.view') && !auth()->user()->can('employee.dashboard'))
|
||||||
@elseif(auth()->user()->isPgAdmin())
|
|
||||||
@can('pg.guards.view')
|
|
||||||
<a href="{{ route('pg.dashboard') }}" class="flex items-center space-x-3 px-3 py-2.5 rounded-xl text-sm {{ request()->routeIs('pg.dashboard') ? 'sidebar-item-active' : 'sidebar-item-inactive' }}">
|
<a href="{{ route('pg.dashboard') }}" class="flex items-center space-x-3 px-3 py-2.5 rounded-xl text-sm {{ request()->routeIs('pg.dashboard') ? 'sidebar-item-active' : 'sidebar-item-inactive' }}">
|
||||||
<svg class="w-5 h-5 flex-shrink-0" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2.2" stroke-linecap="round" stroke-linejoin="round">
|
<svg class="w-5 h-5 flex-shrink-0" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2.2" stroke-linecap="round" stroke-linejoin="round">
|
||||||
<rect x="3" y="3" width="7" height="7" rx="2"></rect>
|
<rect x="3" y="3" width="7" height="7" rx="2"></rect>
|
||||||
@@ -522,9 +509,7 @@
|
|||||||
</svg>
|
</svg>
|
||||||
<span>Dashboard</span>
|
<span>Dashboard</span>
|
||||||
</a>
|
</a>
|
||||||
@endcan
|
@elseif(auth()->user()->can('employee.dashboard') || auth()->user()->isEmployee())
|
||||||
@elseif(auth()->user()->isEmployee())
|
|
||||||
@can('employee.dashboard')
|
|
||||||
<a href="{{ route('employee.dashboard') }}" class="flex items-center space-x-3 px-3 py-2.5 rounded-xl text-sm {{ request()->routeIs('employee.dashboard') ? 'sidebar-item-active' : 'sidebar-item-inactive' }}">
|
<a href="{{ route('employee.dashboard') }}" class="flex items-center space-x-3 px-3 py-2.5 rounded-xl text-sm {{ request()->routeIs('employee.dashboard') ? 'sidebar-item-active' : 'sidebar-item-inactive' }}">
|
||||||
<svg class="w-5 h-5 flex-shrink-0" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2.2" stroke-linecap="round" stroke-linejoin="round">
|
<svg class="w-5 h-5 flex-shrink-0" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2.2" stroke-linecap="round" stroke-linejoin="round">
|
||||||
<rect x="3" y="3" width="7" height="7" rx="2"></rect>
|
<rect x="3" y="3" width="7" height="7" rx="2"></rect>
|
||||||
@@ -534,7 +519,7 @@
|
|||||||
</svg>
|
</svg>
|
||||||
<span>Dashboard</span>
|
<span>Dashboard</span>
|
||||||
</a>
|
</a>
|
||||||
@endcan
|
@endif
|
||||||
|
|
||||||
@can('employee.p2h')
|
@can('employee.p2h')
|
||||||
<a href="{{ route('p2h.index') }}" class="flex items-center space-x-3 px-3 py-2.5 rounded-xl text-sm {{ request()->routeIs('p2h.*') ? 'sidebar-item-active' : 'sidebar-item-inactive' }}">
|
<a href="{{ route('p2h.index') }}" class="flex items-center space-x-3 px-3 py-2.5 rounded-xl text-sm {{ request()->routeIs('p2h.*') ? 'sidebar-item-active' : 'sidebar-item-inactive' }}">
|
||||||
@@ -549,7 +534,6 @@
|
|||||||
<span>Timesheet</span>
|
<span>Timesheet</span>
|
||||||
</a>
|
</a>
|
||||||
@endcan
|
@endcan
|
||||||
@endif
|
|
||||||
</nav>
|
</nav>
|
||||||
</div>
|
</div>
|
||||||
@endif
|
@endif
|
||||||
|
|||||||
@@ -384,4 +384,88 @@ class SuperAdminRbacTest extends TestCase
|
|||||||
$resEmployeeHome->assertOk();
|
$resEmployeeHome->assertOk();
|
||||||
$resEmployeeHome->assertSee(route('employee.dashboard'));
|
$resEmployeeHome->assertSee(route('employee.dashboard'));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public function test_custom_role_sukon_with_employee_permissions_can_login_and_see_employee_dashboard_and_sidebar(): void
|
||||||
|
{
|
||||||
|
// 1. Buat custom role 'sukon' yang memiliki izin karyawan
|
||||||
|
$sukonRole = Role::create(['name' => 'sukon', 'guard_name' => 'web']);
|
||||||
|
$sukonRole->syncPermissions(['employee.dashboard', 'employee.timesheet', 'employee.p2h']);
|
||||||
|
|
||||||
|
// 2. Buat akun pengguna dengan custom role 'sukon'
|
||||||
|
$user = User::factory()->create([
|
||||||
|
'username' => 'sukon.user',
|
||||||
|
'password' => bcrypt('password123'),
|
||||||
|
'role' => 'sukon',
|
||||||
|
]);
|
||||||
|
$user->assignRole('sukon');
|
||||||
|
|
||||||
|
// 3. Uji proses login pengguna custom role 'sukon'
|
||||||
|
$loginResponse = $this->post(route('login.post'), [
|
||||||
|
'username' => 'sukon.user',
|
||||||
|
'password' => 'password123',
|
||||||
|
]);
|
||||||
|
|
||||||
|
// Harus diarahkan ke dashboard karyawan, bukan halaman kosong / profile
|
||||||
|
$loginResponse->assertRedirect(route('employee.dashboard'));
|
||||||
|
$this->assertAuthenticatedAs($user);
|
||||||
|
|
||||||
|
// 4. Akses dashboard karyawan dan periksa sidebar / menu
|
||||||
|
$dashboardResponse = $this->actingAs($user)->get(route('employee.dashboard'));
|
||||||
|
$dashboardResponse->assertOk();
|
||||||
|
$dashboardResponse->assertSee('Dashboard Karyawan');
|
||||||
|
$dashboardResponse->assertSee('Pemeriksaan P2H');
|
||||||
|
$dashboardResponse->assertSee('Timesheet');
|
||||||
|
|
||||||
|
// Profil master Employee harus otomatis terhubung
|
||||||
|
$this->assertNotNull($user->fresh()->employee);
|
||||||
|
$this->assertEquals('sukon.user', $user->fresh()->employee->nik);
|
||||||
|
|
||||||
|
// Halaman Home juga mengarahkan tombol dashboard ke portal karyawan
|
||||||
|
$homeResponse = $this->actingAs($user)->get(route('home'));
|
||||||
|
$homeResponse->assertOk();
|
||||||
|
$homeResponse->assertSee(route('employee.dashboard'));
|
||||||
|
}
|
||||||
|
|
||||||
|
public function test_user_management_passes_role_permissions_map_and_filters_duplicate_role_perms(): void
|
||||||
|
{
|
||||||
|
$superAdmin = User::where('username', 'superadmin')->first();
|
||||||
|
|
||||||
|
// 1. Cek UserController@index menyediakan $rolePermissionsMap
|
||||||
|
$indexResponse = $this->actingAs($superAdmin)->get(route('admin.users.index'));
|
||||||
|
$indexResponse->assertOk();
|
||||||
|
$indexResponse->assertViewHas('rolePermissionsMap');
|
||||||
|
|
||||||
|
$map = $indexResponse->viewData('rolePermissionsMap');
|
||||||
|
$this->assertArrayHasKey('employee', $map);
|
||||||
|
$this->assertContains('employee.dashboard', $map['employee']);
|
||||||
|
|
||||||
|
// 2. Buat user dan simpan direct permissions yang bercampur antara izin bawaan role dan izin khusus
|
||||||
|
$targetUser = User::factory()->create([
|
||||||
|
'role' => 'employee',
|
||||||
|
]);
|
||||||
|
$targetUser->assignRole('employee');
|
||||||
|
|
||||||
|
$updateResponse = $this->actingAs($superAdmin)->post(route('admin.users.update', $targetUser->id), [
|
||||||
|
'name' => 'Karyawan Multi Role',
|
||||||
|
'username' => $targetUser->username,
|
||||||
|
'email' => $targetUser->email,
|
||||||
|
'role' => 'employee',
|
||||||
|
'direct_permissions' => [
|
||||||
|
'employee.dashboard', // Izin bawaan employee role (harus disaring / tidak disimpan sebagai direct)
|
||||||
|
'employee.p2h', // Izin bawaan employee role (harus disaring)
|
||||||
|
'qma.vehicles.view', // Izin tambahan khusus di luar role
|
||||||
|
],
|
||||||
|
]);
|
||||||
|
|
||||||
|
$updateResponse->assertRedirect(route('admin.users.index'));
|
||||||
|
$updateResponse->assertSessionHas('success');
|
||||||
|
|
||||||
|
// Direct permissions yang tersimpan di user hanya 'qma.vehicles.view'
|
||||||
|
$directPermNames = $targetUser->fresh()->permissions->pluck('name')->toArray();
|
||||||
|
$this->assertEquals(['qma.vehicles.view'], $directPermNames);
|
||||||
|
|
||||||
|
// Namun user tetap memiliki wewenang employee.dashboard lewat rolenya
|
||||||
|
$this->assertTrue($targetUser->fresh()->can('employee.dashboard'));
|
||||||
|
$this->assertTrue($targetUser->fresh()->can('qma.vehicles.view'));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user