Fix invitation flow

Author: roncodes

src/Http/Controllers/Internal/v1/UserController.php

@@ -383,19 +383,21 @@ public function inviteUser(InviteUserRequest $request)
             $user->assignSingleRole($request->input('user.role_uuid'));
         }
 
-        $invitation = Invite::create([
-            'company_uuid'    => $company->uuid,
-            'created_by_uuid' => session('user'),
-            'subject_uuid'    => $company->uuid,
-            'subject_type'    => Utils::getMutationType($company),
-            'protocol'        => 'email',
-            'recipients'      => [$user->email],
-            'reason'          => 'join_company',
-            'meta'            => array_filter(['role_uuid' => $request->input('user.role_uuid') ?? $request->input('user.role')]),
-            'expires_at'      => now()->addHours(48),
-        ]);
+        if (!Invite::isAlreadySentToJoinCompany($user, $company)) {
+            $invitation = Invite::create([
+                'company_uuid'    => $company->uuid,
+                'created_by_uuid' => session('user'),
+                'subject_uuid'    => $company->uuid,
+                'subject_type'    => Utils::getMutationType($company),
+                'protocol'        => 'email',
+                'recipients'      => [$user->email],
+                'reason'          => 'join_company',
+                'meta'            => array_filter(['role_uuid' => $request->input('user.role_uuid') ?? $request->input('user.role')]),
+                'expires_at'      => now()->addHours(48),
+            ]);
 
-        $user->notify(new UserInvited($invitation));
+            $user->notify(new UserInvited($invitation));
+        }
 
         return response()->json(['user' => new $this->resource($user)]);
     }

src/Models/User.php

@@ -1149,6 +1149,7 @@ public function sendInviteFromCompany(?Company $company = null): bool
             'protocol'        => 'email',
             'recipients'      => [$this->email],
             'reason'          => 'join_company',
+            'expires_at'      => now()->addHours(48),
         ]);
 
         // notify user