require 2fa if enabled

app/Actions/Fortify/CreateNewUser.php

@@ -17,7 +17,7 @@ class CreateNewUser implements CreatesNewUsers
     use PasswordValidationRules, ProfileValidationRules;
 
     public function __construct(
-        private AcceptTeamInvite $acceptTeamInvite,
+        private readonly AcceptTeamInvite $acceptTeamInvite,
     ) {}
 
     /**
@@ -59,8 +59,7 @@ class CreateNewUser implements CreatesNewUsers
             ]);
 
             if ($invite !== null) {
-                $invite->team->members()->attach($user);
-                $invite->delete();
+                ($this->acceptTeamInvite)($invite, $user);
             }
 
             return $user;

app/Actions/Teams/AcceptTeamInvite.php

@@ -5,15 +5,21 @@ namespace App\Actions\Teams;
 use App\Models\TeamInvite;
 use App\Models\User;
 use Illuminate\Support\Facades\DB;
+use Illuminate\Validation\ValidationException;
 
 readonly class AcceptTeamInvite
 {
-    public function __invoke(TeamInvite $invite): void
+    public function __invoke(TeamInvite $invite, User $newUser): void
     {
-        abort_unless(auth()->user()->email === $invite->invited_email, 403);
+        abort_unless($newUser->email === $invite->invited_email, 403);
 
         $team = $invite->team;
-        $newUser = User::whereEmail($invite->invited_email)->firstOrFail();
+
+        if ($invite->team->require_2fa && ! $newUser->hasEnabledTwoFactorAuthentication()) {
+            throw ValidationException::withMessages([
+                'require_2fa' => 'Du musst 2FA einrichten, damit du dem Team beitreten kannst',
+            ]);
+        }
 
         try {
             DB::transaction(function () use ($team, $newUser, $invite) {