Skynet/misc_pterodactyl-panel
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update the client API to be consistent with how validation is handled

Browse source
This commit is contained in:
Dane Everitt 2021-08-04 20:55:15 -07:00
parent b47d262ee0
commit 622d292f39
No known key found for this signature in database
GPG key ID: EEA66103B3D71F53
33 changed files with 59 additions and 172 deletions
Download patch file Download diff file Expand all files Collapse all files

24
app/Http/Requests/Api/Client/ClientApiRequest.php
View file

@ -6,28 +6,22 @@ use Pterodactyl\Models\Server;
use Pterodactyl\Contracts\Http\ClientPermissionsRequest;
use Pterodactyl\Http\Requests\Api\Application\ApplicationApiRequest;
/**
* @method \Pterodactyl\Models\User user($guard = null)
*/
class ClientApiRequest extends ApplicationApiRequest
abstract class ClientApiRequest extends ApplicationApiRequest implements ClientPermissionsRequest
{
/**
* Determine if the current user is authorized to perform the requested action against the API.
* Determine if the current user is authorized to perform the requested action
* against the API.
*/
public function authorize(): bool
{
if ($this instanceof ClientPermissionsRequest || method_exists($this, 'permission')) {
$server = $this->route()->parameter('server');
$server = $this->route()->parameter('server');
if ($server instanceof Server) {
return $this->user()->can($this->permission(), $server);
}
// If there is no server available on the reqest, trigger a failure since
// we expect there to be one at this point.
return false;
if ($server instanceof Server) {
return $this->user()->can($this->permission(), $server);
}
return true;
// If there is no server available on the reqest, trigger a failure since
// we expect there to be one at this point.
return false;
}
}