From 4a550c291b26df9c975a4ec9808bac3f6f86003f Mon Sep 17 00:00:00 2001
From: Boy132 <mail@boy132.de>
Date: Thu, 15 May 2025 14:41:49 +0200
Subject: [PATCH] fix subuser creation

---
 .../UserResource/Pages/ListUsers.php          |  2 ++
 .../Subusers/SubuserCreationService.php       | 22 ++++++++++---------
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/app/Filament/Server/Resources/UserResource/Pages/ListUsers.php b/app/Filament/Server/Resources/UserResource/Pages/ListUsers.php
index 333964ba5..d752a1623 100644
--- a/app/Filament/Server/Resources/UserResource/Pages/ListUsers.php
+++ b/app/Filament/Server/Resources/UserResource/Pages/ListUsers.php
@@ -383,6 +383,8 @@ class ListUsers extends ListRecords
                 ])
                 ->modalHeading('Invite User')
                 ->modalSubmitActionLabel('Invite')
+                ->successNotificationTitle(null)
+                ->failureNotificationTitle(null)
                 ->action(function (Action $action, array $data, SubuserCreationService $service) use ($server) {
                     $email = strtolower($data['email']);
 
diff --git a/app/Services/Subusers/SubuserCreationService.php b/app/Services/Subusers/SubuserCreationService.php
index 4fe6e5093..b57e383d3 100644
--- a/app/Services/Subusers/SubuserCreationService.php
+++ b/app/Services/Subusers/SubuserCreationService.php
@@ -38,7 +38,7 @@ class SubuserCreationService
     public function handle(Server $server, string $email, array $permissions): Subuser
     {
         return $this->connection->transaction(function () use ($server, $email, $permissions) {
-            $user = User::query()->where('email', $email)->first();
+            $user = User::withoutGlobalScopes()->where('email', $email)->first();
             if (!$user) {
                 // Just cap the username generated at 64 characters at most and then append a random string
                 // to the end to make it "unique"...
@@ -50,15 +50,15 @@ class SubuserCreationService
                     'username' => $username,
                     'root_admin' => false,
                 ]);
-            }
+            } else {
+                if ($server->owner_id === $user->id) {
+                    throw new UserIsServerOwnerException(trans('exceptions.subusers.user_is_owner'));
+                }
 
-            if ($server->owner_id === $user->id) {
-                throw new UserIsServerOwnerException(trans('exceptions.subusers.user_is_owner'));
-            }
-
-            $subuserCount = $server->subusers()->where('user_id', $user->id)->count();
-            if ($subuserCount !== 0) {
-                throw new ServerSubuserExistsException(trans('exceptions.subusers.subuser_exists'));
+                $subuserCount = $server->subusers()->where('user_id', $user->id)->count();
+                if ($subuserCount !== 0) {
+                    throw new ServerSubuserExistsException(trans('exceptions.subusers.subuser_exists'));
+                }
             }
 
             $cleanedPermissions = collect($permissions)
@@ -68,9 +68,11 @@ class SubuserCreationService
                 ->values()
                 ->all();
 
-            $subuser = Subuser::query()->create([
+            $subuser = Subuser::withoutGlobalScopes()->updateOrCreate([
                 'user_id' => $user->id,
                 'server_id' => $server->id,
+            ], [
+
                 'permissions' => $cleanedPermissions,
             ]);