Merge branch 'master' into 6.x

santigarcor · Mar 3, 2021 · 9ab3bfd · 9ab3bfd
2 parents 15ffe62 + ef896b7
commit 9ab3bfd
Show file tree

Hide file tree

Showing 4 changed files with 100 additions and 1 deletion.
diff --git a/config/laratrust.php b/config/laratrust.php
@@ -240,6 +240,16 @@
     */
     'magic_is_able_to_method_case' => 'kebab_case',
 
+    /*
+    |--------------------------------------------------------------------------
+    | Laratrust Permissions as Gates
+    |--------------------------------------------------------------------------
+    |
+    | Determines if you can check if a user has a permission using the "can" method.
+    |
+    */
+    'permissions_as_gates' => false,
+
     /*
     |--------------------------------------------------------------------------
     | Laratrust Panel

diff --git a/src/LaratrustServiceProvider.php b/src/LaratrustServiceProvider.php
@@ -129,6 +129,10 @@ protected function registerResources()
      */
     protected function registerPermissionsToGate()
     {
+        if (!$this->app['config']->get('laratrust.permissions_as_gates')) {
+            return;
+        }
+
         app(Gate::class)->before(function (Authorizable $user, string $ability) {
             if (method_exists($user, 'hasPermission')) {
                 return $user->hasPermission($ability) ?: null;

diff --git a/tests/Checkers/User/LaratrustUserCanDefaultCheckerTest.php b/tests/Checkers/User/LaratrustUserCanDefaultCheckerTest.php
@@ -7,8 +7,14 @@ class LaratrustCanAbilityDefaultCheckerTest extends LaratrustUserCanCheckerTestC
     protected function setUp(): void
     {
         parent::setUp();
+    }
+
+    protected function getEnvironmentSetUp($app)
+    {
+        parent::getEnvironmentSetUp($app);
 
-        $this->app['config']->set('laratrust.checker', 'default');
+        $app['config']->set('laratrust.checker', 'default');
+        $app['config']->set('laratrust.permissions_as_gates', true);
     }
 
     public function testCanShouldReturnBoolean()

diff --git a/tests/LaratrustPermissionsAsGatesTest.php b/tests/LaratrustPermissionsAsGatesTest.php
@@ -0,0 +1,79 @@
+<?php
+
+namespace Laratrust\Tests;
+
+use Illuminate\Contracts\Auth\Access\Gate;
+use Laratrust\LaratrustServiceProvider;
+use Mockery as m;
+use Mockery;
+
+class LaratrustPermissionsAsGatesTest extends LaratrustTestCase
+{
+    public function testRegistersPermissionsAsGates()
+    {
+        /*
+        |------------------------------------------------------------
+        | Set
+        |------------------------------------------------------------
+        */
+        config()->set('laratrust.permissions_as_gates', true);
+
+        /*
+        |------------------------------------------------------------
+        | Expectation
+        |------------------------------------------------------------
+        */
+        $this->mock(Gate::class)->shouldReceive('before')->once();
+
+        /*
+        |------------------------------------------------------------
+        | Assertion
+        |------------------------------------------------------------
+        */
+        $provider = new LaratrustServiceProvider($this->app);
+        $provider->boot();
+    }
+
+    public function testDoesNotRegisterPermissionsAsGatesIfDisabledInConfig()
+    {
+        /*
+        |------------------------------------------------------------
+        | Set
+        |------------------------------------------------------------
+        */
+        config()->set('laratrust.permissions_as_gates', false);
+
+        /*
+        |------------------------------------------------------------
+        | Expectation
+        |------------------------------------------------------------
+        */
+        $this->mock(Gate::class)->shouldNotReceive('before');
+
+        /*
+        |------------------------------------------------------------
+        | Assertion
+        |------------------------------------------------------------
+        */
+        $provider = new LaratrustServiceProvider($this->app);
+        $provider->boot();
+    }
+
+    public function testDoesNotRegisterPermissionsAsGatesByDefault()
+    {
+        /*
+        |------------------------------------------------------------
+        | Expectation
+        |------------------------------------------------------------
+        */
+        $this->mock(Gate::class)->shouldNotReceive('before');
+
+        /*
+        |------------------------------------------------------------
+        | Assertion
+        |------------------------------------------------------------
+        */
+        $provider = new LaratrustServiceProvider($this->app);
+        $provider->boot();
+    }
+}