tiennm99/coolify
1
0
Fork 0
mirror of https://github.com/tiennm99/coolify.git synced 2026-04-17 17:21:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(team): improve team retrieval and session handling for users

Browse Source
This commit is contained in:
Andras Bacsai
2025-12-28 14:50:59 +01:00
parent ddd78658e8
commit 8d212bc110
4 changed files with 22 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/Http/Controllers/Api/TeamController.php
View File

@@ -218,7 +218,10 @@ class TeamController extends Controller
if (is_null($teamId)) { if (is_null($teamId)) {
return invalidTokenResponse(); return invalidTokenResponse();
} }
$team = auth()->user()->currentTeam(); $team = auth()->user()->teams->where('id', $teamId)->first();
if (is_null($team)) {
return response()->json(['message' => 'Team not found.'], 404);
}
return response()->json( return response()->json(
$this->removeSensitiveData($team), $this->removeSensitiveData($team),
@@ -263,7 +266,10 @@ class TeamController extends Controller
if (is_null($teamId)) { if (is_null($teamId)) {
return invalidTokenResponse(); return invalidTokenResponse();
} }
$team = auth()->user()->currentTeam(); $team = auth()->user()->teams->where('id', $teamId)->first();
if (is_null($team)) {
return response()->json(['message' => 'Team not found.'], 404);
}
$team->members->makeHidden([ $team->members->makeHidden([
'pivot', 'pivot',
'email_change_code', 'email_change_code',

3
app/Http/Middleware/DecideWhatToDoWithUser.php
View File

@@ -18,6 +18,9 @@ class DecideWhatToDoWithUser
} }
if (auth()?->user()?->currentTeam()) { if (auth()?->user()?->currentTeam()) {
refreshSession(auth()->user()->currentTeam()); refreshSession(auth()->user()->currentTeam());
} elseif (auth()?->user()?->teams?->count() > 0) {
// User's session team is invalid (e.g., removed from team), switch to first available team
refreshSession(auth()->user()->teams->first());
} }
if (! auth()->user() || ! isCloud()) { if (! auth()->user() || ! isCloud()) {
if (! isCloud() && showBoarding() && ! in_array($request->path(), allowedPathsForBoardingAccounts())) { if (! isCloud() && showBoarding() && ! in_array($request->path(), allowedPathsForBoardingAccounts())) {

6
app/Livewire/Team/Member.php
View File

@@ -71,11 +71,11 @@ class Member extends Component
|| Role::from($this->getMemberRole())->gt(auth()->user()->role())) { || Role::from($this->getMemberRole())->gt(auth()->user()->role())) {
throw new \Exception('You are not authorized to perform this action.'); throw new \Exception('You are not authorized to perform this action.');
} }
$teamId = currentTeam()->id;
$this->member->teams()->detach(currentTeam()); $this->member->teams()->detach(currentTeam());
// Clear cache for the removed user - both old and new key formats
Cache::forget("team:{$this->member->id}"); Cache::forget("team:{$this->member->id}");
Cache::remember('team:'.$this->member->id, 3600, function () { Cache::forget("user:{$this->member->id}:team:{$teamId}");
return $this->member->teams()->first();
});
$this->dispatch('reloadWindow'); $this->dispatch('reloadWindow');
} catch (\Exception $e) { } catch (\Exception $e) {
$this->dispatch('error', $e->getMessage()); $this->dispatch('error', $e->getMessage());

8
app/Models/User.php
View File

@@ -319,6 +319,14 @@ class User extends Authenticatable implements SendsEmail
return null; return null;
} }
// Check if user actually belongs to this team
if (! $this->teams->contains('id', $sessionTeamId)) {
session()->forget('currentTeam');
Cache::forget('user:'.$this->id.':team:'.$sessionTeamId);
return null;
}
return Cache::remember('user:'.$this->id.':team:'.$sessionTeamId, 3600, function () use ($sessionTeamId) { return Cache::remember('user:'.$this->id.':team:'.$sessionTeamId, 3600, function () use ($sessionTeamId) {
return Team::find($sessionTeamId); return Team::find($sessionTeamId);
}); });