handle team invitation for non registered user

src/App/Console/Commands/SetupDevEnvironment.php

@@ -1090,6 +1090,10 @@ class SetupDevEnvironment extends Command
                 'name'  => 'subscription_type',
                 'value' => 'fixed',
             ],
+            [
+                'name'  => 'allowed_recaptcha',
+                'value' => 0,
+            ],
         ])->each(function ($col) {
             Setting::updateOrCreate([
                 'name'  => $col['name'],

src/App/Console/Commands/SetupProdEnvironment.php

@@ -187,6 +187,10 @@ class SetupProdEnvironment extends Command
                 'name'  => 'billing_vat_number',
                 'value' => null,
             ],
+            [
+                'name'  => 'allowed_recaptcha',
+                'value' => 0,
+            ],
         ])->each(function ($col) {
             Setting::forceCreate([
                 'name'  => $col['name'],

src/App/Users/Actions/CreateNewUserAction.php

@@ -1,17 +1,19 @@
 <?php
+
 namespace App\Users\Actions;
 
 use App\Users\Models\User;
 use App\Users\DTO\CreateUserData;
 use App\Http\Controllers\Controller;
+use Domain\Teams\Models\TeamFolderInvitation;
+use Domain\Teams\Models\TeamFolderMember;
 use Illuminate\Auth\Events\Registered;
 
 class CreateNewUserAction extends Controller
 {
     public function __construct(
         protected AutoSubscribeForMeteredBillingAction $autoSubscribeForMeteredBilling,
-    ) {
-    }
+    ) {}
 
     /**
      * Validate and create a new user.
@@ -39,13 +41,27 @@ class CreateNewUserAction extends Controller
             'avatar'     => $data->avatar,
         ]);
 
+        // Join to previously accepted team folder invitations
+        TeamFolderInvitation::where('email', $user->email)
+            ->where('status', 'waiting-for-registration')
+            ->cursor()
+            ->each(function ($invitation) use ($user) {
+                TeamFolderMember::create([
+                    'user_id'    => $user->id,
+                    'parent_id'  => $invitation->parent_id,
+                    'permission' => $invitation->permission,
+                ]);
+
+                $invitation->accept();
+            });
+
         // Subscribe user for metered billing
         if ($settings['subscription_type'] === 'metered') {
             ($this->autoSubscribeForMeteredBilling)($user);
         }
 
         // Mark as verified if verification is disabled
-        if (! $data->password || ! intval($settings['user_verification'])) {
+        if (!$data->password || !intval($settings['user_verification'])) {
             $user->markEmailAsVerified();
         }
 

src/App/Users/Requests/RegisterUserRequest.php

@@ -32,7 +32,7 @@ class RegisterUserRequest extends FormRequest
             'email'     => ['required', 'string', 'email', 'max:255', 'unique:users,email', new EmailProvider],
             'name'      => 'required|string|max:255',
             'password'  => $this->passwordRules(),
-            'reCaptcha' => [new RequiredIf(get_settings('allowed_recaptcha') == 1), 'string', app(ReCaptchaRules::class)],
+            'reCaptcha' => [new RequiredIf(get_settings('allowed_recaptcha') == 1), 'string', 'nullable', app(ReCaptchaRules::class)],
         ];
     }
 }

src/Domain/SetupWizard/Controllers/StoreEnvironmentSettingsController.php

@@ -81,8 +81,9 @@ class StoreEnvironmentSettingsController extends Controller
                     'APP_DEBUG' => 'false',
                 ],
                 'local' => [
-                    'APP_ENV'   => 'local',
-                    'APP_DEBUG' => 'true',
+                    'APP_ENV'          => 'local',
+                    'APP_DEBUG'        => 'true',
+                    'QUEUE_CONNECTION' => 'sync',
                 ],
             ];
 

src/Domain/Teams/Controllers/InvitationsController.php

@@ -2,6 +2,7 @@
 namespace Domain\Teams\Controllers;
 
 use App\Users\Models\User;
+use Domain\Teams\Models\TeamFolderMember;
 use Illuminate\Http\Response;
 use Illuminate\Support\Facades\DB;
 use App\Http\Controllers\Controller;
@@ -13,7 +14,7 @@ class InvitationsController extends Controller
 {
     public function show(TeamFolderInvitation $invitation)
     {
-        if ($invitation->status === 'accepted') {
+        if ($invitation->status !== 'pending') {
             abort(410);
         }
 
@@ -23,19 +24,24 @@ class InvitationsController extends Controller
     public function update(
         TeamFolderInvitation $invitation
     ): ResponseFactory | Response {
-        $user = User::where('email', $invitation->email)
-            ->firstOrFail();
+        $user = User::where('email', $invitation->email);
 
-        $invitation->update([
-            'status' => 'accepted',
-        ]);
+        if ($user->exists()) {
+            $invitation->accept();
 
-        DB::table('team_folder_members')
-            ->insert([
+            // Store team member
+            TeamFolderMember::create([
+                'user_id'    => $user->first()->id,
                 'parent_id'  => $invitation->parent_id,
-                'user_id'    => $user->id,
-                'permission' => 'can-edit',
+                'permission' => $invitation->permission,
             ]);
+        }
+
+        if ($user->doesntExist()) {
+            $invitation->update([
+                'status' => 'waiting-for-registration',
+            ]);
+        }
 
         return response('Done', 204);
     }
@@ -43,9 +49,7 @@ class InvitationsController extends Controller
     public function destroy(
         TeamFolderInvitation $invitation
     ): ResponseFactory | Response {
-        $invitation->update([
-            'status' => 'rejected',
-        ]);
+        $invitation->reject();
 
         return response('Done', 204);
     }

src/Domain/Teams/Models/TeamFolderInvitation.php

@@ -31,6 +31,18 @@ class TeamFolderInvitation extends Model
 
     protected $keyType = 'string';
 
+    public function accept() {
+        $this->update([
+            'status' => 'accepted',
+        ]);
+    }
+
+    public function reject() {
+        $this->update([
+            'status' => 'rejected',
+        ]);
+    }
+
     protected static function newFactory(): TeamFolderInvitationFactory
     {
         return TeamFolderInvitationFactory::new();

src/Domain/Teams/Resources/TeamInvitationResource.php

@@ -1,6 +1,7 @@
 <?php
 namespace Domain\Teams\Resources;
 
+use App\Users\Models\User;
 use Illuminate\Http\Resources\Json\JsonResource;
 
 class TeamInvitationResource extends JsonResource
@@ -17,6 +18,7 @@ class TeamInvitationResource extends JsonResource
                     'color'      => $this->color,
                     'status'     => $this->status,
                     'permission' => $this->permission,
+                    'isExistedUser' => User::where('email', $this->email)->exists(),
                 ],
                 'relationships' => [
                     $this->mergeWhen($this->inviter, fn () => [