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

fix bad merge

Browse source
This commit is contained in:
Matthew Penner 2021-08-21 12:56:56 -06:00
parent b26556e201
commit 14eb482791
No known key found for this signature in database
GPG key ID: 5396CC4C3C1C9704
3 changed files with 5 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/Http/Requests/Api/Client/Account/UpdateEmailRequest.php
View file

@ -5,20 +5,16 @@ namespace Pterodactyl\Http\Requests\Api\Client\Account;
use Pterodactyl\Models\User; use Pterodactyl\Models\User;
use Illuminate\Container\Container; use Illuminate\Container\Container;
use Illuminate\Contracts\Hashing\Hasher; use Illuminate\Contracts\Hashing\Hasher;
use Pterodactyl\Http\Requests\Api\Client\ClientApiRequest; use Pterodactyl\Http\Requests\Api\Client\AccountApiRequest;
use Pterodactyl\Exceptions\Http\Base\InvalidPasswordProvidedException; use Pterodactyl\Exceptions\Http\Base\InvalidPasswordProvidedException;
class UpdateEmailRequest extends ClientApiRequest class UpdateEmailRequest extends AccountApiRequest
{ {
/** /**
* @throws \Pterodactyl\Exceptions\Http\Base\InvalidPasswordProvidedException * @throws \Pterodactyl\Exceptions\Http\Base\InvalidPasswordProvidedException
*/ */
public function authorize(): bool public function authorize(): bool
{ {
if (!parent::authorize()) {
return false;
}
$hasher = Container::getInstance()->make(Hasher::class); $hasher = Container::getInstance()->make(Hasher::class);
// Verify password matches when changing password or email. // Verify password matches when changing password or email.

8
app/Http/Requests/Api/Client/Account/UpdatePasswordRequest.php
View file

@ -4,20 +4,16 @@ namespace Pterodactyl\Http\Requests\Api\Client\Account;
use Illuminate\Container\Container; use Illuminate\Container\Container;
use Illuminate\Contracts\Hashing\Hasher; use Illuminate\Contracts\Hashing\Hasher;
use Pterodactyl\Http\Requests\Api\Client\ClientApiRequest; use Pterodactyl\Http\Requests\Api\Client\AccountApiRequest;
use Pterodactyl\Exceptions\Http\Base\InvalidPasswordProvidedException; use Pterodactyl\Exceptions\Http\Base\InvalidPasswordProvidedException;
class UpdatePasswordRequest extends ClientApiRequest class UpdatePasswordRequest extends AccountApiRequest
{ {
/** /**
* @throws \Pterodactyl\Exceptions\Http\Base\InvalidPasswordProvidedException * @throws \Pterodactyl\Exceptions\Http\Base\InvalidPasswordProvidedException
*/ */
public function authorize(): bool public function authorize(): bool
{ {
if (!parent::authorize()) {
return false;
}
$hasher = Container::getInstance()->make(Hasher::class); $hasher = Container::getInstance()->make(Hasher::class);
// Verify password matches when changing password or email. // Verify password matches when changing password or email.

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

@ -9,7 +9,7 @@ abstract class ClientApiRequest extends ApiRequest
{ {
/** /**
* Returns the permissions string indicating which permission should be used to * Returns the permissions string indicating which permission should be used to
* validate that the authenticated user has permission to perform this action aganist * validate that the authenticated user has permission to perform this action against
* the given resource (server). * the given resource (server).
*/ */
abstract public function permission(): string; abstract public function permission(): string;