StarMC/Astral-nook
StarMC/Astral-nook
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Add support for deleting a subuser from a server

Browse source
This commit is contained in:
Dane Everitt 2020-03-27 15:32:33 -07:00
parent a6f46d36ba
commit 1270e51248
No known key found for this signature in database
GPG key ID: EEA66103B3D71F53
11 changed files with 158 additions and 107 deletions
Download patch file Download diff file Expand all files Collapse all files

8
app/Http/Controllers/Api/Client/Servers/SubuserController.php
View file

@ -83,12 +83,13 @@ class SubuserController extends ClientApiController
* Update a given subuser in the system for the server.
*
* @param \Pterodactyl\Http\Requests\Api\Client\Servers\Subusers\UpdateSubuserRequest $request
*
* @param \Pterodactyl\Models\Server $server
* @return array
*
* @throws \Pterodactyl\Exceptions\Model\DataValidationException
* @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
*/
public function update(UpdateSubuserRequest $request)
public function update(UpdateSubuserRequest $request, Server $server): array
{
$subuser = $request->subuser();
$this->repository->update($subuser->id, [
@ -104,9 +105,10 @@ class SubuserController extends ClientApiController
* Removes a subusers from a server's assignment.
*
* @param \Pterodactyl\Http\Requests\Api\Client\Servers\Subusers\DeleteSubuserRequest $request
* @param \Pterodactyl\Models\Server $server
* @return \Illuminate\Http\JsonResponse
*/
public function delete(DeleteSubuserRequest $request)
public function delete(DeleteSubuserRequest $request, Server $server)
{
$this->repository->delete($request->subuser()->id);

2
app/Http/Requests/Api/Client/Servers/Subusers/AbstractSubuserRequest.php
View file

@ -57,7 +57,7 @@ abstract class AbstractSubuserRequest extends ClientApiRequest
}
return $this->model ?: $this->model = $repository->getUserForServer(
$this->route()->parameter('subuser'), $this->route()->parameter('server')->id
$parameters['server']->id, $parameters['subuser']
);
}
}