From 264c44529ad7bf8cec07afcd7ccd93dac7b8909b Mon Sep 17 00:00:00 2001
From: frederikpyt <frederikpyt@gmail.com>
Date: Thu, 30 Jul 2020 14:38:32 +0200
Subject: [PATCH] Updated Seeders

---
 .../Http/Controllers/MenuPlanController.php   |  3 +++
 skolehjem/app/Http/Middleware/CheckAuth.php   |  6 ++++-
 skolehjem/database/seeds/RoleSeeder.php       | 24 ++++++++++++-------
 3 files changed, 24 insertions(+), 9 deletions(-)

diff --git a/skolehjem/app/Http/Controllers/MenuPlanController.php b/skolehjem/app/Http/Controllers/MenuPlanController.php
index 5a371cc..7b8bf83 100644
--- a/skolehjem/app/Http/Controllers/MenuPlanController.php
+++ b/skolehjem/app/Http/Controllers/MenuPlanController.php
@@ -4,9 +4,12 @@ namespace App\Http\Controllers;
 
 use App\ExternalLink;
 use App\MenuPlan;
+use App\User;
 use Illuminate\Http\Request;
 use Illuminate\Http\Response;
 use Illuminate\Support\Facades\DB;
+use Spatie\Permission\Models\Permission;
+use Spatie\Permission\Models\Role;
 
 
 class MenuPlanController extends Controller
diff --git a/skolehjem/app/Http/Middleware/CheckAuth.php b/skolehjem/app/Http/Middleware/CheckAuth.php
index 7256fae..c4408d9 100644
--- a/skolehjem/app/Http/Middleware/CheckAuth.php
+++ b/skolehjem/app/Http/Middleware/CheckAuth.php
@@ -4,6 +4,10 @@ namespace App\Http\Middleware;
 
 use App\User;
 use Closure;
+use Illuminate\Database\Eloquent\Collection;
+use Illuminate\Support\Facades\Auth;
+use Spatie\Permission\Models\Permission;
+use Spatie\Permission\Models\Role;
 
 class CheckAuth
 {
@@ -19,7 +23,7 @@ class CheckAuth
     public function handle($request, Closure $next, $permissions)
     {
         /** @var User $user */
-        $user = $request->user();
+        $user = Auth::user();
 
         if(!isset($user))
             return redirect()->route("users.login");
diff --git a/skolehjem/database/seeds/RoleSeeder.php b/skolehjem/database/seeds/RoleSeeder.php
index 1fbea25..43e3796 100644
--- a/skolehjem/database/seeds/RoleSeeder.php
+++ b/skolehjem/database/seeds/RoleSeeder.php
@@ -1,5 +1,6 @@
 <?php
 
+use Illuminate\Database\Eloquent\Collection;
 use Illuminate\Database\Seeder;
 
 class RoleSeeder extends Seeder
@@ -33,16 +34,23 @@ class RoleSeeder extends Seeder
 
         //Give all permissions to Administrator (id: 1)
         foreach (\Spatie\Permission\Models\Permission::all() as $permission) {
-            \Spatie\Permission\Models\Role::query()->find(1)->get()[0]->givePermissionTo($permission);
+            \Spatie\Permission\Models\Role::query()->find(1)->first()->givePermissionTo($permission);
         }
 
+        //Bruger Permissions
+        $brugerPermissions = new Collection();
+
+        $brugerPermissions->add(\Spatie\Permission\Models\Permission::query()->where("name", "=", "event.list")->first());
+        $brugerPermissions->add(\Spatie\Permission\Models\Permission::query()->where("name", "=", "link.external.list")->first());
+        $brugerPermissions->add(\Spatie\Permission\Models\Permission::query()->where("name", "=", "contact.list")->first());
+        $brugerPermissions->add(\Spatie\Permission\Models\Permission::query()->where("name", "=", "feedback.create")->first());
+        $brugerPermissions->add(\Spatie\Permission\Models\Permission::query()->where("name", "=", "menuplan.list")->first());
+        $brugerPermissions->add(\Spatie\Permission\Models\Permission::query()->where("name", "=", "washing.machine.reservation.create")->first());
+        $brugerPermissions->add(\Spatie\Permission\Models\Permission::query()->where("name", "=", "washing.machine.reservation.delete")->first());
+
         //Give permissions to Bruger (id: 2)
-        \Spatie\Permission\Models\Role::query()->find(2)->get()[0]->givePermissionTo("event.list");
-        \Spatie\Permission\Models\Role::query()->find(2)->get()[0]->givePermissionTo("link.external.list");
-        \Spatie\Permission\Models\Role::query()->find(2)->get()[0]->givePermissionTo("contact.list");
-        \Spatie\Permission\Models\Role::query()->find(2)->get()[0]->givePermissionTo("feedback.create");
-        \Spatie\Permission\Models\Role::query()->find(2)->get()[0]->givePermissionTo("menuplan.list");
-        \Spatie\Permission\Models\Role::query()->find(2)->get()[0]->givePermissionTo("washing.machine.reservation.create");
-        \Spatie\Permission\Models\Role::query()->find(2)->get()[0]->givePermissionTo("washing.machine.reservation.delete");
+        foreach ($brugerPermissions as $permission) {
+            \Spatie\Permission\Models\Role::query()->find(2)->givePermissionTo($permission);
+        }
     }
 }