Merge remote-tracking branch 'origin/master'

skolehjem/app/Http/Controllers/ExternalLinkController.php

@@ -9,6 +9,15 @@ use Illuminate\Http\Response;
 
 class ExternalLinkController extends Controller
 {
+    function __construct()
+    {
+        $this->middleware("permission:link.external.list")->only("index");
+        $this->middleware("permission:link.external.create")->only(["create", "store"]);
+        $this->middleware("permission:link.external.show")->only("show");
+        $this->middleware("permission:link.external.edit")->only(["edit", "update"]);
+        $this->middleware("permission:link.external.delete")->only("destroy");
+    }
+
     /**
      * Display a listing of the resource.
      *

skolehjem/app/Http/Controllers/PhoneController.php

@@ -0,0 +1,13 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use Illuminate\Http\Request;
+use Illuminate\Http\Response;
+
+class PhoneController extends Controller
+{
+    function index() {
+        return Response::detect("vagttelefons.index");
+    }
+}

skolehjem/app/Http/Controllers/UserController.php

@@ -14,13 +14,14 @@ class UserController extends Controller
 {
     public function __construct()
     {
-//        $this->middleware([ "auth" ])->only("logout");
-//        $this->middleware([ "guest" ])->only("login");
-//
-//        $this->middleware([ "permission:user.list", "role:admin" ])->only("index");
-//        $this->middleware([ "permission:user.show", "role:admin" ])->only("show");
-//        $this->middleware([ "permission:user.edit", "role:admin" ])->only([ "edit", "update" ]);
-//        $this->middleware([ "permission:user.delete", "role:admin" ])->only("delete");
+        $this->middleware([ "auth" ])->only("logout");
+        $this->middleware([ "guest" ])->only("login");
+
+        $this->middleware([ "check.auth:user.list" ])->only("index");
+        $this->middleware([ "check.auth:user.show" ])->only("show");
+        $this->middleware([ "check.auth:user.create" ])->only("create");
+        $this->middleware([ "check.auth:user.edit" ])->only("edit", "update");
+        $this->middleware([ "check.auth:user.delete" ])->only("delete");
     }
 
     /**
@@ -54,7 +55,7 @@ class UserController extends Controller
      */
     public function store(Request $request)
     {
-        Log::debug("STORE FUNCTION");
+//        Log::debug("STORE FUNCTION");
 
         $data = $request->validate([
             "name_first" => "required|max:255",
@@ -65,15 +66,15 @@ class UserController extends Controller
 
         ]);
 
-        Log::debug("FINISHED VALIDATION?");
+//        Log::debug("FINISHED VALIDATION?");
 
         $user = new User($data);
 
-        Log::debug("CREATED USER [NOT PERSISTED YET]");
+//        Log::debug("CREATED USER [NOT PERSISTED YET]");
 
         $user->save();
 
-        Log::debug("SAVED USER");
+//        Log::debug("SAVED USER");
 
         return Response::detect("users.store");
     }
@@ -182,7 +183,7 @@ class UserController extends Controller
     /*******************************************/
 
     public function showLogin() {
-        return view("admin.users.login");
+        return Response::detect("users.login");
     }
 
     public function login(Request $request) {
@@ -190,7 +191,7 @@ class UserController extends Controller
 
         if(Auth::attempt($data)) {
             //TODO: Implement home?
-            return redirect()->route("users.index");
+            return redirect()->route("root.index");
         }
 
         return redirect()->back(303);
@@ -199,6 +200,6 @@ class UserController extends Controller
     public function logout(Request $request) {
         Auth::logout();
 
-        return redirect()->to("/");
+        return redirect()->route("root.index");
     }
 }

skolehjem/app/Http/Kernel.php

@@ -67,5 +67,7 @@ class Kernel extends HttpKernel
         'role' => \Spatie\Permission\Middlewares\RoleMiddleware::class,
         'permission' => \Spatie\Permission\Middlewares\PermissionMiddleware::class,
         'role_or_permission' => \Spatie\Permission\Middlewares\RoleOrPermissionMiddleware::class,
+
+        "check.auth" => \App\Http\Middleware\CheckAuth::class
     ];
 }

skolehjem/app/Http/Middleware/CheckAuth.php

@@ -0,0 +1,31 @@
+<?php
+
+namespace App\Http\Middleware;
+
+use App\User;
+use Closure;
+
+class CheckAuth
+{
+    /**
+     * Handle an incoming request.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @param  \Closure  $next
+     * @return mixed
+     */
+    public function handle($request, Closure $next, $permissions)
+    {
+        /** @var User $user */
+        $user = $request->user();
+
+        if(!isset($user))
+            return redirect()->route("users.login");
+
+        if($user->hasAnyPermission($permissions)) {
+            return $next($request);
+        }
+
+        return redirect()->route("users.login");
+    }
+}

skolehjem/app/MenuPlan.php

@@ -7,6 +7,6 @@ use Illuminate\Database\Eloquent\Model;
 class MenuPlan extends Model
 {
     protected $fillable = [
-        'monday', "tuesday", 'wednesday', 'thursday', "friday", "saturday", "sunday"
+        'monday', "tuesday", 'wednesday', 'thursday'
     ];
 }