Changeset 5372778

Timestamp:

08/26/24 14:20:34 (4 months ago)

Author:

bube-ristovska <ristovska725@…>

Branches:

main

Children:

3c89e27

Parents:

8a258ab

Message:

Middleware for permissions based on officer, policeman or both

Files:

• app/Http/Controllers/SessionsController.php (modified) (1 diff)
• app/Http/Kernel.php (modified) (1 diff)
• app/Http/Middleware/CheckBoth.php (added)
• app/Http/Middleware/CheckOfficer.php (added)
• app/Http/Middleware/CheckPoliceman.php (added)
• resources/views/unauth.blade.php (added)
• routes/web.php (modified) (1 diff)

app/Http/Controllers/SessionsController.php

@@ -54 +54 @@
         if ($this->verifyPassword($password, $value, $value2)) {
             // Authentication passed
+            Session::put('auth', true);
             Session::put('badge_no', $badge_no);
             Session::put('is_policeman', $policeman);

app/Http/Kernel.php

@@ -22 +22 @@
         \App\Http\Middleware\TrimStrings::class,
         \Illuminate\Foundation\Http\Middleware\ConvertEmptyStringsToNull::class,
+    ];
+    protected $routeMiddleware = [
+        // other middleware
+        'policeman' => \App\Http\Middleware\CheckPoliceman::class,
+        'officer' => \App\Http\Middleware\CheckOfficer::class,
+        'both' => \App\Http\Middleware\CheckBoth::class,
     ];
 

routes/web.php

@@ -19 +19 @@
 */
 
-Route::get('/', function () {
-    return view('welcome');
-});
+// UNAUTHORIZED
 Route::get('/login', function () {
     return view('login');
 
 });
-
 Route::post('/login', [SessionsController::class, 'store']);
 
+Route::get('/unauth', function () {
+    return view('unauth');  // Make sure there is a view file named `unauth.blade.php`
+})->name('unauth');  // Name the route 'unauth'
 
+// AUTHORIZED
+// POLICEMAN
+Route::get('register-statement', [CrimeCaseController::class, 'register_statement'])->middleware('policeman');
+Route::post('register-statement', [CrimeCaseController::class, 'register_statement_post'])->middleware('policeman');
+
+// OFFICER
+Route::get('register-policeman', [OfficerController::class, 'register'])->middleware('officer');
+Route::post('register-policeman', [OfficerController::class, 'register_post'])->middleware('officer');
+
+// BOTH
+Route::get('/', function () {
+    return view('welcome');
+})->middleware('both');
 Route::get('logout', [SessionsController::class, 'logout']);
 
+Route::get('employees', [OfficerController::class, 'employees'])->middleware('both');
+Route::get('/employees/{id}', [OfficerController::class, 'show'])->middleware('both');
 
+Route::get('filter', [PeopleController::class, 'filter'])->middleware('both');
+Route::post('filter', [PeopleController::class, 'filter_post'])->middleware('both');
 
-Route::get('employees', [OfficerController::class, 'employees'])->middleware('guest');
-Route::get('/employees/{id}', [OfficerController::class, 'show']);
+Route::get('cases', [CrimeCaseController::class, 'cases'])->middleware('both');
+Route::get('case/{wildcard}', [CrimeCaseController::class, 'case'])->middleware('both');
+Route::get('finished_cases', [CrimeCaseController::class, 'finished_cases'])->middleware('both');
 
-Route::get('filter', [PeopleController::class, 'filter'])->middleware('guest');
-Route::post('filter', [PeopleController::class, 'filter_post'])->middleware('guest');
-
-Route::get('cases', [CrimeCaseController::class, 'cases'])->middleware('guest');
-
-Route::get('case/{wildcard}', [CrimeCaseController::class, 'case'])->name('case')->middleware('guest');
-
-Route::get('finished_cases', [CrimeCaseController::class, 'finished_cases'])->middleware('guest');
-
-
-Route::get('register-policeman', [OfficerController::class, 'register'])->middleware('guest');
-Route::post('register-policeman', [OfficerController::class, 'register_post'])->middleware('guest');
-
-Route::get('register-statement', [CrimeCaseController::class, 'register_statement'])->middleware('guest');
-Route::post('register-statement', [CrimeCaseController::class, 'register_statement_post'])->middleware('guest');
-
-
-
-Route::post('/get-person', [PeopleController::class, 'getPerson']);
+Route::post('/get-person', [PeopleController::class, 'getPerson'])->middleware('both');