From df4543a079e787ebc2a04b691b3935fa1cade408 Mon Sep 17 00:00:00 2001 From: danielkurek <58344902+danielkurek@users.noreply.github.com> Date: Mon, 15 Sep 2025 20:13:00 +0200 Subject: [PATCH] Fix server owner permissions (#1703) --- app/Services/Servers/GetUserPermissionsService.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/Services/Servers/GetUserPermissionsService.php b/app/Services/Servers/GetUserPermissionsService.php index 5c4ecabbd..30d1d4eac 100644 --- a/app/Services/Servers/GetUserPermissionsService.php +++ b/app/Services/Servers/GetUserPermissionsService.php @@ -17,6 +17,10 @@ class GetUserPermissionsService */ public function handle(Server $server, User $user): array { + if ($user->id === $server->owner_id) { + return ['*']; + } + if ($user->isAdmin() && ($user->can('view', $server) || $user->can('update', $server))) { $permissions = $user->can('update', $server) ? ['*'] : ['websocket.connect', 'backup.read']; @@ -27,10 +31,6 @@ class GetUserPermissionsService return $permissions; } - if ($user->id === $server->owner_id) { - return ['*']; - } - /** @var Subuser|null $subuserPermissions */ $subuserPermissions = $server->subusers()->where('user_id', $user->id)->first();