route middleware

src/Auth/Business/LuticateBusiness.php

@@ -16,8 +16,6 @@ use Luticate\Utils\LuRoute;
 
 class LuticateBusiness
 {
-    const TOKEN_HEADER = "X-Authorization";
-
     /**
      * @var LuticateUsersDbo
      */
@@ -28,52 +26,9 @@ class LuticateBusiness
         return self::$_currentUser;
     }
 
-    /**
-     * @param $permissions string[]
-     * @param $request Request
-     * @return bool
-     */
-    public static function authFilter($permissions, $request)
+    public static function setCurrentUser($user)
     {
-        /**
-         * @var $user LuticateUsersDbo
-         */
-        $user = null;
-        $token = $request->header(self::TOKEN_HEADER);
-        if ($token != null && $token != "") {
-            $data = JwtHelper::decode($token);
-            if ($data != null) {
-                $user_id = $data[LuticateUsersBusiness::KEY_USER_ID];
-                $salt = $data[LuticateUsersBusiness::KEY_SALT];
-                $user = LuticateUsersBusiness::getById($user_id);
-                if ($user->getSalt() != $salt) {
-                    $user = null;
-                }
-            }
-        }
-        if (is_null($user)) {
-            if ($token != null && $token != "") {
-                return "Invalid token";
-            }
-            $user = LuticateUsersBusiness::getById(0);
-        }
-
         self::$_currentUser = $user;
-        LuController::$parameters["user"] = $user;
-
-        $permissions[] = LuticatePermissions::USER_LOGIN;
-        foreach ($permissions as $permission) {
-            try {
-                $perm = LuticatePermissionsBusiness::getEffectivePermission(self::$_currentUser->getId(), $permission);
-                if (!$perm->getValue()) {
-                    return "Permission denied";
-                }
-            }catch (\Exception $e)
-            {
-                return "Permission denied";
-            }
-        }
-        return null;
     }
 
     /**
@@ -81,15 +36,7 @@ class LuticateBusiness
      */
     public static function setupAuth($route)
     {
-        $route->setMiddleware(function($permissions, $request)
-        {
-            $auth = self::authFilter($permissions, $request);
-            if (is_null($auth)) {
-                return true;
-            }
-            abort(401, $auth);
-            return false;
-        });
+        $route->addMiddleware('Luticate\Auth\Business\LuticateMiddleware');
     }
 
     /**

src/Auth/Business/LuticateMiddleware.php

@@ -0,0 +1,69 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: robin
+ * Date: 10/19/15
+ * Time: 9:14 PM
+ */
+
+namespace Luticate\Auth\Business;
+
+use Closure;
+use Illuminate\Http\Request;
+use Luticate\Auth\DBO\LuticatePermissions;
+use Luticate\Auth\DBO\LuticateUsersDbo;
+use Luticate\Utils\LuController;
+
+class LuticateMiddleware
+{
+    const TOKEN_HEADER = "X-Authorization";
+
+    /**
+     * @param $request Request
+     * @param Closure $next
+     * @param ...$permissions
+     * @return null|string
+     */
+    public function handle($request, Closure $next, ...$permissions)
+    {
+        /**
+         * @var $user LuticateUsersDbo
+         */
+        $user = null;
+        $token = $request->header(self::TOKEN_HEADER);
+        if ($token != null && $token != "") {
+            $data = JwtHelper::decode($token);
+            if ($data != null) {
+                $user_id = $data[LuticateUsersBusiness::KEY_USER_ID];
+                $salt = $data[LuticateUsersBusiness::KEY_SALT];
+                $user = LuticateUsersBusiness::getById($user_id);
+                if ($user->getSalt() != $salt) {
+                    $user = null;
+                }
+            }
+        }
+        if (is_null($user)) {
+            if ($token != null && $token != "") {
+                abort(401, "Invalid token");
+            }
+            $user = LuticateUsersBusiness::getById(0);
+        }
+
+        LuticateBusiness::setCurrentUser($user);
+        LuController::$parameters["user"] = $user;
+
+        $permissions[] = LuticatePermissions::USER_LOGIN;
+        foreach ($permissions as $permission) {
+            try {
+                $perm = LuticatePermissionsBusiness::getEffectivePermission(LuticateBusiness::getCurrentUser()->getId(), $permission);
+                if (!$perm->getValue()) {
+                    abort(401, "Permission denied");
+                }
+            }catch (\Exception $e)
+            {
+                abort(401, "Permission denied");
+            }
+        }
+        return $next($request);
+    }
+}