Merge pull request #2219 from erikn69/erikn69-patch-fix

Fix undefined index guard_name
spatie · Oct 19, 2022 · 8125446 · 8125446
2 parents 1cb0a5c + e4493da
commit 8125446
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 2 deletions.
diff --git a/src/Models/Permission.php b/src/Models/Permission.php
@@ -64,7 +64,7 @@ public function roles(): BelongsToMany
     public function users(): BelongsToMany
     {
         return $this->morphedByMany(
-            getModelForGuard($this->attributes['guard_name']),
+            getModelForGuard($this->attributes['guard_name'] ?? config('auth.defaults.guard')),
             'model',
             config('permission.table_names.model_has_permissions'),
             PermissionRegistrar::$pivotPermission,

diff --git a/src/Models/Role.php b/src/Models/Role.php
@@ -70,7 +70,7 @@ public function permissions(): BelongsToMany
     public function users(): BelongsToMany
     {
         return $this->morphedByMany(
-            getModelForGuard($this->attributes['guard_name']),
+            getModelForGuard($this->attributes['guard_name'] ?? config('auth.defaults.guard')),
             'model',
             config('permission.table_names.model_has_roles'),
             PermissionRegistrar::$pivotRole,

diff --git a/tests/PermissionTest.php b/tests/PermissionTest.php
@@ -7,6 +7,20 @@
 
 class PermissionTest extends TestCase
 {
+    /** @test */
+    public function it_get_user_models_using_with()
+    {
+        $this->testUser->givePermissionTo($this->testUserPermission);
+
+        $permission = app(Permission::class)::with('users')
+            ->where($this->testUserPermission->getKeyName(), $this->testUserPermission->getKey())
+            ->first();
+
+        $this->assertEquals($permission->getKey(), $this->testUserPermission->getKey());
+        $this->assertCount(1, $permission->users);
+        $this->assertEquals($permission->users[0]->id, $this->testUser->id);
+    }
+
     /** @test */
     public function it_throws_an_exception_when_the_permission_already_exists()
     {

diff --git a/tests/RoleTest.php b/tests/RoleTest.php
@@ -21,6 +21,19 @@ public function setUp(): void
         Permission::create(['name' => 'wrong-guard-permission', 'guard_name' => 'admin']);
     }
 
+    /** @test */
+    public function it_get_user_models_using_with()
+    {
+        $this->testUser->assignRole($this->testUserRole);
+
+        $role = app(Role::class)::with('users')
+            ->where($this->testUserRole->getKeyName(), $this->testUserRole->getKey())->first();
+
+        $this->assertEquals($role->getKey(), $this->testUserRole->getKey());
+        $this->assertCount(1, $role->users);
+        $this->assertEquals($role->users[0]->id, $this->testUser->id);
+    }
+
     /** @test */
     public function it_has_user_models_of_the_right_class()
     {