Fixed bug of loading user roles of different teams to current team (#2803)

* Fixed calling $this->roles  property which could load old roles
* Added reloading roles  before asigning  role  if teams feature is enabled

---------

Co-authored-by: Chris Brown <[email protected]>

Author: mohamedds-12

src/Traits/HasRoles.php

@@ -154,6 +154,11 @@ public function assignRole(...$roles)
             [app(PermissionRegistrar::class)->teamsKey => getPermissionsTeamId()] : [];
 
         if ($model->exists) {
+            if (app(PermissionRegistrar::class)->teams) {
+                // explicit reload in case team has been changed since last load
+                $this->load('roles');
+            }
+
             $currentRoles = $this->roles->map(fn ($role) => $role->getKey())->toArray();
 
             $this->roles()->attach(array_diff($roles, $currentRoles), $teamPivot);

tests/HasRolesTest.php

@@ -13,6 +13,7 @@
 use Spatie\Permission\Events\RoleDetached;
 use Spatie\Permission\Exceptions\GuardDoesNotMatch;
 use Spatie\Permission\Exceptions\RoleDoesNotExist;
+use Spatie\Permission\PermissionRegistrar;
 use Spatie\Permission\Tests\TestModels\Admin;
 use Spatie\Permission\Tests\TestModels\SoftDeletingUser;
 use Spatie\Permission\Tests\TestModels\User;
@@ -394,6 +395,11 @@ public function it_does_not_run_unnecessary_sqls_when_assigning_new_roles()
         DB::disableQueryLog();
 
         $necessaryQueriesCount = 2;
+      
+        // Teams reloads relation, adding an extra query
+        if (app(PermissionRegistrar::class)->teams) {
+            $necessaryQueriesCount++;
+        }
 
         $this->assertCount($necessaryQueriesCount, DB::getQueryLog());
     }

tests/TeamHasRolesTest.php

@@ -55,6 +55,11 @@ public function it_can_assign_same_and_different_roles_on_same_user_different_te
         setPermissionsTeamId(1);
         $this->testUser->assignRole('testRole', 'testRole2');
 
+        // explicit load of roles to assert no mismatch
+        // when same role assigned in diff teams
+        // while old team's roles are loaded 
+        $this->testUser->load('roles');
+
         setPermissionsTeamId(2);
         $this->testUser->assignRole('testRole', 'testRole3');