diff --git a/inc/SP/Api/ApiRequest.class.php b/inc/SP/Api/ApiRequest.class.php index 97b503a1..f72285f0 100644 --- a/inc/SP/Api/ApiRequest.class.php +++ b/inc/SP/Api/ApiRequest.class.php @@ -72,7 +72,20 @@ class ApiRequest */ public function formatJsonError($e) { - $class = get_class($e); + $data = function () use ($e) { + $class = get_class($e); + + if ($class === SPException::class + || $class === InvalidArgumentException::class + ) { + $hint = $e->getHint(); + + return is_array($hint) ? $hint : __($hint); + } + + return ''; + }; + $code = $e->getCode(); $error = [ @@ -80,7 +93,7 @@ class ApiRequest 'error' => [ 'code' => $code, 'message' => __($e->getMessage()), - 'data' => $class === SPException::class || $class === InvalidArgumentException::class ? __($e->getHint()) : '' + 'data' => $data() ], 'id' => ($code === -32700 || $code === -32600) ? null : $this->getId() ]; @@ -192,7 +205,9 @@ class ApiRequest if (!is_object($data) || json_last_error() !== JSON_ERROR_NONE) { throw new SPException(SPException::SP_WARNING, __('Datos inválidos', false), '', -32700); - } elseif (!isset($data->jsonrpc, $data->method, $data->params, $data->id)) { + } + + if (!isset($data->jsonrpc, $data->method, $data->params, $data->id)) { throw new SPException(SPException::SP_WARNING, __('Formato incorrecto', false), '', -32600); } diff --git a/inc/SP/Api/SyspassApi.class.php b/inc/SP/Api/SyspassApi.class.php index 0172f1fd..98d2ab46 100644 --- a/inc/SP/Api/SyspassApi.class.php +++ b/inc/SP/Api/SyspassApi.class.php @@ -166,7 +166,6 @@ class SyspassApi extends ApiBase */ public function addAccount() { - $this->checkAuth(); $this->checkActionAccess(ActionsInterface::ACTION_ACC_NEW); $AccountData = new AccountExtData(); diff --git a/inc/SP/Util/Util.class.php b/inc/SP/Util/Util.class.php index 517ac29c..5b01199a 100644 --- a/inc/SP/Util/Util.class.php +++ b/inc/SP/Util/Util.class.php @@ -407,7 +407,7 @@ class Util */ public static function getVersion($retBuild = false, $normalized = false) { - $build = 17061302; + $build = 17061501; $version = [2, 1, 11]; if ($normalized === true) {