An open-source, self-hostable PaaS alternative to Vercel, Heroku & Netlify that lets you easily deploy static sites, databases, full-stack applications and 360+ one-click services on your own servers.
PHP coolifydatabasesdeploymentdockerdocker-composeinertiajslaravelmariadbmysqlnextjsnodejsphppostgresredisself-hostedself-hostingserverstatic-sitesveltesvelte5
fix(teams): clear stale current_team_id when membership ends
Aditya Tripathi2b92fb86b5c7
diff --git a/app/Actions/Team/DeleteTeam.php b/app/Actions/Team/DeleteTeam.phpindex be880b7e78..5d0c1e6885 100644--- a/app/Actions/Team/DeleteTeam.php+++ b/app/Actions/Team/DeleteTeam.php@@ -50,6 +50,7 @@ class DeleteTeam->get()->each(function (User $member) use ($team): void {$member->teams()->detach($team);+ $member->clearStoredTeamIfMatches($team->id);DB::table('sessions')->where('user_id', $member->id)->delete();});diff --git a/app/Livewire/Team/Member.php b/app/Livewire/Team/Member.phpindex 38c932c39d..ab3f7938a1 100644--- a/app/Livewire/Team/Member.php+++ b/app/Livewire/Team/Member.php@@ -89,6 +89,7 @@ class Member extends ComponentDB::transaction(function () use ($teamId): void {$this->member->teams()->detach($teamId);RevokeUserTeamTokens::forUserTeam($this->member, $teamId);+ $this->member->clearStoredTeamIfMatches($teamId);});// Clear cache for the removed user - both old and new key formatsCache::forget("team:{$this->member->id}");diff --git a/app/Models/User.php b/app/Models/User.phpindex 47f6f2fd40..ab9a817bfe 100644--- a/app/Models/User.php+++ b/app/Models/User.php@@ -401,6 +401,21 @@ class User extends Authenticatable implements SendsEmailreturn null;}+ /**+ * Reset the persisted active team when it points to the given team.+ *+ * Called when the user is removed from a team (or the team is deleted) so a+ * stale current_team_id can never be trusted after the fact. Read paths+ * already re-validate membership; this is defense-in-depth that clears the+ * dangling value at the source event instead of relying on self-healing.+ */+ public function clearStoredTeamIfMatches(int $teamId): void+ {+ if ($this->current_team_id === $teamId) {+ $this->forceFill(['current_team_id' => null])->saveQuietly();+ }+ }+public function role(): ?string{if (data_get($this, 'pivot')) {diff --git a/bootstrap/helpers/shared.php b/bootstrap/helpers/shared.phpindex 169132cb70..1c19fd1ca6 100644--- a/bootstrap/helpers/shared.php+++ b/bootstrap/helpers/shared.php@@ -581,8 +581,13 @@ function refreshSession(?Team $team = null): voidif (! $team) {// The user has no team left (e.g. just deleted their current team and// belongs to no other): clear the stale session reference instead of- // dereferencing null.+ // dereferencing null, and drop the persisted choice so it is not+ // restored on next login.session()->forget('currentTeam');+ $user = Auth::user();+ if ($user && ! is_null($user->current_team_id)) {+ $user->forceFill(['current_team_id' => null])->saveQuietly();+ }return;}diff --git a/tests/Feature/Team/ActiveTeamPersistenceTest.php b/tests/Feature/Team/ActiveTeamPersistenceTest.phpindex 4dc1570cd1..b481cce314 100644--- a/tests/Feature/Team/ActiveTeamPersistenceTest.php+++ b/tests/Feature/Team/ActiveTeamPersistenceTest.php@@ -1,5 +1,6 @@<?php+use App\Actions\Team\DeleteTeam;use App\Livewire\SelectTeam;use App\Models\InstanceSettings;use App\Models\Team;@@ -128,6 +129,38 @@ it('lets the livewire update endpoint through for an ambiguous user', function (expect($response->headers->get('Location'))->not->toBe(route('team.select'));});+it('clears the stored team when the member is removed from it', function () {+ [$user, , $second] = userWithTwoTeams();+ $user->update(['current_team_id' => $second->id]);++ // Simulate the removal event (Team\Member::remove detaches then clears).+ $user->teams()->detach($second->id);+ $user->clearStoredTeamIfMatches($second->id);++ expect($user->fresh()->current_team_id)->toBeNull();+});++it('keeps the stored team when the member is removed from a different team', function () {+ [$user, $personal, $second] = userWithTwoTeams();+ $user->update(['current_team_id' => $second->id]);++ $user->teams()->detach($personal->id);+ $user->clearStoredTeamIfMatches($personal->id);++ expect($user->fresh()->current_team_id)->toBe($second->id);+});++it('clears the stored team for members when their team is deleted', function () {+ [$owner, , $shared] = userWithTwoTeams();+ $member = User::factory()->create();+ $member->teams()->attach($shared, ['role' => 'member']);+ $member->update(['current_team_id' => $shared->id]);++ app(DeleteTeam::class)->handle($shared->fresh(), $owner);++ expect($member->fresh()->current_team_id)->toBeNull();+});+it('bounces users who already have an active team away from the select screen', function () {[$user, , $second] = userWithTwoTeams();$user->update(['current_team_id' => $second->id]);