fix duplicates on sync (#2574)

spatie · Dec 9, 2023 · c24211a · c24211a
1 parent b6b9f4f
commit c24211a
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 6 deletions.
diff --git a/src/Traits/HasPermissions.php b/src/Traits/HasPermissions.php
@@ -370,9 +370,10 @@ private function collectPermissions(...$permissions): array
                     return $array;
                 }
 
-                $this->ensureModelSharesGuard($permission);
-
-                $array[] = $permission->getKey();
+                if (! in_array($permission->getKey(), $array)) {
+                    $this->ensureModelSharesGuard($permission);
+                    $array[] = $permission->getKey();
+                }
 
                 return $array;
             }, []);

diff --git a/src/Traits/HasRoles.php b/src/Traits/HasRoles.php
@@ -129,9 +129,10 @@ private function collectRoles(...$roles): array
                     return $array;
                 }
 
-                $this->ensureModelSharesGuard($role);
-
-                $array[] = $role->getKey();
+                if (! in_array($role->getKey(), $array)) {
+                    $this->ensureModelSharesGuard($role);
+                    $array[] = $role->getKey();
+                }
 
                 return $array;
             }, []);

diff --git a/tests/HasPermissionsTest.php b/tests/HasPermissionsTest.php
@@ -541,6 +541,16 @@ public function it_can_sync_multiple_permissions()
         $this->assertFalse($this->testUser->hasDirectPermission('edit-news'));
     }
 
+    /** @test */
+    public function it_can_avoid_sync_duplicated_permissions()
+    {
+        $this->testUser->syncPermissions('edit-articles', 'edit-blog', 'edit-blog');
+
+        $this->assertTrue($this->testUser->hasDirectPermission('edit-articles'));
+
+        $this->assertTrue($this->testUser->hasDirectPermission('edit-blog'));
+    }
+
     /** @test */
     public function it_can_sync_multiple_permissions_by_id()
     {

diff --git a/tests/HasRolesTest.php b/tests/HasRolesTest.php
@@ -259,6 +259,16 @@ public function it_can_sync_roles_from_a_string_on_a_permission()
         $this->assertTrue($this->testUserPermission->hasRole('testRole2'));
     }
 
+    /** @test */
+    public function it_can_avoid_sync_duplicated_roles()
+    {
+        $this->testUser->syncRoles('testRole', 'testRole', 'testRole2');
+
+        $this->assertTrue($this->testUser->hasRole('testRole'));
+
+        $this->assertTrue($this->testUser->hasRole('testRole2'));
+    }
+
     /** @test */
     public function it_can_sync_multiple_roles()
     {