Mirrors/sysPass
2
0
Fork 0
mirror of https://github.com/nuxsmin/sysPass.git synced 2026-03-03 07:04:07 +01:00
Code Issues Packages Projects Releases Wiki Activity

* [FIX] Wrong behavior when searching for items through the API. Thanks to @GGOUSSEAUD for the feedback and testing. Related #1000

Browse Source 
* [MOD] Improved API help. Related #1004
* [MOD] Code refactoring
This commit is contained in:
nuxsmin
2018-08-09 13:43:02 +02:00
parent 617c3b5e84
commit e28ec274e0
16 changed files with 621 additions and 183 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
app/modules/api/Controllers/ControllerBase.php
View File

@@ -26,6 +26,7 @@ namespace SP\Modules\Api\Controllers;
use DI\Container;
use Klein\Klein;
use Psr\Container\ContainerInterface;
use SP\Core\Context\StatelessContext;
use SP\Core\Events\EventDispatcher;
use SP\Core\Exceptions\SPException;
@@ -42,7 +43,7 @@ abstract class ControllerBase
{
const SEARCH_COUNT_ITEMS = 25;
/**
* @var Container
* @var ContainerInterface
*/
protected $dic;
/**
@@ -120,7 +121,7 @@ abstract class ControllerBase
/**
* @param int $actionId
*
* @throws \Exception
* @throws SPException
* @throws \SP\Services\ServiceException
*/
final protected function setupApi($actionId)
@@ -136,8 +137,6 @@ abstract class ControllerBase
* {"jsonrpc": "2.0", "result": 19, "id": 3}
*
* @param \SP\Services\Api\ApiResponse $apiResponse
*
* @return string La cadena en formato JSON
*/
final protected function returnResponse(ApiResponse $apiResponse)
{
@@ -149,24 +148,22 @@ abstract class ControllerBase
$this->router->response()->headers()->set('Content-type', 'application/json; charset=utf-8');
$this->router->response()->send(true);
exit(JsonRpcResponse::getResponse($apiResponse, $this->apiService->getRequestId()));
echo JsonRpcResponse::getResponse($apiResponse, $this->apiService->getRequestId());
} catch (SPException $e) {
processException($e);
exit(JsonRpcResponse::getResponseException($e, $this->apiService->getRequestId()));
echo JsonRpcResponse::getResponseException($e, $this->apiService->getRequestId());
}
}
/**
* @param \Exception $e
*
* @return string
*/
final protected function returnResponseException(\Exception $e)
{
$this->router->response()->headers()->set('Content-type', 'application/json; charset=utf-8');
$this->router->response()->send(true);
exit(JsonRpcResponse::getResponseException($e, $this->apiService->getRequestId()));
echo JsonRpcResponse::getResponseException($e, $this->apiService->getRequestId());
}
}