tyler.durden/icingaweb2-module-director
1
0
Fork 0
mirror of https://github.com/Icinga/icingaweb2-module-director.git synced 2025-07-31 01:34:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

ObjectController: beautify REST API response codes

Browse Source 
It doesn't hurt when the code matches the documentation ;)
This commit is contained in:
Thomas Gelf 2016-03-01 11:24:24 +01:00
parent 4ec9b324eb
commit c6196ff450
1 changed files with 21 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
library/Director/Web/Controller/ObjectController.php
View File

@ -3,9 +3,10 @@
namespace Icinga\Module\Director\Web\Controller;
use Exception;
use Icinga\Exception\IcingaException;
use Icinga\Exception\NotFoundError;
use Icinga\Web\Url;
use Icinga\Module\Director\Objects\IcingaObject;
use Icinga\Web\Url;
abstract class ObjectController extends ActionController
{
@ -64,6 +65,11 @@ abstract class ObjectController extends ActionController
try {
return $this->handleApiRequest();
} catch (Exception $e) {
$response = $this->getResponse();
if ($response->getHttpResponseCode() === 200) {
$response->setHttpResponseCode(500);
}
return $this->sendJson((object) array('error' => $e->getMessage()));
}
}
@ -283,7 +289,17 @@ abstract class ObjectController extends ActionController
case 'POST':
case 'PUT':
$type = $this->getType();
$data = (array) json_decode($request->getRawBody());
$data = json_decode($request->getRawBody());
if ($data === null) {
$this->getResponse()->setHttpResponseCode(400);
throw new IcingaException(
'Invalid JSON: %s' . $request->getRawBody(),
$this->getLastJsonError()
);
} else {
$data = (array) $data;
}
if ($object = $this->object) {
if ($request->getMethod() === 'POST') {
$object->setProperties($data);
@ -305,12 +321,9 @@ abstract class ObjectController extends ActionController
$response = $this->getResponse();
if ($object->hasBeenModified()) {
$status = $object->hasBeenLoadedFromDb() ? 200 : 201;
$object->store();
if ($object->hasBeenLoadedFromDb()) {
$response->setHttpResponseCode(200);
} else {
$response->setHttpResponseCode(201);
}
$response->setHttpResponseCode($status);
} else {
$response->setHttpResponseCode(304);
}
@ -328,6 +341,7 @@ abstract class ObjectController extends ActionController
);
default:
$request->getResponse()->setHttpResponseCode(400);
throw new Exception('Unsupported method ' . $request->getMethod());
}
}