banquise/pelican-panel-mirror
3
0
Fork 1
mirror of https://github.com/pelican-dev/panel.git synced 2025-05-29 15:34:44 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix subuser creation

Browse Source
This commit is contained in:
Boy132 2025-05-15 14:41:49 +02:00
parent 67ecdd9fb1
commit 4a550c291b
2 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Filament/Server/Resources/UserResource/Pages/ListUsers.php
View File

@ -383,6 +383,8 @@ class ListUsers extends ListRecords
]) ])
->modalHeading('Invite User') ->modalHeading('Invite User')
->modalSubmitActionLabel('Invite') ->modalSubmitActionLabel('Invite')
->successNotificationTitle(null)
->failureNotificationTitle(null)
->action(function (Action $action, array $data, SubuserCreationService $service) use ($server) { ->action(function (Action $action, array $data, SubuserCreationService $service) use ($server) {
$email = strtolower($data['email']); $email = strtolower($data['email']);

22
app/Services/Subusers/SubuserCreationService.php
View File

@ -38,7 +38,7 @@ class SubuserCreationService
public function handle(Server $server, string $email, array $permissions): Subuser public function handle(Server $server, string $email, array $permissions): Subuser
{ {
return $this->connection->transaction(function () use ($server, $email, $permissions) { 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) { if (!$user) {
// Just cap the username generated at 64 characters at most and then append a random string // Just cap the username generated at 64 characters at most and then append a random string
// to the end to make it "unique"... // to the end to make it "unique"...
@ -50,15 +50,15 @@ class SubuserCreationService
'username' => $username, 'username' => $username,
'root_admin' => false, '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) { $subuserCount = $server->subusers()->where('user_id', $user->id)->count();
throw new UserIsServerOwnerException(trans('exceptions.subusers.user_is_owner')); 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) $cleanedPermissions = collect($permissions)
@ -68,9 +68,11 @@ class SubuserCreationService
->values() ->values()
->all(); ->all();
$subuser = Subuser::query()->create([ $subuser = Subuser::withoutGlobalScopes()->updateOrCreate([
'user_id' => $user->id, 'user_id' => $user->id,
'server_id' => $server->id, 'server_id' => $server->id,
], [
'permissions' => $cleanedPermissions, 'permissions' => $cleanedPermissions,
]); ]);