fix: invitation

app/Http/Livewire/Project/Shared/EnvironmentVariable/All.php

@@ -5,7 +5,7 @@ namespace App\Http\Livewire\Project\Shared\EnvironmentVariable;
 use App\Models\EnvironmentVariable;
 use Livewire\Component;
 use Visus\Cuid2\Cuid2;
-use Str;
+use Illuminate\Support\Str;
 
 class All extends Component
 {

app/Http/Livewire/Team/InviteLink.php

@@ -4,9 +4,13 @@ namespace App\Http\Livewire\Team;
 
 use App\Models\TeamInvitation;
 use App\Models\User;
-use App\Notifications\TransactionalEmails\InvitationLink;
+use Illuminate\Notifications\Messages\MailMessage;
+use Illuminate\Support\Facades\Artisan;
 use Livewire\Component;
 use Visus\Cuid2\Cuid2;
+use Illuminate\Support\Facades\Crypt;
+use Illuminate\Support\Facades\Hash;
+use Illuminate\Support\Str;
 
 class InviteLink extends Component
 {
@@ -20,53 +24,68 @@ class InviteLink extends Component
 
     public function viaEmail()
     {
-        $this->generate_invite_link(isEmail: true);
+        $this->generate_invite_link(sendEmail: true);
     }
 
-    private function generate_invite_link(bool $isEmail = false)
+    public function viaLink()
+    {
+        $this->generate_invite_link(sendEmail: false);
+    }
+    private function generate_invite_link(bool $sendEmail = false)
     {
         try {
-            $uuid = new Cuid2(32);
-            $link = url('/') . config('constants.invitation.link.base_url') . $uuid;
-
-            $user = User::whereEmail($this->email);
-
-            if (!$user->exists()) {
-                return general_error_handler(that: $this, customErrorMessage: "$this->email must be registered first (or activate transactional emails to invite via email).");
-            }
-
             $member_emails = currentTeam()->members()->get()->pluck('email');
             if ($member_emails->contains($this->email)) {
                 return general_error_handler(that: $this, customErrorMessage: "$this->email is already a member of " . currentTeam()->name . ".");
             }
+            $uuid = new Cuid2(32);
+            $link = url('/') . config('constants.invitation.link.base_url') . $uuid;
+            $user = User::whereEmail($this->email)->first();
 
-            $invitation = TeamInvitation::whereEmail($this->email);
-
-            if ($invitation->exists()) {
-                $created_at = $invitation->first()->created_at;
-                $diff = $created_at->diffInMinutes(now());
-                if ($diff <= config('constants.invitation.link.expiration')) {
-                    return general_error_handler(that: $this, customErrorMessage: "Invitation already sent to $this->email and waiting for action.");
+            if (is_null($user)) {
+                $password = Str::password();
+                $user = User::create([
+                    'name' => Str::of($this->email)->before('@'),
+                    'email' => $this->email,
+                    'password' => Hash::make($password),
+                    'force_password_reset' => true,
+                ]);
+                $token = Crypt::encryptString("{$user->email}@@@$password");
+                $link = route('auth.link', ['token' => $token]);
+            }
+            $invitation = TeamInvitation::whereEmail($this->email)->first();
+            if (!is_null($invitation)) {
+                $invitationValid = $invitation->isValid();
+                if ($invitationValid) {
+                    return general_error_handler(that: $this, customErrorMessage: "Pending invitation already exists for $this->email.");
                 } else {
                     $invitation->delete();
                 }
             }
 
-            TeamInvitation::firstOrCreate([
+            $invitation = TeamInvitation::firstOrCreate([
                 'team_id' => currentTeam()->id,
                 'uuid' => $uuid,
                 'email' => $this->email,
                 'role' => $this->role,
                 'link' => $link,
-                'via' => $isEmail ? 'email' : 'link',
+                'via' => $sendEmail ? 'email' : 'link',
             ]);
-            if ($isEmail) {
-                $user->first()->notify(new InvitationLink);
+            if ($sendEmail) {
+                $mail = new MailMessage();
+                $mail->view('emails.invitation-link', [
+                    'team' => currentTeam()->name,
+                    'invitation_link' => $link,
+                ]);
+                $mail->subject('You have been invited to ' . currentTeam()->name . ' on ' . config('app.name') . '.');
+                send_user_an_email($mail, $this->email);
                 $this->emit('success', 'Invitation sent via email successfully.');
+                $this->emit('refreshInvitations');
+                return;
             } else {
                 $this->emit('success', 'Invitation link generated.');
+                $this->emit('refreshInvitations');
             }
-            $this->emit('refreshInvitations');
         } catch (\Throwable $e) {
             $error_message = $e->getMessage();
             if ($e->getCode() === '23505') {
@@ -75,9 +94,4 @@ class InviteLink extends Component
             return general_error_handler(err: $e, that: $this, customErrorMessage: $error_message);
         }
     }
-
-    public function viaLink()
-    {
-        $this->generate_invite_link();
-    }
 }

app/Http/Livewire/Team/Member.php

@@ -3,6 +3,7 @@
 namespace App\Http\Livewire\Team;
 
 use App\Models\User;
+use Illuminate\Support\Facades\Cache;
 use Livewire\Component;
 
 class Member extends Component
@@ -24,6 +25,10 @@ class Member extends Component
     public function remove()
     {
         $this->member->teams()->detach(currentTeam());
+        Cache::forget("team:{$this->member->id}");
+        Cache::remember('team:' . $this->member->id, 3600, function() {
+            return $this->member->teams()->first();
+        });
         $this->emit('reloadWindow');
     }
 }

app/Http/Livewire/Waitlist/Index.php

@@ -6,7 +6,7 @@ use App\Jobs\SendConfirmationForWaitlistJob;
 use App\Models\User;
 use App\Models\Waitlist;
 use Livewire\Component;
-use Str;
+use Illuminate\Support\Str;
 
 class Index extends Component
 {