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

Change email handling and logout function

Browse source
This commit is contained in:
Dane Everitt 2018-06-16 14:30:20 -07:00
parent ca0c35bf82
commit fce394f6bd
No known key found for this signature in database
GPG key ID: EEA66103B3D71F53
6 changed files with 18 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

6
app/Http/Controllers/Api/Client/AccountController.php
View file

@ -40,7 +40,7 @@ class AccountController extends ClientApiController
/**
* Update the authenticated user's email address if their password matches.
*
* @param UpdateEmailRequest $request
* @param \Pterodactyl\Http\Requests\Api\Client\Account\UpdateEmailRequest $request
* @return array
*
* @throws \Pterodactyl\Exceptions\Model\DataValidationException
@ -48,9 +48,7 @@ class AccountController extends ClientApiController
*/
public function updateEmail(UpdateEmailRequest $request): array
{
$updated = $this->updateService->handle($request->user(), [
'email' => $request->input('email'),
]);
$updated = $this->updateService->handle($request->user(), $request->validated());
return $this->fractal->item($updated->get('model'))
->transformWith($this->getTransformer(AccountTransformer::class))

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

@ -34,9 +34,6 @@ class UpdateEmailRequest extends ClientApiRequest
{
$rules = User::getUpdateRulesForId($this->user()->id);
return [
'email' => $rules['email'],
'password' => array_merge($rules['password'], ['confirmed']),
];
return ['email' => $rules['email']];
}
}