Merge pull request #95 from brandonlim-hs/bugfix-unintended-users-relation

Fix unintended relation to users when a model uses HasPermissions trait

Author: mostafamaklad

src/Models/Permission.php

@@ -108,7 +108,7 @@ public function roles(): BelongsToMany
      * A permission belongs to some users of the model associated with its guard.
      * @return BelongsToMany
      */
-    public function users()
+    public function users(): BelongsToMany
     {
         return $this->belongsToMany($this->helpers->getModelForGuard($this->attributes['guard_name']));
     }

src/Models/Role.php

@@ -3,6 +3,7 @@
 namespace Maklad\Permission\Models;
 
 use Jenssegers\Mongodb\Eloquent\Model;
+use Jenssegers\Mongodb\Relations\BelongsToMany;
 use Maklad\Permission\Contracts\RoleInterface;
 use Maklad\Permission\Exceptions\GuardDoesNotMatch;
 use Maklad\Permission\Exceptions\RoleAlreadyExists;
@@ -117,6 +118,15 @@ public static function findByName(string $name, $guardName = null): RoleInterfac
         return $role;
     }
 
+    /**
+     * A role belongs to some users of the model associated with its guard.
+     * @return BelongsToMany
+     */
+    public function users(): BelongsToMany
+    {
+        return $this->belongsToMany($this->helpers->getModelForGuard($this->attributes['guard_name']));
+    }
+
     /**
      * Determine if the user may perform the given permission.
      *

src/Traits/HasPermissions.php

@@ -49,14 +49,6 @@ public function permissions(): BelongsToMany
         return $this->belongsToMany(config('permission.models.permission'));
     }
 
-    /**
-     * A role belongs to some users of the model associated with its guard.
-     */
-    public function users(): BelongsToMany
-    {
-        return $this->belongsToMany($this->helpers->getModelForGuard($this->attributes['guard_name']));
-    }
-
     /**
      * Grant the given permission(s) to a role.
      *

tests/HasPermissionsTest.php

@@ -430,4 +430,10 @@ public function it_can_determine_that_the_user_has_all_of_the_permissions_via_ro
         $this->testUser->assignRole('testRole');
         $this->assertTrue($this->testUser->hasAllPermissions('edit-articles', 'edit-news'));
     }
+
+    /** @test */
+    public function a_model_that_uses_hasPermissions_trait_should_not_have_users_method()
+    {
+        $this->assertFalse(method_exists($this->testUser, 'users'));
+    }
 }

tests/HasRolesTest.php

@@ -347,4 +347,10 @@ public function it_can_give_and_revoke_multiple_roles()
 
         $this->assertFalse($this->testUser->hasRole('testRole2'));
     }
+
+    /** @test */
+    public function a_model_that_uses_hasRoles_trait_should_not_have_users_method()
+    {
+        $this->assertFalse(method_exists($this->testUser, 'users'));
+    }
 }