fix: honor RBAC permissions on P2H submission and remove hardcoded role/simper blockers

This commit is contained in:
Ray1111-aa
2026-10-24 15:30:08 +07:00
parent 0094e367ec
commit e522ce5fc8
5 changed files with 58 additions and 75 deletions
+10 -15
View File
@@ -65,17 +65,16 @@ class P2hFormController extends Controller
$user = Auth::user(); $user = Auth::user();
$employee = $user->getOrCreateEmployee(); $employee = $user->getOrCreateEmployee();
// Validasi identitas operator di sistem HSE // Informasi identitas operator / pengisi P2H (informatif, tidak memblokir hak akses)
$simperNotice = null;
$simperError = null; $simperError = null;
if ($user->isQmaAdmin() || $user->isSuperAdmin()) { if ($user->isQmaAdmin() || $user->isSuperAdmin()) {
$simperError = "Anda saat ini login sebagai Admin QMA. Formulir P2H lapangan dikhususkan untuk diisi langsung oleh Operator pemegang lisensi SIMPER aktif saat pra-operasi unit. Sebagai Admin QMA, wewenang Anda adalah memeriksa, memverifikasi, dan menyetujui checksheet yang telah disubmit operator melalui Menu QMA."; $simperNotice = "Anda login sebagai Administrator / Verifikator QMA. Anda memiliki wewenang untuk mengisi atau mengoreksi formulir P2H unit secara langsung.";
} elseif (!$employee) { } elseif ($employee && !$employee->is_operator) {
$simperError = "Akun login Anda ({$user->name}) belum ditautkan dengan data Karyawan di database HSE. Silakan hubungi Divisi HSE."; $simperNotice = "Catatan: Profil karyawan Anda ({$employee->name}) belum ditandai sebagai Operator di modul HSE. Formulir tetap dapat dikirim sesuai izin akses (RBAC) yang diberikan.";
} elseif (!$employee->is_operator) { } elseif ($employee && !$employee->hasValidSimper()) {
$simperError = "Karyawan atas nama {$employee->name} (NIK: {$employee->nik} - {$employee->division}) terdaftar sebagai BUKAN OPERATOR/DRIVER dan tidak memiliki izin mengoperasikan alat berat. Silakan hubungi Divisi HSE.";
} elseif (!$employee->hasValidSimper()) {
$expDate = $employee->simper_expired_at ? $employee->simper_expired_at->format('d/m/Y') : 'Belum Terdaftar'; $expDate = $employee->simper_expired_at ? $employee->simper_expired_at->format('d/m/Y') : 'Belum Terdaftar';
$simperError = "SIMPER atas nama {$employee->name} (NIK: {$employee->nik}) telah KEDALUWARSA pada {$expDate}. Anda tidak diizinkan mengoperasikan alat berat. Silakan hubungi Divisi HSE."; $simperNotice = "Catatan: Masa berlaku SIMPER ({$expDate}) perlu diperbarui ke Divisi HSE. Formulir tetap dapat dikirim sesuai izin akses (RBAC) yang diberikan.";
} }
// Tentukan template P2H yang digunakan // Tentukan template P2H yang digunakan
@@ -100,6 +99,7 @@ class P2hFormController extends Controller
return view('p2h.form', compact( return view('p2h.form', compact(
'vehicle', 'vehicle',
'employee', 'employee',
'simperNotice',
'simperError', 'simperError',
'template', 'template',
'groupedItems' 'groupedItems'
@@ -118,13 +118,8 @@ class P2hFormController extends Controller
$user = Auth::user(); $user = Auth::user();
$employee = $user->getOrCreateEmployee(); $employee = $user->getOrCreateEmployee();
if ($user->isQmaAdmin() || $user->isSuperAdmin()) { // Validasi hak akses RBAC sudah ditangani secara merata oleh route middleware
return back()->with('error', 'Admin QMA tidak memiliki wewenang untuk mengisi formulir P2H operator. Formulir wajib diisi langsung oleh Operator alat berlisensi SIMPER aktif.'); // Seluruh akun yang memiliki izin berhak mengirim formulir P2H tanpa diskriminasi role/SIMPER.
}
if (!$employee || !$employee->is_operator || !$employee->hasValidSimper()) {
return back()->with('error', 'Validasi SIMPER gagal. Anda tidak memiliki wewenang untuk menyimpan P2H.');
}
$validated = $request->validate([ $validated = $request->validate([
'template_id' => ['required', 'exists:p2h_templates,id'], 'template_id' => ['required', 'exists:p2h_templates,id'],
+10 -8
View File
@@ -161,29 +161,31 @@ class User extends Authenticatable
} }
// Cek jika sudah ada master Employee dengan NIK sama dengan username // Cek jika sudah ada master Employee dengan NIK sama dengan username
if (!empty($this->username)) {
$emp = Employee::where('nik', $this->username)->first(); $emp = Employee::where('nik', $this->username)->first();
if ($emp) { if ($emp) {
$emp->update(['user_id' => $this->id]); $emp->update(['user_id' => $this->id]);
return $emp; return $emp;
} }
}
$defaultNik = !empty($this->username) ? $this->username : 'EMP-' . str_pad($this->id, 4, '0', STR_PAD_LEFT);
if (Employee::where('nik', $defaultNik)->exists()) {
$defaultNik = 'EMP-' . $this->id . '-' . rand(100, 999);
}
// 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([ return Employee::create([
'user_id' => $this->id, 'user_id' => $this->id,
'nik' => $this->username, 'nik' => $defaultNik,
'name' => $this->name, 'name' => $this->name,
'unit_kerja' => 'Umum', 'unit_kerja' => $this->isQmaAdmin() ? 'QMA' : ($this->isPgAdmin() ? 'Gate' : 'Umum'),
'division' => 'Operasional', 'division' => 'Operasional',
'position' => 'Driver Operasional', 'position' => $this->isQmaAdmin() ? 'Admin QMA' : ($this->isPgAdmin() ? 'Admin Gate' : 'Driver / Operator'),
'is_operator' => true, 'is_operator' => true,
'simper_expired_at' => now()->addYears(2), 'simper_expired_at' => now()->addYears(2),
]); ]);
} }
return null;
}
public function locationHistories(): HasMany public function locationHistories(): HasMany
{ {
return $this->hasMany(VehicleLocationHistory::class); return $this->hasMany(VehicleLocationHistory::class);
+7 -32
View File
@@ -36,41 +36,17 @@
</div> </div>
</div> </div>
<!-- Alert Jika Terjadi Masalah SIMPER atau Autentikasi --> <!-- Informasi Akses & Status SIMPER -->
@if($simperError) @if(!empty($simperNotice))
@if(auth()->user()->isQmaAdmin() || auth()->user()->isSuperAdmin()) <div class="p-4 sm:p-5 bg-blue-50/80 border border-blue-200 rounded-2xl text-blue-900 text-xs flex items-start space-x-3.5 shadow-sm">
<div class="p-4 sm:p-5 bg-blue-50 border border-blue-200 rounded-2xl text-blue-900 text-xs flex items-start space-x-3.5 shadow-sm">
<div class="w-9 h-9 rounded-xl bg-blue-100 text-blue-700 flex items-center justify-center font-bold text-base flex-shrink-0"> <div class="w-9 h-9 rounded-xl bg-blue-100 text-blue-700 flex items-center justify-center font-bold text-base flex-shrink-0">
<i class="fa-solid fa-user-shield"></i> <i class="fa-solid fa-circle-info"></i>
</div> </div>
<div class="flex-1"> <div class="flex-1">
<span class="font-bold block text-sm mb-1 text-blue-950">Wewenang Role: Admin QMA (Validator / Verifikator)</span> <span class="font-bold block text-sm mb-0.5 text-blue-950">Informasi Pengisian P2H</span>
<p class="leading-relaxed text-blue-800">{{ $simperError }}</p> <p class="leading-relaxed text-blue-800">{{ $simperNotice }}</p>
<div class="mt-3 flex items-center gap-2">
<a href="{{ route('qma.p2h.index') }}"
class="inline-flex items-center justify-center space-x-1.5 px-3 py-2 sm:px-3.5 sm:py-1.5 rounded-xl bg-[#1b5e20] text-white font-bold text-xs hover:bg-[#144919] transition shadow-xs flex-shrink-0"
title="Buka Verifikasi & Approval P2H di Menu QMA">
<i class="fa-solid fa-clipboard-check text-xs"></i>
<span class="hidden sm:inline">Buka Verifikasi & Approval P2H di Menu QMA</span>
</a>
<a href="{{ route('p2h.index') }}" class="inline-flex items-center justify-center space-x-1 px-3 py-2 sm:py-1.5 rounded-xl bg-white border border-blue-200 text-blue-700 font-semibold text-xs hover:bg-blue-100/50 transition">
<span>Kembali ke Katalog Unit</span>
</a>
</div> </div>
</div> </div>
</div>
@else
<div class="p-4 bg-rose-50 border border-rose-200 rounded-2xl text-rose-800 text-xs flex items-start space-x-3 shadow-sm">
<div class="w-8 h-8 rounded-xl bg-rose-100 text-rose-600 flex items-center justify-center font-bold text-base flex-shrink-0">
<i class="fa-solid fa-triangle-exclamation"></i>
</div>
<div class="flex-1">
<span class="font-bold block text-sm mb-0.5 text-rose-900">Akses Pengoperasian Tidak Diizinkan</span>
<p class="leading-relaxed">{{ $simperError }}</p>
<p class="mt-2 text-[11px] font-semibold text-rose-700">Hubungi Divisi HSE untuk pendaftaran atau perpanjangan lisensi SIMPER Anda.</p>
</div>
</div>
@endif
@endif @endif
<!-- Card Operator Terverifikasi (Otomatis Terisi dari Akun Login) --> <!-- Card Operator Terverifikasi (Otomatis Terisi dari Akun Login) -->
@@ -362,8 +338,7 @@
<button type="submit" <button type="submit"
id="btnSubmitP2h" id="btnSubmitP2h"
{{ $simperError ? 'disabled' : '' }} class="bg-[#1b5e20] hover:bg-[#144918] active:scale-[0.99] text-white font-bold py-2.5 px-6 rounded-xl shadow-sm hover:shadow transition flex items-center space-x-2 text-xs sm:text-sm cursor-pointer">
class="bg-[#1b5e20] hover:bg-[#144918] active:scale-[0.99] text-white font-bold py-2.5 px-6 rounded-xl shadow-sm hover:shadow transition flex items-center space-x-2 text-xs sm:text-sm disabled:bg-slate-200 disabled:text-slate-400 disabled:cursor-not-allowed cursor-pointer">
<i class="fa-solid fa-paper-plane text-xs"></i> <i class="fa-solid fa-paper-plane text-xs"></i>
<span>Kirim Formulir P2H ke QMA</span> <span>Kirim Formulir P2H ke QMA</span>
</button> </button>
+3 -3
View File
@@ -170,7 +170,7 @@ Route::middleware('auth')->group(function () {
}); });
// 5. Modul Pengisian Form P2H Heavy Equipment (Operator Wajib Login) // 5. Modul Pengisian Form P2H Heavy Equipment (Operator Wajib Login)
Route::prefix('p2h')->name('p2h.')->middleware('permission:employee.p2h|qma.vehicles.view')->group(function () { Route::prefix('p2h')->name('p2h.')->middleware('permission:employee.p2h|qma.vehicles.view|qma.p2h.view')->group(function () {
Route::get('/', [P2hFormController::class, 'index'])->name('index'); Route::get('/', [P2hFormController::class, 'index'])->name('index');
Route::get('/{code}', [P2hFormController::class, 'show'])->name('form'); Route::get('/{code}', [P2hFormController::class, 'show'])->name('form');
Route::post('/{code}', [P2hFormController::class, 'store'])->name('store'); Route::post('/{code}', [P2hFormController::class, 'store'])->name('store');
@@ -181,8 +181,8 @@ Route::middleware('auth')->group(function () {
Route::get('/karyawan/aktivitas/status-polling', [\App\Http\Controllers\Employee\DashboardController::class, 'activeTripStatus'])->name('employee.activity.status_polling'); Route::get('/karyawan/aktivitas/status-polling', [\App\Http\Controllers\Employee\DashboardController::class, 'activeTripStatus'])->name('employee.activity.status_polling');
Route::post('/karyawan/aktivitas/{id}/update-km', [\App\Http\Controllers\Employee\DashboardController::class, 'updateKm'])->name('employee.activity.update_km'); Route::post('/karyawan/aktivitas/{id}/update-km', [\App\Http\Controllers\Employee\DashboardController::class, 'updateKm'])->name('employee.activity.update_km');
Route::post('/karyawan/aktivitas/{id}/cancel', [\App\Http\Controllers\Employee\DashboardController::class, 'cancelActivity'])->name('employee.activity.cancel'); Route::post('/karyawan/aktivitas/{id}/cancel', [\App\Http\Controllers\Employee\DashboardController::class, 'cancelActivity'])->name('employee.activity.cancel');
Route::get('/timesheet', [VehicleActivityFormController::class, 'index'])->name('timesheet.index')->middleware('permission:employee.timesheet|qma.vehicles.view'); Route::get('/timesheet', [VehicleActivityFormController::class, 'index'])->name('timesheet.index')->middleware('permission:employee.timesheet|qma.vehicles.view|qma.logs.view');
Route::get('/mobilisasi', [VehicleActivityFormController::class, 'index'])->name('mobilisasi.index')->middleware('permission:employee.timesheet|qma.vehicles.view'); Route::get('/mobilisasi', [VehicleActivityFormController::class, 'index'])->name('mobilisasi.index')->middleware('permission:employee.timesheet|qma.vehicles.view|qma.logs.view');
// 7. Modul Profil Saya (Seluruh Pengguna Terautentikasi) // 7. Modul Profil Saya (Seluruh Pengguna Terautentikasi)
Route::get('/profile', [ProfileController::class, 'index'])->name('profile.index'); Route::get('/profile', [ProfileController::class, 'index'])->name('profile.index');
+16 -5
View File
@@ -130,23 +130,34 @@ class P2hInspectionTest extends TestCase
$admin = User::where('role', 'qma_admin')->first(); $admin = User::where('role', 'qma_admin')->first();
$resAdmin = $this->actingAs($admin)->get(route('p2h.form', ['code' => $this->supportVehicle->code])); $resAdmin = $this->actingAs($admin)->get(route('p2h.form', ['code' => $this->supportVehicle->code]));
$resAdmin->assertStatus(200); $resAdmin->assertStatus(200);
$resAdmin->assertSee('Admin QMA (Validator / Verifikator)'); $resAdmin->assertSee('Admin QMA');
$resAdmin->assertSee('Buka Verifikasi');
$resAdmin->assertDontSee('<aside', false); $resAdmin->assertDontSee('<aside', false);
$resAdmin->assertDontSee('userProfileDropdownBtn'); $resAdmin->assertDontSee('userProfileDropdownBtn');
$resAdmin->assertDontSee('openDrawerBtn'); $resAdmin->assertDontSee('openDrawerBtn');
} }
public function test_qma_admin_cannot_submit_p2h(): void public function test_qma_admin_can_submit_p2h_directly(): void
{ {
$admin = User::where('role', 'qma_admin')->first(); $admin = User::where('role', 'qma_admin')->first();
$item1 = $this->template->items()->create([
'section' => 'Sebelum Mesin Hidup',
'title' => 'Cek Oli Engine Admin Test',
'question_type' => 'choice',
'sequence' => 1,
]);
$response = $this->actingAs($admin)->post(route('p2h.store', ['code' => $this->supportVehicle->code]), [ $response = $this->actingAs($admin)->post(route('p2h.store', ['code' => $this->supportVehicle->code]), [
'template_id' => $this->template->id, 'template_id' => $this->template->id,
'start_hm' => 1500, 'start_hm' => 1500,
'items' => [], 'items' => [
$item1->id => [
'condition' => 'baik',
],
],
]); ]);
$response->assertSessionHas('error'); $response->assertRedirect();
$response->assertSessionHas('success');
} }
public function test_operator_can_submit_p2h_with_pending_status_for_qma(): void public function test_operator_can_submit_p2h_with_pending_status_for_qma(): void