Merge pull request #21 from mostafamaklad/v1.2

V1.2.1
mostafamaklad · Sep 5, 2017 · be75d54 · be75d54
2 parents e6975cc + 6a50c92
commit be75d54
Show file tree

Hide file tree

Showing 8 changed files with 57 additions and 36 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -2,6 +2,7 @@ language: php
 
 php:
   - 7.1
+  - 7.2
 
 matrix:
   fast_finish: true
@@ -11,6 +12,11 @@ env:
     - COMPOSER_FLAGS="--prefer-lowest"
     - COMPOSER_FLAGS=""
 
+matrix:
+  exclude:
+    - php: 7.2
+      env: COMPOSER_FLAGS="--prefer-lowest"
+
 sudo: false
 
 services:

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,12 @@
 
 All Notable changes to `laravel-permission-mongodb` will be documented in this file.
 
+## 1.2.1 - 2017-09-05
+
+### Added
+- Let middleware use caching
+- Allow logging while exceptions
+
 ## 1.2.0 - 2017-09-03
 
 ### Added

diff --git a/composer.json b/composer.json
@@ -41,7 +41,7 @@
         "monolog/monolog": "^1.22",
         "orchestra/testbench": "~3.4.2|~5.5.0",
         "php-coveralls/php-coveralls": "^1.0",
-        "phpunit/phpunit": "^6.2"
+        "phpunit/phpunit": "^5.7|6.2"
     },
     "autoload": {
         "psr-4": {

diff --git a/composer.lock b/composer.lock
diff --git a/src/Middlewares/PermissionMiddleware.php b/src/Middlewares/PermissionMiddleware.php
@@ -13,12 +13,16 @@ public function handle($request, Closure $next, $permission)
             abort(403);
         }
 
-        $permission = is_array($permission) ? $permission : explode('|', $permission);
+        $permissions = is_array($permission)
+            ? $permission
+            : explode('|', $permission);
 
-        if (! Auth::user()->hasAnyPermission(...$permission)) {
-            abort(403);
+        foreach ($permissions as $permission) {
+            if (Auth::user()->can($permission)) {
+                return $next($request);
+            }
         }
 
-        return $next($request);
+        abort(403);
     }
 }
diff --git a/src/Traits/HasPermissions.php b/src/Traits/HasPermissions.php
@@ -5,7 +5,6 @@
 use Illuminate\Support\Collection;
 use Jenssegers\Mongodb\Eloquent\Model;
 use Maklad\Permission\Contracts\PermissionInterface as Permission;
-use Maklad\Permission\Contracts\RoleInterface as Role;
 use Maklad\Permission\Exceptions\GuardDoesNotMatch;
 use Maklad\Permission\PermissionRegistrar;
 

diff --git a/src/Traits/HasRoles.php b/src/Traits/HasRoles.php
@@ -60,11 +60,7 @@ public function scopeRole(Builder $query, $roles): Builder
         }
 
         $roles = $roles->map(function ($role) {
-            if ($role instanceof Role) {
-                return $role;
-            }
-
-            return app(Role::class)->findByName($role, $this->getDefaultGuardName());
+            return $this->getStoredRole($role);
         });
 
         return $query->whereIn('role_ids', $roles->pluck('_id'));

diff --git a/tests/MiddlewareTest.php b/tests/MiddlewareTest.php
@@ -56,6 +56,11 @@ public function a_user_can_access_a_route_protected_by_this_role_middleware_if_h
             $this->runMiddleware(
                 $this->roleMiddleware, 'testRole|testRole2'
             ), 200);
+
+        $this->assertEquals(
+            $this->runMiddleware(
+                $this->roleMiddleware, ['testRole2', 'testRole']
+            ), 200);
     }
 
     /** @test */
@@ -124,7 +129,12 @@ public function a_user_can_access_a_route_protected_by_this_permission_middlewar
 
         $this->assertEquals(
             $this->runMiddleware(
-                $this->permissionMiddleware, 'edit-articles|edit-news'
+                $this->permissionMiddleware, 'edit-news|edit-articles'
+            ), 200);
+
+        $this->assertEquals(
+            $this->runMiddleware(
+                $this->permissionMiddleware, ['edit-news', 'edit-articles']
             ), 200);
     }