dave/coolify
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

feat(auth): enhance user login flow to handle team invitations, attaching users to invited teams upon first login and maintaining personal team logic for regular logins

Browse Source
This commit is contained in:
Andras Bacsai
2025-09-15 12:12:14 +02:00
parent 5e3d65d2e8
commit a1eaa046c9
1 changed files with 17 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
app/Providers/FortifyServiceProvider.php
View File

@@ -80,9 +80,23 @@ class FortifyServiceProvider extends ServiceProvider
) { ) {
$user->updated_at = now(); $user->updated_at = now();
$user->save(); $user->save();
$user->currentTeam = $user->teams->firstWhere('personal_team', true);
if (! $user->currentTeam) { // Check if user has a pending invitation they haven't accepted yet
$user->currentTeam = $user->recreate_personal_team(); $invitation = \App\Models\TeamInvitation::whereEmail($email)->first();
if ($invitation && $invitation->isValid()) {
// User is logging in for the first time after being invited
// Attach them to the invited team if not already attached
if (! $user->teams()->where('team_id', $invitation->team->id)->exists()) {
$user->teams()->attach($invitation->team->id, ['role' => $invitation->role]);
}
$user->currentTeam = $invitation->team;
$invitation->delete();
} else {
// Normal login - use personal team
$user->currentTeam = $user->teams->firstWhere('personal_team', true);
if (! $user->currentTeam) {
$user->currentTeam = $user->recreate_personal_team();
}
} }
session(['currentTeam' => $user->currentTeam]); session(['currentTeam' => $user->currentTeam]);