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

Fix exceptions thrown to mimic proper HTTP status codes

Browse source
This commit is contained in:
Dane Everitt 2016-01-15 00:20:58 -05:00
parent 69c2e89fe0
commit 0ccaa16ea4
1 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -4,7 +4,7 @@ namespace Pterodactyl\Http\Controllers\API;
use Illuminate\Http\Request; use Illuminate\Http\Request;
use Dingo\Api\Exception\StoreResourceFailedException; use Dingo\Api\Exception\ResourceException;
use Pterodactyl\Models; use Pterodactyl\Models;
use Pterodactyl\Transformers\UserTransformer; use Pterodactyl\Transformers\UserTransformer;
@ -14,6 +14,7 @@ use Pterodactyl\Exceptions\DisplayValidationException;
use Pterodactyl\Exceptions\DisplayException; use Pterodactyl\Exceptions\DisplayException;
use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
use Symfony\Component\HttpKernel\Exception\BadRequestHttpException; use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;
use Symfony\Component\HttpKernel\Exception\ServiceUnavailableHttpException;
/** /**
* @Resource("Users") * @Resource("Users")
@ -109,11 +110,11 @@ class UserController extends BaseController
'id' => $create 'id' => $create
])); ]));
} catch (DisplayValidationException $ex) { } catch (DisplayValidationException $ex) {
throw new StoreResourceFailedException('A validation error occured.', json_decode($ex->getMessage(), true)); throw new ResourceException('A validation error occured.', json_decode($ex->getMessage(), true));
} catch (DisplayException $ex) { } catch (DisplayException $ex) {
throw new StoreResourceFailedException($ex->getMessage()); throw new ResourceException($ex->getMessage());
} catch (\Exception $ex) { } catch (\Exception $ex) {
throw new StoreResourceFailedException('Unable to create a user on the system due to an error.'); throw new ServiceUnavailableHttpException('Unable to create a user on the system due to an error.');
} }
} }
@ -142,11 +143,11 @@ class UserController extends BaseController
$user->update($id, $request->all()); $user->update($id, $request->all());
return Models\User::findOrFail($id); return Models\User::findOrFail($id);
} catch (DisplayValidationException $ex) { } catch (DisplayValidationException $ex) {
throw new StoreResourceFailedException('A validation error occured.', json_decode($ex->getMessage(), true)); throw new ResourceException('A validation error occured.', json_decode($ex->getMessage(), true));
} catch (DisplayException $ex) { } catch (DisplayException $ex) {
throw new StoreResourceFailedException($ex->getMessage()); throw new ResourceException($ex->getMessage());
} catch (\Exception $ex) { } catch (\Exception $ex) {
throw new StoreResourceFailedException('Unable to create a user on the system due to an error.'); throw new ServiceUnavailableHttpException('Unable to update a user on the system due to an error.');
} }
} }
@ -171,9 +172,9 @@ class UserController extends BaseController
$user->delete($id); $user->delete($id);
return $this->response->noContent(); return $this->response->noContent();
} catch (DisplayException $ex) { } catch (DisplayException $ex) {
throw new StoreResourceFailedException($ex->getMessage()); throw new ResourceException($ex->getMessage());
} catch (\Exception $ex) { } catch (\Exception $ex) {
throw new StoreResourceFailedException('Unable to delete this user due to an error.'); throw new ServiceUnavailableHttpException('Unable to delete this user due to an error.');
} }
} }