merge: integrate Spatie RBAC Super Admin with Docker, Unit Support, and P2H features
This commit is contained in:
@@ -0,0 +1,54 @@
|
||||
<?php
|
||||
|
||||
namespace App\Http\Controllers\Admin;
|
||||
|
||||
use App\Http\Controllers\Controller;
|
||||
use App\Models\Employee;
|
||||
use App\Models\SecurityGuard;
|
||||
use App\Models\User;
|
||||
use App\Models\Vehicle;
|
||||
use App\Models\VehicleActivity;
|
||||
use Carbon\Carbon;
|
||||
use Illuminate\View\View;
|
||||
use Spatie\Permission\Models\Role;
|
||||
|
||||
class DashboardController extends Controller
|
||||
{
|
||||
/**
|
||||
* Tampilkan Dashboard Ringkasan Super Admin & RBAC.
|
||||
*/
|
||||
public function index(): View
|
||||
{
|
||||
$today = Carbon::today();
|
||||
|
||||
$metrics = [
|
||||
'total_users' => User::count(),
|
||||
'total_roles' => Role::count(),
|
||||
'total_employees' => Employee::count(),
|
||||
'total_vehicles' => Vehicle::count(),
|
||||
'total_guards' => SecurityGuard::count(),
|
||||
'activities_today' => VehicleActivity::whereDate('created_at', $today)->count(),
|
||||
'activities_pending' => VehicleActivity::pending()->count(),
|
||||
'activities_approved' => VehicleActivity::approved()->whereDate('created_at', $today)->count(),
|
||||
];
|
||||
|
||||
$usersByRole = User::with('roles')
|
||||
->get()
|
||||
->groupBy(function ($u) {
|
||||
return $u->roles->first()?->name ?? $u->role ?? 'Tanpa Role';
|
||||
})
|
||||
->map->count();
|
||||
|
||||
$recentUsers = User::with(['roles', 'gate'])
|
||||
->latest()
|
||||
->take(6)
|
||||
->get();
|
||||
|
||||
$recentActivities = VehicleActivity::with(['vehicle', 'driver', 'gate'])
|
||||
->latest()
|
||||
->take(5)
|
||||
->get();
|
||||
|
||||
return view('admin.dashboard', compact('metrics', 'usersByRole', 'recentUsers', 'recentActivities'));
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,92 @@
|
||||
<?php
|
||||
|
||||
namespace App\Http\Controllers\Admin;
|
||||
|
||||
use App\Http\Controllers\Controller;
|
||||
use Illuminate\Http\RedirectResponse;
|
||||
use Illuminate\Http\Request;
|
||||
use Illuminate\View\View;
|
||||
use Spatie\Permission\Models\Permission;
|
||||
use Spatie\Permission\Models\Role;
|
||||
use Spatie\Permission\PermissionRegistrar;
|
||||
|
||||
class RolePermissionController extends Controller
|
||||
{
|
||||
/**
|
||||
* Tampilkan matriks Role & Permission RBAC.
|
||||
*/
|
||||
public function index(): View
|
||||
{
|
||||
$roles = Role::with('permissions')->orderBy('id')->get();
|
||||
$modules = config('rbac_permissions.modules', []);
|
||||
|
||||
return view('admin.roles.index', compact('roles', 'modules'));
|
||||
}
|
||||
|
||||
/**
|
||||
* Buat Role baru di sistem.
|
||||
*/
|
||||
public function storeRole(Request $request): RedirectResponse
|
||||
{
|
||||
$request->validate([
|
||||
'name' => ['required', 'string', 'max:50', 'unique:roles,name'],
|
||||
], [
|
||||
'name.required' => 'Nama role wajib diisi.',
|
||||
'name.unique' => 'Role dengan nama tersebut sudah ada.',
|
||||
]);
|
||||
|
||||
$role = Role::create([
|
||||
'name' => strtolower(trim(str_replace(' ', '_', $request->input('name')))),
|
||||
'guard_name' => 'web',
|
||||
]);
|
||||
|
||||
return redirect()->route('admin.roles.index')
|
||||
->with('success', "Role [{$role->name}] berhasil ditambahkan ke sistem.");
|
||||
}
|
||||
|
||||
/**
|
||||
* Perbarui hak akses (permissions) untuk suatu role dari matriks.
|
||||
*/
|
||||
public function updatePermissions(Request $request, int $roleId): RedirectResponse
|
||||
{
|
||||
$role = Role::findOrFail($roleId);
|
||||
|
||||
// Jangan izinkan modifikasi permission super_admin karena otomatis memiliki seluruh akses
|
||||
if ($role->name === 'super_admin') {
|
||||
return redirect()->route('admin.roles.index')
|
||||
->with('error', 'Role Super Administrator selalu memiliki hak akses penuh (bypassed) dan tidak dapat dikurangi.');
|
||||
}
|
||||
|
||||
$selectedPermissions = $request->input('permissions', []);
|
||||
$role->syncPermissions($selectedPermissions);
|
||||
|
||||
// Reset permission cache
|
||||
app()[PermissionRegistrar::class]->forgetCachedPermissions();
|
||||
|
||||
return redirect()->route('admin.roles.index')
|
||||
->with('success', "Matriks permission untuk role [{$role->name}] berhasil diperbarui.");
|
||||
}
|
||||
|
||||
/**
|
||||
* Hapus role kustom dari sistem.
|
||||
*/
|
||||
public function destroyRole(int $roleId): RedirectResponse
|
||||
{
|
||||
$role = Role::findOrFail($roleId);
|
||||
|
||||
// Proteksi role inti sistem
|
||||
$coreRoles = ['super_admin', 'hse_admin', 'qma_admin', 'pg_admin', 'gate_officer'];
|
||||
if (in_array($role->name, $coreRoles)) {
|
||||
return redirect()->route('admin.roles.index')
|
||||
->with('error', "Aksi Ditolak: Role inti sistem [{$role->name}] tidak dapat dihapus.");
|
||||
}
|
||||
|
||||
$name = $role->name;
|
||||
$role->delete();
|
||||
|
||||
app()[PermissionRegistrar::class]->forgetCachedPermissions();
|
||||
|
||||
return redirect()->route('admin.roles.index')
|
||||
->with('success', "Role [{$name}] berhasil dihapus dari sistem.");
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,174 @@
|
||||
<?php
|
||||
|
||||
namespace App\Http\Controllers\Admin;
|
||||
|
||||
use App\Http\Controllers\Controller;
|
||||
use App\Models\Gate;
|
||||
use App\Models\User;
|
||||
use Illuminate\Http\RedirectResponse;
|
||||
use Illuminate\Http\Request;
|
||||
use Illuminate\Support\Facades\Auth;
|
||||
use Illuminate\Support\Facades\Hash;
|
||||
use Illuminate\Validation\Rule;
|
||||
use Illuminate\View\View;
|
||||
use Spatie\Permission\Models\Role;
|
||||
use Spatie\Permission\PermissionRegistrar;
|
||||
|
||||
class UserController extends Controller
|
||||
{
|
||||
/**
|
||||
* Tampilkan daftar seluruh pengguna sistem dengan filter & pencarian.
|
||||
*/
|
||||
public function index(Request $request): View
|
||||
{
|
||||
$query = User::with(['roles', 'gate'])->latest();
|
||||
|
||||
if ($request->filled('search')) {
|
||||
$search = trim($request->input('search'));
|
||||
$query->where(function ($q) use ($search) {
|
||||
$q->where('name', 'like', "%{$search}%")
|
||||
->orWhere('username', 'like', "%{$search}%")
|
||||
->orWhere('email', 'like', "%{$search}%");
|
||||
});
|
||||
}
|
||||
|
||||
if ($request->filled('role')) {
|
||||
$roleFilter = $request->input('role');
|
||||
$query->where(function ($q) use ($roleFilter) {
|
||||
$q->whereHas('roles', fn ($rq) => $rq->where('name', $roleFilter))
|
||||
->orWhere('role', $roleFilter);
|
||||
});
|
||||
}
|
||||
|
||||
$users = $query->with('permissions')->paginate(15)->withQueryString();
|
||||
$roles = Role::orderBy('name')->get();
|
||||
$gates = Gate::where('is_active', true)->orderBy('name')->get();
|
||||
$modules = config('rbac_permissions.modules', []);
|
||||
|
||||
return view('admin.users.index', compact('users', 'roles', 'gates', 'modules'));
|
||||
}
|
||||
|
||||
/**
|
||||
* Simpan pengguna baru ke sistem beserta penugasan Spatie Role.
|
||||
*/
|
||||
public function store(Request $request): RedirectResponse
|
||||
{
|
||||
$validated = $request->validate([
|
||||
'name' => ['required', 'string', 'max:255'],
|
||||
'username' => ['required', 'string', 'max:50', 'unique:users,username'],
|
||||
'email' => ['required', 'string', 'email', 'max:255', 'unique:users,email'],
|
||||
'password' => ['required', 'string', 'min:6'],
|
||||
'role' => ['required', 'string', 'exists:roles,name'],
|
||||
'gate_id' => ['nullable', 'exists:gates,id'],
|
||||
], [
|
||||
'name.required' => 'Nama lengkap wajib diisi.',
|
||||
'username.required' => 'Username wajib diisi.',
|
||||
'username.unique' => 'Username tersebut sudah digunakan.',
|
||||
'email.required' => 'Email wajib diisi.',
|
||||
'email.unique' => 'Email tersebut sudah terdaftar.',
|
||||
'password.required' => 'Password wajib diisi.',
|
||||
'password.min' => 'Password minimal terdiri dari 6 karakter.',
|
||||
'role.required' => 'Role wajib dipilih.',
|
||||
'role.exists' => 'Role yang dipilih tidak valid.',
|
||||
]);
|
||||
|
||||
$user = User::create([
|
||||
'name' => $validated['name'],
|
||||
'username' => $validated['username'],
|
||||
'email' => $validated['email'],
|
||||
'password' => Hash::make($validated['password']),
|
||||
'role' => $validated['role'], // Simpan ke kolom legacy untuk backwards-compat
|
||||
'gate_id' => $validated['gate_id'] ?? null,
|
||||
]);
|
||||
|
||||
// Assign Spatie Role
|
||||
$user->assignRole($validated['role']);
|
||||
|
||||
// Sync Direct Permissions (jika ada izin khusus tambahan)
|
||||
if ($request->has('direct_permissions')) {
|
||||
$user->syncPermissions($request->input('direct_permissions', []));
|
||||
}
|
||||
|
||||
// Reset permission cache Spatie
|
||||
app()[PermissionRegistrar::class]->forgetCachedPermissions();
|
||||
|
||||
return redirect()->route('admin.users.index')
|
||||
->with('success', "Akun pengguna [{$user->name}] berhasil dibuat dengan role [{$validated['role']}].");
|
||||
}
|
||||
|
||||
/**
|
||||
* Perbarui data pengguna & perbarui Role Spatie serta Direct Permissions.
|
||||
*/
|
||||
public function update(Request $request, int $id): RedirectResponse
|
||||
{
|
||||
$user = User::findOrFail($id);
|
||||
|
||||
$validated = $request->validate([
|
||||
'name' => ['required', 'string', 'max:255'],
|
||||
'username' => ['required', 'string', 'max:50', Rule::unique('users', 'username')->ignore($user->id)],
|
||||
'email' => ['required', 'string', 'email', 'max:255', Rule::unique('users', 'email')->ignore($user->id)],
|
||||
'password' => ['nullable', 'string', 'min:6'],
|
||||
'role' => ['required', 'string', 'exists:roles,name'],
|
||||
'gate_id' => ['nullable', 'exists:gates,id'],
|
||||
], [
|
||||
'name.required' => 'Nama lengkap wajib diisi.',
|
||||
'username.required' => 'Username wajib diisi.',
|
||||
'username.unique' => 'Username tersebut sudah digunakan oleh akun lain.',
|
||||
'email.required' => 'Email wajib diisi.',
|
||||
'email.unique' => 'Email tersebut sudah digunakan oleh akun lain.',
|
||||
'password.min' => 'Password minimal 6 karakter jika ingin diubah.',
|
||||
'role.required' => 'Role wajib dipilih.',
|
||||
]);
|
||||
|
||||
$user->name = $validated['name'];
|
||||
$user->username = $validated['username'];
|
||||
$user->email = $validated['email'];
|
||||
$user->role = $validated['role'];
|
||||
$user->gate_id = $validated['gate_id'] ?? null;
|
||||
|
||||
if (!empty($validated['password'])) {
|
||||
$user->password = Hash::make($validated['password']);
|
||||
}
|
||||
|
||||
$user->save();
|
||||
|
||||
// Sync Spatie Role
|
||||
$user->syncRoles([$validated['role']]);
|
||||
|
||||
// Sync Direct Permissions
|
||||
$user->syncPermissions($request->input('direct_permissions', []));
|
||||
|
||||
// Reset permission cache Spatie
|
||||
app()[PermissionRegistrar::class]->forgetCachedPermissions();
|
||||
|
||||
return redirect()->route('admin.users.index')
|
||||
->with('success', "Data pengguna [{$user->name}] berhasil diperbarui.");
|
||||
}
|
||||
|
||||
/**
|
||||
* Hapus akun pengguna dari sistem.
|
||||
*/
|
||||
public function destroy(int $id): RedirectResponse
|
||||
{
|
||||
$user = User::findOrFail($id);
|
||||
|
||||
// Proteksi: jangan hapus akun sendiri yang sedang login
|
||||
if (Auth::id() === $user->id) {
|
||||
return redirect()->route('admin.users.index')
|
||||
->with('error', 'Aksi Ditolak: Anda tidak dapat menghapus akun Anda sendiri saat sedang login.');
|
||||
}
|
||||
|
||||
// Proteksi: akun superadmin utama tidak boleh dihapus
|
||||
if ($user->username === 'superadmin') {
|
||||
return redirect()->route('admin.users.index')
|
||||
->with('error', 'Aksi Ditolak: Akun Super Administrator utama sistem tidak dapat dihapus.');
|
||||
}
|
||||
|
||||
$name = $user->name;
|
||||
$user->syncRoles([]);
|
||||
$user->delete();
|
||||
|
||||
return redirect()->route('admin.users.index')
|
||||
->with('success', "Akun pengguna [{$name}] berhasil dihapus dari sistem.");
|
||||
}
|
||||
}
|
||||
@@ -71,6 +71,10 @@ class LoginController extends Controller
|
||||
*/
|
||||
private function redirectBasedOnRole($user): RedirectResponse
|
||||
{
|
||||
if ($user->isSuperAdmin()) {
|
||||
return redirect()->route('admin.dashboard');
|
||||
}
|
||||
|
||||
return match ($user->role) {
|
||||
'super_admin', 'superadmin', 'admin' => redirect()->route('superadmin.dashboard'),
|
||||
'hse_admin' => redirect()->route('hse.dashboard'),
|
||||
|
||||
@@ -120,32 +120,74 @@ class EmployeeController extends Controller
|
||||
}
|
||||
|
||||
/**
|
||||
* Pendaftaran master karyawan baru dialihkan ke Super Admin.
|
||||
* Simpan data karyawan baru beserta izin SIMPER (Form modal tambah karyawan).
|
||||
*/
|
||||
public function store(Request $request): RedirectResponse
|
||||
{
|
||||
return back()->with('error', 'Pendaftaran master data karyawan baru hanya dapat dilakukan oleh Super Admin melalui menu Manajemen Akun.');
|
||||
$validated = $request->validate([
|
||||
'nik' => ['required', 'string', 'max:50', 'unique:employees,nik'],
|
||||
'name' => ['required', 'string', 'max:100'],
|
||||
'unit_kerja' => ['required', 'string'],
|
||||
'division' => ['required', 'string'],
|
||||
'position' => ['required', 'string'],
|
||||
'is_operator' => ['required', 'in:1,0'],
|
||||
'simper_expired_at' => ['nullable', 'date'],
|
||||
], [
|
||||
'nik.required' => 'NIK wajib diisi.',
|
||||
'nik.unique' => 'NIK sudah terdaftar dalam sistem.',
|
||||
'name.required' => 'Nama karyawan wajib diisi.',
|
||||
'unit_kerja.required' => 'Unit kerja wajib dipilih.',
|
||||
'division.required' => 'Divisi wajib dipilih.',
|
||||
'position.required' => 'Posisi / Jabatan wajib diisi.',
|
||||
'is_operator.required' => 'Pilih apakah karyawan berstatus Operator / Driver.',
|
||||
]);
|
||||
|
||||
$isOperator = (bool) $validated['is_operator'];
|
||||
$simperExpiredAt = $isOperator ? ($validated['simper_expired_at'] ?? null) : null;
|
||||
|
||||
Employee::create([
|
||||
'nik' => $validated['nik'],
|
||||
'name' => $validated['name'],
|
||||
'unit_kerja' => $validated['unit_kerja'],
|
||||
'division' => $validated['division'],
|
||||
'position' => $validated['position'],
|
||||
'is_operator' => $isOperator,
|
||||
'simper_expired_at' => $simperExpiredAt,
|
||||
]);
|
||||
|
||||
return back()->with('success', "Data karyawan {$validated['name']} berhasil ditambahkan.");
|
||||
}
|
||||
|
||||
/**
|
||||
* Perpanjang atau perbarui status driver & masa berlaku SIMPER karyawan.
|
||||
* Master data profil karyawan dikelola terpusat oleh Super Admin.
|
||||
* Perpanjang atau perbarui data karyawan & SIMPER.
|
||||
*/
|
||||
public function update(Request $request, int $id): RedirectResponse
|
||||
{
|
||||
$employee = Employee::findOrFail($id);
|
||||
|
||||
$validated = $request->validate([
|
||||
'nik' => ['sometimes', 'required', 'string', 'max:50', 'unique:employees,nik,' . $employee->id],
|
||||
'name' => ['sometimes', 'required', 'string', 'max:100'],
|
||||
'unit_kerja' => ['sometimes', 'required', 'string'],
|
||||
'division' => ['sometimes', 'required', 'string'],
|
||||
'position' => ['sometimes', 'required', 'string'],
|
||||
'is_operator' => ['required', 'in:1,0'],
|
||||
'simper_expired_at' => ['nullable', 'date'],
|
||||
], [
|
||||
'nik.unique' => 'NIK sudah digunakan oleh karyawan lain.',
|
||||
'name.required' => 'Nama lengkap wajib diisi.',
|
||||
'is_operator.required' => 'Status driver wajib dipilih.',
|
||||
]);
|
||||
|
||||
$isOperator = (bool) $validated['is_operator'];
|
||||
$simperExpiredAt = $isOperator ? ($validated['simper_expired_at'] ?? null) : null;
|
||||
$simperExpiredAt = $isOperator ? ($validated['simper_expired_at'] ?? $employee->simper_expired_at) : null;
|
||||
|
||||
$employee->update([
|
||||
'nik' => $validated['nik'] ?? $employee->nik,
|
||||
'name' => $validated['name'] ?? $employee->name,
|
||||
'unit_kerja' => $validated['unit_kerja'] ?? $employee->unit_kerja,
|
||||
'division' => $validated['division'] ?? $employee->division,
|
||||
'position' => $validated['position'] ?? $employee->position,
|
||||
'is_operator' => $isOperator,
|
||||
'simper_expired_at' => $simperExpiredAt,
|
||||
]);
|
||||
|
||||
@@ -1,17 +0,0 @@
|
||||
<?php
|
||||
|
||||
namespace App\Http\Controllers\SuperAdmin;
|
||||
|
||||
use App\Http\Controllers\Controller;
|
||||
use Illuminate\View\View;
|
||||
|
||||
class DashboardController extends Controller
|
||||
{
|
||||
/**
|
||||
* Tampilkan dashboard utama Super Admin (halaman kosong / persiapan awal).
|
||||
*/
|
||||
public function index(): View
|
||||
{
|
||||
return view('superadmin.dashboard');
|
||||
}
|
||||
}
|
||||
@@ -1,272 +0,0 @@
|
||||
<?php
|
||||
|
||||
namespace App\Http\Controllers\SuperAdmin;
|
||||
|
||||
use App\Http\Controllers\Controller;
|
||||
use App\Models\Gate;
|
||||
use App\Models\User;
|
||||
use Illuminate\Http\RedirectResponse;
|
||||
use Illuminate\Http\Request;
|
||||
use Illuminate\Support\Facades\Auth;
|
||||
use Illuminate\Support\Facades\DB;
|
||||
use Illuminate\Support\Facades\Hash;
|
||||
use Illuminate\Validation\Rule;
|
||||
use Illuminate\View\View;
|
||||
|
||||
class UserController extends Controller
|
||||
{
|
||||
/**
|
||||
* Tampilkan halaman utama Super Admin: Manajemen Akun & Hak Akses Seluruh Modul.
|
||||
*/
|
||||
public function index(Request $request): View
|
||||
{
|
||||
$roleFilter = $request->query('role');
|
||||
$search = trim((string) $request->query('search', ''));
|
||||
|
||||
$query = User::with(['gate', 'securityGuard.gate', 'employee'])->latest();
|
||||
|
||||
if ($roleFilter && $roleFilter !== 'all') {
|
||||
if ($roleFilter === 'admin_group') {
|
||||
$query->whereIn('role', ['super_admin', 'superadmin', 'admin', 'hse_admin', 'qma_admin', 'pg_admin']);
|
||||
} elseif ($roleFilter === 'super_admin') {
|
||||
$query->whereIn('role', ['super_admin', 'superadmin', 'admin']);
|
||||
} else {
|
||||
$query->where('role', $roleFilter);
|
||||
}
|
||||
}
|
||||
|
||||
if ($search !== '') {
|
||||
$query->where(function ($q) use ($search) {
|
||||
$q->where('name', 'like', "%{$search}%")
|
||||
->orWhere('username', 'like', "%{$search}%")
|
||||
->orWhere('email', 'like', "%{$search}%");
|
||||
});
|
||||
}
|
||||
|
||||
$users = $query->paginate(15)->withQueryString();
|
||||
|
||||
// Ringkasan Statistik Pengguna
|
||||
$stats = [
|
||||
'total' => User::count(),
|
||||
'super_admin' => User::whereIn('role', ['super_admin', 'superadmin', 'admin'])->count(),
|
||||
'hse_admin' => User::where('role', 'hse_admin')->count(),
|
||||
'qma_admin' => User::where('role', 'qma_admin')->count(),
|
||||
'pg_admin' => User::where('role', 'pg_admin')->count(),
|
||||
'gate_officer' => User::where('role', 'gate_officer')->count(),
|
||||
'employee' => User::where('role', 'employee')->count(),
|
||||
];
|
||||
|
||||
// Daftar Gerbang Aktif untuk Pilihan Pos Satpam
|
||||
$gates = Gate::where('is_active', true)->orderBy('name')->get();
|
||||
|
||||
return view('superadmin.roles_index', compact('users', 'stats', 'gates', 'roleFilter', 'search'));
|
||||
}
|
||||
|
||||
/**
|
||||
* Simpan akun admin / pengguna baru.
|
||||
*/
|
||||
public function store(Request $request): RedirectResponse
|
||||
{
|
||||
$validated = $request->validate([
|
||||
'name' => ['required', 'string', 'max:255'],
|
||||
'username' => ['required', 'string', 'max:50', 'regex:/^[a-zA-Z0-9._-]+$/', 'unique:users,username'],
|
||||
'email' => ['required', 'string', 'email', 'max:255', 'unique:users,email'],
|
||||
'password' => ['nullable', 'string', 'min:6'],
|
||||
'role' => ['required', 'string', Rule::in(['super_admin', 'hse_admin', 'qma_admin', 'pg_admin', 'gate_officer', 'employee'])],
|
||||
'gate_id' => ['nullable', 'exists:gates,id'],
|
||||
], [
|
||||
'username.unique' => 'Username tersebut sudah digunakan oleh akun lain.',
|
||||
'username.regex' => 'Username hanya boleh berupa huruf, angka, titik (.), tanda hubung (-) dan garis bawah (_).',
|
||||
'email.unique' => 'Email tersebut sudah terdaftar di sistem.',
|
||||
'password.min' => 'Password minimal terdiri dari 6 karakter.',
|
||||
'role.in' => 'Pilihan role tidak valid.',
|
||||
]);
|
||||
|
||||
// Jika bukan gate_officer, kosongkan gate_id
|
||||
if ($validated['role'] !== 'gate_officer') {
|
||||
$validated['gate_id'] = null;
|
||||
}
|
||||
|
||||
// Default password ke 'password' jika kosong atau tidak diisi
|
||||
$rawPassword = !empty($validated['password']) ? $validated['password'] : 'password';
|
||||
$validated['password'] = Hash::make($rawPassword);
|
||||
|
||||
$user = User::create($validated);
|
||||
|
||||
// Jika role adalah 'employee', buat juga record master Employee (Unit Kerja, Divisi, Jabatan Wajib Diisi)
|
||||
if ($validated['role'] === 'employee') {
|
||||
$empData = $request->validate([
|
||||
'unit_kerja' => ['required', 'string', 'max:100'],
|
||||
'division' => ['required', 'string', 'max:100'],
|
||||
'position' => ['required', 'string', 'max:100'],
|
||||
], [
|
||||
'unit_kerja.required' => 'Unit kerja wajib dipilih untuk karyawan.',
|
||||
'division.required' => 'Divisi wajib dipilih untuk karyawan.',
|
||||
'position.required' => 'Jabatan wajib diisi untuk karyawan.',
|
||||
]);
|
||||
|
||||
$nik = $validated['username'];
|
||||
|
||||
\App\Models\Employee::create([
|
||||
'user_id' => $user->id,
|
||||
'nik' => $nik,
|
||||
'name' => $validated['name'],
|
||||
'unit_kerja' => $empData['unit_kerja'],
|
||||
'division' => $empData['division'],
|
||||
'position' => $empData['position'],
|
||||
'is_operator' => false, // Default bukan driver, akan diatur oleh Admin HSE
|
||||
'simper_expired_at' => null,
|
||||
]);
|
||||
}
|
||||
|
||||
return redirect()->route('superadmin.roles.index')
|
||||
->with('success', "Akun '{$validated['name']}' dengan role '{$validated['role']}' berhasil dibuat.");
|
||||
}
|
||||
|
||||
/**
|
||||
* Perbarui data akun pengguna.
|
||||
*/
|
||||
public function update(Request $request, int $id): RedirectResponse
|
||||
{
|
||||
$user = User::findOrFail($id);
|
||||
|
||||
$validated = $request->validate([
|
||||
'name' => ['required', 'string', 'max:255'],
|
||||
'username' => ['required', 'string', 'max:50', 'regex:/^[a-zA-Z0-9._-]+$/', Rule::unique('users', 'username')->ignore($user->id)],
|
||||
'email' => ['required', 'string', 'email', 'max:255', Rule::unique('users', 'email')->ignore($user->id)],
|
||||
'password' => ['nullable', 'string', 'min:6'],
|
||||
'role' => ['required', 'string', Rule::in(['super_admin', 'hse_admin', 'qma_admin', 'pg_admin', 'gate_officer', 'employee'])],
|
||||
'gate_id' => ['nullable', 'exists:gates,id'],
|
||||
], [
|
||||
'username.unique' => 'Username tersebut sudah digunakan oleh akun lain.',
|
||||
'username.regex' => 'Username hanya boleh berupa huruf, angka, titik (.), tanda hubung (-) dan garis bawah (_).',
|
||||
'email.unique' => 'Email tersebut sudah terdaftar di sistem.',
|
||||
'password.min' => 'Password baru minimal terdiri dari 6 karakter.',
|
||||
]);
|
||||
|
||||
// Keamanan: Cegah super admin terakhir mengubah rolenya sendiri menjadi role biasa
|
||||
if ($user->id === Auth::id() && $validated['role'] !== 'super_admin') {
|
||||
$superAdminCount = User::whereIn('role', ['super_admin', 'superadmin', 'admin'])->count();
|
||||
if ($superAdminCount <= 1) {
|
||||
return back()->with('error', 'Gagal: Anda adalah satu-satunya Super Admin aktif di sistem.');
|
||||
}
|
||||
}
|
||||
|
||||
if ($validated['role'] !== 'gate_officer') {
|
||||
$validated['gate_id'] = null;
|
||||
}
|
||||
|
||||
if (!empty($validated['password'])) {
|
||||
$validated['password'] = Hash::make($validated['password']);
|
||||
} else {
|
||||
unset($validated['password']);
|
||||
}
|
||||
|
||||
$user->update($validated);
|
||||
|
||||
// Jika user ini adalah karyawan, sinkronkan nama, NIK (dari username), dan data kerjanya (wajib diisi)
|
||||
if ($user->role === 'employee' || $user->employee) {
|
||||
$unitKerja = $request->input('employee_unit_kerja') ?? $request->input('unit_kerja');
|
||||
$division = $request->input('employee_division') ?? $request->input('division');
|
||||
$position = $request->input('employee_position') ?? $request->input('position');
|
||||
|
||||
if ($user->role === 'employee' && (empty($unitKerja) || empty($division) || empty($position))) {
|
||||
return back()->withErrors([
|
||||
'employee_unit_kerja' => 'Unit kerja, divisi, dan jabatan wajib diisi untuk akun karyawan.',
|
||||
])->withInput();
|
||||
}
|
||||
|
||||
$empFields = [
|
||||
'name' => $user->name,
|
||||
'nik' => $user->username,
|
||||
];
|
||||
if (!empty($unitKerja)) {
|
||||
$empFields['unit_kerja'] = $unitKerja;
|
||||
}
|
||||
if (!empty($division)) {
|
||||
$empFields['division'] = $division;
|
||||
}
|
||||
if (!empty($position)) {
|
||||
$empFields['position'] = $position;
|
||||
}
|
||||
|
||||
if ($user->employee) {
|
||||
$user->employee->update($empFields);
|
||||
} else {
|
||||
$empFields['user_id'] = $user->id;
|
||||
$empFields['is_operator'] = false;
|
||||
$empFields['simper_expired_at'] = null;
|
||||
\App\Models\Employee::create($empFields);
|
||||
}
|
||||
}
|
||||
|
||||
return redirect()->route('superadmin.roles.index')
|
||||
->with('success', "Data akun '{$user->name}' berhasil diperbarui.");
|
||||
}
|
||||
|
||||
/**
|
||||
* Hapus akun pengguna.
|
||||
*/
|
||||
public function destroy(int $id): RedirectResponse
|
||||
{
|
||||
$user = User::findOrFail($id);
|
||||
|
||||
// Keamanan 1: Cegah Super Admin menghapus akunnya sendiri
|
||||
if ($user->id === Auth::id()) {
|
||||
return back()->with('error', 'Operasi ditolak: Anda tidak dapat menghapus akun Anda sendiri.');
|
||||
}
|
||||
|
||||
// Keamanan 2: Cegah menghapus jika merupakan super admin terakhir
|
||||
if ($user->isSuperAdmin()) {
|
||||
$superAdminCount = User::whereIn('role', ['super_admin', 'superadmin', 'admin'])->count();
|
||||
if ($superAdminCount <= 1) {
|
||||
return back()->with('error', 'Operasi ditolak: Akun Super Admin terakhir tidak boleh dihapus.');
|
||||
}
|
||||
}
|
||||
|
||||
// Keamanan 3: Cegah penghapusan jika Karyawan memiliki riwayat aktivitas atau P2H
|
||||
if ($user->employee) {
|
||||
if ($user->employee->activities()->exists()) {
|
||||
return back()->with('error', "Operasi ditolak: Akun '{$user->name}' tidak dapat dihapus karena memiliki riwayat log pergerakan kendaraan di pos gerbang.");
|
||||
}
|
||||
if ($user->employee->p2hRecords()->exists()) {
|
||||
return back()->with('error', "Operasi ditolak: Akun '{$user->name}' tidak dapat dihapus karena memiliki riwayat checksheet inspeksi keselamatan P2H.");
|
||||
}
|
||||
}
|
||||
|
||||
// Keamanan 4: Cegah penghapusan jika Petugas Satpam memiliki riwayat validasi pos gerbang
|
||||
if ($user->securityGuard) {
|
||||
if ($user->securityGuard->activities()->exists()) {
|
||||
return back()->with('error', "Operasi ditolak: Petugas Satpam '{$user->name}' tidak dapat dihapus karena telah memvalidasi aktivitas kendaraan di pos gerbang.");
|
||||
}
|
||||
}
|
||||
|
||||
$userName = $user->name;
|
||||
DB::transaction(function () use ($user) {
|
||||
if ($user->employee) {
|
||||
$user->employee->delete();
|
||||
}
|
||||
if ($user->securityGuard) {
|
||||
$user->securityGuard->delete();
|
||||
}
|
||||
$user->delete();
|
||||
});
|
||||
|
||||
return redirect()->route('superadmin.roles.index')
|
||||
->with('success', "Akun '{$userName}' telah berhasil dihapus dari sistem.");
|
||||
}
|
||||
|
||||
/**
|
||||
* Reset password akun pengguna menjadi default "password".
|
||||
*/
|
||||
public function resetPassword(int $id): RedirectResponse
|
||||
{
|
||||
$user = User::findOrFail($id);
|
||||
$user->update([
|
||||
'password' => Hash::make('password'),
|
||||
]);
|
||||
|
||||
return redirect()->route('superadmin.roles.index')
|
||||
->with('success', "Password akun '{$user->name}' berhasil direset ke default ('password').");
|
||||
}
|
||||
}
|
||||
@@ -19,10 +19,16 @@ class CheckRole
|
||||
return redirect()->route('login')->with('error', 'Silakan login terlebih dahulu untuk mengakses menu ini.');
|
||||
}
|
||||
|
||||
$userRole = $request->user()->role;
|
||||
$user = $request->user();
|
||||
$userRole = $user->role;
|
||||
|
||||
// Role 'super_admin' dan 'admin' selalu memiliki hak akses penuh ke seluruh modul
|
||||
if (in_array($userRole, ['super_admin', 'superadmin', 'admin']) || in_array($userRole, $roles)) {
|
||||
// Role 'super_admin', 'superadmin', dan 'admin' selalu memiliki hak akses penuh ke seluruh modul
|
||||
if (in_array($userRole, ['super_admin', 'superadmin', 'admin']) || (method_exists($user, 'hasRole') && ($user->hasRole('super_admin') || $user->hasRole('admin')))) {
|
||||
return $next($request);
|
||||
}
|
||||
|
||||
// Cek via kolom role string atau Spatie hasAnyRole
|
||||
if (in_array($userRole, $roles) || (method_exists($user, 'hasAnyRole') && $user->hasAnyRole($roles))) {
|
||||
return $next($request);
|
||||
}
|
||||
|
||||
|
||||
+39
-26
@@ -9,11 +9,42 @@ use Illuminate\Database\Eloquent\Relations\BelongsTo;
|
||||
use Illuminate\Database\Eloquent\Relations\HasOne;
|
||||
use Illuminate\Foundation\Auth\User as Authenticatable;
|
||||
use Illuminate\Notifications\Notifiable;
|
||||
use Spatie\Permission\Traits\HasRoles;
|
||||
|
||||
class User extends Authenticatable
|
||||
{
|
||||
/** @use HasFactory<UserFactory> */
|
||||
use HasFactory, Notifiable;
|
||||
use HasFactory, Notifiable, HasRoles;
|
||||
|
||||
/**
|
||||
* The "booted" method of the model.
|
||||
*/
|
||||
protected static function booted(): void
|
||||
{
|
||||
static::created(function (User $user) {
|
||||
if ($user->role && \Illuminate\Support\Facades\Schema::hasTable('roles')) {
|
||||
$role = \Spatie\Permission\Models\Role::where('name', $user->role)->first();
|
||||
if ($role && !$user->hasRole($user->role)) {
|
||||
$user->assignRole($role);
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
static::deleting(function (User $user) {
|
||||
if ($user->employee) {
|
||||
if ($user->employee->activities()->exists() || $user->employee->p2hRecords()->exists()) {
|
||||
throw new \Exception("Tidak dapat menghapus user: Karyawan '{$user->name}' memiliki data audit riwayat operasional kendaraan atau inspeksi P2H.");
|
||||
}
|
||||
$user->employee->delete();
|
||||
}
|
||||
if ($user->securityGuard) {
|
||||
if ($user->securityGuard->activities()->exists()) {
|
||||
throw new \Exception("Tidak dapat menghapus user: Petugas Satpam '{$user->name}' memiliki riwayat data validasi pos gerbang.");
|
||||
}
|
||||
$user->securityGuard->delete();
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
/**
|
||||
* The attributes that are mass assignable.
|
||||
@@ -52,24 +83,6 @@ class User extends Authenticatable
|
||||
];
|
||||
}
|
||||
|
||||
protected static function booted(): void
|
||||
{
|
||||
static::deleting(function (User $user) {
|
||||
if ($user->employee) {
|
||||
if ($user->employee->activities()->exists() || $user->employee->p2hRecords()->exists()) {
|
||||
throw new \Exception("Tidak dapat menghapus user: Karyawan '{$user->name}' memiliki data audit riwayat operasional kendaraan atau inspeksi P2H.");
|
||||
}
|
||||
$user->employee->delete();
|
||||
}
|
||||
if ($user->securityGuard) {
|
||||
if ($user->securityGuard->activities()->exists()) {
|
||||
throw new \Exception("Tidak dapat menghapus user: Petugas Satpam '{$user->name}' memiliki riwayat data validasi pos gerbang.");
|
||||
}
|
||||
$user->securityGuard->delete();
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
public function gate(): BelongsTo
|
||||
{
|
||||
return $this->belongsTo(Gate::class);
|
||||
@@ -87,36 +100,36 @@ class User extends Authenticatable
|
||||
|
||||
public function isEmployee(): bool
|
||||
{
|
||||
return $this->role === 'employee';
|
||||
return $this->role === 'employee' || $this->hasRole('employee');
|
||||
}
|
||||
|
||||
public function isGateOfficer(): bool
|
||||
{
|
||||
return $this->role === 'gate_officer';
|
||||
return $this->role === 'gate_officer' || $this->hasRole('gate_officer');
|
||||
}
|
||||
|
||||
public function isHseAdmin(): bool
|
||||
{
|
||||
return $this->role === 'hse_admin';
|
||||
return $this->isSuperAdmin() || $this->role === 'hse_admin' || $this->hasRole('hse_admin');
|
||||
}
|
||||
|
||||
public function isQmaAdmin(): bool
|
||||
{
|
||||
return $this->role === 'qma_admin';
|
||||
return $this->isSuperAdmin() || $this->role === 'qma_admin' || $this->hasRole('qma_admin');
|
||||
}
|
||||
|
||||
public function isPgAdmin(): bool
|
||||
{
|
||||
return $this->role === 'pg_admin';
|
||||
return $this->isSuperAdmin() || $this->role === 'pg_admin' || $this->hasRole('pg_admin');
|
||||
}
|
||||
|
||||
public function isSuperAdmin(): bool
|
||||
{
|
||||
return in_array($this->role, ['super_admin', 'superadmin']);
|
||||
return in_array($this->role, ['super_admin', 'superadmin']) || $this->hasRole('super_admin');
|
||||
}
|
||||
|
||||
public function isAdmin(): bool
|
||||
{
|
||||
return in_array($this->role, ['admin', 'super_admin', 'superadmin']);
|
||||
return $this->isSuperAdmin() || in_array($this->role, ['admin', 'super_admin', 'superadmin']) || $this->hasRole('admin');
|
||||
}
|
||||
}
|
||||
|
||||
@@ -2,6 +2,7 @@
|
||||
|
||||
namespace App\Providers;
|
||||
|
||||
use Illuminate\Support\Facades\Gate;
|
||||
use Illuminate\Support\ServiceProvider;
|
||||
|
||||
class AppServiceProvider extends ServiceProvider
|
||||
@@ -21,5 +22,10 @@ class AppServiceProvider extends ServiceProvider
|
||||
{
|
||||
\Carbon\Carbon::setLocale('id');
|
||||
date_default_timezone_set(config('app.timezone', 'Asia/Jakarta'));
|
||||
|
||||
// Super Admin bypass: secara otomatis memiliki izin untuk semua ability
|
||||
Gate::before(function ($user, $ability) {
|
||||
return ($user->role === 'super_admin' || $user->hasRole('super_admin')) ? true : null;
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user