From a5cb2e2cdec3b59e7a432486bbc4adeedf783dda Mon Sep 17 00:00:00 2001 From: frederikpyt Date: Wed, 29 Jul 2020 12:18:08 +0200 Subject: [PATCH] Permission fixes --- skolehjem/app/Http/Controllers/RootController.php | 5 ++++- skolehjem/app/Http/Controllers/UserController.php | 8 -------- skolehjem/database/seeds/PermissionSeeder.php | 3 ++- 3 files changed, 6 insertions(+), 10 deletions(-) diff --git a/skolehjem/app/Http/Controllers/RootController.php b/skolehjem/app/Http/Controllers/RootController.php index 284d91f..d147e5b 100644 --- a/skolehjem/app/Http/Controllers/RootController.php +++ b/skolehjem/app/Http/Controllers/RootController.php @@ -13,6 +13,9 @@ class RootController extends Controller } public function index() { - return Response::detect("root.index"); + if(auth()->user()->can('admin.panel.show')) + return Response::detect("root.index"); + else + return view('app.root.index'); } } diff --git a/skolehjem/app/Http/Controllers/UserController.php b/skolehjem/app/Http/Controllers/UserController.php index 9bd7924..538daa7 100644 --- a/skolehjem/app/Http/Controllers/UserController.php +++ b/skolehjem/app/Http/Controllers/UserController.php @@ -60,29 +60,21 @@ class UserController extends Controller */ public function store(Request $request) { -// Log::debug("STORE FUNCTION"); - $data = $request->validate([ "name_first" => "required|max:255", "name_last" => "required|max:255", "email" => "required|email|unique:users", "password" => "required|max:60", "phone" => "required|unique:users", - ]); -// Log::debug("FINISHED VALIDATION?"); - $rolez = $request->input("roles", [ "User" ]); $user = new User($data); -// Log::debug("CREATED USER [NOT PERSISTED YET]"); - $user->assignRole($rolez); $user->save(); -// Log::debug("SAVED USER"); return Response::detect("users.store"); } diff --git a/skolehjem/database/seeds/PermissionSeeder.php b/skolehjem/database/seeds/PermissionSeeder.php index befed63..f85c0e9 100644 --- a/skolehjem/database/seeds/PermissionSeeder.php +++ b/skolehjem/database/seeds/PermissionSeeder.php @@ -98,7 +98,8 @@ class PermissionSeeder extends Seeder "washing.machine.reservation.edit" => "Allows editing of washing machine reservations", "washing.machine.reservation.delete" => "Allows deletion of washing machine reservations", - + //Allows access to the admin panel + "admin.panel.show" => "Allows access to administration panel", ]; foreach ($permissions as $key => $value) {