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

Fix some missing exceptions and validation handling for users

Browse source
This commit is contained in:
Dane Everitt 2016-01-15 00:08:50 -05:00
parent e2d5145e3d
commit 69c2e89fe0
2 changed files with 21 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

15
app/Http/Controllers/API/UserController.php
View file

@ -9,8 +9,11 @@ use Dingo\Api\Exception\StoreResourceFailedException;
use Pterodactyl\Models;
use Pterodactyl\Transformers\UserTransformer;
use Pterodactyl\Repositories\UserRepository;
use Pterodactyl\Exceptions\DisplayValidationException;
use Pterodactyl\Exceptions\DisplayException;
use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;
/**
* @Resource("Users")
@ -61,7 +64,17 @@ class UserController extends BaseController
}
}
return $query->first();
try {
if (!$query->first()) {
throw new NotFoundHttpException('No user by that ID was found.');
}
return $query->first();
} catch (NotFoundHttpException $ex) {
throw $ex;
} catch (\Exception $ex) {
throw new BadRequestHttpException('There was an issue with the fields passed in the request.');
}
}
/**