diff --git a/app/modules/api/Controllers/ControllerBase.php b/app/modules/api/Controllers/ControllerBase.php index 132c03a0..f2eba51e 100644 --- a/app/modules/api/Controllers/ControllerBase.php +++ b/app/modules/api/Controllers/ControllerBase.php @@ -4,7 +4,7 @@ * * @author nuxsmin * @link https://syspass.org - * @copyright 2012-2022, Rubén Domínguez nuxsmin@$syspass.org + * @copyright 2012-2023, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * @@ -38,7 +38,7 @@ use SP\Domain\Common\Services\ServiceException; use SP\Domain\Config\Ports\ConfigDataInterface; use SP\Domain\Core\Context\ContextInterface; use SP\Domain\Core\Exceptions\SPException; -use SP\Http\Json; +use SP\Http\JsonResponse; /** * Class ControllerBase @@ -121,7 +121,7 @@ abstract class ControllerBase */ private function sendJsonResponse(string $response): void { - Json::factory($this->router->response())->returnRawJson($response); + JsonResponse::factory($this->router->response())->sendRaw($response); } final protected function returnResponseException(Exception $e): void diff --git a/app/modules/api/Init.php b/app/modules/api/Init.php index 043e0694..41614c97 100644 --- a/app/modules/api/Init.php +++ b/app/modules/api/Init.php @@ -34,10 +34,10 @@ use SP\Core\Language; use SP\Core\ProvidersHelper; use SP\Domain\Core\Exceptions\InitializationException; use SP\Domain\Core\LanguageInterface; +use SP\Domain\Http\RequestInterface; use SP\Domain\Upgrade\Services\UpgradeAppService; use SP\Domain\Upgrade\Services\UpgradeDatabaseService; use SP\Domain\Upgrade\Services\UpgradeUtil; -use SP\Http\RequestInterface; use SP\Infrastructure\Database\DatabaseUtil; use SP\Infrastructure\File\FileException; use SP\Util\HttpUtil; diff --git a/app/modules/web/Controllers/Account/SaveCopyController.php b/app/modules/web/Controllers/Account/SaveCopyController.php index 1629e873..bd70e43a 100644 --- a/app/modules/web/Controllers/Account/SaveCopyController.php +++ b/app/modules/web/Controllers/Account/SaveCopyController.php @@ -31,7 +31,7 @@ use SP\Core\Events\Event; use SP\Core\Events\EventMessage; use SP\Domain\Core\Acl\AclActionsInterface; use SP\Domain\Core\Exceptions\ValidationException; -use SP\Http\JsonResponse; +use SP\Http\JsonMessage; /** * Class SaveCopyController @@ -73,7 +73,7 @@ final class SaveCopyController extends AccountSaveBase 'itemId' => $accountId, 'nextAction' => Acl::getActionRoute(AclActionsInterface::ACCOUNT_EDIT), ], - JsonResponse::JSON_SUCCESS, + JsonMessage::JSON_SUCCESS, __u('Account created') ); } catch (ValidationException $e) { diff --git a/app/modules/web/Controllers/Account/SaveCreateController.php b/app/modules/web/Controllers/Account/SaveCreateController.php index b3df9b2a..7d8c5b7d 100644 --- a/app/modules/web/Controllers/Account/SaveCreateController.php +++ b/app/modules/web/Controllers/Account/SaveCreateController.php @@ -31,7 +31,7 @@ use SP\Core\Events\Event; use SP\Core\Events\EventMessage; use SP\Domain\Core\Acl\AclActionsInterface; use SP\Domain\Core\Exceptions\ValidationException; -use SP\Http\JsonResponse; +use SP\Http\JsonMessage; /** * Class SaveCreateController @@ -73,7 +73,7 @@ final class SaveCreateController extends AccountSaveBase 'itemId' => $accountId, 'nextAction' => Acl::getActionRoute(AclActionsInterface::ACCOUNT_EDIT), ], - JsonResponse::JSON_SUCCESS, + JsonMessage::JSON_SUCCESS, __u('Account created') ); } catch (ValidationException $e) { diff --git a/app/modules/web/Controllers/Account/SaveDeleteController.php b/app/modules/web/Controllers/Account/SaveDeleteController.php index 4deec635..9076794e 100644 --- a/app/modules/web/Controllers/Account/SaveDeleteController.php +++ b/app/modules/web/Controllers/Account/SaveDeleteController.php @@ -33,7 +33,7 @@ use SP\Core\Events\EventMessage; use SP\Domain\Account\Ports\AccountServiceInterface; use SP\Domain\Core\Acl\AclActionsInterface; use SP\Domain\CustomField\Ports\CustomFieldServiceInterface; -use SP\Http\JsonResponse; +use SP\Http\JsonMessage; use SP\Modules\Web\Controllers\Traits\JsonTrait; use SP\Mvc\Controller\ItemTrait; use SP\Mvc\Controller\WebControllerHelper; @@ -91,7 +91,7 @@ final class SaveDeleteController extends AccountControllerBase $this->deleteCustomFieldsForItem(AclActionsInterface::ACCOUNT, $id, $this->customFieldService); - return $this->returnJsonResponse(JsonResponse::JSON_SUCCESS, __u('Account removed')); + return $this->returnJsonResponse(JsonMessage::JSON_SUCCESS, __u('Account removed')); } catch (Exception $e) { processException($e); diff --git a/app/modules/web/Controllers/Account/SaveEditController.php b/app/modules/web/Controllers/Account/SaveEditController.php index 7ced70cb..fe4d9156 100644 --- a/app/modules/web/Controllers/Account/SaveEditController.php +++ b/app/modules/web/Controllers/Account/SaveEditController.php @@ -32,7 +32,7 @@ use SP\Core\Events\Event; use SP\Core\Events\EventMessage; use SP\Domain\Core\Acl\AclActionsInterface; use SP\Domain\Core\Exceptions\ValidationException; -use SP\Http\JsonResponse; +use SP\Http\JsonMessage; /** * Class SaveEditController @@ -80,7 +80,7 @@ final class SaveEditController extends AccountSaveBase 'itemId' => $id, 'nextAction' => Acl::getActionRoute(AclActionsInterface::ACCOUNT_VIEW), ], - JsonResponse::JSON_SUCCESS, + JsonMessage::JSON_SUCCESS, __u('Account updated') ); } catch (ValidationException $e) { diff --git a/app/modules/web/Controllers/Account/SaveEditPassController.php b/app/modules/web/Controllers/Account/SaveEditPassController.php index 69acdeb5..cdb8894c 100644 --- a/app/modules/web/Controllers/Account/SaveEditPassController.php +++ b/app/modules/web/Controllers/Account/SaveEditPassController.php @@ -35,7 +35,7 @@ use SP\Domain\Account\Ports\AccountPresetServiceInterface; use SP\Domain\Account\Ports\AccountServiceInterface; use SP\Domain\Core\Acl\AclActionsInterface; use SP\Domain\Core\Exceptions\ValidationException; -use SP\Http\JsonResponse; +use SP\Http\JsonMessage; use SP\Modules\Web\Controllers\Traits\JsonTrait; use SP\Modules\Web\Forms\AccountForm; use SP\Mvc\Controller\WebControllerHelper; @@ -97,7 +97,7 @@ final class SaveEditPassController extends AccountControllerBase 'itemId' => $id, 'nextAction' => Acl::getActionRoute(AclActionsInterface::ACCOUNT_VIEW), ], - JsonResponse::JSON_SUCCESS, + JsonMessage::JSON_SUCCESS, __u('Password updated') ); } catch (ValidationException $e) { diff --git a/app/modules/web/Controllers/Account/SaveEditRestoreController.php b/app/modules/web/Controllers/Account/SaveEditRestoreController.php index ec90eddf..5fb37b4c 100644 --- a/app/modules/web/Controllers/Account/SaveEditRestoreController.php +++ b/app/modules/web/Controllers/Account/SaveEditRestoreController.php @@ -33,7 +33,7 @@ use SP\Core\Events\Event; use SP\Core\Events\EventMessage; use SP\Domain\Account\Ports\AccountServiceInterface; use SP\Domain\Core\Acl\AclActionsInterface; -use SP\Http\JsonResponse; +use SP\Http\JsonMessage; use SP\Modules\Web\Controllers\Traits\JsonTrait; use SP\Mvc\Controller\WebControllerHelper; @@ -90,7 +90,7 @@ final class SaveEditRestoreController extends AccountControllerBase 'itemId' => $id, 'nextAction' => Acl::getActionRoute(AclActionsInterface::ACCOUNT_VIEW), ], - JsonResponse::JSON_SUCCESS, + JsonMessage::JSON_SUCCESS, __u('Account restored') ); } catch (Exception $e) { diff --git a/app/modules/web/Controllers/Account/SaveRequestController.php b/app/modules/web/Controllers/Account/SaveRequestController.php index c07e8be8..2d9fb6aa 100644 --- a/app/modules/web/Controllers/Account/SaveRequestController.php +++ b/app/modules/web/Controllers/Account/SaveRequestController.php @@ -36,7 +36,7 @@ use SP\Domain\Account\Ports\AccountServiceInterface; use SP\Domain\Core\Acl\AclActionsInterface; use SP\Domain\Core\Exceptions\ValidationException; use SP\Domain\User\Ports\UserServiceInterface; -use SP\Http\JsonResponse; +use SP\Http\JsonMessage; use SP\Http\Uri; use SP\Modules\Web\Controllers\Traits\JsonTrait; use SP\Mvc\Controller\ItemTrait; @@ -125,7 +125,7 @@ final class SaveRequestController extends AccountControllerBase 'itemId' => $id, 'nextAction' => Acl::getActionRoute(AclActionsInterface::ACCOUNT), ], - JsonResponse::JSON_SUCCESS, + JsonMessage::JSON_SUCCESS, __u('Request done') ); } catch (ValidationException $e) { diff --git a/app/modules/web/Controllers/AccountFavorite/MarkController.php b/app/modules/web/Controllers/AccountFavorite/MarkController.php index 9c6790ba..cc53a1ae 100644 --- a/app/modules/web/Controllers/AccountFavorite/MarkController.php +++ b/app/modules/web/Controllers/AccountFavorite/MarkController.php @@ -25,8 +25,9 @@ namespace SP\Modules\Web\Controllers\AccountFavorite; use Exception; +use JsonException; use SP\Core\Events\Event; -use SP\Http\JsonResponse; +use SP\Http\JsonMessage; use SP\Modules\Web\Controllers\Traits\JsonTrait; /** @@ -42,14 +43,14 @@ final class MarkController extends AccountFavoriteBase * @param int $accountId * * @return bool - * @throws \JsonException + * @throws JsonException */ public function markAction(int $accountId): bool { try { $this->accountToFavoriteService->add($accountId, $this->session->getUserData()->getId()); - return $this->returnJsonResponse(JsonResponse::JSON_SUCCESS, __u('Favorite added')); + return $this->returnJsonResponse(JsonMessage::JSON_SUCCESS, __u('Favorite added')); } catch (Exception $e) { processException($e); diff --git a/app/modules/web/Controllers/AccountFavorite/UnmarkController.php b/app/modules/web/Controllers/AccountFavorite/UnmarkController.php index 082d2202..1317c380 100644 --- a/app/modules/web/Controllers/AccountFavorite/UnmarkController.php +++ b/app/modules/web/Controllers/AccountFavorite/UnmarkController.php @@ -25,8 +25,9 @@ namespace SP\Modules\Web\Controllers\AccountFavorite; use Exception; +use JsonException; use SP\Core\Events\Event; -use SP\Http\JsonResponse; +use SP\Http\JsonMessage; use SP\Modules\Web\Controllers\Traits\JsonTrait; /** @@ -42,14 +43,14 @@ final class UnmarkController extends AccountFavoriteBase * @param int $accountId * * @return bool - * @throws \JsonException + * @throws JsonException */ public function unmarkAction(int $accountId): bool { try { $this->accountToFavoriteService->delete($accountId, $this->session->getUserData()->getId()); - return $this->returnJsonResponse(JsonResponse::JSON_SUCCESS, __u('Favorite deleted')); + return $this->returnJsonResponse(JsonMessage::JSON_SUCCESS, __u('Favorite deleted')); } catch (Exception $e) { processException($e); diff --git a/app/modules/web/Controllers/AccountFile/SearchController.php b/app/modules/web/Controllers/AccountFile/SearchController.php index 6e5c911a..337dcda8 100644 --- a/app/modules/web/Controllers/AccountFile/SearchController.php +++ b/app/modules/web/Controllers/AccountFile/SearchController.php @@ -31,7 +31,7 @@ use SP\Domain\Core\Acl\AclActionsInterface; use SP\Domain\Core\Exceptions\ConstraintException; use SP\Domain\Core\Exceptions\QueryException; use SP\Html\DataGrid\DataGridInterface; -use SP\Http\JsonResponse; +use SP\Http\JsonMessage; use SP\Modules\Web\Controllers\ControllerBase; use SP\Modules\Web\Controllers\Helpers\Grid\FileGrid; use SP\Modules\Web\Controllers\Traits\JsonTrait; @@ -77,7 +77,7 @@ final class SearchController extends ControllerBase { if (!$this->acl->checkUserAccess(AclActionsInterface::ACCOUNT_FILE_SEARCH)) { return $this->returnJsonResponse( - JsonResponse::JSON_ERROR, + JsonMessage::JSON_ERROR, __u('You don\'t have permission to do this operation') ); } diff --git a/app/modules/web/Controllers/AccountFile/ViewController.php b/app/modules/web/Controllers/AccountFile/ViewController.php index 75d790a1..5f109125 100644 --- a/app/modules/web/Controllers/AccountFile/ViewController.php +++ b/app/modules/web/Controllers/AccountFile/ViewController.php @@ -29,7 +29,7 @@ use JsonException; use SP\Core\Events\Event; use SP\Core\Events\EventMessage; use SP\Domain\Core\Exceptions\SPException; -use SP\Http\JsonResponse; +use SP\Http\JsonMessage; use SP\Modules\Web\Controllers\Traits\JsonTrait; use SP\Util\FileUtil; @@ -105,6 +105,6 @@ final class ViewController extends AccountFileBase return $this->returnJsonResponseException($e); } - return $this->returnJsonResponse(JsonResponse::JSON_WARNING, __u('File not supported for preview')); + return $this->returnJsonResponse(JsonMessage::JSON_WARNING, __u('File not supported for preview')); } } diff --git a/app/modules/web/Controllers/AccountHistoryManager/DeleteController.php b/app/modules/web/Controllers/AccountHistoryManager/DeleteController.php index 84d8a18e..24991a76 100644 --- a/app/modules/web/Controllers/AccountHistoryManager/DeleteController.php +++ b/app/modules/web/Controllers/AccountHistoryManager/DeleteController.php @@ -25,12 +25,13 @@ namespace SP\Modules\Web\Controllers\AccountHistoryManager; use Exception; +use JsonException; use SP\Core\Application; use SP\Core\Events\Event; use SP\Core\Events\EventMessage; use SP\Domain\Account\Ports\AccountHistoryServiceInterface; use SP\Domain\Account\Ports\AccountServiceInterface; -use SP\Http\JsonResponse; +use SP\Http\JsonMessage; use SP\Modules\Web\Controllers\ControllerBase; use SP\Modules\Web\Controllers\Traits\JsonTrait; use SP\Mvc\Controller\ItemTrait; @@ -43,7 +44,8 @@ use SP\Mvc\Controller\WebControllerHelper; */ final class DeleteController extends ControllerBase { - use JsonTrait, ItemTrait; + use ItemTrait; + use JsonTrait; private AccountHistoryServiceInterface $accountHistoryService; private AccountServiceInterface $accountService; @@ -67,7 +69,7 @@ final class DeleteController extends ControllerBase * @param int|null $id * * @return bool - * @throws \JsonException + * @throws JsonException */ public function deleteAction(?int $id = null): bool { @@ -85,7 +87,7 @@ final class DeleteController extends ControllerBase ); return $this->returnJsonResponse( - JsonResponse::JSON_SUCCESS, + JsonMessage::JSON_SUCCESS, __u('Accounts removed') ); } @@ -105,7 +107,7 @@ final class DeleteController extends ControllerBase ); return $this->returnJsonResponse( - JsonResponse::JSON_SUCCESS, + JsonMessage::JSON_SUCCESS, __u('Account removed') ); } catch (Exception $e) { diff --git a/app/modules/web/Controllers/AccountHistoryManager/RestoreController.php b/app/modules/web/Controllers/AccountHistoryManager/RestoreController.php index 0ed4b748..77df79d0 100644 --- a/app/modules/web/Controllers/AccountHistoryManager/RestoreController.php +++ b/app/modules/web/Controllers/AccountHistoryManager/RestoreController.php @@ -25,12 +25,13 @@ namespace SP\Modules\Web\Controllers\AccountHistoryManager; use Exception; +use JsonException; use SP\Core\Application; use SP\Core\Events\Event; use SP\Core\Events\EventMessage; use SP\Domain\Account\Ports\AccountHistoryServiceInterface; use SP\Domain\Account\Ports\AccountServiceInterface; -use SP\Http\JsonResponse; +use SP\Http\JsonMessage; use SP\Modules\Web\Controllers\ControllerBase; use SP\Modules\Web\Controllers\Traits\JsonTrait; use SP\Mvc\Controller\WebControllerHelper; @@ -68,7 +69,7 @@ final class RestoreController extends ControllerBase * @param int $id Account's history ID * * @return bool - * @throws \JsonException + * @throws JsonException */ public function restoreAction(int $id): bool { @@ -92,7 +93,7 @@ final class RestoreController extends ControllerBase ) ); - return $this->returnJsonResponse(JsonResponse::JSON_SUCCESS, __u('Account restored')); + return $this->returnJsonResponse(JsonMessage::JSON_SUCCESS, __u('Account restored')); } catch (Exception $e) { processException($e); diff --git a/app/modules/web/Controllers/AccountHistoryManager/SearchController.php b/app/modules/web/Controllers/AccountHistoryManager/SearchController.php index 42faf141..1a80f8ad 100644 --- a/app/modules/web/Controllers/AccountHistoryManager/SearchController.php +++ b/app/modules/web/Controllers/AccountHistoryManager/SearchController.php @@ -31,7 +31,7 @@ use SP\Domain\Core\Acl\AclActionsInterface; use SP\Domain\Core\Exceptions\ConstraintException; use SP\Domain\Core\Exceptions\QueryException; use SP\Html\DataGrid\DataGridInterface; -use SP\Http\JsonResponse; +use SP\Http\JsonMessage; use SP\Modules\Web\Controllers\ControllerBase; use SP\Modules\Web\Controllers\Helpers; use SP\Modules\Web\Controllers\Helpers\Grid\AccountHistoryGrid; @@ -77,7 +77,7 @@ final class SearchController extends ControllerBase { if (!$this->acl->checkUserAccess(AclActionsInterface::ACCOUNTMGR_HISTORY_SEARCH)) { return $this->returnJsonResponse( - JsonResponse::JSON_ERROR, + JsonMessage::JSON_ERROR, __u('You don\'t have permission to do this operation') ); } diff --git a/app/modules/web/Controllers/AccountManager/BulkEditController.php b/app/modules/web/Controllers/AccountManager/BulkEditController.php index 863f1b81..cbe282b4 100644 --- a/app/modules/web/Controllers/AccountManager/BulkEditController.php +++ b/app/modules/web/Controllers/AccountManager/BulkEditController.php @@ -39,7 +39,7 @@ use SP\Domain\CustomField\Ports\CustomFieldServiceInterface; use SP\Domain\Tag\Ports\TagServiceInterface; use SP\Domain\User\Ports\UserGroupServiceInterface; use SP\Domain\User\Ports\UserServiceInterface; -use SP\Http\JsonResponse; +use SP\Http\JsonMessage; use SP\Modules\Web\Controllers\ControllerBase; use SP\Modules\Web\Controllers\Helpers\Grid\AccountGrid; use SP\Modules\Web\Controllers\Traits\JsonTrait; @@ -99,7 +99,7 @@ final class BulkEditController extends ControllerBase try { if (!$this->acl->checkUserAccess(AclActionsInterface::ACCOUNTMGR)) { return $this->returnJsonResponse( - JsonResponse::JSON_ERROR, + JsonMessage::JSON_ERROR, __u('You don\'t have permission to do this operation') ); } diff --git a/app/modules/web/Controllers/AccountManager/DeleteController.php b/app/modules/web/Controllers/AccountManager/DeleteController.php index fe910336..ba6bc0bb 100644 --- a/app/modules/web/Controllers/AccountManager/DeleteController.php +++ b/app/modules/web/Controllers/AccountManager/DeleteController.php @@ -32,7 +32,7 @@ use SP\Core\Events\EventMessage; use SP\Domain\Account\Ports\AccountServiceInterface; use SP\Domain\Core\Acl\AclActionsInterface; use SP\Domain\CustomField\Ports\CustomFieldServiceInterface; -use SP\Http\JsonResponse; +use SP\Http\JsonMessage; use SP\Modules\Web\Controllers\ControllerBase; use SP\Modules\Web\Controllers\Traits\JsonTrait; use SP\Mvc\Controller\ItemTrait; @@ -86,7 +86,7 @@ final class DeleteController extends ControllerBase new Event($this, EventMessage::factory()->addDescription(__u('Accounts removed'))) ); - return $this->returnJsonResponseData(JsonResponse::JSON_SUCCESS, __u('Accounts removed')); + return $this->returnJsonResponseData(JsonMessage::JSON_SUCCESS, __u('Accounts removed')); } $accountDetails = $this->accountService->getByIdEnriched($id)->getAccountVData(); @@ -106,7 +106,7 @@ final class DeleteController extends ControllerBase ) ); - return $this->returnJsonResponse(JsonResponse::JSON_SUCCESS, __u('Account removed')); + return $this->returnJsonResponse(JsonMessage::JSON_SUCCESS, __u('Account removed')); } catch (Exception $e) { processException($e); diff --git a/app/modules/web/Controllers/AccountManager/SaveBulkEditController.php b/app/modules/web/Controllers/AccountManager/SaveBulkEditController.php index a4a17fcd..3d7b7293 100644 --- a/app/modules/web/Controllers/AccountManager/SaveBulkEditController.php +++ b/app/modules/web/Controllers/AccountManager/SaveBulkEditController.php @@ -34,7 +34,7 @@ use SP\Domain\Account\Ports\AccountPresetServiceInterface; use SP\Domain\Account\Ports\AccountServiceInterface; use SP\Domain\Core\Acl\AclActionsInterface; use SP\Domain\Core\Exceptions\SPException; -use SP\Http\JsonResponse; +use SP\Http\JsonMessage; use SP\Modules\Web\Controllers\ControllerBase; use SP\Modules\Web\Controllers\Traits\JsonTrait; use SP\Modules\Web\Forms\AccountForm; @@ -104,7 +104,7 @@ final class SaveBulkEditController extends ControllerBase new Event($this, EventMessage::factory()->addDescription(__u('Accounts updated'))) ); - return $this->returnJsonResponse(JsonResponse::JSON_SUCCESS, __u('Accounts updated')); + return $this->returnJsonResponse(JsonMessage::JSON_SUCCESS, __u('Accounts updated')); } catch (Exception $e) { processException($e); diff --git a/app/modules/web/Controllers/AccountManager/SearchController.php b/app/modules/web/Controllers/AccountManager/SearchController.php index 04df7b76..c155d455 100644 --- a/app/modules/web/Controllers/AccountManager/SearchController.php +++ b/app/modules/web/Controllers/AccountManager/SearchController.php @@ -35,7 +35,7 @@ use SP\Domain\Core\Exceptions\QueryException; use SP\Domain\Core\Exceptions\SessionTimeout; use SP\Domain\Core\Exceptions\SPException; use SP\Html\DataGrid\DataGridInterface; -use SP\Http\JsonResponse; +use SP\Http\JsonMessage; use SP\Modules\Web\Controllers\ControllerBase; use SP\Modules\Web\Controllers\Helpers; use SP\Modules\Web\Controllers\Helpers\Grid\AccountGrid; @@ -85,7 +85,7 @@ final class SearchController extends ControllerBase { if (!$this->acl->checkUserAccess(AclActionsInterface::ACCOUNTMGR_SEARCH)) { return $this->returnJsonResponse( - JsonResponse::JSON_ERROR, + JsonMessage::JSON_ERROR, __u('You don\'t have permission to do this operation') ); } diff --git a/app/modules/web/Controllers/AuthToken/CreateController.php b/app/modules/web/Controllers/AuthToken/CreateController.php index 45e0f390..175e94c3 100644 --- a/app/modules/web/Controllers/AuthToken/CreateController.php +++ b/app/modules/web/Controllers/AuthToken/CreateController.php @@ -28,7 +28,7 @@ use Exception; use JsonException; use SP\Core\Events\Event; use SP\Domain\Core\Acl\AclActionsInterface; -use SP\Http\JsonResponse; +use SP\Http\JsonMessage; /** * Class CreateController @@ -46,7 +46,7 @@ final class CreateController extends AuthTokenViewBase try { if (!$this->acl->checkUserAccess(AclActionsInterface::AUTHTOKEN_CREATE)) { return $this->returnJsonResponse( - JsonResponse::JSON_ERROR, + JsonMessage::JSON_ERROR, __u('You don\'t have permission to do this operation') ); } diff --git a/app/modules/web/Controllers/AuthToken/DeleteController.php b/app/modules/web/Controllers/AuthToken/DeleteController.php index 62a2a15a..83600fb1 100644 --- a/app/modules/web/Controllers/AuthToken/DeleteController.php +++ b/app/modules/web/Controllers/AuthToken/DeleteController.php @@ -29,7 +29,7 @@ use JsonException; use SP\Core\Events\Event; use SP\Core\Events\EventMessage; use SP\Domain\Core\Acl\AclActionsInterface; -use SP\Http\JsonResponse; +use SP\Http\JsonMessage; /** * Class DeleteController @@ -51,7 +51,7 @@ final class DeleteController extends AuthTokenSaveBase try { if (!$this->acl->checkUserAccess(AclActionsInterface::AUTHTOKEN_DELETE)) { return $this->returnJsonResponse( - JsonResponse::JSON_ERROR, + JsonMessage::JSON_ERROR, __u('You don\'t have permission to do this operation') ); } @@ -66,7 +66,7 @@ final class DeleteController extends AuthTokenSaveBase new Event($this, EventMessage::factory()->addDescription(__u('Authorizations deleted'))) ); - return $this->returnJsonResponse(JsonResponse::JSON_SUCCESS, __u('Authorizations deleted')); + return $this->returnJsonResponse(JsonMessage::JSON_SUCCESS, __u('Authorizations deleted')); } $this->authTokenService->delete($id); @@ -83,7 +83,7 @@ final class DeleteController extends AuthTokenSaveBase ) ); - return $this->returnJsonResponse(JsonResponse::JSON_SUCCESS, __u('Authorization deleted')); + return $this->returnJsonResponse(JsonMessage::JSON_SUCCESS, __u('Authorization deleted')); } catch (Exception $e) { processException($e); diff --git a/app/modules/web/Controllers/AuthToken/EditController.php b/app/modules/web/Controllers/AuthToken/EditController.php index 0731c4bf..50feab48 100644 --- a/app/modules/web/Controllers/AuthToken/EditController.php +++ b/app/modules/web/Controllers/AuthToken/EditController.php @@ -28,7 +28,7 @@ use Exception; use JsonException; use SP\Core\Events\Event; use SP\Domain\Core\Acl\AclActionsInterface; -use SP\Http\JsonResponse; +use SP\Http\JsonMessage; /** * Class EditController @@ -50,7 +50,7 @@ final class EditController extends AuthTokenViewBase try { if (!$this->acl->checkUserAccess(AclActionsInterface::AUTHTOKEN_EDIT)) { return $this->returnJsonResponse( - JsonResponse::JSON_ERROR, + JsonMessage::JSON_ERROR, __u('You don\'t have permission to do this operation') ); } diff --git a/app/modules/web/Controllers/AuthToken/SaveCreateController.php b/app/modules/web/Controllers/AuthToken/SaveCreateController.php index f3042dee..5ca8bb8a 100644 --- a/app/modules/web/Controllers/AuthToken/SaveCreateController.php +++ b/app/modules/web/Controllers/AuthToken/SaveCreateController.php @@ -29,7 +29,7 @@ use JsonException; use SP\Core\Events\Event; use SP\Domain\Core\Acl\AclActionsInterface; use SP\Domain\Core\Exceptions\ValidationException; -use SP\Http\JsonResponse; +use SP\Http\JsonMessage; /** * Class SaveCreateController @@ -47,7 +47,7 @@ final class SaveCreateController extends AuthTokenSaveBase try { if (!$this->acl->checkUserAccess(AclActionsInterface::AUTHTOKEN_CREATE)) { return $this->returnJsonResponse( - JsonResponse::JSON_ERROR, + JsonMessage::JSON_ERROR, __u('You don\'t have permission to do this operation') ); } @@ -65,9 +65,9 @@ final class SaveCreateController extends AuthTokenSaveBase $this->eventDispatcher->notify('create.authToken', new Event($this)); - return $this->returnJsonResponse(JsonResponse::JSON_SUCCESS, __u('Authorization added')); + return $this->returnJsonResponse(JsonMessage::JSON_SUCCESS, __u('Authorization added')); } catch (ValidationException $e) { - return $this->returnJsonResponse(JsonResponse::JSON_ERROR, $e->getMessage()); + return $this->returnJsonResponse(JsonMessage::JSON_ERROR, $e->getMessage()); } catch (Exception $e) { processException($e); diff --git a/app/modules/web/Controllers/AuthToken/SaveEditController.php b/app/modules/web/Controllers/AuthToken/SaveEditController.php index 65d9cde6..74c9449d 100644 --- a/app/modules/web/Controllers/AuthToken/SaveEditController.php +++ b/app/modules/web/Controllers/AuthToken/SaveEditController.php @@ -30,7 +30,7 @@ use SP\Core\Events\Event; use SP\Core\Events\EventMessage; use SP\Domain\Core\Acl\AclActionsInterface; use SP\Domain\Core\Exceptions\ValidationException; -use SP\Http\JsonResponse; +use SP\Http\JsonMessage; /** * Class SaveEditController @@ -52,7 +52,7 @@ final class SaveEditController extends AuthTokenSaveBase try { if (!$this->acl->checkUserAccess(AclActionsInterface::AUTHTOKEN_EDIT)) { return $this->returnJsonResponse( - JsonResponse::JSON_ERROR, + JsonMessage::JSON_ERROR, __u('You don\'t have permission to do this operation') ); } @@ -92,9 +92,9 @@ final class SaveEditController extends AuthTokenSaveBase $this->customFieldService ); - return $this->returnJsonResponse(JsonResponse::JSON_SUCCESS, __u('Authorization updated')); + return $this->returnJsonResponse(JsonMessage::JSON_SUCCESS, __u('Authorization updated')); } catch (ValidationException $e) { - return $this->returnJsonResponse(JsonResponse::JSON_ERROR, $e->getMessage()); + return $this->returnJsonResponse(JsonMessage::JSON_ERROR, $e->getMessage()); } catch (Exception $e) { processException($e); diff --git a/app/modules/web/Controllers/AuthToken/SearchController.php b/app/modules/web/Controllers/AuthToken/SearchController.php index cb3e81db..2e5031b8 100644 --- a/app/modules/web/Controllers/AuthToken/SearchController.php +++ b/app/modules/web/Controllers/AuthToken/SearchController.php @@ -32,7 +32,7 @@ use SP\Domain\Core\Exceptions\ConstraintException; use SP\Domain\Core\Exceptions\QueryException; use SP\Domain\Core\Exceptions\SPException; use SP\Html\DataGrid\DataGridInterface; -use SP\Http\JsonResponse; +use SP\Http\JsonMessage; use SP\Modules\Web\Controllers\ControllerBase; use SP\Modules\Web\Controllers\Helpers\Grid\AuthTokenGrid; use SP\Modules\Web\Controllers\Traits\JsonTrait; @@ -79,7 +79,7 @@ final class SearchController extends ControllerBase { if (!$this->acl->checkUserAccess(AclActionsInterface::AUTHTOKEN_SEARCH)) { return $this->returnJsonResponse( - JsonResponse::JSON_ERROR, + JsonMessage::JSON_ERROR, __u('You don\'t have permission to do this operation') ); } diff --git a/app/modules/web/Controllers/AuthToken/ViewController.php b/app/modules/web/Controllers/AuthToken/ViewController.php index 55b1984d..7f7919e4 100644 --- a/app/modules/web/Controllers/AuthToken/ViewController.php +++ b/app/modules/web/Controllers/AuthToken/ViewController.php @@ -29,7 +29,7 @@ use JsonException; use SP\Core\Events\Event; use SP\Core\Events\EventMessage; use SP\Domain\Core\Acl\AclActionsInterface; -use SP\Http\JsonResponse; +use SP\Http\JsonMessage; /** * Class ViewController @@ -51,7 +51,7 @@ final class ViewController extends AuthTokenViewBase try { if (!$this->acl->checkUserAccess(AclActionsInterface::AUTHTOKEN_VIEW)) { return $this->returnJsonResponse( - JsonResponse::JSON_ERROR, + JsonMessage::JSON_ERROR, __u('You don\'t have permission to do this operation') ); } diff --git a/app/modules/web/Controllers/Category/CreateController.php b/app/modules/web/Controllers/Category/CreateController.php index e4681c6d..0bed2ce4 100644 --- a/app/modules/web/Controllers/Category/CreateController.php +++ b/app/modules/web/Controllers/Category/CreateController.php @@ -28,7 +28,7 @@ use Exception; use JsonException; use SP\Core\Events\Event; use SP\Domain\Core\Acl\AclActionsInterface; -use SP\Http\JsonResponse; +use SP\Http\JsonMessage; use SP\Modules\Web\Controllers\Traits\JsonTrait; /** @@ -47,7 +47,7 @@ final class CreateController extends CategoryViewBase try { if (!$this->acl->checkUserAccess(AclActionsInterface::CATEGORY_CREATE)) { return $this->returnJsonResponse( - JsonResponse::JSON_ERROR, + JsonMessage::JSON_ERROR, __u('You don\'t have permission to do this operation') ); } diff --git a/app/modules/web/Controllers/Category/DeleteController.php b/app/modules/web/Controllers/Category/DeleteController.php index 18b5e5a0..bd6d4d92 100644 --- a/app/modules/web/Controllers/Category/DeleteController.php +++ b/app/modules/web/Controllers/Category/DeleteController.php @@ -30,7 +30,7 @@ use JsonException; use SP\Core\Events\Event; use SP\Core\Events\EventMessage; use SP\Domain\Core\Acl\AclActionsInterface; -use SP\Http\JsonResponse; +use SP\Http\JsonMessage; /** * DeleteController @@ -50,7 +50,7 @@ final class DeleteController extends CategorySaveBase try { if (!$this->acl->checkUserAccess(AclActionsInterface::CATEGORY_DELETE)) { return $this->returnJsonResponse( - JsonResponse::JSON_ERROR, + JsonMessage::JSON_ERROR, __u('You don\'t have permission to do this operation') ); } @@ -68,7 +68,7 @@ final class DeleteController extends CategorySaveBase ) ); - return $this->returnJsonResponse(JsonResponse::JSON_SUCCESS, __u('Categories deleted')); + return $this->returnJsonResponse(JsonMessage::JSON_SUCCESS, __u('Categories deleted')); } $this->categoryService->delete($id); @@ -86,7 +86,7 @@ final class DeleteController extends CategorySaveBase ); return $this->returnJsonResponse( - JsonResponse::JSON_SUCCESS, + JsonMessage::JSON_SUCCESS, __u('Category deleted') ); } catch (Exception $e) { diff --git a/app/modules/web/Controllers/Category/EditController.php b/app/modules/web/Controllers/Category/EditController.php index 528bd6f5..f8b07c55 100644 --- a/app/modules/web/Controllers/Category/EditController.php +++ b/app/modules/web/Controllers/Category/EditController.php @@ -29,7 +29,7 @@ use Exception; use JsonException; use SP\Core\Events\Event; use SP\Domain\Core\Acl\AclActionsInterface; -use SP\Http\JsonResponse; +use SP\Http\JsonMessage; use SP\Modules\Web\Controllers\Traits\JsonTrait; /** @@ -52,7 +52,7 @@ final class EditController extends CategoryViewBase try { if (!$this->acl->checkUserAccess(AclActionsInterface::CATEGORY_EDIT)) { return $this->returnJsonResponse( - JsonResponse::JSON_ERROR, + JsonMessage::JSON_ERROR, __u('You don\'t have permission to do this operation') ); } diff --git a/app/modules/web/Controllers/Category/SaveCreateAction.php b/app/modules/web/Controllers/Category/SaveCreateAction.php index ef1d32f6..f9b9ae5f 100644 --- a/app/modules/web/Controllers/Category/SaveCreateAction.php +++ b/app/modules/web/Controllers/Category/SaveCreateAction.php @@ -30,7 +30,7 @@ use SP\Core\Events\Event; use SP\Core\Events\EventMessage; use SP\Domain\Core\Acl\AclActionsInterface; use SP\Domain\Core\Exceptions\ValidationException; -use SP\Http\JsonResponse; +use SP\Http\JsonMessage; /** * SaveCreateAction @@ -46,7 +46,7 @@ final class SaveCreateAction extends CategorySaveBase try { if (!$this->acl->checkUserAccess(AclActionsInterface::CATEGORY_CREATE)) { return $this->returnJsonResponse( - JsonResponse::JSON_ERROR, + JsonMessage::JSON_ERROR, __u('You don\'t have permission to do this operation') ); } @@ -74,7 +74,7 @@ final class SaveCreateAction extends CategorySaveBase $this->customFieldService ); - return $this->returnJsonResponse(JsonResponse::JSON_SUCCESS, __u('Category added')); + return $this->returnJsonResponse(JsonMessage::JSON_SUCCESS, __u('Category added')); } catch (ValidationException $e) { return $this->returnJsonResponseException($e); } catch (Exception $e) { diff --git a/app/modules/web/Controllers/Category/SaveEditController.php b/app/modules/web/Controllers/Category/SaveEditController.php index 92f5c916..42fb5b44 100644 --- a/app/modules/web/Controllers/Category/SaveEditController.php +++ b/app/modules/web/Controllers/Category/SaveEditController.php @@ -30,7 +30,7 @@ use SP\Core\Events\Event; use SP\Core\Events\EventMessage; use SP\Domain\Core\Acl\AclActionsInterface; use SP\Domain\Core\Exceptions\ValidationException; -use SP\Http\JsonResponse; +use SP\Http\JsonMessage; /** * SaveEditController @@ -50,7 +50,7 @@ final class SaveEditController extends CategorySaveBase try { if (!$this->acl->checkUserAccess(AclActionsInterface::CATEGORY_EDIT)) { return $this->returnJsonResponse( - JsonResponse::JSON_ERROR, + JsonMessage::JSON_ERROR, __u('You don\'t have permission to do this operation') ); } @@ -78,7 +78,7 @@ final class SaveEditController extends CategorySaveBase $this->customFieldService ); - return $this->returnJsonResponse(JsonResponse::JSON_SUCCESS, __u('Category updated')); + return $this->returnJsonResponse(JsonMessage::JSON_SUCCESS, __u('Category updated')); } catch (ValidationException $e) { return $this->returnJsonResponseException($e); } catch (Exception $e) { diff --git a/app/modules/web/Controllers/Category/SearchController.php b/app/modules/web/Controllers/Category/SearchController.php index 5e913720..230f189c 100644 --- a/app/modules/web/Controllers/Category/SearchController.php +++ b/app/modules/web/Controllers/Category/SearchController.php @@ -33,7 +33,7 @@ use SP\Domain\Core\Exceptions\ConstraintException; use SP\Domain\Core\Exceptions\QueryException; use SP\Domain\Core\Exceptions\SPException; use SP\Html\DataGrid\DataGridInterface; -use SP\Http\JsonResponse; +use SP\Http\JsonMessage; use SP\Modules\Web\Controllers\ControllerBase; use SP\Modules\Web\Controllers\Helpers\Grid\CategoryGrid; use SP\Modules\Web\Controllers\Traits\JsonTrait; @@ -78,7 +78,7 @@ final class SearchController extends ControllerBase { if (!$this->acl->checkUserAccess(AclActionsInterface::CATEGORY_SEARCH)) { return $this->returnJsonResponse( - JsonResponse::JSON_ERROR, + JsonMessage::JSON_ERROR, __u('You don\'t have permission to do this operation') ); } diff --git a/app/modules/web/Controllers/Category/ViewController.php b/app/modules/web/Controllers/Category/ViewController.php index 2bbe0cb4..7f5b13ff 100644 --- a/app/modules/web/Controllers/Category/ViewController.php +++ b/app/modules/web/Controllers/Category/ViewController.php @@ -28,7 +28,7 @@ use Exception; use JsonException; use SP\Core\Events\Event; use SP\Domain\Core\Acl\AclActionsInterface; -use SP\Http\JsonResponse; +use SP\Http\JsonMessage; use SP\Modules\Web\Controllers\Traits\JsonTrait; /** @@ -51,7 +51,7 @@ final class ViewController extends CategoryViewBase try { if (!$this->acl->checkUserAccess(AclActionsInterface::CATEGORY_VIEW)) { return $this->returnJsonResponse( - JsonResponse::JSON_ERROR, + JsonMessage::JSON_ERROR, __u('You don\'t have permission to do this operation') ); } diff --git a/app/modules/web/Controllers/Client/CreateController.php b/app/modules/web/Controllers/Client/CreateController.php index 30c11643..9748b60b 100644 --- a/app/modules/web/Controllers/Client/CreateController.php +++ b/app/modules/web/Controllers/Client/CreateController.php @@ -29,7 +29,7 @@ use Exception; use JsonException; use SP\Core\Events\Event; use SP\Domain\Core\Acl\AclActionsInterface; -use SP\Http\JsonResponse; +use SP\Http\JsonMessage; use SP\Modules\Web\Controllers\Traits\JsonTrait; /** @@ -48,7 +48,7 @@ final class CreateController extends ClientViewBase try { if (!$this->acl->checkUserAccess(AclActionsInterface::CLIENT_CREATE)) { return $this->returnJsonResponse( - JsonResponse::JSON_ERROR, + JsonMessage::JSON_ERROR, __u('You don\'t have permission to do this operation') ); } diff --git a/app/modules/web/Controllers/Client/DeleteController.php b/app/modules/web/Controllers/Client/DeleteController.php index 106dcbba..751a242d 100644 --- a/app/modules/web/Controllers/Client/DeleteController.php +++ b/app/modules/web/Controllers/Client/DeleteController.php @@ -30,7 +30,7 @@ use JsonException; use SP\Core\Events\Event; use SP\Core\Events\EventMessage; use SP\Domain\Core\Acl\AclActionsInterface; -use SP\Http\JsonResponse; +use SP\Http\JsonMessage; use SP\Modules\Web\Controllers\Traits\JsonTrait; use SP\Mvc\Controller\ItemTrait; @@ -55,7 +55,7 @@ final class DeleteController extends ClientSaveBase try { if (!$this->acl->checkUserAccess(AclActionsInterface::CLIENT_DELETE)) { return $this->returnJsonResponse( - JsonResponse::JSON_ERROR, + JsonMessage::JSON_ERROR, __u('You don\'t have permission to do this operation') ); } @@ -73,7 +73,7 @@ final class DeleteController extends ClientSaveBase ) ); - return $this->returnJsonResponse(JsonResponse::JSON_SUCCESS, __u('Clients deleted')); + return $this->returnJsonResponse(JsonMessage::JSON_SUCCESS, __u('Clients deleted')); } $this->clientService->delete($id); @@ -90,7 +90,7 @@ final class DeleteController extends ClientSaveBase ); return $this->returnJsonResponse( - JsonResponse::JSON_SUCCESS, + JsonMessage::JSON_SUCCESS, __u('Client deleted') ); } catch (Exception $e) { diff --git a/app/modules/web/Controllers/Client/EditController.php b/app/modules/web/Controllers/Client/EditController.php index 6123fa6b..2b5bc995 100644 --- a/app/modules/web/Controllers/Client/EditController.php +++ b/app/modules/web/Controllers/Client/EditController.php @@ -29,7 +29,7 @@ use Exception; use JsonException; use SP\Core\Events\Event; use SP\Domain\Core\Acl\AclActionsInterface; -use SP\Http\JsonResponse; +use SP\Http\JsonMessage; use SP\Modules\Web\Controllers\Traits\JsonTrait; /** @@ -52,7 +52,7 @@ final class EditController extends ClientViewBase try { if (!$this->acl->checkUserAccess(AclActionsInterface::CLIENT_EDIT)) { return $this->returnJsonResponse( - JsonResponse::JSON_ERROR, + JsonMessage::JSON_ERROR, __u('You don\'t have permission to do this operation') ); } diff --git a/app/modules/web/Controllers/Client/SaveCreateController.php b/app/modules/web/Controllers/Client/SaveCreateController.php index 9382ca27..454d29dc 100644 --- a/app/modules/web/Controllers/Client/SaveCreateController.php +++ b/app/modules/web/Controllers/Client/SaveCreateController.php @@ -31,7 +31,7 @@ use SP\Core\Events\Event; use SP\Core\Events\EventMessage; use SP\Domain\Core\Acl\AclActionsInterface; use SP\Domain\Core\Exceptions\ValidationException; -use SP\Http\JsonResponse; +use SP\Http\JsonMessage; use SP\Modules\Web\Controllers\Traits\JsonTrait; use SP\Mvc\Controller\ItemTrait; @@ -52,7 +52,7 @@ final class SaveCreateController extends ClientSaveBase try { if (!$this->acl->checkUserAccess(AclActionsInterface::CLIENT_CREATE)) { return $this->returnJsonResponse( - JsonResponse::JSON_ERROR, + JsonMessage::JSON_ERROR, __u('You don\'t have permission to do this operation') ); } @@ -80,7 +80,7 @@ final class SaveCreateController extends ClientSaveBase $this->customFieldService ); - return $this->returnJsonResponse(JsonResponse::JSON_SUCCESS, __u('Client added')); + return $this->returnJsonResponse(JsonMessage::JSON_SUCCESS, __u('Client added')); } catch (ValidationException $e) { return $this->returnJsonResponseException($e); } catch (Exception $e) { diff --git a/app/modules/web/Controllers/Client/SaveEditController.php b/app/modules/web/Controllers/Client/SaveEditController.php index c4cced62..b19fe106 100644 --- a/app/modules/web/Controllers/Client/SaveEditController.php +++ b/app/modules/web/Controllers/Client/SaveEditController.php @@ -31,7 +31,7 @@ use SP\Core\Events\Event; use SP\Core\Events\EventMessage; use SP\Domain\Core\Acl\AclActionsInterface; use SP\Domain\Core\Exceptions\ValidationException; -use SP\Http\JsonResponse; +use SP\Http\JsonMessage; use SP\Modules\Web\Controllers\Traits\JsonTrait; use SP\Mvc\Controller\ItemTrait; @@ -56,7 +56,7 @@ final class SaveEditController extends ClientSaveBase try { if (!$this->acl->checkUserAccess(AclActionsInterface::CLIENT_EDIT)) { return $this->returnJsonResponse( - JsonResponse::JSON_ERROR, + JsonMessage::JSON_ERROR, __u('You don\'t have permission to do this operation') ); } @@ -80,7 +80,7 @@ final class SaveEditController extends ClientSaveBase $this->customFieldService ); - return $this->returnJsonResponse(JsonResponse::JSON_SUCCESS, __u('Client updated')); + return $this->returnJsonResponse(JsonMessage::JSON_SUCCESS, __u('Client updated')); } catch (ValidationException $e) { return $this->returnJsonResponseException($e); } catch (Exception $e) { diff --git a/app/modules/web/Controllers/Client/SearchController.php b/app/modules/web/Controllers/Client/SearchController.php index 8a69362f..da7b07cf 100644 --- a/app/modules/web/Controllers/Client/SearchController.php +++ b/app/modules/web/Controllers/Client/SearchController.php @@ -33,7 +33,7 @@ use SP\Domain\Core\Exceptions\ConstraintException; use SP\Domain\Core\Exceptions\QueryException; use SP\Domain\Core\Exceptions\SPException; use SP\Html\DataGrid\DataGridInterface; -use SP\Http\JsonResponse; +use SP\Http\JsonMessage; use SP\Modules\Web\Controllers\ControllerBase; use SP\Modules\Web\Controllers\Helpers\Grid\ClientGrid; use SP\Modules\Web\Controllers\Traits\JsonTrait; @@ -78,7 +78,7 @@ final class SearchController extends ControllerBase { if (!$this->acl->checkUserAccess(AclActionsInterface::CLIENT_SEARCH)) { return $this->returnJsonResponse( - JsonResponse::JSON_ERROR, + JsonMessage::JSON_ERROR, __u('You don\'t have permission to do this operation') ); } diff --git a/app/modules/web/Controllers/Client/ViewController.php b/app/modules/web/Controllers/Client/ViewController.php index a3b4ece5..3da6f6dc 100644 --- a/app/modules/web/Controllers/Client/ViewController.php +++ b/app/modules/web/Controllers/Client/ViewController.php @@ -28,7 +28,7 @@ use Exception; use JsonException; use SP\Core\Events\Event; use SP\Domain\Core\Acl\AclActionsInterface; -use SP\Http\JsonResponse; +use SP\Http\JsonMessage; use SP\Modules\Web\Controllers\Traits\JsonTrait; /** @@ -53,7 +53,7 @@ final class ViewController extends ClientViewBase try { if (!$this->acl->checkUserAccess(AclActionsInterface::CLIENT_VIEW)) { return $this->returnJsonResponse( - JsonResponse::JSON_ERROR, + JsonMessage::JSON_ERROR, __u('You don\'t have permission to do this operation') ); } diff --git a/app/modules/web/Controllers/ConfigBackup/FileBackupController.php b/app/modules/web/Controllers/ConfigBackup/FileBackupController.php index 719f90a3..df813b48 100644 --- a/app/modules/web/Controllers/ConfigBackup/FileBackupController.php +++ b/app/modules/web/Controllers/ConfigBackup/FileBackupController.php @@ -35,7 +35,7 @@ use SP\Domain\Core\Acl\UnauthorizedPageException; use SP\Domain\Core\Exceptions\SessionTimeout; use SP\Domain\Core\Exceptions\SPException; use SP\Domain\Export\Ports\FileBackupServiceInterface; -use SP\Http\JsonResponse; +use SP\Http\JsonMessage; use SP\Modules\Web\Controllers\SimpleControllerBase; use SP\Modules\Web\Controllers\Traits\ConfigTrait; use SP\Mvc\Controller\SimpleControllerHelper; @@ -66,7 +66,7 @@ final class FileBackupController extends SimpleControllerBase public function fileBackupAction(): bool { if ($this->config->getConfigData()->isDemoEnabled()) { - return $this->returnJsonResponse(JsonResponse::JSON_WARNING, __u('Ey, this is a DEMO!!')); + return $this->returnJsonResponse(JsonMessage::JSON_WARNING, __u('Ey, this is a DEMO!!')); } try { @@ -84,7 +84,7 @@ final class FileBackupController extends SimpleControllerBase ) ); - return $this->returnJsonResponse(JsonResponse::JSON_SUCCESS, __u('Backup process finished')); + return $this->returnJsonResponse(JsonMessage::JSON_SUCCESS, __u('Backup process finished')); } catch (Exception $e) { processException($e); diff --git a/app/modules/web/Controllers/ConfigBackup/XmlExportController.php b/app/modules/web/Controllers/ConfigBackup/XmlExportController.php index 055a341a..85d8098c 100644 --- a/app/modules/web/Controllers/ConfigBackup/XmlExportController.php +++ b/app/modules/web/Controllers/ConfigBackup/XmlExportController.php @@ -35,7 +35,7 @@ use SP\Domain\Core\Exceptions\SessionTimeout; use SP\Domain\Core\Exceptions\SPException; use SP\Domain\Export\Ports\XmlExportServiceInterface; use SP\Domain\Export\Ports\XmlVerifyServiceInterface; -use SP\Http\JsonResponse; +use SP\Http\JsonMessage; use SP\Modules\Web\Controllers\SimpleControllerBase; use SP\Modules\Web\Controllers\Traits\JsonTrait; use SP\Mvc\Controller\SimpleControllerHelper; @@ -72,7 +72,7 @@ final class XmlExportController extends SimpleControllerBase $exportPasswordR = $this->request->analyzeEncrypted('exportPwdR'); if (!empty($exportPassword) && $exportPassword !== $exportPasswordR) { - return $this->returnJsonResponse(JsonResponse::JSON_ERROR, __u('Passwords do not match')); + return $this->returnJsonResponse(JsonMessage::JSON_ERROR, __u('Passwords do not match')); } try { @@ -120,7 +120,7 @@ final class XmlExportController extends SimpleControllerBase // Create the XML archive after verifying the export integrity $this->xmlExportService->createArchive(); - return $this->returnJsonResponse(JsonResponse::JSON_SUCCESS, __u('Export process finished')); + return $this->returnJsonResponse(JsonMessage::JSON_SUCCESS, __u('Export process finished')); } catch (Exception $e) { processException($e); diff --git a/app/modules/web/Controllers/ConfigEncryption/RefreshController.php b/app/modules/web/Controllers/ConfigEncryption/RefreshController.php index 152c7688..b23cee72 100644 --- a/app/modules/web/Controllers/ConfigEncryption/RefreshController.php +++ b/app/modules/web/Controllers/ConfigEncryption/RefreshController.php @@ -36,7 +36,7 @@ use SP\Domain\Core\Acl\AclActionsInterface; use SP\Domain\Core\Acl\UnauthorizedPageException; use SP\Domain\Core\Exceptions\SessionTimeout; use SP\Domain\Crypt\Ports\MasterPassServiceInterface; -use SP\Http\JsonResponse; +use SP\Http\JsonMessage; use SP\Modules\Web\Controllers\SimpleControllerBase; use SP\Modules\Web\Controllers\Traits\JsonTrait; use SP\Mvc\Controller\SimpleControllerHelper; @@ -70,7 +70,7 @@ final class RefreshController extends SimpleControllerBase { try { if ($this->config->getConfigData()->isDemoEnabled()) { - return $this->returnJsonResponse(JsonResponse::JSON_WARNING, __u('Ey, this is a DEMO!!')); + return $this->returnJsonResponse(JsonMessage::JSON_WARNING, __u('Ey, this is a DEMO!!')); } $this->masterPassService->updateConfig(Hash::hashKey(CryptSession::getSessionKey($this->session))); @@ -80,14 +80,14 @@ final class RefreshController extends SimpleControllerBase new Event($this, EventMessage::factory()->addDescription(__u('Master password hash updated'))) ); - return $this->returnJsonResponse(JsonResponse::JSON_SUCCESS, __u('Master password hash updated')); + return $this->returnJsonResponse(JsonMessage::JSON_SUCCESS, __u('Master password hash updated')); } catch (Exception $e) { processException($e); $this->eventDispatcher->notify('exception', new Event($e)); return $this->returnJsonResponse( - JsonResponse::JSON_ERROR, + JsonMessage::JSON_ERROR, __u('Error while updating the master password hash') ); } diff --git a/app/modules/web/Controllers/ConfigEncryption/SaveController.php b/app/modules/web/Controllers/ConfigEncryption/SaveController.php index eb816fe9..f37b9b7b 100644 --- a/app/modules/web/Controllers/ConfigEncryption/SaveController.php +++ b/app/modules/web/Controllers/ConfigEncryption/SaveController.php @@ -41,7 +41,7 @@ use SP\Domain\Crypt\Services\UpdateMasterPassRequest; use SP\Domain\Task\Ports\TaskInterface; use SP\Domain\Task\Services\Task; use SP\Domain\Task\Services\TaskFactory; -use SP\Http\JsonResponse; +use SP\Http\JsonMessage; use SP\Infrastructure\Common\Repositories\NoSuchItemException; use SP\Infrastructure\File\FileException; use SP\Modules\Web\Controllers\SimpleControllerBase; @@ -87,7 +87,7 @@ final class SaveController extends SimpleControllerBase if (!$this->masterPassService->checkUserUpdateMPass($this->session->getUserData()->getLastUpdateMPass())) { return $this->returnJsonResponse( - JsonResponse::JSON_SUCCESS_STICKY, + JsonMessage::JSON_SUCCESS_STICKY, __u('Master password updated'), [__u('Please, restart the session for update it')] ); @@ -95,42 +95,42 @@ final class SaveController extends SimpleControllerBase if (empty($newMasterPass) || empty($currentMasterPass)) { return $this->returnJsonResponse( - JsonResponse::JSON_ERROR, + JsonMessage::JSON_ERROR, __u('Master password not entered') ); } if ($confirmPassChange === false) { return $this->returnJsonResponse( - JsonResponse::JSON_ERROR, + JsonMessage::JSON_ERROR, __u('The password update must be confirmed') ); } if ($newMasterPass === $currentMasterPass) { return $this->returnJsonResponse( - JsonResponse::JSON_ERROR, + JsonMessage::JSON_ERROR, __u('Passwords are the same') ); } if ($newMasterPass !== $newMasterPassR) { return $this->returnJsonResponse( - JsonResponse::JSON_ERROR, + JsonMessage::JSON_ERROR, __u('Master passwords do not match') ); } if (!$this->masterPassService->checkMasterPassword($currentMasterPass)) { return $this->returnJsonResponse( - JsonResponse::JSON_ERROR, + JsonMessage::JSON_ERROR, __u('The current master password does not match') ); } if (!$this->config->getConfigData()->isMaintenance()) { return $this->returnJsonResponse( - JsonResponse::JSON_WARNING, + JsonMessage::JSON_WARNING, __u('Maintenance mode not enabled'), [__u('Please, enable it to avoid unwanted behavior from other sessions')] ); @@ -138,7 +138,7 @@ final class SaveController extends SimpleControllerBase if ($this->config->getConfigData()->isDemoEnabled()) { return $this->returnJsonResponse( - JsonResponse::JSON_WARNING, + JsonMessage::JSON_WARNING, __u('Ey, this is a DEMO!!') ); } @@ -181,14 +181,14 @@ final class SaveController extends SimpleControllerBase $this->eventDispatcher->notify('exception', new Event($e)); return $this->returnJsonResponse( - JsonResponse::JSON_ERROR, + JsonMessage::JSON_ERROR, __u('Error while saving the Master Password\'s hash') ); } } return $this->returnJsonResponse( - JsonResponse::JSON_SUCCESS_STICKY, + JsonMessage::JSON_SUCCESS_STICKY, __u('Master password updated'), [__u('Please, restart the session to update it')] ); diff --git a/app/modules/web/Controllers/ConfigEncryption/SaveTempController.php b/app/modules/web/Controllers/ConfigEncryption/SaveTempController.php index 91d6f892..2051791e 100644 --- a/app/modules/web/Controllers/ConfigEncryption/SaveTempController.php +++ b/app/modules/web/Controllers/ConfigEncryption/SaveTempController.php @@ -32,7 +32,7 @@ use SP\Domain\Core\Acl\AclActionsInterface; use SP\Domain\Core\Acl\UnauthorizedPageException; use SP\Domain\Core\Exceptions\SessionTimeout; use SP\Domain\Crypt\Ports\TemporaryMasterPassServiceInterface; -use SP\Http\JsonResponse; +use SP\Http\JsonMessage; use SP\Modules\Web\Controllers\SimpleControllerBase; use SP\Modules\Web\Controllers\Traits\JsonTrait; use SP\Mvc\Controller\SimpleControllerHelper; @@ -85,7 +85,7 @@ final class SaveTempController extends SimpleControllerBase } return $this->returnJsonResponse( - JsonResponse::JSON_SUCCESS, + JsonMessage::JSON_SUCCESS, __u('Temporary password generated'), [__u('Email sent')] ); @@ -95,14 +95,14 @@ final class SaveTempController extends SimpleControllerBase $this->eventDispatcher->notify('exception', new Event($e)); return $this->returnJsonResponse( - JsonResponse::JSON_WARNING, + JsonMessage::JSON_WARNING, __u('Temporary password generated'), [__u('Error while sending the email')] ); } } - return $this->returnJsonResponse(JsonResponse::JSON_SUCCESS, __u('Temporary password generated')); + return $this->returnJsonResponse(JsonMessage::JSON_SUCCESS, __u('Temporary password generated')); } catch (Exception $e) { processException($e); diff --git a/app/modules/web/Controllers/ConfigImport/ImportController.php b/app/modules/web/Controllers/ConfigImport/ImportController.php index d330f777..1faee48c 100644 --- a/app/modules/web/Controllers/ConfigImport/ImportController.php +++ b/app/modules/web/Controllers/ConfigImport/ImportController.php @@ -36,7 +36,7 @@ use SP\Domain\Core\Exceptions\SessionTimeout; use SP\Domain\Import\Ports\ImportServiceInterface; use SP\Domain\Import\Services\FileImport; use SP\Domain\Import\Services\ImportParams; -use SP\Http\JsonResponse; +use SP\Http\JsonMessage; use SP\Modules\Web\Controllers\SimpleControllerBase; use SP\Modules\Web\Controllers\Traits\JsonTrait; use SP\Mvc\Controller\SimpleControllerHelper; @@ -68,7 +68,7 @@ final class ImportController extends SimpleControllerBase public function importAction(): bool { if ($this->config->getConfigData()->isDemoEnabled()) { - return $this->returnJsonResponse(JsonResponse::JSON_WARNING, __u('Ey, this is a DEMO!!')); + return $this->returnJsonResponse(JsonMessage::JSON_WARNING, __u('Ey, this is a DEMO!!')); } try { @@ -91,14 +91,14 @@ final class ImportController extends SimpleControllerBase if ($counter > 0) { return $this->returnJsonResponse( - JsonResponse::JSON_SUCCESS, + JsonMessage::JSON_SUCCESS, __u('Import finished'), [__u('Please check out the event log for more details')] ); } return $this->returnJsonResponse( - JsonResponse::JSON_WARNING, + JsonMessage::JSON_WARNING, __u('No accounts were imported'), [__u('Please check out the event log for more details')] ); diff --git a/app/modules/web/Controllers/ConfigLdap/CheckController.php b/app/modules/web/Controllers/ConfigLdap/CheckController.php index 48617538..705764d2 100644 --- a/app/modules/web/Controllers/ConfigLdap/CheckController.php +++ b/app/modules/web/Controllers/ConfigLdap/CheckController.php @@ -35,7 +35,7 @@ use SP\Domain\Core\Acl\UnauthorizedPageException; use SP\Domain\Core\Exceptions\CheckException; use SP\Domain\Core\Exceptions\SessionTimeout; use SP\Domain\Core\Exceptions\SPException; -use SP\Http\JsonResponse; +use SP\Http\JsonMessage; use SP\Modules\Web\Controllers\SimpleControllerBase; use SP\Modules\Web\Controllers\Traits\JsonTrait; use SP\Mvc\Controller\SimpleControllerHelper; @@ -78,7 +78,7 @@ final class CheckController extends SimpleControllerBase || $ldapParams->getBindDn()) ) { return $this->returnJsonResponse( - JsonResponse::JSON_ERROR, + JsonMessage::JSON_ERROR, __u('Missing LDAP parameters') ); } @@ -90,7 +90,7 @@ final class CheckController extends SimpleControllerBase return $this->returnJsonResponseData( ['template' => $this->template->render(), 'items' => $data['results']], - JsonResponse::JSON_SUCCESS, + JsonMessage::JSON_SUCCESS, __u('LDAP connection OK'), [sprintf(__('Objects found: %d'), $data['count'])] ); diff --git a/app/modules/web/Controllers/ConfigLdap/CheckImportController.php b/app/modules/web/Controllers/ConfigLdap/CheckImportController.php index 0edd175d..c747d220 100644 --- a/app/modules/web/Controllers/ConfigLdap/CheckImportController.php +++ b/app/modules/web/Controllers/ConfigLdap/CheckImportController.php @@ -35,7 +35,7 @@ use SP\Domain\Core\Acl\UnauthorizedPageException; use SP\Domain\Core\Exceptions\CheckException; use SP\Domain\Core\Exceptions\SessionTimeout; use SP\Domain\Core\Exceptions\SPException; -use SP\Http\JsonResponse; +use SP\Http\JsonMessage; use SP\Modules\Web\Controllers\SimpleControllerBase; use SP\Modules\Web\Controllers\Traits\JsonTrait; use SP\Mvc\Controller\SimpleControllerHelper; @@ -77,7 +77,7 @@ final class CheckImportController extends SimpleControllerBase || $ldapParams->getSearchBase() || $ldapParams->getBindDn()) ) { - return $this->returnJsonResponse(JsonResponse::JSON_ERROR, __u('Missing LDAP parameters')); + return $this->returnJsonResponse(JsonMessage::JSON_ERROR, __u('Missing LDAP parameters')); } $filter = $this->request->analyzeString('ldap_import_filter'); @@ -97,7 +97,7 @@ final class CheckImportController extends SimpleControllerBase return $this->returnJsonResponseData( ['template' => $this->template->render(), 'items' => $data['results']], - JsonResponse::JSON_SUCCESS, + JsonMessage::JSON_SUCCESS, __u('LDAP connection OK'), [sprintf(__('Objects found: %d'), $data['count'])] ); diff --git a/app/modules/web/Controllers/ConfigLdap/ConfigLdapTrait.php b/app/modules/web/Controllers/ConfigLdap/ConfigLdapTrait.php index c89c1b44..b4d18ee0 100644 --- a/app/modules/web/Controllers/ConfigLdap/ConfigLdapTrait.php +++ b/app/modules/web/Controllers/ConfigLdap/ConfigLdapTrait.php @@ -25,7 +25,7 @@ namespace SP\Modules\Web\Controllers\ConfigLdap; use SP\Domain\Core\Exceptions\ValidationException; -use SP\Http\RequestInterface; +use SP\Domain\Http\RequestInterface; use SP\Providers\Auth\Ldap\LdapParams; use SP\Providers\Auth\Ldap\LdapTypeEnum; diff --git a/app/modules/web/Controllers/ConfigLdap/ImportController.php b/app/modules/web/Controllers/ConfigLdap/ImportController.php index 05d84eba..7e6a4bec 100644 --- a/app/modules/web/Controllers/ConfigLdap/ImportController.php +++ b/app/modules/web/Controllers/ConfigLdap/ImportController.php @@ -40,10 +40,10 @@ use SP\Domain\Core\Exceptions\SessionTimeout; use SP\Domain\Core\Exceptions\SPException; use SP\Domain\Core\Exceptions\ValidationException; use SP\Domain\Core\UI\ThemeInterface; +use SP\Domain\Http\RequestInterface; use SP\Domain\Import\Ports\LdapImportServiceInterface; use SP\Domain\Import\Services\LdapImportParams; -use SP\Http\JsonResponse; -use SP\Http\RequestInterface; +use SP\Http\JsonMessage; use SP\Modules\Web\Controllers\SimpleControllerBase; use SP\Modules\Web\Controllers\Traits\JsonTrait; @@ -81,7 +81,7 @@ final class ImportController extends SimpleControllerBase { try { if ($this->configData->isDemoEnabled()) { - return $this->returnJsonResponse(JsonResponse::JSON_WARNING, __u('Ey, this is a DEMO!!')); + return $this->returnJsonResponse(JsonMessage::JSON_WARNING, __u('Ey, this is a DEMO!!')); } [$ldapImportParams, $checkImportGroups] = $this->getImportParams(); @@ -109,7 +109,7 @@ final class ImportController extends SimpleControllerBase } return $this->returnJsonResponse( - JsonResponse::JSON_SUCCESS, + JsonMessage::JSON_SUCCESS, __u('LDAP users import finished'), [ sprintf( diff --git a/app/modules/web/Controllers/ConfigLdap/SaveController.php b/app/modules/web/Controllers/ConfigLdap/SaveController.php index da55835d..3e2ee3e8 100644 --- a/app/modules/web/Controllers/ConfigLdap/SaveController.php +++ b/app/modules/web/Controllers/ConfigLdap/SaveController.php @@ -34,7 +34,7 @@ use SP\Domain\Core\Exceptions\CheckException; use SP\Domain\Core\Exceptions\SessionTimeout; use SP\Domain\Core\Exceptions\SPException; use SP\Domain\Core\Exceptions\ValidationException; -use SP\Http\JsonResponse; +use SP\Http\JsonMessage; use SP\Modules\Web\Controllers\SimpleControllerBase; use SP\Modules\Web\Controllers\Traits\ConfigTrait; @@ -99,7 +99,7 @@ final class SaveController extends SimpleControllerBase $eventMessage->addDescription(__u('LDAP disabled')); } else { - return $this->returnJsonResponse(JsonResponse::JSON_SUCCESS, __u('No changes')); + return $this->returnJsonResponse(JsonMessage::JSON_SUCCESS, __u('No changes')); } return $this->saveConfig( diff --git a/app/modules/web/Controllers/ConfigMail/CheckController.php b/app/modules/web/Controllers/ConfigMail/CheckController.php index d0250951..62940783 100644 --- a/app/modules/web/Controllers/ConfigMail/CheckController.php +++ b/app/modules/web/Controllers/ConfigMail/CheckController.php @@ -37,7 +37,7 @@ use SP\Domain\Core\Exceptions\SessionTimeout; use SP\Domain\Core\Exceptions\SPException; use SP\Domain\Core\Exceptions\ValidationException; use SP\Domain\Notification\Ports\MailServiceInterface; -use SP\Http\JsonResponse; +use SP\Http\JsonMessage; use SP\Modules\Web\Controllers\SimpleControllerBase; use SP\Modules\Web\Controllers\Traits\ConfigTrait; use SP\Mvc\Controller\SimpleControllerHelper; @@ -91,7 +91,7 @@ final class CheckController extends SimpleControllerBase ); return $this->returnJsonResponse( - JsonResponse::JSON_SUCCESS, + JsonMessage::JSON_SUCCESS, __u('Email sent'), [__u('Please, check your inbox')] ); diff --git a/app/modules/web/Controllers/ConfigMail/SaveController.php b/app/modules/web/Controllers/ConfigMail/SaveController.php index 037e6863..49e7c9af 100644 --- a/app/modules/web/Controllers/ConfigMail/SaveController.php +++ b/app/modules/web/Controllers/ConfigMail/SaveController.php @@ -31,7 +31,7 @@ use SP\Domain\Config\Services\ConfigUtil; use SP\Domain\Core\Acl\AclActionsInterface; use SP\Domain\Core\Acl\UnauthorizedPageException; use SP\Domain\Core\Exceptions\SessionTimeout; -use SP\Http\JsonResponse; +use SP\Http\JsonMessage; use SP\Modules\Web\Controllers\SimpleControllerBase; use SP\Modules\Web\Controllers\Traits\ConfigTrait; @@ -67,7 +67,7 @@ final class SaveController extends SimpleControllerBase if ($mailEnabled && (empty($mailServer) || empty($mailFrom)) ) { - return $this->returnJsonResponse(JsonResponse::JSON_ERROR, __u('Missing Mail parameters')); + return $this->returnJsonResponse(JsonMessage::JSON_ERROR, __u('Missing Mail parameters')); } if ($mailEnabled) { @@ -101,7 +101,7 @@ final class SaveController extends SimpleControllerBase $eventMessage->addDescription(__u('Mail disabled')); } else { - return $this->returnJsonResponse(JsonResponse::JSON_SUCCESS, __u('No changes')); + return $this->returnJsonResponse(JsonMessage::JSON_SUCCESS, __u('No changes')); } return $this->saveConfig( diff --git a/app/modules/web/Controllers/ConfigWiki/SaveController.php b/app/modules/web/Controllers/ConfigWiki/SaveController.php index 937ebe83..48e2aa6a 100644 --- a/app/modules/web/Controllers/ConfigWiki/SaveController.php +++ b/app/modules/web/Controllers/ConfigWiki/SaveController.php @@ -30,7 +30,7 @@ use SP\Core\Events\EventMessage; use SP\Domain\Core\Acl\AclActionsInterface; use SP\Domain\Core\Acl\UnauthorizedPageException; use SP\Domain\Core\Exceptions\SessionTimeout; -use SP\Http\JsonResponse; +use SP\Http\JsonMessage; use SP\Modules\Web\Controllers\SimpleControllerBase; use SP\Modules\Web\Controllers\Traits\ConfigTrait; @@ -58,7 +58,7 @@ final class SaveController extends SimpleControllerBase $wikiFilter = $this->request->analyzeString('wiki_filter'); if ($wikiEnabled && (!$wikiSearchUrl || !$wikiPageUrl || !$wikiFilter)) { - return $this->returnJsonResponse(JsonResponse::JSON_ERROR, __u('Missing Wiki parameters')); + return $this->returnJsonResponse(JsonMessage::JSON_ERROR, __u('Missing Wiki parameters')); } if ($wikiEnabled) { @@ -75,7 +75,7 @@ final class SaveController extends SimpleControllerBase $eventMessage->addDescription(__u('Wiki disabled')); } else { - return $this->returnJsonResponse(JsonResponse::JSON_SUCCESS, __u('No changes')); + return $this->returnJsonResponse(JsonMessage::JSON_SUCCESS, __u('No changes')); } return $this->saveConfig( diff --git a/app/modules/web/Controllers/ControllerBase.php b/app/modules/web/Controllers/ControllerBase.php index 9e71ea5a..814e1748 100644 --- a/app/modules/web/Controllers/ControllerBase.php +++ b/app/modules/web/Controllers/ControllerBase.php @@ -42,8 +42,8 @@ use SP\Domain\Core\Exceptions\FileNotFoundException; use SP\Domain\Core\Exceptions\SessionTimeout; use SP\Domain\Core\Exceptions\SPException; use SP\Domain\Core\UI\ThemeInterface; +use SP\Domain\Http\RequestInterface; use SP\Domain\User\Services\UserLoginResponse; -use SP\Http\RequestInterface; use SP\Modules\Web\Controllers\Helpers\LayoutHelper; use SP\Modules\Web\Controllers\Traits\WebControllerTrait; use SP\Mvc\Controller\WebControllerHelper; diff --git a/app/modules/web/Controllers/CustomField/CreateController.php b/app/modules/web/Controllers/CustomField/CreateController.php index 4d7bf7fa..c0b08c22 100644 --- a/app/modules/web/Controllers/CustomField/CreateController.php +++ b/app/modules/web/Controllers/CustomField/CreateController.php @@ -29,7 +29,7 @@ use Exception; use JsonException; use SP\Core\Events\Event; use SP\Domain\Core\Acl\AclActionsInterface; -use SP\Http\JsonResponse; +use SP\Http\JsonMessage; use SP\Modules\Web\Controllers\Traits\JsonTrait; /** @@ -48,7 +48,7 @@ final class CreateController extends CustomFieldViewBase try { if (!$this->acl->checkUserAccess(AclActionsInterface::CUSTOMFIELD_CREATE)) { return $this->returnJsonResponse( - JsonResponse::JSON_ERROR, + JsonMessage::JSON_ERROR, __u('You don\'t have permission to do this operation') ); } diff --git a/app/modules/web/Controllers/CustomField/DeleteController.php b/app/modules/web/Controllers/CustomField/DeleteController.php index b89f36bb..9e99a841 100644 --- a/app/modules/web/Controllers/CustomField/DeleteController.php +++ b/app/modules/web/Controllers/CustomField/DeleteController.php @@ -30,7 +30,7 @@ use JsonException; use SP\Core\Events\Event; use SP\Core\Events\EventMessage; use SP\Domain\Core\Acl\AclActionsInterface; -use SP\Http\JsonResponse; +use SP\Http\JsonMessage; use SP\Modules\Web\Controllers\Traits\JsonTrait; use SP\Mvc\Controller\ItemTrait; @@ -55,7 +55,7 @@ final class DeleteController extends CustomFieldSaveBase try { if (!$this->acl->checkUserAccess(AclActionsInterface::CUSTOMFIELD_DELETE)) { return $this->returnJsonResponse( - JsonResponse::JSON_ERROR, + JsonMessage::JSON_ERROR, __u('You don\'t have permission to do this operation') ); } @@ -68,14 +68,14 @@ final class DeleteController extends CustomFieldSaveBase new Event($this, EventMessage::factory()->addDescription(__u('Fields deleted'))) ); - return $this->returnJsonResponse(JsonResponse::JSON_SUCCESS, __u('Fields deleted')); + return $this->returnJsonResponse(JsonMessage::JSON_SUCCESS, __u('Fields deleted')); } $this->customFieldDefService->delete($id); $this->eventDispatcher->notify('delete.customField', new Event($this)); - return $this->returnJsonResponse(JsonResponse::JSON_SUCCESS, __u('Field deleted')); + return $this->returnJsonResponse(JsonMessage::JSON_SUCCESS, __u('Field deleted')); } catch (Exception $e) { processException($e); diff --git a/app/modules/web/Controllers/CustomField/EditController.php b/app/modules/web/Controllers/CustomField/EditController.php index 8e3065b8..fa6231d9 100644 --- a/app/modules/web/Controllers/CustomField/EditController.php +++ b/app/modules/web/Controllers/CustomField/EditController.php @@ -29,7 +29,7 @@ use Exception; use JsonException; use SP\Core\Events\Event; use SP\Domain\Core\Acl\AclActionsInterface; -use SP\Http\JsonResponse; +use SP\Http\JsonMessage; use SP\Modules\Web\Controllers\Traits\JsonTrait; /** @@ -52,7 +52,7 @@ final class EditController extends CustomFieldViewBase try { if (!$this->acl->checkUserAccess(AclActionsInterface::CUSTOMFIELD_EDIT)) { return $this->returnJsonResponse( - JsonResponse::JSON_ERROR, + JsonMessage::JSON_ERROR, __u('You don\'t have permission to do this operation') ); } diff --git a/app/modules/web/Controllers/CustomField/SaveCreateController.php b/app/modules/web/Controllers/CustomField/SaveCreateController.php index b89fd8f6..1999aa4d 100644 --- a/app/modules/web/Controllers/CustomField/SaveCreateController.php +++ b/app/modules/web/Controllers/CustomField/SaveCreateController.php @@ -31,7 +31,7 @@ use SP\Core\Events\Event; use SP\Core\Events\EventMessage; use SP\Domain\Core\Acl\AclActionsInterface; use SP\Domain\Core\Exceptions\ValidationException; -use SP\Http\JsonResponse; +use SP\Http\JsonMessage; use SP\Modules\Web\Controllers\Traits\JsonTrait; /** @@ -50,7 +50,7 @@ final class SaveCreateController extends CustomFieldSaveBase try { if (!$this->acl->checkUserAccess(AclActionsInterface::CUSTOMFIELD_CREATE)) { return $this->returnJsonResponse( - JsonResponse::JSON_ERROR, + JsonMessage::JSON_ERROR, __u('You don\'t have permission to do this operation') ); } @@ -72,7 +72,7 @@ final class SaveCreateController extends CustomFieldSaveBase ); return $this->returnJsonResponse( - JsonResponse::JSON_SUCCESS, + JsonMessage::JSON_SUCCESS, __u('Field added') ); } catch (ValidationException $e) { diff --git a/app/modules/web/Controllers/CustomField/SaveEditController.php b/app/modules/web/Controllers/CustomField/SaveEditController.php index 1e1c2718..75f4aff3 100644 --- a/app/modules/web/Controllers/CustomField/SaveEditController.php +++ b/app/modules/web/Controllers/CustomField/SaveEditController.php @@ -31,7 +31,7 @@ use SP\Core\Events\Event; use SP\Core\Events\EventMessage; use SP\Domain\Core\Acl\AclActionsInterface; use SP\Domain\Core\Exceptions\ValidationException; -use SP\Http\JsonResponse; +use SP\Http\JsonMessage; use SP\Modules\Web\Controllers\Traits\JsonTrait; /** @@ -54,7 +54,7 @@ final class SaveEditController extends CustomFieldSaveBase try { if (!$this->acl->checkUserAccess(AclActionsInterface::CUSTOMFIELD_EDIT)) { return $this->returnJsonResponse( - JsonResponse::JSON_ERROR, + JsonMessage::JSON_ERROR, __u('You don\'t have permission to do this operation') ); } @@ -75,7 +75,7 @@ final class SaveEditController extends CustomFieldSaveBase ) ); - return $this->returnJsonResponse(JsonResponse::JSON_SUCCESS, __u('Field updated')); + return $this->returnJsonResponse(JsonMessage::JSON_SUCCESS, __u('Field updated')); } catch (ValidationException $e) { return $this->returnJsonResponseException($e); } catch (Exception $e) { diff --git a/app/modules/web/Controllers/CustomField/SearchController.php b/app/modules/web/Controllers/CustomField/SearchController.php index b5a45aab..7a04f6d6 100644 --- a/app/modules/web/Controllers/CustomField/SearchController.php +++ b/app/modules/web/Controllers/CustomField/SearchController.php @@ -32,7 +32,7 @@ use SP\Domain\Core\Exceptions\ConstraintException; use SP\Domain\Core\Exceptions\QueryException; use SP\Domain\CustomField\Ports\CustomFieldDefServiceInterface; use SP\Html\DataGrid\DataGridInterface; -use SP\Http\JsonResponse; +use SP\Http\JsonMessage; use SP\Modules\Web\Controllers\ControllerBase; use SP\Modules\Web\Controllers\Helpers\Grid\CustomFieldGrid; use SP\Modules\Web\Controllers\Traits\JsonTrait; @@ -76,7 +76,7 @@ final class SearchController extends ControllerBase { if (!$this->acl->checkUserAccess(AclActionsInterface::CUSTOMFIELD_SEARCH)) { return $this->returnJsonResponse( - JsonResponse::JSON_ERROR, + JsonMessage::JSON_ERROR, __u('You don\'t have permission to do this operation') ); } diff --git a/app/modules/web/Controllers/CustomField/ViewController.php b/app/modules/web/Controllers/CustomField/ViewController.php index 6864bf0e..e1f49321 100644 --- a/app/modules/web/Controllers/CustomField/ViewController.php +++ b/app/modules/web/Controllers/CustomField/ViewController.php @@ -28,7 +28,7 @@ use Exception; use JsonException; use SP\Core\Events\Event; use SP\Domain\Core\Acl\AclActionsInterface; -use SP\Http\JsonResponse; +use SP\Http\JsonMessage; use SP\Modules\Web\Controllers\Traits\JsonTrait; /** @@ -53,7 +53,7 @@ final class ViewController extends CustomFieldViewBase try { if (!$this->acl->checkUserAccess(AclActionsInterface::CUSTOMFIELD_VIEW)) { return $this->returnJsonResponse( - JsonResponse::JSON_ERROR, + JsonMessage::JSON_ERROR, __u('You don\'t have permission to do this operation') ); } @@ -69,7 +69,7 @@ final class ViewController extends CustomFieldViewBase $this->eventDispatcher->notify('exception', new Event($e)); - return $this->returnJsonResponse(JsonResponse::JSON_ERROR, $e->getMessage()); + return $this->returnJsonResponse(JsonMessage::JSON_ERROR, $e->getMessage()); } return $this->returnJsonResponseData(['html' => $this->render()]); diff --git a/app/modules/web/Controllers/Eventlog/ClearController.php b/app/modules/web/Controllers/Eventlog/ClearController.php index 332acc53..2c80a9ef 100644 --- a/app/modules/web/Controllers/Eventlog/ClearController.php +++ b/app/modules/web/Controllers/Eventlog/ClearController.php @@ -33,7 +33,7 @@ use SP\Core\Events\EventMessage; use SP\Domain\Auth\Services\AuthException; use SP\Domain\Core\Exceptions\SessionTimeout; use SP\Domain\Security\Ports\EventlogServiceInterface; -use SP\Http\JsonResponse; +use SP\Http\JsonMessage; use SP\Modules\Web\Controllers\ControllerBase; use SP\Modules\Web\Controllers\Traits\JsonTrait; use SP\Mvc\Controller\WebControllerHelper; @@ -79,7 +79,7 @@ final class ClearController extends ControllerBase new Event($this, EventMessage::factory()->addDescription(__u('Event log cleared'))) ); - return $this->returnJsonResponse(JsonResponse::JSON_SUCCESS, __u('Event log cleared')); + return $this->returnJsonResponse(JsonMessage::JSON_SUCCESS, __u('Event log cleared')); } catch (Exception $e) { processException($e); diff --git a/app/modules/web/Controllers/Eventlog/SearchController.php b/app/modules/web/Controllers/Eventlog/SearchController.php index b6416611..4d8b6e95 100644 --- a/app/modules/web/Controllers/Eventlog/SearchController.php +++ b/app/modules/web/Controllers/Eventlog/SearchController.php @@ -32,7 +32,7 @@ use SP\Domain\Core\Exceptions\ConstraintException; use SP\Domain\Core\Exceptions\QueryException; use SP\Domain\Security\Ports\EventlogServiceInterface; use SP\Html\DataGrid\DataGridInterface; -use SP\Http\JsonResponse; +use SP\Http\JsonMessage; use SP\Modules\Web\Controllers\ControllerBase; use SP\Modules\Web\Controllers\Helpers\Grid\EventlogGrid; use SP\Modules\Web\Controllers\Traits\JsonTrait; @@ -76,7 +76,7 @@ final class SearchController extends ControllerBase { if (!$this->acl->checkUserAccess(AclActionsInterface::EVENTLOG_SEARCH)) { return $this->returnJsonResponse( - JsonResponse::JSON_ERROR, + JsonMessage::JSON_ERROR, __u('You don\'t have permission to do this operation') ); } diff --git a/app/modules/web/Controllers/Helpers/Account/AccountActionsHelper.php b/app/modules/web/Controllers/Helpers/Account/AccountActionsHelper.php index d395f40c..652657ab 100644 --- a/app/modules/web/Controllers/Helpers/Account/AccountActionsHelper.php +++ b/app/modules/web/Controllers/Helpers/Account/AccountActionsHelper.php @@ -30,9 +30,9 @@ use SP\Core\UI\ThemeIcons; use SP\Domain\Account\Services\AccountAcl; use SP\Domain\Account\Services\AccountSearchItem; use SP\Domain\Core\Acl\AclActionsInterface; +use SP\Domain\Http\RequestInterface; use SP\Html\DataGrid\Action\DataGridAction; use SP\Html\DataGrid\Action\DataGridActionType; -use SP\Http\RequestInterface; use SP\Modules\Web\Controllers\Helpers\HelperBase; use SP\Mvc\View\TemplateInterface; diff --git a/app/modules/web/Controllers/Helpers/Account/AccountHelper.php b/app/modules/web/Controllers/Helpers/Account/AccountHelper.php index ab92c3b8..bbec56d9 100644 --- a/app/modules/web/Controllers/Helpers/Account/AccountHelper.php +++ b/app/modules/web/Controllers/Helpers/Account/AccountHelper.php @@ -50,13 +50,13 @@ use SP\Domain\Core\Exceptions\QueryException; use SP\Domain\Core\Exceptions\SPException; use SP\Domain\Crypt\Ports\MasterPassServiceInterface; use SP\Domain\CustomField\Ports\CustomFieldServiceInterface; +use SP\Domain\Http\RequestInterface; use SP\Domain\ItemPreset\Ports\ItemPresetInterface; use SP\Domain\ItemPreset\Ports\ItemPresetServiceInterface; use SP\Domain\Tag\Ports\TagServiceInterface; use SP\Domain\User\Ports\UserGroupServiceInterface; use SP\Domain\User\Ports\UserServiceInterface; use SP\Domain\User\Services\UpdatedMasterPassException; -use SP\Http\RequestInterface; use SP\Infrastructure\Common\Repositories\NoSuchItemException; use SP\Mvc\Controller\ItemTrait; use SP\Mvc\View\Components\SelectItemAdapter; diff --git a/app/modules/web/Controllers/Helpers/Account/AccountHelperBase.php b/app/modules/web/Controllers/Helpers/Account/AccountHelperBase.php index fb594381..e82c6ee1 100644 --- a/app/modules/web/Controllers/Helpers/Account/AccountHelperBase.php +++ b/app/modules/web/Controllers/Helpers/Account/AccountHelperBase.php @@ -4,7 +4,7 @@ * * @author nuxsmin * @link https://syspass.org - * @copyright 2012-2022, Rubén Domínguez nuxsmin@$syspass.org + * @copyright 2012-2023, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * @@ -31,8 +31,8 @@ use SP\Domain\Common\Services\ServiceException; use SP\Domain\Core\Acl\UnauthorizedPageException; use SP\Domain\Core\Exceptions\SPException; use SP\Domain\Crypt\Ports\MasterPassServiceInterface; +use SP\Domain\Http\RequestInterface; use SP\Domain\User\Services\UpdatedMasterPassException; -use SP\Http\RequestInterface; use SP\Infrastructure\Common\Repositories\NoSuchItemException; use SP\Modules\Web\Controllers\Helpers\HelperBase; use SP\Mvc\View\TemplateInterface; diff --git a/app/modules/web/Controllers/Helpers/Account/AccountHistoryHelper.php b/app/modules/web/Controllers/Helpers/Account/AccountHistoryHelper.php index 3a4070f4..8a571bae 100644 --- a/app/modules/web/Controllers/Helpers/Account/AccountHistoryHelper.php +++ b/app/modules/web/Controllers/Helpers/Account/AccountHistoryHelper.php @@ -4,7 +4,7 @@ * * @author nuxsmin * @link https://syspass.org - * @copyright 2012-2022, Rubén Domínguez nuxsmin@$syspass.org + * @copyright 2012-2023, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * @@ -42,8 +42,8 @@ use SP\Domain\Core\Exceptions\ConstraintException; use SP\Domain\Core\Exceptions\QueryException; use SP\Domain\Core\Exceptions\SPException; use SP\Domain\Crypt\Ports\MasterPassServiceInterface; +use SP\Domain\Http\RequestInterface; use SP\Domain\User\Services\UpdatedMasterPassException; -use SP\Http\RequestInterface; use SP\Infrastructure\Common\Repositories\NoSuchItemException; use SP\Mvc\View\Components\SelectItemAdapter; use SP\Mvc\View\TemplateInterface; diff --git a/app/modules/web/Controllers/Helpers/Account/AccountPasswordHelper.php b/app/modules/web/Controllers/Helpers/Account/AccountPasswordHelper.php index 45515d3a..514b8307 100644 --- a/app/modules/web/Controllers/Helpers/Account/AccountPasswordHelper.php +++ b/app/modules/web/Controllers/Helpers/Account/AccountPasswordHelper.php @@ -37,7 +37,7 @@ use SP\Domain\Common\Services\ServiceException; use SP\Domain\Core\Acl\AclActionsInterface; use SP\Domain\Core\Exceptions\FileNotFoundException; use SP\Domain\Crypt\Ports\MasterPassServiceInterface; -use SP\Http\RequestInterface; +use SP\Domain\Http\RequestInterface; use SP\Infrastructure\Common\Repositories\NoSuchItemException; use SP\Modules\Web\Controllers\Helpers\HelperBase; use SP\Modules\Web\Controllers\Helpers\HelperException; diff --git a/app/modules/web/Controllers/Helpers/Account/AccountSearchHelper.php b/app/modules/web/Controllers/Helpers/Account/AccountSearchHelper.php index f1704bc9..06287a47 100644 --- a/app/modules/web/Controllers/Helpers/Account/AccountSearchHelper.php +++ b/app/modules/web/Controllers/Helpers/Account/AccountSearchHelper.php @@ -40,6 +40,7 @@ use SP\Domain\Core\Acl\AclActionsInterface; use SP\Domain\Core\Exceptions\ConstraintException; use SP\Domain\Core\Exceptions\QueryException; use SP\Domain\Core\Exceptions\SPException; +use SP\Domain\Http\RequestInterface; use SP\Domain\Tag\Ports\TagServiceInterface; use SP\Html\DataGrid\Action\DataGridAction; use SP\Html\DataGrid\Action\DataGridActionSearch; @@ -48,7 +49,6 @@ use SP\Html\DataGrid\DataGridData; use SP\Html\DataGrid\DataGridSort; use SP\Html\DataGrid\Layout\DataGridHeaderSort; use SP\Html\DataGrid\Layout\DataGridPager; -use SP\Http\RequestInterface; use SP\Modules\Web\Controllers\Helpers\HelperBase; use SP\Mvc\View\Components\SelectItemAdapter; use SP\Mvc\View\TemplateInterface; diff --git a/app/modules/web/Controllers/Helpers/Grid/GridBase.php b/app/modules/web/Controllers/Helpers/Grid/GridBase.php index e741a2ff..c2f8f112 100644 --- a/app/modules/web/Controllers/Helpers/Grid/GridBase.php +++ b/app/modules/web/Controllers/Helpers/Grid/GridBase.php @@ -28,12 +28,12 @@ use SP\Core\Acl\Acl; use SP\Core\Application; use SP\Core\UI\ThemeIcons; use SP\DataModel\ItemSearchData; +use SP\Domain\Http\RequestInterface; use SP\Html\DataGrid\Action\DataGridActionSearch; use SP\Html\DataGrid\DataGridData; use SP\Html\DataGrid\DataGridInterface; use SP\Html\DataGrid\Layout\DataGridHeader; use SP\Html\DataGrid\Layout\DataGridPager; -use SP\Http\RequestInterface; use SP\Modules\Web\Controllers\Helpers\HelperBase; use SP\Mvc\View\TemplateInterface; diff --git a/app/modules/web/Controllers/Helpers/HelperBase.php b/app/modules/web/Controllers/Helpers/HelperBase.php index aba50127..1eed65c6 100644 --- a/app/modules/web/Controllers/Helpers/HelperBase.php +++ b/app/modules/web/Controllers/Helpers/HelperBase.php @@ -4,7 +4,7 @@ * * @author nuxsmin * @link https://syspass.org - * @copyright 2012-2022, Rubén Domínguez nuxsmin@$syspass.org + * @copyright 2012-2023, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * @@ -29,8 +29,8 @@ use SP\Core\Events\EventDispatcher; use SP\Domain\Config\Ports\ConfigDataInterface; use SP\Domain\Config\Services\ConfigFileService; use SP\Domain\Core\Context\ContextInterface; +use SP\Domain\Http\RequestInterface; use SP\Http\Request; -use SP\Http\RequestInterface; use SP\Mvc\View\TemplateInterface; /** diff --git a/app/modules/web/Controllers/Helpers/ItemPresetHelper.php b/app/modules/web/Controllers/Helpers/ItemPresetHelper.php index 57dc64f9..323c9dc9 100644 --- a/app/modules/web/Controllers/Helpers/ItemPresetHelper.php +++ b/app/modules/web/Controllers/Helpers/ItemPresetHelper.php @@ -4,7 +4,7 @@ * * @author nuxsmin * @link https://syspass.org - * @copyright 2012-2022, Rubén Domínguez nuxsmin@$syspass.org + * @copyright 2012-2023, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * @@ -34,10 +34,10 @@ use SP\Domain\Core\Exceptions\ConstraintException; use SP\Domain\Core\Exceptions\InvalidArgumentException; use SP\Domain\Core\Exceptions\NoSuchPropertyException; use SP\Domain\Core\Exceptions\QueryException; +use SP\Domain\Http\RequestInterface; use SP\Domain\User\Ports\UserGroupServiceInterface; use SP\Domain\User\Ports\UserProfileServiceInterface; use SP\Domain\User\Ports\UserServiceInterface; -use SP\Http\RequestInterface; use SP\Mvc\View\Components\SelectItemAdapter; use SP\Mvc\View\TemplateInterface; diff --git a/app/modules/web/Controllers/Helpers/LayoutHelper.php b/app/modules/web/Controllers/Helpers/LayoutHelper.php index ee34d917..d1bf2c77 100644 --- a/app/modules/web/Controllers/Helpers/LayoutHelper.php +++ b/app/modules/web/Controllers/Helpers/LayoutHelper.php @@ -33,9 +33,9 @@ use SP\Domain\Core\AppInfoInterface; use SP\Domain\Core\Crypt\CryptPKIInterface; use SP\Domain\Core\Exceptions\SPException; use SP\Domain\Core\UI\ThemeInterface; +use SP\Domain\Http\RequestInterface; use SP\Domain\Install\Services\InstallerService; use SP\Html\DataGrid\Action\DataGridAction; -use SP\Http\RequestInterface; use SP\Http\Uri; use SP\Mvc\View\TemplateInterface; use SP\Plugin\PluginManager; diff --git a/app/modules/web/Controllers/Install/InstallController.php b/app/modules/web/Controllers/Install/InstallController.php index 9091a50b..afc7b2d0 100644 --- a/app/modules/web/Controllers/Install/InstallController.php +++ b/app/modules/web/Controllers/Install/InstallController.php @@ -4,7 +4,7 @@ * * @author nuxsmin * @link https://syspass.org - * @copyright 2012-2022, Rubén Domínguez nuxsmin@$syspass.org + * @copyright 2012-2023, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * @@ -30,7 +30,7 @@ use SP\Core\Application; use SP\Domain\Core\Exceptions\SPException; use SP\Domain\Install\Adapters\InstallDataFactory; use SP\Domain\Install\Ports\InstallerServiceInterface; -use SP\Http\JsonResponse; +use SP\Http\JsonMessage; use SP\Modules\Web\Controllers\ControllerBase; use SP\Modules\Web\Controllers\Traits\JsonTrait; use SP\Mvc\Controller\WebControllerHelper; @@ -65,7 +65,7 @@ final class InstallController extends ControllerBase try { $this->installer->run($installData); - return $this->returnJsonResponse(JsonResponse::JSON_SUCCESS, __u('Installation finished')); + return $this->returnJsonResponse(JsonMessage::JSON_SUCCESS, __u('Installation finished')); } catch (Exception $e) { processException($e); diff --git a/app/modules/web/Controllers/ItemPreset/CreateController.php b/app/modules/web/Controllers/ItemPreset/CreateController.php index 04e32fad..2ddfdadd 100644 --- a/app/modules/web/Controllers/ItemPreset/CreateController.php +++ b/app/modules/web/Controllers/ItemPreset/CreateController.php @@ -29,7 +29,7 @@ use Exception; use JsonException; use SP\Core\Events\Event; use SP\Domain\Core\Acl\AclActionsInterface; -use SP\Http\JsonResponse; +use SP\Http\JsonMessage; use SP\Modules\Web\Controllers\Traits\JsonTrait; use SP\Util\Filter; @@ -51,7 +51,7 @@ final class CreateController extends ItemPresetViewBase try { if (!$this->acl->checkUserAccess(AclActionsInterface::ITEMPRESET_CREATE)) { return $this->returnJsonResponse( - JsonResponse::JSON_ERROR, + JsonMessage::JSON_ERROR, __u('You don\'t have permission to do this operation') ); } diff --git a/app/modules/web/Controllers/ItemPreset/DeleteController.php b/app/modules/web/Controllers/ItemPreset/DeleteController.php index cc0d0ce7..95c3cae2 100644 --- a/app/modules/web/Controllers/ItemPreset/DeleteController.php +++ b/app/modules/web/Controllers/ItemPreset/DeleteController.php @@ -30,7 +30,7 @@ use JsonException; use SP\Core\Events\Event; use SP\Core\Events\EventMessage; use SP\Domain\Core\Acl\AclActionsInterface; -use SP\Http\JsonResponse; +use SP\Http\JsonMessage; use SP\Modules\Web\Controllers\Traits\JsonTrait; use SP\Mvc\Controller\ItemTrait; @@ -55,7 +55,7 @@ final class DeleteController extends ItemPresetSaveBase try { if (!$this->acl->checkUserAccess(AclActionsInterface::ITEMPRESET_DELETE)) { return $this->returnJsonResponse( - JsonResponse::JSON_ERROR, + JsonMessage::JSON_ERROR, __u('You don\'t have permission to do this operation') ); } @@ -68,7 +68,7 @@ final class DeleteController extends ItemPresetSaveBase new Event($this, EventMessage::factory()->addDescription(__u('Values deleted'))) ); - return $this->returnJsonResponse(JsonResponse::JSON_SUCCESS, __u('Values deleted')); + return $this->returnJsonResponse(JsonMessage::JSON_SUCCESS, __u('Values deleted')); } $this->itemPresetService->delete($id); @@ -83,7 +83,7 @@ final class DeleteController extends ItemPresetSaveBase ) ); - return $this->returnJsonResponse(JsonResponse::JSON_SUCCESS, __u('Value deleted')); + return $this->returnJsonResponse(JsonMessage::JSON_SUCCESS, __u('Value deleted')); } catch (Exception $e) { processException($e); diff --git a/app/modules/web/Controllers/ItemPreset/EditController.php b/app/modules/web/Controllers/ItemPreset/EditController.php index 8f508a35..8c5733c8 100644 --- a/app/modules/web/Controllers/ItemPreset/EditController.php +++ b/app/modules/web/Controllers/ItemPreset/EditController.php @@ -29,7 +29,7 @@ use Exception; use JsonException; use SP\Core\Events\Event; use SP\Domain\Core\Acl\AclActionsInterface; -use SP\Http\JsonResponse; +use SP\Http\JsonMessage; use SP\Modules\Web\Controllers\Traits\JsonTrait; /** @@ -52,7 +52,7 @@ final class EditController extends ItemPresetViewBase try { if (!$this->acl->checkUserAccess(AclActionsInterface::ITEMPRESET_EDIT)) { return $this->returnJsonResponse( - JsonResponse::JSON_ERROR, + JsonMessage::JSON_ERROR, __u('You don\'t have permission to do this operation') ); } diff --git a/app/modules/web/Controllers/ItemPreset/SaveCreateController.php b/app/modules/web/Controllers/ItemPreset/SaveCreateController.php index 048c5b19..28a93345 100644 --- a/app/modules/web/Controllers/ItemPreset/SaveCreateController.php +++ b/app/modules/web/Controllers/ItemPreset/SaveCreateController.php @@ -31,7 +31,7 @@ use SP\Core\Events\Event; use SP\Core\Events\EventMessage; use SP\Domain\Core\Acl\AclActionsInterface; use SP\Domain\Core\Exceptions\ValidationException; -use SP\Http\JsonResponse; +use SP\Http\JsonMessage; use SP\Modules\Web\Controllers\Traits\JsonTrait; /** @@ -50,7 +50,7 @@ final class SaveCreateController extends ItemPresetSaveBase try { if (!$this->acl->checkUserAccess(AclActionsInterface::ITEMPRESET_CREATE)) { return $this->returnJsonResponse( - JsonResponse::JSON_ERROR, + JsonMessage::JSON_ERROR, __u('You don\'t have permission to do this operation') ); } @@ -72,7 +72,7 @@ final class SaveCreateController extends ItemPresetSaveBase ) ); - return $this->returnJsonResponse(JsonResponse::JSON_SUCCESS, __u('Value created')); + return $this->returnJsonResponse(JsonMessage::JSON_SUCCESS, __u('Value created')); } catch (ValidationException $e) { return $this->returnJsonResponseException($e); } catch (Exception $e) { diff --git a/app/modules/web/Controllers/ItemPreset/SaveEditController.php b/app/modules/web/Controllers/ItemPreset/SaveEditController.php index 7c414840..ee113198 100644 --- a/app/modules/web/Controllers/ItemPreset/SaveEditController.php +++ b/app/modules/web/Controllers/ItemPreset/SaveEditController.php @@ -31,7 +31,7 @@ use SP\Core\Events\Event; use SP\Core\Events\EventMessage; use SP\Domain\Core\Acl\AclActionsInterface; use SP\Domain\Core\Exceptions\ValidationException; -use SP\Http\JsonResponse; +use SP\Http\JsonMessage; use SP\Modules\Web\Controllers\Traits\JsonTrait; /** @@ -54,7 +54,7 @@ final class SaveEditController extends ItemPresetSaveBase try { if (!$this->acl->checkUserAccess(AclActionsInterface::ITEMPRESET_EDIT)) { return $this->returnJsonResponse( - JsonResponse::JSON_ERROR, + JsonMessage::JSON_ERROR, __u('You don\'t have permission to do this operation') ); } @@ -76,7 +76,7 @@ final class SaveEditController extends ItemPresetSaveBase ) ); - return $this->returnJsonResponse(JsonResponse::JSON_SUCCESS, __u('Value updated')); + return $this->returnJsonResponse(JsonMessage::JSON_SUCCESS, __u('Value updated')); } catch (ValidationException $e) { return $this->returnJsonResponseException($e); } catch (Exception $e) { diff --git a/app/modules/web/Controllers/ItemPreset/SearchController.php b/app/modules/web/Controllers/ItemPreset/SearchController.php index d65c115e..532e0a79 100644 --- a/app/modules/web/Controllers/ItemPreset/SearchController.php +++ b/app/modules/web/Controllers/ItemPreset/SearchController.php @@ -32,7 +32,7 @@ use SP\Domain\Core\Exceptions\ConstraintException; use SP\Domain\Core\Exceptions\QueryException; use SP\Domain\ItemPreset\Ports\ItemPresetServiceInterface; use SP\Html\DataGrid\DataGridInterface; -use SP\Http\JsonResponse; +use SP\Http\JsonMessage; use SP\Modules\Web\Controllers\ControllerBase; use SP\Modules\Web\Controllers\Helpers\Grid\ItemPresetGrid; use SP\Modules\Web\Controllers\Traits\JsonTrait; @@ -77,7 +77,7 @@ final class SearchController extends ControllerBase { if (!$this->acl->checkUserAccess(AclActionsInterface::ITEMPRESET_SEARCH)) { return $this->returnJsonResponse( - JsonResponse::JSON_ERROR, + JsonMessage::JSON_ERROR, __u('You don\'t have permission to do this operation') ); } diff --git a/app/modules/web/Controllers/ItemPreset/ViewController.php b/app/modules/web/Controllers/ItemPreset/ViewController.php index b2fcca1b..ca71af50 100644 --- a/app/modules/web/Controllers/ItemPreset/ViewController.php +++ b/app/modules/web/Controllers/ItemPreset/ViewController.php @@ -28,7 +28,7 @@ use Exception; use JsonException; use SP\Core\Events\Event; use SP\Domain\Core\Acl\AclActionsInterface; -use SP\Http\JsonResponse; +use SP\Http\JsonMessage; use SP\Modules\Web\Controllers\Traits\JsonTrait; use SP\Mvc\Controller\ItemTrait; @@ -55,7 +55,7 @@ final class ViewController extends ItemPresetViewBase try { if (!$this->acl->checkUserAccess(AclActionsInterface::ITEMPRESET_VIEW)) { return $this->returnJsonResponse( - JsonResponse::JSON_ERROR, + JsonMessage::JSON_ERROR, __u('You don\'t have permission to do this operation') ); } diff --git a/app/modules/web/Controllers/Items/AccountsUserController.php b/app/modules/web/Controllers/Items/AccountsUserController.php index ec8b37a4..b5c81f66 100644 --- a/app/modules/web/Controllers/Items/AccountsUserController.php +++ b/app/modules/web/Controllers/Items/AccountsUserController.php @@ -4,7 +4,7 @@ * * @author nuxsmin * @link https://syspass.org - * @copyright 2012-2022, Rubén Domínguez nuxsmin@$syspass.org + * @copyright 2012-2023, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * @@ -29,7 +29,7 @@ use SP\Domain\Account\Ports\AccountServiceInterface; use SP\Domain\Core\Exceptions\ConstraintException; use SP\Domain\Core\Exceptions\QueryException; use SP\Domain\Core\Exceptions\SPException; -use SP\Http\Json; +use SP\Http\JsonMessage; use SP\Http\JsonResponse; use SP\Modules\Web\Controllers\SimpleControllerBase; use SP\Mvc\Controller\SimpleControllerHelper; @@ -75,10 +75,10 @@ final class AccountsUserController extends SimpleControllerBase $outItems[] = $obj; } - $jsonResponse = new JsonResponse(); + $jsonResponse = new JsonMessage(); $jsonResponse->setStatus(0); $jsonResponse->setData($outItems); - Json::factory($this->router->response())->returnJson($jsonResponse); + JsonResponse::factory($this->router->response())->send($jsonResponse); } } diff --git a/app/modules/web/Controllers/Items/CategoriesController.php b/app/modules/web/Controllers/Items/CategoriesController.php index 00fb80a2..d62181c6 100644 --- a/app/modules/web/Controllers/Items/CategoriesController.php +++ b/app/modules/web/Controllers/Items/CategoriesController.php @@ -4,7 +4,7 @@ * * @author nuxsmin * @link https://syspass.org - * @copyright 2012-2022, Rubén Domínguez nuxsmin@$syspass.org + * @copyright 2012-2023, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * @@ -29,7 +29,7 @@ use SP\Domain\Category\Ports\CategoryServiceInterface; use SP\Domain\Core\Exceptions\ConstraintException; use SP\Domain\Core\Exceptions\QueryException; use SP\Domain\Core\Exceptions\SPException; -use SP\Http\Json; +use SP\Http\JsonResponse; use SP\Modules\Web\Controllers\SimpleControllerBase; use SP\Mvc\Controller\SimpleControllerHelper; use SP\Mvc\View\Components\SelectItemAdapter; @@ -60,7 +60,9 @@ final class CategoriesController extends SimpleControllerBase */ public function categoriesAction(): void { - Json::factory($this->router->response()) - ->returnRawJson(SelectItemAdapter::factory($this->categoryService->getAllBasic())->getJsonItemsFromModel()); + JsonResponse::factory($this->router->response()) + ->sendRaw( + SelectItemAdapter::factory($this->categoryService->getAllBasic())->getJsonItemsFromModel() + ); } } diff --git a/app/modules/web/Controllers/Items/ClientsController.php b/app/modules/web/Controllers/Items/ClientsController.php index 0d12cc77..9d353f4b 100644 --- a/app/modules/web/Controllers/Items/ClientsController.php +++ b/app/modules/web/Controllers/Items/ClientsController.php @@ -4,7 +4,7 @@ * * @author nuxsmin * @link https://syspass.org - * @copyright 2012-2022, Rubén Domínguez nuxsmin@$syspass.org + * @copyright 2012-2023, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * @@ -29,7 +29,7 @@ use SP\Domain\Client\Ports\ClientServiceInterface; use SP\Domain\Core\Exceptions\ConstraintException; use SP\Domain\Core\Exceptions\QueryException; use SP\Domain\Core\Exceptions\SPException; -use SP\Http\Json; +use SP\Http\JsonResponse; use SP\Modules\Web\Controllers\SimpleControllerBase; use SP\Mvc\Controller\SimpleControllerHelper; use SP\Mvc\View\Components\SelectItemAdapter; @@ -60,7 +60,9 @@ final class ClientsController extends SimpleControllerBase */ public function clientsAction(): void { - Json::factory($this->router->response()) - ->returnRawJson(SelectItemAdapter::factory($this->clientService->getAllForUser())->getJsonItemsFromModel()); + JsonResponse::factory($this->router->response()) + ->sendRaw( + SelectItemAdapter::factory($this->clientService->getAllForUser())->getJsonItemsFromModel() + ); } } diff --git a/app/modules/web/Controllers/Items/NotificationsController.php b/app/modules/web/Controllers/Items/NotificationsController.php index 605e5500..e69c47ec 100644 --- a/app/modules/web/Controllers/Items/NotificationsController.php +++ b/app/modules/web/Controllers/Items/NotificationsController.php @@ -4,7 +4,7 @@ * * @author nuxsmin * @link https://syspass.org - * @copyright 2012-2022, Rubén Domínguez nuxsmin@$syspass.org + * @copyright 2012-2023, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * @@ -31,7 +31,7 @@ use SP\Domain\Core\Exceptions\QueryException; use SP\Domain\Core\Exceptions\SPException; use SP\Domain\Notification\Ports\NotificationServiceInterface; use SP\Html\Html; -use SP\Http\Json; +use SP\Http\JsonMessage; use SP\Http\JsonResponse; use SP\Modules\Web\Controllers\SimpleControllerBase; use SP\Mvc\Controller\SimpleControllerHelper; @@ -77,7 +77,7 @@ final class NotificationsController extends SimpleControllerBase $count = count($notifications); - $jsonResponse = new JsonResponse(); + $jsonResponse = new JsonMessage(); $jsonResponse->setStatus(0); $jsonResponse->setData([ 'message' => __('There aren\'t any pending notifications'), @@ -87,6 +87,6 @@ final class NotificationsController extends SimpleControllerBase 'hash' => sha1(implode('', $notifications)), ]); - Json::factory($this->router->response())->returnJson($jsonResponse); + JsonResponse::factory($this->router->response())->send($jsonResponse); } } diff --git a/app/modules/web/Controllers/Items/TagsController.php b/app/modules/web/Controllers/Items/TagsController.php index 6a413ab0..302a240a 100644 --- a/app/modules/web/Controllers/Items/TagsController.php +++ b/app/modules/web/Controllers/Items/TagsController.php @@ -4,7 +4,7 @@ * * @author nuxsmin * @link https://syspass.org - * @copyright 2012-2022, Rubén Domínguez nuxsmin@$syspass.org + * @copyright 2012-2023, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * @@ -29,7 +29,7 @@ use SP\Domain\Core\Exceptions\ConstraintException; use SP\Domain\Core\Exceptions\QueryException; use SP\Domain\Core\Exceptions\SPException; use SP\Domain\Tag\Ports\TagServiceInterface; -use SP\Http\Json; +use SP\Http\JsonResponse; use SP\Modules\Web\Controllers\SimpleControllerBase; use SP\Mvc\Controller\SimpleControllerHelper; use SP\Mvc\View\Components\SelectItemAdapter; @@ -60,7 +60,7 @@ final class TagsController extends SimpleControllerBase */ public function tagsAction(): void { - Json::factory($this->router->response()) - ->returnRawJson(SelectItemAdapter::factory($this->tagService->getAllBasic())->getJsonItemsFromModel()); + JsonResponse::factory($this->router->response()) + ->sendRaw(SelectItemAdapter::factory($this->tagService->getAllBasic())->getJsonItemsFromModel()); } } diff --git a/app/modules/web/Controllers/Notification/CheckController.php b/app/modules/web/Controllers/Notification/CheckController.php index 4a1b1207..3fc32856 100644 --- a/app/modules/web/Controllers/Notification/CheckController.php +++ b/app/modules/web/Controllers/Notification/CheckController.php @@ -30,7 +30,7 @@ use JsonException; use SP\Core\Events\Event; use SP\Core\Events\EventMessage; use SP\Domain\Core\Acl\AclActionsInterface; -use SP\Http\JsonResponse; +use SP\Http\JsonMessage; use SP\Modules\Web\Controllers\Traits\JsonTrait; final class CheckController extends NotificationSaveBase @@ -50,7 +50,7 @@ final class CheckController extends NotificationSaveBase try { if (!$this->acl->checkUserAccess(AclActionsInterface::NOTIFICATION_CHECK)) { return $this->returnJsonResponse( - JsonResponse::JSON_ERROR, + JsonMessage::JSON_ERROR, __u('You don\'t have permission to do this operation') ); } @@ -67,7 +67,7 @@ final class CheckController extends NotificationSaveBase ) ); - return $this->returnJsonResponse(JsonResponse::JSON_SUCCESS, __u('Notification read')); + return $this->returnJsonResponse(JsonMessage::JSON_SUCCESS, __u('Notification read')); } catch (Exception $e) { processException($e); diff --git a/app/modules/web/Controllers/Notification/CreateController.php b/app/modules/web/Controllers/Notification/CreateController.php index 89b2bed6..1f7bab39 100644 --- a/app/modules/web/Controllers/Notification/CreateController.php +++ b/app/modules/web/Controllers/Notification/CreateController.php @@ -29,7 +29,7 @@ use Exception; use JsonException; use SP\Core\Events\Event; use SP\Domain\Core\Acl\AclActionsInterface; -use SP\Http\JsonResponse; +use SP\Http\JsonMessage; use SP\Modules\Web\Controllers\Traits\JsonTrait; /** @@ -48,7 +48,7 @@ final class CreateController extends NotificationViewBase try { if (!$this->acl->checkUserAccess(AclActionsInterface::NOTIFICATION_CREATE)) { return $this->returnJsonResponse( - JsonResponse::JSON_ERROR, + JsonMessage::JSON_ERROR, __u('You don\'t have permission to do this operation') ); } diff --git a/app/modules/web/Controllers/Notification/DeleteController.php b/app/modules/web/Controllers/Notification/DeleteController.php index 8a3c9d66..fd1a15a0 100644 --- a/app/modules/web/Controllers/Notification/DeleteController.php +++ b/app/modules/web/Controllers/Notification/DeleteController.php @@ -26,9 +26,10 @@ namespace SP\Modules\Web\Controllers\Notification; use Exception; +use JsonException; use SP\Core\Events\Event; use SP\Core\Events\EventMessage; -use SP\Http\JsonResponse; +use SP\Http\JsonMessage; use SP\Modules\Web\Controllers\Traits\JsonTrait; use SP\Mvc\Controller\ItemTrait; @@ -37,7 +38,8 @@ use SP\Mvc\Controller\ItemTrait; */ final class DeleteController extends NotificationSaveBase { - use JsonTrait, ItemTrait; + use ItemTrait; + use JsonTrait; /** * Delete action @@ -45,7 +47,7 @@ final class DeleteController extends NotificationSaveBase * @param int|null $id * * @return bool - * @throws \JsonException + * @throws JsonException */ public function deleteAction(?int $id = null): bool { @@ -62,7 +64,7 @@ final class DeleteController extends NotificationSaveBase new Event($this, EventMessage::factory()->addDescription(__u('Notifications deleted'))) ); - return $this->returnJsonResponse(JsonResponse::JSON_SUCCESS, __u('Notifications deleted')); + return $this->returnJsonResponse(JsonMessage::JSON_SUCCESS, __u('Notifications deleted')); } if ($this->userData->getIsAdminApp()) { @@ -81,7 +83,7 @@ final class DeleteController extends NotificationSaveBase ) ); - return $this->returnJsonResponse(JsonResponse::JSON_SUCCESS, __u('Notification deleted')); + return $this->returnJsonResponse(JsonMessage::JSON_SUCCESS, __u('Notification deleted')); } catch (Exception $e) { processException($e); diff --git a/app/modules/web/Controllers/Notification/EditController.php b/app/modules/web/Controllers/Notification/EditController.php index 4cb4cc21..9aa66d46 100644 --- a/app/modules/web/Controllers/Notification/EditController.php +++ b/app/modules/web/Controllers/Notification/EditController.php @@ -29,7 +29,7 @@ use Exception; use JsonException; use SP\Core\Events\Event; use SP\Domain\Core\Acl\AclActionsInterface; -use SP\Http\JsonResponse; +use SP\Http\JsonMessage; use SP\Modules\Web\Controllers\Traits\JsonTrait; /** @@ -52,7 +52,7 @@ final class EditController extends NotificationViewBase try { if (!$this->acl->checkUserAccess(AclActionsInterface::NOTIFICATION_EDIT)) { return $this->returnJsonResponse( - JsonResponse::JSON_ERROR, + JsonMessage::JSON_ERROR, __u('You don\'t have permission to do this operation') ); } diff --git a/app/modules/web/Controllers/Notification/SaveCreateController.php b/app/modules/web/Controllers/Notification/SaveCreateController.php index b3aa4a8a..9070cab9 100644 --- a/app/modules/web/Controllers/Notification/SaveCreateController.php +++ b/app/modules/web/Controllers/Notification/SaveCreateController.php @@ -30,7 +30,7 @@ use JsonException; use SP\Core\Events\Event; use SP\Core\Events\EventMessage; use SP\Domain\Core\Acl\AclActionsInterface; -use SP\Http\JsonResponse; +use SP\Http\JsonMessage; use SP\Modules\Web\Controllers\Traits\JsonTrait; final class SaveCreateController extends NotificationSaveBase @@ -46,7 +46,7 @@ final class SaveCreateController extends NotificationSaveBase try { if (!$this->acl->checkUserAccess(AclActionsInterface::NOTIFICATION_CREATE)) { return $this->returnJsonResponse( - JsonResponse::JSON_ERROR, + JsonMessage::JSON_ERROR, __u('You don\'t have permission to do this operation') ); } @@ -60,7 +60,7 @@ final class SaveCreateController extends NotificationSaveBase new Event($this, EventMessage::factory()->addDescription(__u('Notification created'))) ); - return $this->returnJsonResponse(JsonResponse::JSON_SUCCESS, __u('Notification created')); + return $this->returnJsonResponse(JsonMessage::JSON_SUCCESS, __u('Notification created')); } catch (Exception $e) { processException($e); diff --git a/app/modules/web/Controllers/Notification/SaveEditController.php b/app/modules/web/Controllers/Notification/SaveEditController.php index 9cc48f7d..11a438da 100644 --- a/app/modules/web/Controllers/Notification/SaveEditController.php +++ b/app/modules/web/Controllers/Notification/SaveEditController.php @@ -30,7 +30,7 @@ use JsonException; use SP\Core\Events\Event; use SP\Core\Events\EventMessage; use SP\Domain\Core\Acl\AclActionsInterface; -use SP\Http\JsonResponse; +use SP\Http\JsonMessage; use SP\Modules\Web\Controllers\Traits\JsonTrait; /** @@ -53,7 +53,7 @@ final class SaveEditController extends NotificationSaveBase try { if (!$this->acl->checkUserAccess(AclActionsInterface::NOTIFICATION_EDIT)) { return $this->returnJsonResponse( - JsonResponse::JSON_ERROR, + JsonMessage::JSON_ERROR, __u('You don\'t have permission to do this operation') ); } @@ -67,7 +67,7 @@ final class SaveEditController extends NotificationSaveBase new Event($this, EventMessage::factory()->addDescription(__u('Notification updated'))) ); - return $this->returnJsonResponse(JsonResponse::JSON_SUCCESS, __u('Notification updated')); + return $this->returnJsonResponse(JsonMessage::JSON_SUCCESS, __u('Notification updated')); } catch (Exception $e) { processException($e); diff --git a/app/modules/web/Controllers/Notification/SearchController.php b/app/modules/web/Controllers/Notification/SearchController.php index b7166685..56958c8a 100644 --- a/app/modules/web/Controllers/Notification/SearchController.php +++ b/app/modules/web/Controllers/Notification/SearchController.php @@ -32,7 +32,7 @@ use SP\Domain\Core\Exceptions\ConstraintException; use SP\Domain\Core\Exceptions\QueryException; use SP\Domain\Notification\Ports\NotificationServiceInterface; use SP\Html\DataGrid\DataGridInterface; -use SP\Http\JsonResponse; +use SP\Http\JsonMessage; use SP\Modules\Web\Controllers\ControllerBase; use SP\Modules\Web\Controllers\Helpers\Grid\NotificationGrid; use SP\Modules\Web\Controllers\Traits\JsonTrait; @@ -74,7 +74,7 @@ final class SearchController extends ControllerBase { if (!$this->acl->checkUserAccess(AclActionsInterface::NOTIFICATION_SEARCH)) { return $this->returnJsonResponse( - JsonResponse::JSON_ERROR, + JsonMessage::JSON_ERROR, __u('You don\'t have permission to do this operation') ); } diff --git a/app/modules/web/Controllers/Notification/ViewController.php b/app/modules/web/Controllers/Notification/ViewController.php index 63312568..213e91b3 100644 --- a/app/modules/web/Controllers/Notification/ViewController.php +++ b/app/modules/web/Controllers/Notification/ViewController.php @@ -29,7 +29,7 @@ use Exception; use JsonException; use SP\Core\Events\Event; use SP\Domain\Core\Acl\AclActionsInterface; -use SP\Http\JsonResponse; +use SP\Http\JsonMessage; use SP\Modules\Web\Controllers\Traits\JsonTrait; /** @@ -52,7 +52,7 @@ final class ViewController extends NotificationViewBase try { if (!$this->acl->checkUserAccess(AclActionsInterface::NOTIFICATION_VIEW)) { return $this->returnJsonResponse( - JsonResponse::JSON_ERROR, + JsonMessage::JSON_ERROR, __u('You don\'t have permission to do this operation') ); } diff --git a/app/modules/web/Controllers/Plugin/DeleteController.php b/app/modules/web/Controllers/Plugin/DeleteController.php index f4961c59..bba315fe 100644 --- a/app/modules/web/Controllers/Plugin/DeleteController.php +++ b/app/modules/web/Controllers/Plugin/DeleteController.php @@ -31,7 +31,7 @@ use SP\Core\Application; use SP\Core\Events\Event; use SP\Domain\Core\Acl\AclActionsInterface; use SP\Domain\Plugin\Ports\PluginServiceInterface; -use SP\Http\JsonResponse; +use SP\Http\JsonMessage; use SP\Modules\Web\Controllers\ControllerBase; use SP\Modules\Web\Controllers\Traits\JsonTrait; use SP\Mvc\Controller\ItemTrait; @@ -72,7 +72,7 @@ final class DeleteController extends ControllerBase try { if (!$this->acl->checkUserAccess(AclActionsInterface::PLUGIN_DELETE)) { return $this->returnJsonResponse( - JsonResponse::JSON_ERROR, + JsonMessage::JSON_ERROR, __u('You don\'t have permission to do this operation') ); } @@ -82,14 +82,14 @@ final class DeleteController extends ControllerBase $this->eventDispatcher->notify('delete.plugin.selection', new Event($this)); - return $this->returnJsonResponse(JsonResponse::JSON_SUCCESS, __u('Plugins deleted')); + return $this->returnJsonResponse(JsonMessage::JSON_SUCCESS, __u('Plugins deleted')); } $this->pluginService->delete($id); $this->eventDispatcher->notify('delete.plugin', new Event($this)); - return $this->returnJsonResponse(JsonResponse::JSON_SUCCESS, __u('Plugin deleted')); + return $this->returnJsonResponse(JsonMessage::JSON_SUCCESS, __u('Plugin deleted')); } catch (Exception $e) { processException($e); diff --git a/app/modules/web/Controllers/Plugin/DisableController.php b/app/modules/web/Controllers/Plugin/DisableController.php index b5e31d5c..3310da6e 100644 --- a/app/modules/web/Controllers/Plugin/DisableController.php +++ b/app/modules/web/Controllers/Plugin/DisableController.php @@ -26,10 +26,12 @@ namespace SP\Modules\Web\Controllers\Plugin; use Exception; +use JsonException; use SP\Core\Application; use SP\Core\Events\Event; use SP\Core\Events\EventMessage; -use SP\Http\JsonResponse; +use SP\Domain\Plugin\Ports\PluginServiceInterface; +use SP\Http\JsonMessage; use SP\Modules\Web\Controllers\ControllerBase; use SP\Modules\Web\Controllers\Traits\JsonTrait; use SP\Mvc\Controller\WebControllerHelper; @@ -41,12 +43,12 @@ final class DisableController extends ControllerBase { use JsonTrait; - private \SP\Domain\Plugin\Ports\PluginServiceInterface $pluginService; + private PluginServiceInterface $pluginService; public function __construct( Application $application, WebControllerHelper $webControllerHelper, - \SP\Domain\Plugin\Ports\PluginServiceInterface $pluginService + PluginServiceInterface $pluginService ) { parent::__construct($application, $webControllerHelper); @@ -61,7 +63,7 @@ final class DisableController extends ControllerBase * @param int $id * * @return bool - * @throws \JsonException + * @throws JsonException */ public function disableAction(int $id): bool { @@ -73,7 +75,7 @@ final class DisableController extends ControllerBase new Event($this, EventMessage::factory()->addDescription(__u('Plugin disabled'))) ); - return $this->returnJsonResponse(JsonResponse::JSON_SUCCESS, __u('Plugin disabled')); + return $this->returnJsonResponse(JsonMessage::JSON_SUCCESS, __u('Plugin disabled')); } catch (Exception $e) { processException($e); diff --git a/app/modules/web/Controllers/Plugin/EnableController.php b/app/modules/web/Controllers/Plugin/EnableController.php index ff2cef39..09406f00 100644 --- a/app/modules/web/Controllers/Plugin/EnableController.php +++ b/app/modules/web/Controllers/Plugin/EnableController.php @@ -26,11 +26,12 @@ namespace SP\Modules\Web\Controllers\Plugin; use Exception; +use JsonException; use SP\Core\Application; use SP\Core\Events\Event; use SP\Core\Events\EventMessage; use SP\Domain\Plugin\Ports\PluginServiceInterface; -use SP\Http\JsonResponse; +use SP\Http\JsonMessage; use SP\Modules\Web\Controllers\ControllerBase; use SP\Modules\Web\Controllers\Traits\JsonTrait; use SP\Mvc\Controller\WebControllerHelper; @@ -42,7 +43,7 @@ final class EnableController extends ControllerBase { use JsonTrait; - private \SP\Domain\Plugin\Ports\PluginServiceInterface $pluginService; + private PluginServiceInterface $pluginService; public function __construct( Application $application, @@ -62,7 +63,7 @@ final class EnableController extends ControllerBase * @param int $id * * @return bool - * @throws \JsonException + * @throws JsonException */ public function enableAction(int $id): bool { @@ -74,7 +75,7 @@ final class EnableController extends ControllerBase new Event($this, EventMessage::factory()->addDescription(__u('Plugin enabled'))) ); - return $this->returnJsonResponse(JsonResponse::JSON_SUCCESS, __u('Plugin enabled')); + return $this->returnJsonResponse(JsonMessage::JSON_SUCCESS, __u('Plugin enabled')); } catch (Exception $e) { processException($e); diff --git a/app/modules/web/Controllers/Plugin/ResetController.php b/app/modules/web/Controllers/Plugin/ResetController.php index a6dcfc69..be0ac4a8 100644 --- a/app/modules/web/Controllers/Plugin/ResetController.php +++ b/app/modules/web/Controllers/Plugin/ResetController.php @@ -26,11 +26,13 @@ namespace SP\Modules\Web\Controllers\Plugin; use Exception; +use JsonException; use SP\Core\Application; use SP\Core\Events\Event; use SP\Core\Events\EventMessage; use SP\Domain\Plugin\Ports\PluginDataServiceInterface; -use SP\Http\JsonResponse; +use SP\Domain\Plugin\Ports\PluginServiceInterface; +use SP\Http\JsonMessage; use SP\Modules\Web\Controllers\ControllerBase; use SP\Modules\Web\Controllers\Traits\JsonTrait; use SP\Mvc\Controller\WebControllerHelper; @@ -42,14 +44,14 @@ final class ResetController extends ControllerBase { use JsonTrait; - private \SP\Domain\Plugin\Ports\PluginServiceInterface $pluginService; + private PluginServiceInterface $pluginService; private PluginDataServiceInterface $pluginDataService; public function __construct( Application $application, WebControllerHelper $webControllerHelper, - \SP\Domain\Plugin\Ports\PluginServiceInterface $pluginService, - \SP\Domain\Plugin\Ports\PluginDataServiceInterface $pluginDataService + PluginServiceInterface $pluginService, + PluginDataServiceInterface $pluginDataService ) { parent::__construct($application, $webControllerHelper); @@ -65,7 +67,7 @@ final class ResetController extends ControllerBase * @param int $id * * @return bool - * @throws \JsonException + * @throws JsonException */ public function resetAction(int $id): bool { @@ -77,7 +79,7 @@ final class ResetController extends ControllerBase new Event($this, EventMessage::factory()->addDescription(__u('Plugin reset'))) ); - return $this->returnJsonResponse(JsonResponse::JSON_SUCCESS, __u('Plugin reset')); + return $this->returnJsonResponse(JsonMessage::JSON_SUCCESS, __u('Plugin reset')); } catch (Exception $e) { processException($e); diff --git a/app/modules/web/Controllers/Plugin/SearchController.php b/app/modules/web/Controllers/Plugin/SearchController.php index 9a53c097..e148d410 100644 --- a/app/modules/web/Controllers/Plugin/SearchController.php +++ b/app/modules/web/Controllers/Plugin/SearchController.php @@ -29,7 +29,7 @@ use JsonException; use SP\Domain\Core\Acl\AclActionsInterface; use SP\Domain\Core\Exceptions\ConstraintException; use SP\Domain\Core\Exceptions\QueryException; -use SP\Http\JsonResponse; +use SP\Http\JsonMessage; /** * Class SearchController @@ -48,7 +48,7 @@ final class SearchController extends PluginSearchBase { if (!$this->acl->checkUserAccess(AclActionsInterface::PLUGIN_SEARCH)) { return $this->returnJsonResponse( - JsonResponse::JSON_ERROR, + JsonMessage::JSON_ERROR, __u('You don\'t have permission to do this operation') ); } diff --git a/app/modules/web/Controllers/Plugin/ViewController.php b/app/modules/web/Controllers/Plugin/ViewController.php index 43b51106..179e6d85 100644 --- a/app/modules/web/Controllers/Plugin/ViewController.php +++ b/app/modules/web/Controllers/Plugin/ViewController.php @@ -34,7 +34,7 @@ use SP\Domain\Core\Acl\AclActionsInterface; use SP\Domain\Core\Exceptions\ConstraintException; use SP\Domain\Core\Exceptions\QueryException; use SP\Domain\Plugin\Ports\PluginServiceInterface; -use SP\Http\JsonResponse; +use SP\Http\JsonMessage; use SP\Infrastructure\Common\Repositories\NoSuchItemException; use SP\Infrastructure\Plugin\Repositories\PluginModel; use SP\Modules\Web\Controllers\ControllerBase; @@ -79,7 +79,7 @@ final class ViewController extends ControllerBase try { if (!$this->acl->checkUserAccess(AclActionsInterface::PLUGIN_VIEW)) { return $this->returnJsonResponse( - JsonResponse::JSON_ERROR, + JsonMessage::JSON_ERROR, __u('You don\'t have permission to do this operation') ); } diff --git a/app/modules/web/Controllers/PublicLink/CreateController.php b/app/modules/web/Controllers/PublicLink/CreateController.php index a2a211b1..7f656b9c 100644 --- a/app/modules/web/Controllers/PublicLink/CreateController.php +++ b/app/modules/web/Controllers/PublicLink/CreateController.php @@ -29,7 +29,7 @@ use Exception; use JsonException; use SP\Core\Events\Event; use SP\Domain\Core\Acl\AclActionsInterface; -use SP\Http\JsonResponse; +use SP\Http\JsonMessage; use SP\Modules\Web\Controllers\Traits\JsonTrait; /** @@ -48,7 +48,7 @@ final class CreateController extends PublicLinkViewBase try { if (!$this->acl->checkUserAccess(AclActionsInterface::PUBLICLINK_CREATE)) { return $this->returnJsonResponse( - JsonResponse::JSON_ERROR, + JsonMessage::JSON_ERROR, __u('You don\'t have permission to do this operation') ); } diff --git a/app/modules/web/Controllers/PublicLink/DeleteController.php b/app/modules/web/Controllers/PublicLink/DeleteController.php index 07f77233..e925f96a 100644 --- a/app/modules/web/Controllers/PublicLink/DeleteController.php +++ b/app/modules/web/Controllers/PublicLink/DeleteController.php @@ -30,7 +30,7 @@ use JsonException; use SP\Core\Events\Event; use SP\Core\Events\EventMessage; use SP\Domain\Core\Acl\AclActionsInterface; -use SP\Http\JsonResponse; +use SP\Http\JsonMessage; use SP\Modules\Web\Controllers\Traits\JsonTrait; use SP\Mvc\Controller\ItemTrait; @@ -55,7 +55,7 @@ final class DeleteController extends PublicLinkSaveBase try { if (!$this->acl->checkUserAccess(AclActionsInterface::PUBLICLINK_DELETE)) { return $this->returnJsonResponse( - JsonResponse::JSON_ERROR, + JsonMessage::JSON_ERROR, __u('You don\'t have permission to do this operation') ); } @@ -69,7 +69,7 @@ final class DeleteController extends PublicLinkSaveBase new Event($this, EventMessage::factory()->addDescription(__u('Links deleted'))) ); - return $this->returnJsonResponse(JsonResponse::JSON_SUCCESS, __u('Links deleted')); + return $this->returnJsonResponse(JsonMessage::JSON_SUCCESS, __u('Links deleted')); } $this->publicLinkService->delete($id); @@ -82,7 +82,7 @@ final class DeleteController extends PublicLinkSaveBase ) ); - return $this->returnJsonResponse(JsonResponse::JSON_SUCCESS, __u('Link deleted')); + return $this->returnJsonResponse(JsonMessage::JSON_SUCCESS, __u('Link deleted')); } catch (Exception $e) { processException($e); diff --git a/app/modules/web/Controllers/PublicLink/EditController.php b/app/modules/web/Controllers/PublicLink/EditController.php index 22644386..578da297 100644 --- a/app/modules/web/Controllers/PublicLink/EditController.php +++ b/app/modules/web/Controllers/PublicLink/EditController.php @@ -29,7 +29,7 @@ use Exception; use JsonException; use SP\Core\Events\Event; use SP\Domain\Core\Acl\AclActionsInterface; -use SP\Http\JsonResponse; +use SP\Http\JsonMessage; use SP\Modules\Web\Controllers\Traits\JsonTrait; /** @@ -52,7 +52,7 @@ final class EditController extends PublicLinkViewBase try { if (!$this->acl->checkUserAccess(AclActionsInterface::PUBLICLINK_EDIT)) { return $this->returnJsonResponse( - JsonResponse::JSON_ERROR, + JsonMessage::JSON_ERROR, __u('You don\'t have permission to do this operation') ); } diff --git a/app/modules/web/Controllers/PublicLink/PublicLinkController.php b/app/modules/web/Controllers/PublicLink/PublicLinkController.php index dc667e47..2ffb1927 100644 --- a/app/modules/web/Controllers/PublicLink/PublicLinkController.php +++ b/app/modules/web/Controllers/PublicLink/PublicLinkController.php @@ -28,7 +28,7 @@ use Exception; use JsonException; use SP\Core\Events\Event; use SP\Domain\Core\Acl\AclActionsInterface; -use SP\Http\JsonResponse; +use SP\Http\JsonMessage; use SP\Modules\Web\Controllers\Traits\JsonTrait; /** @@ -53,7 +53,7 @@ final class PublicLinkController extends PublicLinkViewBase try { if (!$this->acl->checkUserAccess(AclActionsInterface::PUBLICLINK_VIEW)) { return $this->returnJsonResponse( - JsonResponse::JSON_ERROR, + JsonMessage::JSON_ERROR, __u('You don\'t have permission to do this operation') ); } diff --git a/app/modules/web/Controllers/PublicLink/RefreshController.php b/app/modules/web/Controllers/PublicLink/RefreshController.php index cce1de09..6d82e0a3 100644 --- a/app/modules/web/Controllers/PublicLink/RefreshController.php +++ b/app/modules/web/Controllers/PublicLink/RefreshController.php @@ -29,7 +29,7 @@ use Exception; use JsonException; use SP\Core\Events\Event; use SP\Domain\Core\Acl\AclActionsInterface; -use SP\Http\JsonResponse; +use SP\Http\JsonMessage; use SP\Modules\Web\Controllers\Traits\JsonTrait; /** @@ -52,7 +52,7 @@ final class RefreshController extends PublicLinkSaveBase try { if (!$this->acl->checkUserAccess(AclActionsInterface::PUBLICLINK_REFRESH)) { return $this->returnJsonResponse( - JsonResponse::JSON_ERROR, + JsonMessage::JSON_ERROR, __u('You don\'t have permission to do this operation') ); } @@ -61,7 +61,7 @@ final class RefreshController extends PublicLinkSaveBase $this->eventDispatcher->notify('edit.publicLink.refresh', new Event($this)); - return $this->returnJsonResponse(JsonResponse::JSON_SUCCESS, __u('Link updated')); + return $this->returnJsonResponse(JsonMessage::JSON_SUCCESS, __u('Link updated')); } catch (Exception $e) { processException($e); diff --git a/app/modules/web/Controllers/PublicLink/SaveCreate.php b/app/modules/web/Controllers/PublicLink/SaveCreate.php index d8ce9dc5..eb0e1acf 100644 --- a/app/modules/web/Controllers/PublicLink/SaveCreate.php +++ b/app/modules/web/Controllers/PublicLink/SaveCreate.php @@ -30,7 +30,7 @@ use JsonException; use SP\Core\Events\Event; use SP\Domain\Core\Acl\AclActionsInterface; use SP\Domain\Core\Exceptions\ValidationException; -use SP\Http\JsonResponse; +use SP\Http\JsonMessage; use SP\Modules\Web\Controllers\Traits\JsonTrait; /** @@ -49,7 +49,7 @@ final class SaveCreate extends PublicLinkSaveBase try { if (!$this->acl->checkUserAccess(AclActionsInterface::PUBLICLINK_CREATE)) { return $this->returnJsonResponse( - JsonResponse::JSON_ERROR, + JsonMessage::JSON_ERROR, __u('You don\'t have permission to do this operation') ); } @@ -60,7 +60,7 @@ final class SaveCreate extends PublicLinkSaveBase $this->eventDispatcher->notify('create.publicLink', new Event($this)); - return $this->returnJsonResponse(JsonResponse::JSON_SUCCESS, __u('Link created')); + return $this->returnJsonResponse(JsonMessage::JSON_SUCCESS, __u('Link created')); } catch (ValidationException $e) { return $this->returnJsonResponseException($e); } catch (Exception $e) { diff --git a/app/modules/web/Controllers/PublicLink/SaveCreateFromAccountController.php b/app/modules/web/Controllers/PublicLink/SaveCreateFromAccountController.php index 99c43567..f76c8ec8 100644 --- a/app/modules/web/Controllers/PublicLink/SaveCreateFromAccountController.php +++ b/app/modules/web/Controllers/PublicLink/SaveCreateFromAccountController.php @@ -30,7 +30,7 @@ use SP\Core\Events\Event; use SP\DataModel\PublicLinkData; use SP\Domain\Account\Services\PublicLinkService; use SP\Domain\Core\Acl\AclActionsInterface; -use SP\Http\JsonResponse; +use SP\Http\JsonMessage; use SP\Modules\Web\Controllers\Traits\JsonTrait; use SP\Util\PasswordUtil; @@ -55,7 +55,7 @@ final class SaveCreateFromAccountController extends PublicLinkSaveBase try { if (!$this->acl->checkUserAccess(AclActionsInterface::PUBLICLINK_CREATE)) { return $this->returnJsonResponse( - JsonResponse::JSON_ERROR, + JsonMessage::JSON_ERROR, __u('You don\'t have permission to do this operation') ); } @@ -70,7 +70,7 @@ final class SaveCreateFromAccountController extends PublicLinkSaveBase $this->eventDispatcher->notify('create.publicLink.account', new Event($this)); - return $this->returnJsonResponse(JsonResponse::JSON_SUCCESS, __u('Link created')); + return $this->returnJsonResponse(JsonMessage::JSON_SUCCESS, __u('Link created')); } catch (Exception $e) { processException($e); diff --git a/app/modules/web/Controllers/PublicLink/SearchController.php b/app/modules/web/Controllers/PublicLink/SearchController.php index 998e2ba2..ee14840c 100644 --- a/app/modules/web/Controllers/PublicLink/SearchController.php +++ b/app/modules/web/Controllers/PublicLink/SearchController.php @@ -32,7 +32,7 @@ use SP\Domain\Core\Acl\AclActionsInterface; use SP\Domain\Core\Exceptions\ConstraintException; use SP\Domain\Core\Exceptions\QueryException; use SP\Html\DataGrid\DataGridInterface; -use SP\Http\JsonResponse; +use SP\Http\JsonMessage; use SP\Modules\Web\Controllers\ControllerBase; use SP\Modules\Web\Controllers\Helpers\Grid\PublicLinkGrid; use SP\Modules\Web\Controllers\Traits\JsonTrait; @@ -76,7 +76,7 @@ final class SearchController extends ControllerBase { if (!$this->acl->checkUserAccess(AclActionsInterface::PUBLICLINK_SEARCH)) { return $this->returnJsonResponse( - JsonResponse::JSON_ERROR, + JsonMessage::JSON_ERROR, __u('You don\'t have permission to do this operation') ); } diff --git a/app/modules/web/Controllers/Status/CheckNotices.php b/app/modules/web/Controllers/Status/CheckNotices.php index 8bd168cf..ff64f07f 100644 --- a/app/modules/web/Controllers/Status/CheckNotices.php +++ b/app/modules/web/Controllers/Status/CheckNotices.php @@ -28,7 +28,7 @@ namespace SP\Modules\Web\Controllers\Status; use JsonException; use SP\Domain\Core\AppInfoInterface; use SP\Domain\Core\Exceptions\CheckException; -use SP\Http\JsonResponse; +use SP\Http\JsonMessage; use SP\Modules\Web\Controllers\Traits\JsonTrait; use Throwable; @@ -74,7 +74,7 @@ final class CheckNotices extends StatusBase logger($requestData->message); } - return $this->returnJsonResponse(JsonResponse::JSON_ERROR, __u('Notifications not available')); + return $this->returnJsonResponse(JsonMessage::JSON_ERROR, __u('Notifications not available')); } catch (CheckException $e) { return $this->returnJsonResponseException($e); } catch (Throwable $e) { diff --git a/app/modules/web/Controllers/Status/StatusController.php b/app/modules/web/Controllers/Status/StatusController.php index c97745ba..2ff45c0e 100644 --- a/app/modules/web/Controllers/Status/StatusController.php +++ b/app/modules/web/Controllers/Status/StatusController.php @@ -27,7 +27,7 @@ namespace SP\Modules\Web\Controllers\Status; use JsonException; use SP\Domain\Core\AppInfoInterface; use SP\Domain\Core\Exceptions\CheckException; -use SP\Http\JsonResponse; +use SP\Http\JsonMessage; use SP\Modules\Web\Controllers\Traits\JsonTrait; use SP\Util\VersionUtil; use Throwable; @@ -85,7 +85,7 @@ final class StatusController extends StatusBase logger($requestData->message); } - return $this->returnJsonResponse(JsonResponse::JSON_ERROR, __u('Version unavailable')); + return $this->returnJsonResponse(JsonMessage::JSON_ERROR, __u('Version unavailable')); } catch (CheckException $e) { return $this->returnJsonResponseException($e); } catch (Throwable $e) { diff --git a/app/modules/web/Controllers/Tag/CreateController.php b/app/modules/web/Controllers/Tag/CreateController.php index beb7db7f..530c2438 100644 --- a/app/modules/web/Controllers/Tag/CreateController.php +++ b/app/modules/web/Controllers/Tag/CreateController.php @@ -29,7 +29,7 @@ use Exception; use JsonException; use SP\Core\Events\Event; use SP\Domain\Core\Acl\AclActionsInterface; -use SP\Http\JsonResponse; +use SP\Http\JsonMessage; use SP\Modules\Web\Controllers\Traits\JsonTrait; /** @@ -48,7 +48,7 @@ final class CreateController extends TagViewBase try { if (!$this->acl->checkUserAccess(AclActionsInterface::TAG_CREATE)) { return $this->returnJsonResponse( - JsonResponse::JSON_ERROR, + JsonMessage::JSON_ERROR, __u('You don\'t have permission to do this operation') ); } diff --git a/app/modules/web/Controllers/Tag/DeleteController.php b/app/modules/web/Controllers/Tag/DeleteController.php index 70a694fe..dd1b0751 100644 --- a/app/modules/web/Controllers/Tag/DeleteController.php +++ b/app/modules/web/Controllers/Tag/DeleteController.php @@ -29,7 +29,7 @@ use Exception; use JsonException; use SP\Core\Events\Event; use SP\Domain\Core\Acl\AclActionsInterface; -use SP\Http\JsonResponse; +use SP\Http\JsonMessage; use SP\Modules\Web\Controllers\Traits\JsonTrait; use SP\Mvc\Controller\ItemTrait; @@ -54,7 +54,7 @@ final class DeleteController extends TagSaveBase try { if (!$this->acl->checkUserAccess(AclActionsInterface::TAG_DELETE)) { return $this->returnJsonResponse( - JsonResponse::JSON_ERROR, + JsonMessage::JSON_ERROR, __u('You don\'t have permission to do this operation') ); } @@ -66,7 +66,7 @@ final class DeleteController extends TagSaveBase $this->eventDispatcher->notify('delete.tag.selection', new Event($this)); - return $this->returnJsonResponse(JsonResponse::JSON_SUCCESS, __u('Tags deleted')); + return $this->returnJsonResponse(JsonMessage::JSON_SUCCESS, __u('Tags deleted')); } $this->tagService->delete($id); @@ -76,7 +76,7 @@ final class DeleteController extends TagSaveBase $this->eventDispatcher->notify('delete.tag', new Event($this)); return $this->returnJsonResponse( - JsonResponse::JSON_SUCCESS, + JsonMessage::JSON_SUCCESS, __u('Tag removed') ); } catch (Exception $e) { diff --git a/app/modules/web/Controllers/Tag/EditController.php b/app/modules/web/Controllers/Tag/EditController.php index 8b4f3750..3f22baa8 100644 --- a/app/modules/web/Controllers/Tag/EditController.php +++ b/app/modules/web/Controllers/Tag/EditController.php @@ -29,7 +29,7 @@ use Exception; use JsonException; use SP\Core\Events\Event; use SP\Domain\Core\Acl\AclActionsInterface; -use SP\Http\JsonResponse; +use SP\Http\JsonMessage; use SP\Modules\Web\Controllers\Traits\JsonTrait; /** @@ -52,7 +52,7 @@ final class EditController extends TagViewBase try { if (!$this->acl->checkUserAccess(AclActionsInterface::TAG_EDIT)) { return $this->returnJsonResponse( - JsonResponse::JSON_ERROR, + JsonMessage::JSON_ERROR, __u('You don\'t have permission to do this operation') ); } diff --git a/app/modules/web/Controllers/Tag/SaveCreateController.php b/app/modules/web/Controllers/Tag/SaveCreateController.php index fa732f8b..f8ab6388 100644 --- a/app/modules/web/Controllers/Tag/SaveCreateController.php +++ b/app/modules/web/Controllers/Tag/SaveCreateController.php @@ -30,7 +30,7 @@ use JsonException; use SP\Core\Events\Event; use SP\Domain\Core\Acl\AclActionsInterface; use SP\Domain\Core\Exceptions\ValidationException; -use SP\Http\JsonResponse; +use SP\Http\JsonMessage; use SP\Modules\Web\Controllers\Traits\JsonTrait; /** @@ -49,7 +49,7 @@ final class SaveCreateController extends TagSaveBase try { if (!$this->acl->checkUserAccess(AclActionsInterface::TAG_CREATE)) { return $this->returnJsonResponse( - JsonResponse::JSON_ERROR, + JsonMessage::JSON_ERROR, __u('You don\'t have permission to do this operation') ); } @@ -60,7 +60,7 @@ final class SaveCreateController extends TagSaveBase $this->eventDispatcher->notify('create.tag', new Event($this)); - return $this->returnJsonResponse(JsonResponse::JSON_SUCCESS, __u('Tag added')); + return $this->returnJsonResponse(JsonMessage::JSON_SUCCESS, __u('Tag added')); } catch (ValidationException $e) { return $this->returnJsonResponseException($e); } catch (Exception $e) { diff --git a/app/modules/web/Controllers/Tag/SaveEditController.php b/app/modules/web/Controllers/Tag/SaveEditController.php index 865a5fc6..89a2d08d 100644 --- a/app/modules/web/Controllers/Tag/SaveEditController.php +++ b/app/modules/web/Controllers/Tag/SaveEditController.php @@ -30,7 +30,7 @@ use JsonException; use SP\Core\Events\Event; use SP\Domain\Core\Acl\AclActionsInterface; use SP\Domain\Core\Exceptions\ValidationException; -use SP\Http\JsonResponse; +use SP\Http\JsonMessage; use SP\Modules\Web\Controllers\Traits\JsonTrait; /** @@ -53,7 +53,7 @@ final class SaveEditController extends TagSaveBase try { if (!$this->acl->checkUserAccess(AclActionsInterface::TAG_EDIT)) { return $this->returnJsonResponse( - JsonResponse::JSON_ERROR, + JsonMessage::JSON_ERROR, __u('You don\'t have permission to do this operation') ); } @@ -64,7 +64,7 @@ final class SaveEditController extends TagSaveBase $this->eventDispatcher->notify('edit.tag', new Event($this)); - return $this->returnJsonResponse(JsonResponse::JSON_SUCCESS, __u('Tag updated')); + return $this->returnJsonResponse(JsonMessage::JSON_SUCCESS, __u('Tag updated')); } catch (ValidationException $e) { return $this->returnJsonResponseException($e); } catch (Exception $e) { diff --git a/app/modules/web/Controllers/Tag/SearchController.php b/app/modules/web/Controllers/Tag/SearchController.php index 9de7593e..0b6a67b8 100644 --- a/app/modules/web/Controllers/Tag/SearchController.php +++ b/app/modules/web/Controllers/Tag/SearchController.php @@ -32,7 +32,7 @@ use SP\Domain\Core\Exceptions\ConstraintException; use SP\Domain\Core\Exceptions\QueryException; use SP\Domain\Tag\Ports\TagServiceInterface; use SP\Html\DataGrid\DataGridInterface; -use SP\Http\JsonResponse; +use SP\Http\JsonMessage; use SP\Modules\Web\Controllers\ControllerBase; use SP\Modules\Web\Controllers\Helpers\Grid\TagGrid; use SP\Modules\Web\Controllers\Traits\JsonTrait; @@ -76,7 +76,7 @@ final class SearchController extends ControllerBase { if (!$this->acl->checkUserAccess(AclActionsInterface::TAG_SEARCH)) { return $this->returnJsonResponse( - JsonResponse::JSON_ERROR, + JsonMessage::JSON_ERROR, __u('You don\'t have permission to do this operation') ); } diff --git a/app/modules/web/Controllers/Tag/ViewController.php b/app/modules/web/Controllers/Tag/ViewController.php index 77d541f6..a0ab84b7 100644 --- a/app/modules/web/Controllers/Tag/ViewController.php +++ b/app/modules/web/Controllers/Tag/ViewController.php @@ -28,7 +28,7 @@ use Exception; use JsonException; use SP\Core\Events\Event; use SP\Domain\Core\Acl\AclActionsInterface; -use SP\Http\JsonResponse; +use SP\Http\JsonMessage; use SP\Modules\Web\Controllers\Traits\JsonTrait; /** @@ -53,7 +53,7 @@ final class ViewController extends TagViewBase try { if (!$this->acl->checkUserAccess(AclActionsInterface::TAG_VIEW)) { return $this->returnJsonResponse( - JsonResponse::JSON_ERROR, + JsonMessage::JSON_ERROR, __u('You don\'t have permission to do this operation') ); } diff --git a/app/modules/web/Controllers/Track/ClearController.php b/app/modules/web/Controllers/Track/ClearController.php index e483475f..0efed459 100644 --- a/app/modules/web/Controllers/Track/ClearController.php +++ b/app/modules/web/Controllers/Track/ClearController.php @@ -31,7 +31,7 @@ use SP\Core\Events\Event; use SP\Domain\Core\Acl\AclActionsInterface; use SP\Domain\Core\Acl\UnauthorizedActionException; use SP\Domain\Core\Exceptions\SPException; -use SP\Http\JsonResponse; +use SP\Http\JsonMessage; use SP\Modules\Web\Controllers\Traits\JsonTrait; /** @@ -58,7 +58,7 @@ final class ClearController extends TrackBase $this->eventDispatcher->notify('clear.track', new Event($this)); - return $this->returnJsonResponse(JsonResponse::JSON_SUCCESS, __u('Tracks cleared out')); + return $this->returnJsonResponse(JsonMessage::JSON_SUCCESS, __u('Tracks cleared out')); } catch (Exception $e) { processException($e); diff --git a/app/modules/web/Controllers/Track/UnlockController.php b/app/modules/web/Controllers/Track/UnlockController.php index 79870b64..48dd0518 100644 --- a/app/modules/web/Controllers/Track/UnlockController.php +++ b/app/modules/web/Controllers/Track/UnlockController.php @@ -30,7 +30,7 @@ use SP\Core\Events\Event; use SP\Domain\Core\Acl\AclActionsInterface; use SP\Domain\Core\Acl\UnauthorizedActionException; use SP\Domain\Core\Exceptions\SPException; -use SP\Http\JsonResponse; +use SP\Http\JsonMessage; use SP\Modules\Web\Controllers\Traits\JsonTrait; /** @@ -61,7 +61,7 @@ final class UnlockController extends TrackBase $this->eventDispatcher->notify('unlock.track', new Event($this)); - return $this->returnJsonResponse(JsonResponse::JSON_SUCCESS, __u('Track unlocked')); + return $this->returnJsonResponse(JsonMessage::JSON_SUCCESS, __u('Track unlocked')); } catch (Exception $e) { processException($e); diff --git a/app/modules/web/Controllers/Traits/ConfigTrait.php b/app/modules/web/Controllers/Traits/ConfigTrait.php index 0d2781c7..e09810e7 100644 --- a/app/modules/web/Controllers/Traits/ConfigTrait.php +++ b/app/modules/web/Controllers/Traits/ConfigTrait.php @@ -4,7 +4,7 @@ * * @author nuxsmin * @link https://syspass.org - * @copyright 2012-2022, Rubén Domínguez nuxsmin@$syspass.org + * @copyright 2012-2023, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * @@ -25,10 +25,11 @@ namespace SP\Modules\Web\Controllers\Traits; use Exception; +use JsonException; use SP\Core\Bootstrap\BootstrapBase; use SP\Domain\Config\Ports\ConfigDataInterface; use SP\Domain\Config\Ports\ConfigInterface; -use SP\Http\JsonResponse; +use SP\Http\JsonMessage; use SP\Util\Util; /** @@ -43,7 +44,7 @@ trait ConfigTrait /** * Guardar la configuración * - * @throws \JsonException + * @throws JsonException */ protected function saveConfig( ConfigDataInterface $configData, @@ -52,7 +53,7 @@ trait ConfigTrait ): bool { try { if ($configData->isDemoEnabled()) { - return $this->returnJsonResponse(JsonResponse::JSON_WARNING, __u('Ey, this is a DEMO!!')); + return $this->returnJsonResponse(JsonMessage::JSON_WARNING, __u('Ey, this is a DEMO!!')); } $config->saveConfig($configData); @@ -65,12 +66,12 @@ trait ConfigTrait $onSuccess(); } - return $this->returnJsonResponse(JsonResponse::JSON_SUCCESS, __u('Configuration updated')); + return $this->returnJsonResponse(JsonMessage::JSON_SUCCESS, __u('Configuration updated')); } catch (Exception $e) { processException($e); return $this->returnJsonResponse( - JsonResponse::JSON_ERROR, + JsonMessage::JSON_ERROR, __u('Error while saving the configuration'), [$e] ); diff --git a/app/modules/web/Controllers/Traits/JsonTrait.php b/app/modules/web/Controllers/Traits/JsonTrait.php index 2cf03b42..aa2cbca3 100644 --- a/app/modules/web/Controllers/Traits/JsonTrait.php +++ b/app/modules/web/Controllers/Traits/JsonTrait.php @@ -4,7 +4,7 @@ * * @author nuxsmin * @link https://syspass.org - * @copyright 2012-2022, Rubén Domínguez nuxsmin@$syspass.org + * @copyright 2012-2023, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * @@ -28,7 +28,7 @@ use Exception; use Klein\Klein; use SP\Core\Context\SessionContext; use SP\Domain\Core\Exceptions\SPException; -use SP\Http\Json; +use SP\Http\JsonMessage; use SP\Http\JsonResponse; /** @@ -51,7 +51,7 @@ trait JsonTrait */ protected function returnJsonResponse(int $status, string $description, ?array $messages = null): bool { - $jsonResponse = new JsonResponse(); + $jsonResponse = new JsonMessage(); $jsonResponse->setStatus($status); $jsonResponse->setDescription($description); @@ -59,7 +59,7 @@ trait JsonTrait $jsonResponse->setMessages($messages); } - return Json::factory($this->router->response())->returnJson($jsonResponse); + return JsonResponse::factory($this->router->response())->send($jsonResponse); } /** @@ -75,12 +75,12 @@ trait JsonTrait */ protected function returnJsonResponseData( $data, - int $status = JsonResponse::JSON_SUCCESS, + int $status = JsonMessage::JSON_SUCCESS, ?string $description = null, ?array $messages = null ): bool { - $jsonResponse = new JsonResponse(); + $jsonResponse = new JsonMessage(); $jsonResponse->setStatus($status); $jsonResponse->setData($data); @@ -92,7 +92,7 @@ trait JsonTrait $jsonResponse->setMessages($messages); } - return Json::factory($this->router->response())->returnJson($jsonResponse); + return JsonResponse::factory($this->router->response())->send($jsonResponse); } /** @@ -104,9 +104,9 @@ trait JsonTrait * @return bool * @throws SPException */ - protected function returnJsonResponseException(Exception $exception, int $status = JsonResponse::JSON_ERROR): bool + protected function returnJsonResponseException(Exception $exception, int $status = JsonMessage::JSON_ERROR): bool { - $jsonResponse = new JsonResponse(); + $jsonResponse = new JsonMessage(); $jsonResponse->setStatus($status); $jsonResponse->setDescription($exception->getMessage()); @@ -114,6 +114,6 @@ trait JsonTrait $jsonResponse->setMessages([$exception->getHint()]); } - return Json::factory($this->router->response())->returnJson($jsonResponse); + return JsonResponse::factory($this->router->response())->send($jsonResponse); } } diff --git a/app/modules/web/Controllers/Traits/WebControllerTrait.php b/app/modules/web/Controllers/Traits/WebControllerTrait.php index cd04007d..e97afdce 100644 --- a/app/modules/web/Controllers/Traits/WebControllerTrait.php +++ b/app/modules/web/Controllers/Traits/WebControllerTrait.php @@ -4,7 +4,7 @@ * * @author nuxsmin * @link https://syspass.org - * @copyright 2012-2022, Rubén Domínguez nuxsmin@$syspass.org + * @copyright 2012-2023, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * @@ -26,7 +26,7 @@ namespace SP\Modules\Web\Controllers\Traits; use SP\Domain\Config\Ports\ConfigDataInterface; use SP\Domain\Core\Exceptions\SPException; -use SP\Http\RequestInterface; +use SP\Domain\Http\RequestInterface; use SP\Mvc\Controller\ControllerTrait; /** diff --git a/app/modules/web/Controllers/Upgrade/UpgradeController.php b/app/modules/web/Controllers/Upgrade/UpgradeController.php index c1349d63..558e64e1 100644 --- a/app/modules/web/Controllers/Upgrade/UpgradeController.php +++ b/app/modules/web/Controllers/Upgrade/UpgradeController.php @@ -4,7 +4,7 @@ * * @author nuxsmin * @link https://syspass.org - * @copyright 2012-2022, Rubén Domínguez nuxsmin@$syspass.org + * @copyright 2012-2023, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * @@ -33,7 +33,7 @@ use SP\Domain\Persistence\Ports\UpgradeDatabaseServiceInterface; use SP\Domain\Upgrade\Services\UpgradeAppService; use SP\Domain\Upgrade\Services\UpgradeDatabaseService; use SP\Domain\Upgrade\Services\UpgradeException; -use SP\Http\JsonResponse; +use SP\Http\JsonMessage; use SP\Infrastructure\File\FileException; use SP\Modules\Web\Controllers\ControllerBase; use SP\Modules\Web\Controllers\Traits\JsonTrait; @@ -78,12 +78,12 @@ final class UpgradeController extends ControllerBase $this->config->saveConfig($this->configData, false); return $this->returnJsonResponse( - JsonResponse::JSON_SUCCESS, + JsonMessage::JSON_SUCCESS, __u('Application successfully updated'), [__u('You will be redirected to log in within 5 seconds')] ); } catch (ValidationException $e) { - return $this->returnJsonResponse(JsonResponse::JSON_ERROR, $e->getMessage()); + return $this->returnJsonResponse(JsonMessage::JSON_ERROR, $e->getMessage()); } catch (Exception $e) { processException($e); diff --git a/app/modules/web/Controllers/User/CreateController.php b/app/modules/web/Controllers/User/CreateController.php index fb57a375..4e0ca79a 100644 --- a/app/modules/web/Controllers/User/CreateController.php +++ b/app/modules/web/Controllers/User/CreateController.php @@ -29,7 +29,7 @@ use Exception; use JsonException; use SP\Core\Events\Event; use SP\Domain\Core\Acl\AclActionsInterface; -use SP\Http\JsonResponse; +use SP\Http\JsonMessage; use SP\Modules\Web\Controllers\Traits\JsonTrait; /** @@ -48,7 +48,7 @@ final class CreateController extends UserViewBase try { if (!$this->acl->checkUserAccess(AclActionsInterface::USER_CREATE)) { return $this->returnJsonResponse( - JsonResponse::JSON_ERROR, + JsonMessage::JSON_ERROR, __u('You don\'t have permission to do this operation') ); } diff --git a/app/modules/web/Controllers/User/DeleteController.php b/app/modules/web/Controllers/User/DeleteController.php index 42168c0c..968c95a3 100644 --- a/app/modules/web/Controllers/User/DeleteController.php +++ b/app/modules/web/Controllers/User/DeleteController.php @@ -30,7 +30,7 @@ use JsonException; use SP\Core\Events\Event; use SP\Core\Events\EventMessage; use SP\Domain\Core\Acl\AclActionsInterface; -use SP\Http\JsonResponse; +use SP\Http\JsonMessage; use SP\Modules\Web\Controllers\Traits\JsonTrait; use SP\Mvc\Controller\ItemTrait; @@ -55,7 +55,7 @@ final class DeleteController extends UserSaveBase try { if (!$this->acl->checkUserAccess(AclActionsInterface::USER_DELETE)) { return $this->returnJsonResponse( - JsonResponse::JSON_ERROR, + JsonMessage::JSON_ERROR, __u('You don\'t have permission to do this operation') ); } @@ -75,7 +75,7 @@ final class DeleteController extends UserSaveBase $this->deleteCustomFieldsForItem(AclActionsInterface::USER, $id, $this->customFieldService); - return $this->returnJsonResponse(JsonResponse::JSON_SUCCESS, __u('Users deleted')); + return $this->returnJsonResponse(JsonMessage::JSON_SUCCESS, __u('Users deleted')); } $this->userService->delete($id); @@ -93,7 +93,7 @@ final class DeleteController extends UserSaveBase ) ); - return $this->returnJsonResponse(JsonResponse::JSON_SUCCESS, __u('User deleted')); + return $this->returnJsonResponse(JsonMessage::JSON_SUCCESS, __u('User deleted')); } catch (Exception $e) { processException($e); diff --git a/app/modules/web/Controllers/User/EditController.php b/app/modules/web/Controllers/User/EditController.php index 5cf19368..9be2bf7c 100644 --- a/app/modules/web/Controllers/User/EditController.php +++ b/app/modules/web/Controllers/User/EditController.php @@ -29,7 +29,7 @@ use Exception; use JsonException; use SP\Core\Events\Event; use SP\Domain\Core\Acl\AclActionsInterface; -use SP\Http\JsonResponse; +use SP\Http\JsonMessage; use SP\Modules\Web\Controllers\Traits\JsonTrait; /** @@ -52,7 +52,7 @@ final class EditController extends UserViewBase try { if (!$this->acl->checkUserAccess(AclActionsInterface::USER_EDIT)) { return $this->returnJsonResponse( - JsonResponse::JSON_ERROR, + JsonMessage::JSON_ERROR, __u('You don\'t have permission to do this operation') ); } diff --git a/app/modules/web/Controllers/User/EditPassController.php b/app/modules/web/Controllers/User/EditPassController.php index 5e841f0a..4f23d101 100644 --- a/app/modules/web/Controllers/User/EditPassController.php +++ b/app/modules/web/Controllers/User/EditPassController.php @@ -30,7 +30,7 @@ use JsonException; use SP\Core\Events\Event; use SP\DataModel\UserData; use SP\Domain\Core\Acl\AclActionsInterface; -use SP\Http\JsonResponse; +use SP\Http\JsonMessage; use SP\Modules\Web\Controllers\Traits\JsonTrait; /** @@ -54,7 +54,7 @@ final class EditPassController extends UserViewBase // Comprobar si el usuario a modificar es distinto al de la sesión if (!$this->acl->checkUserAccess(AclActionsInterface::USER_EDIT_PASS, $id)) { return $this->returnJsonResponse( - JsonResponse::JSON_ERROR, + JsonMessage::JSON_ERROR, __u('You don\'t have permission to do this operation') ); } diff --git a/app/modules/web/Controllers/User/SaveCreateController.php b/app/modules/web/Controllers/User/SaveCreateController.php index ae09a0a0..0db24d0b 100644 --- a/app/modules/web/Controllers/User/SaveCreateController.php +++ b/app/modules/web/Controllers/User/SaveCreateController.php @@ -31,7 +31,7 @@ use SP\Core\Events\Event; use SP\Core\Events\EventMessage; use SP\Domain\Core\Acl\AclActionsInterface; use SP\Domain\Core\Exceptions\ValidationException; -use SP\Http\JsonResponse; +use SP\Http\JsonMessage; use SP\Modules\Web\Controllers\Traits\JsonTrait; use SP\Mvc\Controller\ItemTrait; @@ -52,7 +52,7 @@ final class SaveCreateController extends UserSaveBase try { if (!$this->acl->checkUserAccess(AclActionsInterface::USER_CREATE)) { return $this->returnJsonResponse( - JsonResponse::JSON_ERROR, + JsonMessage::JSON_ERROR, __u('You don\'t have permission to do this operation') ); } @@ -77,7 +77,7 @@ final class SaveCreateController extends UserSaveBase $this->checkChangeUserPass($id, $itemData); - return $this->returnJsonResponse(JsonResponse::JSON_SUCCESS, __u('User added')); + return $this->returnJsonResponse(JsonMessage::JSON_SUCCESS, __u('User added')); } catch (ValidationException $e) { return $this->returnJsonResponseException($e); } catch (Exception $e) { diff --git a/app/modules/web/Controllers/User/SaveEditController.php b/app/modules/web/Controllers/User/SaveEditController.php index cd18b53c..3d014366 100644 --- a/app/modules/web/Controllers/User/SaveEditController.php +++ b/app/modules/web/Controllers/User/SaveEditController.php @@ -31,7 +31,7 @@ use SP\Core\Events\Event; use SP\Core\Events\EventMessage; use SP\Domain\Core\Acl\AclActionsInterface; use SP\Domain\Core\Exceptions\ValidationException; -use SP\Http\JsonResponse; +use SP\Http\JsonMessage; use SP\Modules\Web\Controllers\Traits\JsonTrait; use SP\Mvc\Controller\ItemTrait; @@ -56,7 +56,7 @@ final class SaveEditController extends UserSaveBase try { if (!$this->acl->checkUserAccess(AclActionsInterface::USER_EDIT)) { return $this->returnJsonResponse( - JsonResponse::JSON_ERROR, + JsonMessage::JSON_ERROR, __u('You don\'t have permission to do this operation') ); } @@ -82,7 +82,7 @@ final class SaveEditController extends UserSaveBase $this->checkChangeUserPass($id, $itemData); - return $this->returnJsonResponse(JsonResponse::JSON_SUCCESS, __u('User updated')); + return $this->returnJsonResponse(JsonMessage::JSON_SUCCESS, __u('User updated')); } catch (ValidationException $e) { return $this->returnJsonResponseException($e); } catch (Exception $e) { diff --git a/app/modules/web/Controllers/User/SaveEditPassController.php b/app/modules/web/Controllers/User/SaveEditPassController.php index 3e498410..92b08166 100644 --- a/app/modules/web/Controllers/User/SaveEditPassController.php +++ b/app/modules/web/Controllers/User/SaveEditPassController.php @@ -31,7 +31,7 @@ use SP\Core\Events\Event; use SP\Core\Events\EventMessage; use SP\Domain\Core\Acl\AclActionsInterface; use SP\Domain\Core\Exceptions\ValidationException; -use SP\Http\JsonResponse; +use SP\Http\JsonMessage; use SP\Modules\Web\Controllers\Traits\JsonTrait; /** @@ -54,7 +54,7 @@ final class SaveEditPassController extends UserSaveBase try { if (!$this->acl->checkUserAccess(AclActionsInterface::USER_EDIT_PASS, $id)) { return $this->returnJsonResponse( - JsonResponse::JSON_ERROR, + JsonMessage::JSON_ERROR, __u('You don\'t have permission to do this operation') ); } @@ -75,7 +75,7 @@ final class SaveEditPassController extends UserSaveBase ) ); - return $this->returnJsonResponse(JsonResponse::JSON_SUCCESS, __u('Password updated')); + return $this->returnJsonResponse(JsonMessage::JSON_SUCCESS, __u('Password updated')); } catch (ValidationException $e) { return $this->returnJsonResponseException($e); } catch (Exception $e) { diff --git a/app/modules/web/Controllers/User/SearchController.php b/app/modules/web/Controllers/User/SearchController.php index 7dfdc0dd..fac274eb 100644 --- a/app/modules/web/Controllers/User/SearchController.php +++ b/app/modules/web/Controllers/User/SearchController.php @@ -32,7 +32,7 @@ use SP\Domain\Core\Exceptions\ConstraintException; use SP\Domain\Core\Exceptions\QueryException; use SP\Domain\User\Ports\UserServiceInterface; use SP\Html\DataGrid\DataGridInterface; -use SP\Http\JsonResponse; +use SP\Http\JsonMessage; use SP\Modules\Web\Controllers\ControllerBase; use SP\Modules\Web\Controllers\Helpers\Grid\UserGrid; use SP\Modules\Web\Controllers\Traits\JsonTrait; @@ -76,7 +76,7 @@ final class SearchController extends ControllerBase { if (!$this->acl->checkUserAccess(AclActionsInterface::USER_SEARCH)) { return $this->returnJsonResponse( - JsonResponse::JSON_ERROR, + JsonMessage::JSON_ERROR, __u('You don\'t have permission to do this operation') ); } diff --git a/app/modules/web/Controllers/User/ViewController.php b/app/modules/web/Controllers/User/ViewController.php index e8da3aa2..e974d3fb 100644 --- a/app/modules/web/Controllers/User/ViewController.php +++ b/app/modules/web/Controllers/User/ViewController.php @@ -28,7 +28,7 @@ use Exception; use JsonException; use SP\Core\Events\Event; use SP\Domain\Core\Acl\AclActionsInterface; -use SP\Http\JsonResponse; +use SP\Http\JsonMessage; use SP\Modules\Web\Controllers\Traits\JsonTrait; /** @@ -53,7 +53,7 @@ final class ViewController extends UserViewBase try { if (!$this->acl->checkUserAccess(AclActionsInterface::USER_VIEW)) { return $this->returnJsonResponse( - JsonResponse::JSON_ERROR, + JsonMessage::JSON_ERROR, __u('You don\'t have permission to do this operation') ); } diff --git a/app/modules/web/Controllers/UserGroup/CreateController.php b/app/modules/web/Controllers/UserGroup/CreateController.php index 6e7fedf7..a80a0ba8 100644 --- a/app/modules/web/Controllers/UserGroup/CreateController.php +++ b/app/modules/web/Controllers/UserGroup/CreateController.php @@ -29,7 +29,7 @@ use Exception; use JsonException; use SP\Core\Events\Event; use SP\Domain\Core\Acl\AclActionsInterface; -use SP\Http\JsonResponse; +use SP\Http\JsonMessage; use SP\Modules\Web\Controllers\Traits\JsonTrait; /** @@ -48,7 +48,7 @@ final class CreateController extends UserGroupViewBase try { if (!$this->acl->checkUserAccess(AclActionsInterface::GROUP_CREATE)) { return $this->returnJsonResponse( - JsonResponse::JSON_ERROR, + JsonMessage::JSON_ERROR, __u('You don\'t have permission to do this operation') ); } diff --git a/app/modules/web/Controllers/UserGroup/DeleteController.php b/app/modules/web/Controllers/UserGroup/DeleteController.php index b05dbb86..d95de452 100644 --- a/app/modules/web/Controllers/UserGroup/DeleteController.php +++ b/app/modules/web/Controllers/UserGroup/DeleteController.php @@ -30,7 +30,7 @@ use JsonException; use SP\Core\Events\Event; use SP\Core\Events\EventMessage; use SP\Domain\Core\Acl\AclActionsInterface; -use SP\Http\JsonResponse; +use SP\Http\JsonMessage; use SP\Modules\Web\Controllers\Traits\JsonTrait; use SP\Mvc\Controller\ItemTrait; @@ -55,7 +55,7 @@ final class DeleteController extends UserGroupSaveBase try { if (!$this->acl->checkUserAccess(AclActionsInterface::GROUP_DELETE)) { return $this->returnJsonResponse( - JsonResponse::JSON_ERROR, + JsonMessage::JSON_ERROR, __u('You don\'t have permission to do this operation') ); } @@ -70,7 +70,7 @@ final class DeleteController extends UserGroupSaveBase $this->deleteCustomFieldsForItem(AclActionsInterface::GROUP, $id, $this->customFieldService); - return $this->returnJsonResponse(JsonResponse::JSON_SUCCESS, __u('Groups deleted')); + return $this->returnJsonResponse(JsonMessage::JSON_SUCCESS, __u('Groups deleted')); } $this->userGroupService->delete($id); @@ -88,7 +88,7 @@ final class DeleteController extends UserGroupSaveBase $this->deleteCustomFieldsForItem(AclActionsInterface::GROUP, $id, $this->customFieldService); - return $this->returnJsonResponse(JsonResponse::JSON_SUCCESS, __u('Group deleted')); + return $this->returnJsonResponse(JsonMessage::JSON_SUCCESS, __u('Group deleted')); } catch (Exception $e) { processException($e); diff --git a/app/modules/web/Controllers/UserGroup/EditController.php b/app/modules/web/Controllers/UserGroup/EditController.php index 53bebad4..d79190af 100644 --- a/app/modules/web/Controllers/UserGroup/EditController.php +++ b/app/modules/web/Controllers/UserGroup/EditController.php @@ -29,7 +29,7 @@ use Exception; use JsonException; use SP\Core\Events\Event; use SP\Domain\Core\Acl\AclActionsInterface; -use SP\Http\JsonResponse; +use SP\Http\JsonMessage; use SP\Modules\Web\Controllers\Traits\JsonTrait; /** @@ -52,7 +52,7 @@ final class EditController extends UserGroupViewBase try { if (!$this->acl->checkUserAccess(AclActionsInterface::GROUP_EDIT)) { return $this->returnJsonResponse( - JsonResponse::JSON_ERROR, + JsonMessage::JSON_ERROR, __u('You don\'t have permission to do this operation') ); } diff --git a/app/modules/web/Controllers/UserGroup/SaveCreateController.php b/app/modules/web/Controllers/UserGroup/SaveCreateController.php index 9f60cd0d..d8a9d95c 100644 --- a/app/modules/web/Controllers/UserGroup/SaveCreateController.php +++ b/app/modules/web/Controllers/UserGroup/SaveCreateController.php @@ -31,7 +31,7 @@ use SP\Core\Events\Event; use SP\Core\Events\EventMessage; use SP\Domain\Core\Acl\AclActionsInterface; use SP\Domain\Core\Exceptions\ValidationException; -use SP\Http\JsonResponse; +use SP\Http\JsonMessage; use SP\Modules\Web\Controllers\Traits\JsonTrait; use SP\Mvc\Controller\ItemTrait; @@ -52,7 +52,7 @@ final class SaveCreateController extends UserGroupSaveBase try { if (!$this->acl->checkUserAccess(AclActionsInterface::GROUP_CREATE)) { return $this->returnJsonResponse( - JsonResponse::JSON_ERROR, + JsonMessage::JSON_ERROR, __u('You don\'t have permission to do this operation') ); } @@ -75,7 +75,7 @@ final class SaveCreateController extends UserGroupSaveBase $this->addCustomFieldsForItem(AclActionsInterface::GROUP, $id, $this->request, $this->customFieldService); - return $this->returnJsonResponse(JsonResponse::JSON_SUCCESS, __u('Group added')); + return $this->returnJsonResponse(JsonMessage::JSON_SUCCESS, __u('Group added')); } catch (ValidationException $e) { return $this->returnJsonResponseException($e); } catch (Exception $e) { diff --git a/app/modules/web/Controllers/UserGroup/SaveEditController.php b/app/modules/web/Controllers/UserGroup/SaveEditController.php index d5c9ab38..1d5956d2 100644 --- a/app/modules/web/Controllers/UserGroup/SaveEditController.php +++ b/app/modules/web/Controllers/UserGroup/SaveEditController.php @@ -31,7 +31,7 @@ use SP\Core\Events\Event; use SP\Core\Events\EventMessage; use SP\Domain\Core\Acl\AclActionsInterface; use SP\Domain\Core\Exceptions\ValidationException; -use SP\Http\JsonResponse; +use SP\Http\JsonMessage; use SP\Modules\Web\Controllers\Traits\JsonTrait; use SP\Mvc\Controller\ItemTrait; @@ -56,7 +56,7 @@ final class SaveEditController extends UserGroupSaveBase try { if (!$this->acl->checkUserAccess(AclActionsInterface::GROUP_EDIT)) { return $this->returnJsonResponse( - JsonResponse::JSON_ERROR, + JsonMessage::JSON_ERROR, __u('You don\'t have permission to do this operation') ); } @@ -80,7 +80,7 @@ final class SaveEditController extends UserGroupSaveBase $this->updateCustomFieldsForItem(AclActionsInterface::GROUP, $id, $this->request, $this->customFieldService); - return $this->returnJsonResponse(JsonResponse::JSON_SUCCESS, __u('Group updated')); + return $this->returnJsonResponse(JsonMessage::JSON_SUCCESS, __u('Group updated')); } catch (ValidationException $e) { return $this->returnJsonResponseException($e); } catch (Exception $e) { diff --git a/app/modules/web/Controllers/UserGroup/SearchController.php b/app/modules/web/Controllers/UserGroup/SearchController.php index 84b6e075..a0d09fd4 100644 --- a/app/modules/web/Controllers/UserGroup/SearchController.php +++ b/app/modules/web/Controllers/UserGroup/SearchController.php @@ -32,7 +32,7 @@ use SP\Domain\Core\Exceptions\ConstraintException; use SP\Domain\Core\Exceptions\QueryException; use SP\Domain\User\Ports\UserGroupServiceInterface; use SP\Html\DataGrid\DataGridInterface; -use SP\Http\JsonResponse; +use SP\Http\JsonMessage; use SP\Modules\Web\Controllers\ControllerBase; use SP\Modules\Web\Controllers\Helpers\Grid\UserGroupGrid; use SP\Modules\Web\Controllers\Traits\JsonTrait; @@ -76,7 +76,7 @@ final class SearchController extends ControllerBase { if (!$this->acl->checkUserAccess(AclActionsInterface::GROUP_SEARCH)) { return $this->returnJsonResponse( - JsonResponse::JSON_ERROR, + JsonMessage::JSON_ERROR, __u('You don\'t have permission to do this operation') ); } diff --git a/app/modules/web/Controllers/UserGroup/ViewController.php b/app/modules/web/Controllers/UserGroup/ViewController.php index 83add1e9..5edf1c05 100644 --- a/app/modules/web/Controllers/UserGroup/ViewController.php +++ b/app/modules/web/Controllers/UserGroup/ViewController.php @@ -28,7 +28,7 @@ use Exception; use JsonException; use SP\Core\Events\Event; use SP\Domain\Core\Acl\AclActionsInterface; -use SP\Http\JsonResponse; +use SP\Http\JsonMessage; use SP\Modules\Web\Controllers\Traits\JsonTrait; /** @@ -53,7 +53,7 @@ final class ViewController extends UserGroupViewBase try { if (!$this->acl->checkUserAccess(AclActionsInterface::GROUP_VIEW)) { return $this->returnJsonResponse( - JsonResponse::JSON_ERROR, + JsonMessage::JSON_ERROR, __u('You don\'t have permission to do this operation') ); } diff --git a/app/modules/web/Controllers/UserPassReset/SaveRequestController.php b/app/modules/web/Controllers/UserPassReset/SaveRequestController.php index 85065577..8fa19265 100644 --- a/app/modules/web/Controllers/UserPassReset/SaveRequestController.php +++ b/app/modules/web/Controllers/UserPassReset/SaveRequestController.php @@ -31,7 +31,7 @@ use SP\Core\Events\Event; use SP\Core\Events\EventMessage; use SP\Domain\Core\Exceptions\SPException; use SP\Domain\User\Services\UserPassRecoverService; -use SP\Http\JsonResponse; +use SP\Http\JsonMessage; use SP\Modules\Web\Controllers\Traits\JsonTrait; /** @@ -86,7 +86,7 @@ final class SaveRequestController extends UserPassResetSaveBase ); return $this->returnJsonResponse( - JsonResponse::JSON_SUCCESS, + JsonMessage::JSON_SUCCESS, __u('Request sent'), [__u('You will receive an email to complete the request shortly.')] ); diff --git a/app/modules/web/Controllers/UserPassReset/SaveResetController.php b/app/modules/web/Controllers/UserPassReset/SaveResetController.php index d519350d..ecd7ae93 100644 --- a/app/modules/web/Controllers/UserPassReset/SaveResetController.php +++ b/app/modules/web/Controllers/UserPassReset/SaveResetController.php @@ -30,7 +30,7 @@ use JsonException; use SP\Core\Events\Event; use SP\Core\Events\EventMessage; use SP\Domain\Core\Exceptions\ValidationException; -use SP\Http\JsonResponse; +use SP\Http\JsonMessage; use SP\Modules\Web\Controllers\Traits\JsonTrait; /** @@ -82,7 +82,7 @@ final class SaveResetController extends UserPassResetSaveBase ) ); - return $this->returnJsonResponse(JsonResponse::JSON_SUCCESS, __u('Password updated')); + return $this->returnJsonResponse(JsonMessage::JSON_SUCCESS, __u('Password updated')); } catch (Exception $e) { processException($e); diff --git a/app/modules/web/Controllers/UserProfile/CreateController.php b/app/modules/web/Controllers/UserProfile/CreateController.php index d0f79274..806b421d 100644 --- a/app/modules/web/Controllers/UserProfile/CreateController.php +++ b/app/modules/web/Controllers/UserProfile/CreateController.php @@ -29,7 +29,7 @@ use Exception; use JsonException; use SP\Core\Events\Event; use SP\Domain\Core\Acl\AclActionsInterface; -use SP\Http\JsonResponse; +use SP\Http\JsonMessage; use SP\Modules\Web\Controllers\Traits\JsonTrait; /** @@ -48,7 +48,7 @@ final class CreateController extends UserProfileViewBase try { if (!$this->acl->checkUserAccess(AclActionsInterface::PROFILE_CREATE)) { return $this->returnJsonResponse( - JsonResponse::JSON_ERROR, + JsonMessage::JSON_ERROR, __u('You don\'t have permission to do this operation') ); } diff --git a/app/modules/web/Controllers/UserProfile/DeleteController.php b/app/modules/web/Controllers/UserProfile/DeleteController.php index d74f228a..0bb89106 100644 --- a/app/modules/web/Controllers/UserProfile/DeleteController.php +++ b/app/modules/web/Controllers/UserProfile/DeleteController.php @@ -30,7 +30,7 @@ use JsonException; use SP\Core\Events\Event; use SP\Core\Events\EventMessage; use SP\Domain\Core\Acl\AclActionsInterface; -use SP\Http\JsonResponse; +use SP\Http\JsonMessage; use SP\Modules\Web\Controllers\Traits\JsonTrait; use SP\Mvc\Controller\ItemTrait; @@ -55,7 +55,7 @@ final class DeleteController extends UserProfileSaveBase try { if (!$this->acl->checkUserAccess(AclActionsInterface::PROFILE_DELETE)) { return $this->returnJsonResponse( - JsonResponse::JSON_ERROR, + JsonMessage::JSON_ERROR, __u('You don\'t have permission to do this operation') ); } @@ -70,7 +70,7 @@ final class DeleteController extends UserProfileSaveBase $this->deleteCustomFieldsForItem(AclActionsInterface::PROFILE, $id, $this->customFieldService); - return $this->returnJsonResponse(JsonResponse::JSON_SUCCESS, __u('Profiles deleted')); + return $this->returnJsonResponse(JsonMessage::JSON_SUCCESS, __u('Profiles deleted')); } $this->userProfileService->delete($id); @@ -88,7 +88,7 @@ final class DeleteController extends UserProfileSaveBase $this->deleteCustomFieldsForItem(AclActionsInterface::PROFILE, $id, $this->customFieldService); - return $this->returnJsonResponse(JsonResponse::JSON_SUCCESS, __u('Profile deleted')); + return $this->returnJsonResponse(JsonMessage::JSON_SUCCESS, __u('Profile deleted')); } catch (Exception $e) { processException($e); diff --git a/app/modules/web/Controllers/UserProfile/EditController.php b/app/modules/web/Controllers/UserProfile/EditController.php index 47a04f76..59deb2ec 100644 --- a/app/modules/web/Controllers/UserProfile/EditController.php +++ b/app/modules/web/Controllers/UserProfile/EditController.php @@ -29,7 +29,7 @@ use Exception; use JsonException; use SP\Core\Events\Event; use SP\Domain\Core\Acl\AclActionsInterface; -use SP\Http\JsonResponse; +use SP\Http\JsonMessage; use SP\Modules\Web\Controllers\Traits\JsonTrait; /** @@ -52,7 +52,7 @@ final class EditController extends UserProfileViewBase try { if (!$this->acl->checkUserAccess(AclActionsInterface::PROFILE_EDIT)) { return $this->returnJsonResponse( - JsonResponse::JSON_ERROR, + JsonMessage::JSON_ERROR, __u('You don\'t have permission to do this operation') ); } diff --git a/app/modules/web/Controllers/UserProfile/SaveCreateController.php b/app/modules/web/Controllers/UserProfile/SaveCreateController.php index 8e2d620d..09c32165 100644 --- a/app/modules/web/Controllers/UserProfile/SaveCreateController.php +++ b/app/modules/web/Controllers/UserProfile/SaveCreateController.php @@ -31,7 +31,7 @@ use SP\Core\Events\Event; use SP\Core\Events\EventMessage; use SP\Domain\Core\Acl\AclActionsInterface; use SP\Domain\Core\Exceptions\ValidationException; -use SP\Http\JsonResponse; +use SP\Http\JsonMessage; use SP\Modules\Web\Controllers\Traits\JsonTrait; use SP\Mvc\Controller\ItemTrait; @@ -52,7 +52,7 @@ final class SaveCreateController extends UserProfileSaveBase try { if (!$this->acl->checkUserAccess(AclActionsInterface::PROFILE_CREATE)) { return $this->returnJsonResponse( - JsonResponse::JSON_ERROR, + JsonMessage::JSON_ERROR, __u('You don\'t have permission to do this operation') ); } @@ -75,7 +75,7 @@ final class SaveCreateController extends UserProfileSaveBase $this->addCustomFieldsForItem(AclActionsInterface::PROFILE, $id, $this->request, $this->customFieldService); - return $this->returnJsonResponse(JsonResponse::JSON_SUCCESS, __u('Profile added')); + return $this->returnJsonResponse(JsonMessage::JSON_SUCCESS, __u('Profile added')); } catch (ValidationException $e) { return $this->returnJsonResponseException($e); } catch (Exception $e) { diff --git a/app/modules/web/Controllers/UserProfile/SaveEditController.php b/app/modules/web/Controllers/UserProfile/SaveEditController.php index 262454d2..702c5b97 100644 --- a/app/modules/web/Controllers/UserProfile/SaveEditController.php +++ b/app/modules/web/Controllers/UserProfile/SaveEditController.php @@ -31,7 +31,7 @@ use SP\Core\Events\Event; use SP\Core\Events\EventMessage; use SP\Domain\Core\Acl\AclActionsInterface; use SP\Domain\Core\Exceptions\ValidationException; -use SP\Http\JsonResponse; +use SP\Http\JsonMessage; use SP\Modules\Web\Controllers\Traits\JsonTrait; use SP\Mvc\Controller\ItemTrait; @@ -56,7 +56,7 @@ final class SaveEditController extends UserProfileSaveBase try { if (!$this->acl->checkUserAccess(AclActionsInterface::PROFILE_EDIT)) { return $this->returnJsonResponse( - JsonResponse::JSON_ERROR, + JsonMessage::JSON_ERROR, __u('You don\'t have permission to do this operation') ); } @@ -80,7 +80,7 @@ final class SaveEditController extends UserProfileSaveBase $this->updateCustomFieldsForItem(AclActionsInterface::PROFILE, $id, $this->request, $this->customFieldService); - return $this->returnJsonResponse(JsonResponse::JSON_SUCCESS, __u('Profile updated')); + return $this->returnJsonResponse(JsonMessage::JSON_SUCCESS, __u('Profile updated')); } catch (ValidationException $e) { return $this->returnJsonResponseException($e); } catch (Exception $e) { diff --git a/app/modules/web/Controllers/UserProfile/SearchController.php b/app/modules/web/Controllers/UserProfile/SearchController.php index 8efe6b6e..a90b02d0 100644 --- a/app/modules/web/Controllers/UserProfile/SearchController.php +++ b/app/modules/web/Controllers/UserProfile/SearchController.php @@ -32,7 +32,7 @@ use SP\Domain\Core\Exceptions\ConstraintException; use SP\Domain\Core\Exceptions\QueryException; use SP\Domain\User\Ports\UserProfileServiceInterface; use SP\Html\DataGrid\DataGridInterface; -use SP\Http\JsonResponse; +use SP\Http\JsonMessage; use SP\Modules\Web\Controllers\ControllerBase; use SP\Modules\Web\Controllers\Helpers\Grid\UserProfileGrid; use SP\Modules\Web\Controllers\Traits\JsonTrait; @@ -76,7 +76,7 @@ final class SearchController extends ControllerBase { if (!$this->acl->checkUserAccess(AclActionsInterface::PROFILE_SEARCH)) { return $this->returnJsonResponse( - JsonResponse::JSON_ERROR, + JsonMessage::JSON_ERROR, __u('You don\'t have permission to do this operation') ); } diff --git a/app/modules/web/Controllers/UserProfile/ViewController.php b/app/modules/web/Controllers/UserProfile/ViewController.php index 2dd876f6..423ed250 100644 --- a/app/modules/web/Controllers/UserProfile/ViewController.php +++ b/app/modules/web/Controllers/UserProfile/ViewController.php @@ -28,7 +28,7 @@ use Exception; use JsonException; use SP\Core\Events\Event; use SP\Domain\Core\Acl\AclActionsInterface; -use SP\Http\JsonResponse; +use SP\Http\JsonMessage; use SP\Modules\Web\Controllers\Traits\JsonTrait; /** @@ -53,7 +53,7 @@ final class ViewController extends UserProfileViewBase try { if (!$this->acl->checkUserAccess(AclActionsInterface::PROFILE_VIEW)) { return $this->returnJsonResponse( - JsonResponse::JSON_ERROR, + JsonMessage::JSON_ERROR, __u('You don\'t have permission to do this operation') ); } diff --git a/app/modules/web/Controllers/UserSettingsGeneral/SaveController.php b/app/modules/web/Controllers/UserSettingsGeneral/SaveController.php index d64079cd..0f4669ac 100644 --- a/app/modules/web/Controllers/UserSettingsGeneral/SaveController.php +++ b/app/modules/web/Controllers/UserSettingsGeneral/SaveController.php @@ -25,13 +25,14 @@ namespace SP\Modules\Web\Controllers\UserSettingsGeneral; use Exception; +use JsonException; use SP\Core\Application; use SP\Core\Events\Event; use SP\DataModel\UserPreferencesData; use SP\Domain\User\Ports\UserServiceInterface; use SP\Domain\User\Services\UserLoginResponse; use SP\Domain\User\Services\UserService; -use SP\Http\JsonResponse; +use SP\Http\JsonMessage; use SP\Modules\Web\Controllers\SimpleControllerBase; use SP\Modules\Web\Controllers\Traits\JsonTrait; use SP\Mvc\Controller\SimpleControllerHelper; @@ -61,7 +62,7 @@ final class SaveController extends SimpleControllerBase /** * @return bool - * @throws \JsonException + * @throws JsonException */ public function saveAction(): bool { @@ -75,7 +76,7 @@ final class SaveController extends SimpleControllerBase // Save preferences in current session $userData->setPreferences($userPreferencesData); - return $this->returnJsonResponse(JsonResponse::JSON_SUCCESS, __u('Preferences updated')); + return $this->returnJsonResponse(JsonMessage::JSON_SUCCESS, __u('Preferences updated')); } catch (Exception $e) { processException($e); @@ -86,9 +87,9 @@ final class SaveController extends SimpleControllerBase } /** - * @param \SP\Domain\User\Services\UserLoginResponse $userData + * @param UserLoginResponse $userData * - * @return \SP\DataModel\UserPreferencesData + * @return UserPreferencesData */ private function getUserPreferencesData(UserLoginResponse $userData): UserPreferencesData { diff --git a/app/modules/web/Forms/AccountForm.php b/app/modules/web/Forms/AccountForm.php index b8e8d0d9..eec5f20f 100644 --- a/app/modules/web/Forms/AccountForm.php +++ b/app/modules/web/Forms/AccountForm.php @@ -31,7 +31,7 @@ use SP\Domain\Account\Dtos\AccountUpdateDto; use SP\Domain\Account\Ports\AccountPresetServiceInterface; use SP\Domain\Core\Acl\AclActionsInterface; use SP\Domain\Core\Exceptions\ValidationException; -use SP\Http\RequestInterface; +use SP\Domain\Http\RequestInterface; use SP\Util\Chainable; use function SP\__u; diff --git a/app/modules/web/Forms/FormBase.php b/app/modules/web/Forms/FormBase.php index 8a65b8f7..1999ce6e 100644 --- a/app/modules/web/Forms/FormBase.php +++ b/app/modules/web/Forms/FormBase.php @@ -4,7 +4,7 @@ * * @author nuxsmin * @link https://syspass.org - * @copyright 2012-2022, Rubén Domínguez nuxsmin@$syspass.org + * @copyright 2012-2023, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * @@ -28,7 +28,7 @@ use SP\Core\Application; use SP\Domain\Config\Ports\ConfigDataInterface; use SP\Domain\Config\Services\ConfigFileService; use SP\Domain\Core\Context\ContextInterface; -use SP\Http\RequestInterface; +use SP\Domain\Http\RequestInterface; /** * Class FormBase diff --git a/app/modules/web/Init.php b/app/modules/web/Init.php index dada2d20..9017a624 100644 --- a/app/modules/web/Init.php +++ b/app/modules/web/Init.php @@ -51,6 +51,7 @@ use SP\Domain\Core\Exceptions\SPException; use SP\Domain\Core\LanguageInterface; use SP\Domain\Crypt\Ports\SecureSessionServiceInterface; use SP\Domain\Crypt\Services\SecureSessionService; +use SP\Domain\Http\RequestInterface; use SP\Domain\ItemPreset\Ports\ItemPresetInterface; use SP\Domain\ItemPreset\Services\ItemPresetService; use SP\Domain\Upgrade\Services\UpgradeAppService; @@ -59,7 +60,6 @@ use SP\Domain\Upgrade\Services\UpgradeUtil; use SP\Domain\User\Ports\UserProfileServiceInterface; use SP\Domain\User\Services\UserProfileService; use SP\Http\Address; -use SP\Http\RequestInterface; use SP\Http\Uri; use SP\Infrastructure\Common\Repositories\NoSuchItemException; use SP\Infrastructure\Database\DatabaseUtil; diff --git a/lib/SP/Core/Bootstrap/BootstrapBase.php b/lib/SP/Core/Bootstrap/BootstrapBase.php index bc75b896..c01b32e9 100644 --- a/lib/SP/Core/Bootstrap/BootstrapBase.php +++ b/lib/SP/Core/Bootstrap/BootstrapBase.php @@ -45,8 +45,8 @@ use SP\Domain\Core\Exceptions\CheckException; use SP\Domain\Core\Exceptions\ConfigException; use SP\Domain\Core\Exceptions\InitializationException; use SP\Domain\Core\Exceptions\SPException; +use SP\Domain\Http\RequestInterface; use SP\Domain\Upgrade\Services\UpgradeException; -use SP\Http\RequestInterface; use SP\Plugin\PluginManager; use SP\Util\Checks; use Symfony\Component\Debug\Debug; diff --git a/lib/SP/Core/Bootstrap/UriContext.php b/lib/SP/Core/Bootstrap/UriContext.php index 1d710f9c..798c787a 100644 --- a/lib/SP/Core/Bootstrap/UriContext.php +++ b/lib/SP/Core/Bootstrap/UriContext.php @@ -25,7 +25,7 @@ namespace SP\Core\Bootstrap; use SP\Domain\Core\Bootstrap\UriContextInterface; -use SP\Http\RequestInterface; +use SP\Domain\Http\RequestInterface; /** * Class UriContext diff --git a/lib/SP/Core/Crypt/Cookie.php b/lib/SP/Core/Crypt/Cookie.php index a035e1cd..75e63729 100644 --- a/lib/SP/Core/Crypt/Cookie.php +++ b/lib/SP/Core/Crypt/Cookie.php @@ -25,7 +25,7 @@ namespace SP\Core\Crypt; use SP\Core\Bootstrap\BootstrapBase; -use SP\Http\RequestInterface; +use SP\Domain\Http\RequestInterface; use function SP\logger; diff --git a/lib/SP/Core/Crypt/Csrf.php b/lib/SP/Core/Crypt/Csrf.php index 40c753a5..98dcf855 100644 --- a/lib/SP/Core/Crypt/Csrf.php +++ b/lib/SP/Core/Crypt/Csrf.php @@ -27,7 +27,8 @@ namespace SP\Core\Crypt; use SP\Domain\Config\Ports\ConfigDataInterface; use SP\Domain\Core\Context\SessionContextInterface; use SP\Domain\Core\Crypt\CsrfInterface; -use SP\Http\RequestInterface; +use SP\Domain\Http\Method; +use SP\Domain\Http\RequestInterface; use function SP\logger; @@ -51,13 +52,13 @@ class Csrf implements CsrfInterface */ public function check(): bool { - $method = strtoupper($this->request->getMethod()); + $method = $this->request->getMethod(); $with = $this->request->getHeader('X-Requested-With'); if ($this->context->isLoggedIn() && $this->context->getCSRF() !== null - && ($method === 'POST' - || ($method === 'GET' && $with === 'XMLHttpRequest')) + && ($method === Method::POST + || ($method === Method::GET && $with === 'XMLHttpRequest')) ) { $token = $this->request->getHeader('X-CSRF'); diff --git a/lib/SP/Core/Crypt/RequestBasedPassword.php b/lib/SP/Core/Crypt/RequestBasedPassword.php index 6946b86a..0de315d4 100644 --- a/lib/SP/Core/Crypt/RequestBasedPassword.php +++ b/lib/SP/Core/Crypt/RequestBasedPassword.php @@ -26,7 +26,7 @@ namespace SP\Core\Crypt; use SP\Domain\Config\Ports\ConfigDataInterface; use SP\Domain\Core\Crypt\RequestBasedPasswordInterface; -use SP\Http\RequestInterface; +use SP\Domain\Http\RequestInterface; /** * Class RequestBasedPassword diff --git a/lib/SP/Core/Crypt/UuidCookie.php b/lib/SP/Core/Crypt/UuidCookie.php index 31f8519c..3faf13b0 100644 --- a/lib/SP/Core/Crypt/UuidCookie.php +++ b/lib/SP/Core/Crypt/UuidCookie.php @@ -25,7 +25,7 @@ namespace SP\Core\Crypt; use SP\Domain\Core\Crypt\UuidCookieInterface; -use SP\Http\RequestInterface; +use SP\Domain\Http\RequestInterface; /** * Class UuidCookie diff --git a/lib/SP/Core/Definitions/CoreDefinitions.php b/lib/SP/Core/Definitions/CoreDefinitions.php index 355ff576..72e0522d 100644 --- a/lib/SP/Core/Definitions/CoreDefinitions.php +++ b/lib/SP/Core/Definitions/CoreDefinitions.php @@ -67,6 +67,7 @@ use SP\Domain\Core\UI\ThemeContextInterface; use SP\Domain\Core\UI\ThemeIconsInterface; use SP\Domain\Core\UI\ThemeInterface; use SP\Domain\Html\MinifyInterface; +use SP\Domain\Http\RequestInterface; use SP\Domain\Install\Adapters\InstallDataFactory; use SP\Domain\Install\Services\DatabaseSetupInterface; use SP\Domain\Install\Services\MysqlSetupBuilder; @@ -75,7 +76,6 @@ use SP\Domain\Providers\MailProviderInterface; use SP\Html\Minify; use SP\Http\Client; use SP\Http\Request; -use SP\Http\RequestInterface; use SP\Infrastructure\Database\Database; use SP\Infrastructure\Database\DatabaseConnectionData; use SP\Infrastructure\Database\DatabaseInterface; diff --git a/lib/SP/Core/HttpModuleBase.php b/lib/SP/Core/HttpModuleBase.php index eb9a0319..e8249172 100644 --- a/lib/SP/Core/HttpModuleBase.php +++ b/lib/SP/Core/HttpModuleBase.php @@ -27,7 +27,7 @@ namespace SP\Core; use JsonException; use Klein\Klein; use SP\Core\Bootstrap\BootstrapBase; -use SP\Http\RequestInterface; +use SP\Domain\Http\RequestInterface; use SP\Util\Util; /** diff --git a/lib/SP/Core/Language.php b/lib/SP/Core/Language.php index 1887dcf9..e68c3426 100644 --- a/lib/SP/Core/Language.php +++ b/lib/SP/Core/Language.php @@ -27,7 +27,7 @@ namespace SP\Core; use SP\Domain\Config\Ports\ConfigDataInterface; use SP\Domain\Core\Context\ContextInterface; use SP\Domain\Core\LanguageInterface; -use SP\Http\RequestInterface; +use SP\Domain\Http\RequestInterface; use function SP\logger; diff --git a/lib/SP/Core/Messages/LogMessage.php b/lib/SP/Core/Messages/LogMessage.php deleted file mode 100644 index e951a79a..00000000 --- a/lib/SP/Core/Messages/LogMessage.php +++ /dev/null @@ -1,201 +0,0 @@ -. - */ - -namespace SP\Core\Messages; - -use SP\Domain\Core\Messages\FormatterInterface; - -/** - * Class LogMessage - * - * @package SP\Core\Messages - */ -final class LogMessage extends MessageBase -{ - /** - * @var string Acción realizada - */ - protected string $action; - /** - * @var array Detalles de la acción en formato "detalle : descripción" - */ - protected array $details = []; - protected int $descriptionCounter = 0; - protected int $detailsCounter = 0; - - /** - * Establece los detalles de la acción realizada - */ - public function addDetails(string $key, string $value): LogMessage - { - if ($value === '' || $key === '') { - return $this; - } - - $this->details[] = [$this->formatString($key), $this->formatString($value)]; - $this->detailsCounter++; - - return $this; - } - - /** - * Formatear una cadena para guardarla en el registro - */ - private function formatString(string $string): string - { - return strip_tags($string); - } - - /** - * Establece la descripción de la acción realizada - */ - public function addDescription(string $description = ''): LogMessage - { - $this->description[] = $this->formatString($description); - - return $this; - } - - /** - * Añadir una línea en blanco a la descripción - */ - public function addDescriptionLine(): LogMessage - { - $this->description[] = ''; - $this->descriptionCounter++; - - return $this; - } - - /** - * Componer un mensaje en formato texto - */ - public function composeText(string $delimiter = PHP_EOL): string - { - $formatter = new TextFormatter(); - - $message[] = $this->getAction(true); - $message[] = $this->getDescription($formatter, true); - $message[] = $this->getDetails($formatter, true); - - return implode(PHP_EOL, $message); - } - - /** - * Devuelve la acción realizada - */ - public function getAction(bool $translate = false): string - { - return $translate ? __($this->action) : $this->action; - } - - /** - * Establece la acción realizada - */ - public function setAction(string $action): LogMessage - { - $this->action = $this->formatString($action); - - return $this; - } - - /** - * Devuelve la descripción de la acción realizada - */ - public function getDescription( - FormatterInterface $formatter, - bool $translate - ): string - { - if (count($this->description) === 0) { - return ''; - } - - return $formatter->formatDescription($this->description, $translate); - } - - /** - * Devuelve los detalles de la acción realizada - */ - public function getDetails( - FormatterInterface $formatter, - bool $translate - ): string - { - if (count($this->details) === 0) { - return ''; - } - - return $formatter->formatDetail($this->details, $translate); - } - - /** - * Componer un mensaje en formato HTML - */ - public function composeHtml(): string - { - $formatter = new HtmlFormatter(); - - $message = '
'; - $message .= '

'.$this->action.'

'; - $message .= '
'.$this->getDescription($formatter, true).'
'; - $message .= '
'.$this->getDetails($formatter, true).'
'; - $message .= ''; - $message .= '
'; - - return $message; - } - - /** - * Restablecer la variable de descripcion - */ - public function resetDescription(): LogMessage - { - $this->description = []; - $this->descriptionCounter = 0; - - return $this; - } - - /** - * Restablecer la variable de detalles - */ - public function resetDetails(): LogMessage - { - $this->details = []; - $this->detailsCounter = 0; - - return $this; - } - - public function getDescriptionCounter(): int - { - return $this->descriptionCounter; - } - - public function getDetailsCounter(): int - { - return $this->detailsCounter; - } -} diff --git a/lib/SP/Domain/Account/Services/PublicLinkService.php b/lib/SP/Domain/Account/Services/PublicLinkService.php index ddbfac37..03b2e4e3 100644 --- a/lib/SP/Domain/Account/Services/PublicLinkService.php +++ b/lib/SP/Domain/Account/Services/PublicLinkService.php @@ -44,7 +44,7 @@ use SP\Domain\Core\Exceptions\ConstraintException; use SP\Domain\Core\Exceptions\CryptException; use SP\Domain\Core\Exceptions\QueryException; use SP\Domain\Core\Exceptions\SPException; -use SP\Http\RequestInterface; +use SP\Domain\Http\RequestInterface; use SP\Http\Uri; use SP\Infrastructure\Common\Repositories\NoSuchItemException; use SP\Infrastructure\Database\QueryResult; diff --git a/lib/SP/Domain/Api/Services/JsonRpcResponse.php b/lib/SP/Domain/Api/Services/JsonRpcResponse.php index 9e104586..9b758fe2 100644 --- a/lib/SP/Domain/Api/Services/JsonRpcResponse.php +++ b/lib/SP/Domain/Api/Services/JsonRpcResponse.php @@ -4,7 +4,7 @@ * * @author nuxsmin * @link https://syspass.org - * @copyright 2012-2022, Rubén Domínguez nuxsmin@$syspass.org + * @copyright 2012-2023, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * @@ -26,7 +26,7 @@ namespace SP\Domain\Api\Services; use Exception; use SP\Domain\Core\Exceptions\SPException; -use SP\Http\Json; +use SP\Http\JsonResponse; /** * Class JsonRpcResponse @@ -53,11 +53,11 @@ final class JsonRpcResponse ApiResponse $apiResponse, int $id ): string { - return Json::getJson([ + return JsonResponse::buildJsonFrom([ 'jsonrpc' => '2.0', 'result' => $apiResponse->getResponse(), 'id' => $id, - ], JSON_UNESCAPED_SLASHES); + ], JSON_UNESCAPED_SLASHES); } public static function getResponseException(Exception $e, int $id): string diff --git a/lib/SP/Domain/Auth/Services/LoginService.php b/lib/SP/Domain/Auth/Services/LoginService.php index ddb90784..a511efc4 100644 --- a/lib/SP/Domain/Auth/Services/LoginService.php +++ b/lib/SP/Domain/Auth/Services/LoginService.php @@ -45,6 +45,7 @@ use SP\Domain\Core\Exceptions\SPException; use SP\Domain\Core\LanguageInterface; use SP\Domain\Core\UI\ThemeInterface; use SP\Domain\Crypt\Ports\TemporaryMasterPassServiceInterface; +use SP\Domain\Http\RequestInterface; use SP\Domain\Security\Ports\TrackServiceInterface; use SP\Domain\User\Ports\UserPassRecoverServiceInterface; use SP\Domain\User\Ports\UserPassServiceInterface; @@ -52,7 +53,6 @@ use SP\Domain\User\Ports\UserProfileServiceInterface; use SP\Domain\User\Ports\UserServiceInterface; use SP\Domain\User\Services\UserLoginRequest; use SP\Domain\User\Services\UserPassService; -use SP\Http\RequestInterface; use SP\Http\Uri; use SP\Infrastructure\Common\Repositories\NoSuchItemException; use SP\Infrastructure\Security\Repositories\TrackRequest; diff --git a/lib/SP/Domain/Config/Services/ConfigBackupService.php b/lib/SP/Domain/Config/Services/ConfigBackupService.php index f0735c51..35d03e6e 100644 --- a/lib/SP/Domain/Config/Services/ConfigBackupService.php +++ b/lib/SP/Domain/Config/Services/ConfigBackupService.php @@ -31,7 +31,7 @@ use SP\Domain\Config\Ports\ConfigBackupServiceInterface; use SP\Domain\Config\Ports\ConfigDataInterface; use SP\Domain\Config\Ports\ConfigInterface; use SP\Domain\Core\Exceptions\SPException; -use SP\Http\Json; +use SP\Http\JsonResponse; use SP\Infrastructure\Common\Repositories\NoSuchItemException; use SP\Infrastructure\File\FileException; use SP\Util\Util; @@ -57,7 +57,7 @@ class ConfigBackupService implements ConfigBackupServiceInterface */ public static function configToJson(string $configData): string { - return Json::getJson(Util::unserialize(ConfigData::class, $configData), JSON_PRETTY_PRINT); + return JsonResponse::buildJsonFrom(Util::unserialize(ConfigData::class, $configData), JSON_PRETTY_PRINT); } /** diff --git a/lib/SP/Domain/Html/Header.php b/lib/SP/Domain/Html/Header.php index f6adf19a..23f57b10 100644 --- a/lib/SP/Domain/Html/Header.php +++ b/lib/SP/Domain/Html/Header.php @@ -29,10 +29,20 @@ namespace SP\Domain\Html; */ enum Header: string { - case ETAG = 'Etag'; - case EXPIRES = 'Expires'; - case CONTENT_TYPE = 'Content-type'; - case PRAGMA = 'Pragma'; - case CACHE_CONTROL = 'Cache-Control'; - case IF_NONE_MATCH = 'If-None-Match'; + case ETAG = 'Etag'; + case EXPIRES = 'Expires'; + case CONTENT_TYPE = 'Content-type'; + case PRAGMA = 'Pragma'; + case CACHE_CONTROL = 'Cache-Control'; + case IF_NONE_MATCH = 'If-None-Match'; + case CONTENT_TYPE_JSON = 'application/json; charset=utf-8'; + case CONTENT_TYPE_CSS = 'text/css; charset: UTF-8'; + case CONTENT_TYPE_JS = 'application/javascript; charset: UTF-8'; + case ACCEPT = 'Accept'; + case ACCEPT_JSON = 'application/json'; + case X_REQUESTED_WITH = 'X-Requested-With'; + case HTTP_FORWARDED = 'Http-Forwarded'; + case HTTP_X_FORWARDED_HOST = 'Http-Forwarded-Host'; + case HTTP_X_FORWARDED_PROTO = 'Http-Forwarded-Proto'; + case HTTP_X_FORWARDED_FOR = 'Http-Forwarded-For'; } diff --git a/lib/SP/Domain/Http/JsonResponseInterface.php b/lib/SP/Domain/Http/JsonResponseInterface.php new file mode 100644 index 00000000..1e1c549f --- /dev/null +++ b/lib/SP/Domain/Http/JsonResponseInterface.php @@ -0,0 +1,53 @@ +. + */ + +namespace SP\Domain\Http; + +use SP\Domain\Core\Exceptions\SPException; +use SP\Http\JsonMessage; + +/** + * Interface JsonResponseInterface + */ +interface JsonResponseInterface +{ + /** + * Devuelve una respuesta en formato JSON + * + * @param string $data JSON string + * + * @return bool + */ + public function sendRaw(string $data): bool; + + /** + * Devuelve una respuesta en formato JSON con el estado y el mensaje. + * + * @param JsonMessage $jsonMessage + * + * @return bool + * @throws SPException + */ + public function send(JsonMessage $jsonMessage): bool; +} diff --git a/lib/SP/Domain/Http/Method.php b/lib/SP/Domain/Http/Method.php new file mode 100644 index 00000000..0371ec07 --- /dev/null +++ b/lib/SP/Domain/Http/Method.php @@ -0,0 +1,34 @@ +. + */ + +namespace SP\Domain\Http; + +/** + * Enum Method + */ +enum Method: string +{ + case GET = 'GET'; + case POST = 'POST'; +} diff --git a/lib/SP/Http/RequestInterface.php b/lib/SP/Domain/Http/RequestInterface.php similarity index 85% rename from lib/SP/Http/RequestInterface.php rename to lib/SP/Domain/Http/RequestInterface.php index b6b6ae4e..75116dca 100644 --- a/lib/SP/Http/RequestInterface.php +++ b/lib/SP/Domain/Http/RequestInterface.php @@ -4,7 +4,7 @@ * * @author nuxsmin * @link https://syspass.org - * @copyright 2012-2022, Rubén Domínguez nuxsmin@$syspass.org + * @copyright 2012-2023, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * @@ -22,9 +22,9 @@ * along with sysPass. If not, see . */ -namespace SP\Http; - +namespace SP\Domain\Http; +use Klein\Request; use SP\Domain\Core\Exceptions\SPException; /** @@ -58,13 +58,13 @@ interface RequestInterface public function analyzeUnsafeString(string $param, ?string $default = null): ?string; /** - * @param string $param - * @param callable|null $mapper - * @param null $default + * @param string $param + * @param callable|null $mapper + * @param mixed $default * * @return array|null */ - public function analyzeArray(string $param, callable $mapper = null, $default = null): ?array; + public function analyzeArray(string $param, ?callable $mapper = null, mixed $default = null): ?array; /** * Comprobar si la petición es en formato JSON @@ -83,8 +83,8 @@ interface RequestInterface public function analyzeBool(string $param, ?bool $default = null): bool; /** - * @param string $key - * @param string|null $param Checks the signature only for the given param + * @param string $key + * @param string|null $param Checks the signature only for the given param * * @throws SPException */ @@ -111,13 +111,13 @@ interface RequestInterface */ public function getXForwardedData(): ?array; - public function getMethod(): ?string; + public function getMethod(): Method; public function isHttps(): ?bool; public function getServerPort(): int; - public function getRequest(): \Klein\Request; + public function getRequest(): Request; public function getServer(string $key): string; } diff --git a/lib/SP/Domain/Import/Services/FileImport.php b/lib/SP/Domain/Import/Services/FileImport.php index 30ca4070..9fd3dd9f 100644 --- a/lib/SP/Domain/Import/Services/FileImport.php +++ b/lib/SP/Domain/Import/Services/FileImport.php @@ -4,7 +4,7 @@ * * @author nuxsmin * @link https://syspass.org - * @copyright 2012-2022, Rubén Domínguez nuxsmin@$syspass.org + * @copyright 2012-2023, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * @@ -25,7 +25,7 @@ namespace SP\Domain\Import\Services; use SP\Domain\Core\Exceptions\SPException; -use SP\Http\RequestInterface; +use SP\Domain\Http\RequestInterface; use SP\Infrastructure\File\FileException; use SP\Infrastructure\File\FileHandler; use SP\Infrastructure\File\FileHandlerInterface; diff --git a/lib/SP/Domain/Install/Adapters/InstallDataFactory.php b/lib/SP/Domain/Install/Adapters/InstallDataFactory.php index 8e19717d..f797a729 100644 --- a/lib/SP/Domain/Install/Adapters/InstallDataFactory.php +++ b/lib/SP/Domain/Install/Adapters/InstallDataFactory.php @@ -4,7 +4,7 @@ * * @author nuxsmin * @link https://syspass.org - * @copyright 2012-2022, Rubén Domínguez nuxsmin@$syspass.org + * @copyright 2012-2023, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * @@ -24,7 +24,7 @@ namespace SP\Domain\Install\Adapters; -use SP\Http\RequestInterface; +use SP\Domain\Http\RequestInterface; /** * Class InstallDataAdapter diff --git a/lib/SP/Domain/Install/Services/InstallerService.php b/lib/SP/Domain/Install/Services/InstallerService.php index 2f0b7804..c0425cc3 100644 --- a/lib/SP/Domain/Install/Services/InstallerService.php +++ b/lib/SP/Domain/Install/Services/InstallerService.php @@ -39,12 +39,12 @@ use SP\Domain\Core\Exceptions\ConstraintException; use SP\Domain\Core\Exceptions\InvalidArgumentException; use SP\Domain\Core\Exceptions\QueryException; use SP\Domain\Core\Exceptions\SPException; +use SP\Domain\Http\RequestInterface; use SP\Domain\Install\Adapters\InstallData; use SP\Domain\Install\Ports\InstallerServiceInterface; use SP\Domain\User\Ports\UserGroupServiceInterface; use SP\Domain\User\Ports\UserProfileServiceInterface; use SP\Domain\User\Ports\UserServiceInterface; -use SP\Http\RequestInterface; use SP\Infrastructure\Database\DatabaseConnectionData; use SP\Util\VersionUtil; diff --git a/lib/SP/Domain/Security/Services/EventlogService.php b/lib/SP/Domain/Security/Services/EventlogService.php index 55c48002..7ddce73b 100644 --- a/lib/SP/Domain/Security/Services/EventlogService.php +++ b/lib/SP/Domain/Security/Services/EventlogService.php @@ -4,7 +4,7 @@ * * @author nuxsmin * @link https://syspass.org - * @copyright 2012-2022, Rubén Domínguez nuxsmin@$syspass.org + * @copyright 2012-2023, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * @@ -31,9 +31,9 @@ use SP\Domain\Common\Services\Service; use SP\Domain\Core\Exceptions\ConstraintException; use SP\Domain\Core\Exceptions\QueryException; use SP\Domain\Core\Exceptions\SPException; +use SP\Domain\Http\RequestInterface; use SP\Domain\Security\Ports\EventlogRepositoryInterface; use SP\Domain\Security\Ports\EventlogServiceInterface; -use SP\Http\RequestInterface; use SP\Infrastructure\Database\QueryResult; use SP\Infrastructure\Security\Repositories\EventlogRepository; diff --git a/lib/SP/Domain/Security/Services/TrackService.php b/lib/SP/Domain/Security/Services/TrackService.php index cf94864d..c97ce1ba 100644 --- a/lib/SP/Domain/Security/Services/TrackService.php +++ b/lib/SP/Domain/Security/Services/TrackService.php @@ -35,9 +35,9 @@ use SP\Domain\Common\Services\ServiceException; use SP\Domain\Core\Exceptions\ConstraintException; use SP\Domain\Core\Exceptions\InvalidArgumentException; use SP\Domain\Core\Exceptions\QueryException; +use SP\Domain\Http\RequestInterface; use SP\Domain\Security\Ports\TrackRepositoryInterface; use SP\Domain\Security\Ports\TrackServiceInterface; -use SP\Http\RequestInterface; use SP\Infrastructure\Common\Repositories\NoSuchItemException; use SP\Infrastructure\Database\QueryResult; use SP\Infrastructure\Security\Repositories\TrackRepository; diff --git a/lib/SP/Html/Html.php b/lib/SP/Html/Html.php index ad35aa57..83fb59c5 100644 --- a/lib/SP/Html/Html.php +++ b/lib/SP/Html/Html.php @@ -46,7 +46,7 @@ final class Html string $ellipsis = '...' ): string { if (mb_strlen($text) > $limit) { - return trim(mb_substr($text, 0, $limit)) . $ellipsis; + return sprintf('%s%s', trim(mb_substr($text, 0, $limit)), $ellipsis); } return $text; diff --git a/lib/SP/Html/Minify.php b/lib/SP/Html/Minify.php index 9c4b1ec7..caa1bb11 100644 --- a/lib/SP/Html/Minify.php +++ b/lib/SP/Html/Minify.php @@ -48,8 +48,7 @@ abstract class Minify implements MinifyInterface public function __construct( private readonly Response $response, - private readonly Request $request, - private bool $insecure = false + private readonly Request $request ) { $this->files = new SplObjectStorage(); } @@ -159,7 +158,7 @@ abstract class Minify implements MinifyInterface ): MinifyInterface { $fileHandler->checkFileExists(); - $this->files->attach(new MinifyFile($fileHandler, $minify, $this->insecure)); + $this->files->attach(new MinifyFile($fileHandler, $minify)); return $this; } diff --git a/lib/SP/Html/MinifyCss.php b/lib/SP/Html/MinifyCss.php index 4bfb7b33..4facd414 100644 --- a/lib/SP/Html/MinifyCss.php +++ b/lib/SP/Html/MinifyCss.php @@ -24,6 +24,7 @@ namespace SP\Html; +use SP\Domain\Html\Header; use SP\Domain\Html\MinifyFile; use SP\Infrastructure\File\FileException; use SplObjectStorage; @@ -51,6 +52,6 @@ final class MinifyCss extends Minify protected function getContentTypeHeader(): string { - return 'text/css; charset: UTF-8'; + return Header::CONTENT_TYPE_CSS->value; } } diff --git a/lib/SP/Html/MinifyJs.php b/lib/SP/Html/MinifyJs.php index f0d5d810..1422f75e 100644 --- a/lib/SP/Html/MinifyJs.php +++ b/lib/SP/Html/MinifyJs.php @@ -24,6 +24,7 @@ namespace SP\Html; +use SP\Domain\Html\Header; use SP\Domain\Html\MinifyFile; use SP\Infrastructure\File\FileException; use SplObjectStorage; @@ -78,6 +79,6 @@ final class MinifyJs extends Minify protected function getContentTypeHeader(): string { - return 'application/javascript; charset: UTF-8'; + return Header::CONTENT_TYPE_JS->value; } } diff --git a/lib/SP/Http/Json.php b/lib/SP/Http/Json.php index aad33f3b..8273608f 100644 --- a/lib/SP/Http/Json.php +++ b/lib/SP/Http/Json.php @@ -4,7 +4,7 @@ * * @author nuxsmin * @link https://syspass.org - * @copyright 2012-2022, Rubén Domínguez nuxsmin@$syspass.org + * @copyright 2012-2023, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * @@ -27,89 +27,39 @@ namespace SP\Http; use JsonException; use Klein\Response; use SP\Domain\Core\Exceptions\SPException; +use SP\Domain\Html\Header; +use SP\Domain\Http\JsonResponseInterface; +use function SP\__u; /** - * Class Json con utilidades para JSON - * - * @package SP\Util + * Class JsonResponse */ -final class Json +final class JsonResponse implements JsonResponseInterface { - public const SAFE = [ - 'from' => ['\\', '"', '\''], - 'to' => ['\\', '\"', '\\\''], - ]; - - private Response $response; - /** * Json constructor. */ - public function __construct(Response $response) + public function __construct(private readonly Response $response) { - $this->response = $response; } - public static function factory(Response $response): Json + public static function factory(Response $response): JsonResponseInterface { return new self($response); } - /** - * Devuelve un array con las cadenas formateadas para JSON - */ - public static function safeJson(&$data): string - { - if (is_array($data) || is_object($data)) { - array_walk_recursive( - $data, - static function ($value) { - if (is_object($value)) { - foreach ($value as $property => $v) { - if (is_string($v) && $v !== '') { - $value->$property = self::safeJsonString($v); - } - } - - return $value; - } - - if (is_string($value) && $value !== '') { - return self::safeJsonString($value); - } - - return $value; - } - ); - } elseif (is_string($data) && $data !== '') { - return self::safeJsonString($data); - } - - return $data; - } - - /** - * Devuelve una cadena con los carácteres formateadas para JSON - * - * @return array|string|string[] - */ - public static function safeJsonString($string) - { - return str_replace(self::SAFE['from'], self::SAFE['to'], $string); - } - /** * Devuelve una respuesta en formato JSON * - * @param string $data JSON string + * @param string $data JSON string * * @return bool */ - public function returnRawJson(string $data): bool + public function sendRaw(string $data): bool { return $this->response - ->header('Content-type', 'application/json; charset=utf-8') + ->header(Header::CONTENT_TYPE->value, Header::CONTENT_TYPE_JSON->value) ->body($data) ->send(true) ->isSent(); @@ -118,22 +68,22 @@ final class Json /** * Devuelve una respuesta en formato JSON con el estado y el mensaje. * - * @param JsonResponse $jsonResponse + * @param JsonMessage $jsonMessage * * @return bool * @throws SPException */ - public function returnJson(JsonResponse $jsonResponse): bool + public function send(JsonMessage $jsonMessage): bool { - $this->response->header('Content-type', 'application/json; charset=utf-8'); + $this->response->header(Header::CONTENT_TYPE->value, Header::CONTENT_TYPE_JSON->value); try { - $this->response->body(self::getJson($jsonResponse)); + $this->response->body(self::buildJsonFrom($jsonMessage)); } catch (SPException $e) { - $jsonResponse = new JsonResponse($e->getMessage()); - $jsonResponse->addMessage($e->getHint()); + $jsonMessage = new JsonMessage($e->getMessage()); + $jsonMessage->addMessage($e->getHint()); - $this->response->body(self::getJson($jsonResponse)); + $this->response->body(self::buildJsonFrom($jsonMessage)); } return $this->response->send(true)->isSent(); @@ -142,12 +92,13 @@ final class Json /** * Devuelve una cadena en formato JSON * - * @param mixed $data - * @param int $flags JSON_* flags + * @param mixed $data + * @param int $flags JSON_* flags * + * @return string * @throws SPException */ - public static function getJson($data, int $flags = 0): string + public static function buildJsonFrom(mixed $data, int $flags = 0): string { try { return json_encode($data, JSON_THROW_ON_ERROR | $flags); diff --git a/lib/SP/Http/JsonMessage.php b/lib/SP/Http/JsonMessage.php new file mode 100644 index 00000000..1c62275b --- /dev/null +++ b/lib/SP/Http/JsonMessage.php @@ -0,0 +1,118 @@ +. + */ + +namespace SP\Http; + +use JsonSerializable; +use stdClass; + +use function SP\__; + +/** + * Class Json para definir la estructura de una respuesta en formato JSON + */ +final class JsonMessage implements JsonSerializable +{ + public const JSON_SUCCESS = 0; + public const JSON_SUCCESS_STICKY = 100; + public const JSON_ERROR = 1; + public const JSON_WARNING = 2; + protected int $status = self::JSON_ERROR; + protected ?string $description = null; + protected array $data = []; + protected array $messages = []; + + /** + * JsonResponse constructor. + */ + public function __construct(?string $description = null) + { + $this->description = $description; + } + + public function setStatus(int $status): JsonMessage + { + $this->status = $status; + + return $this; + } + + public function setDescription(string $description): JsonMessage + { + $this->description = __($description); + + return $this; + } + + /** + * @param array|stdClass $data + * @return JsonMessage + */ + public function setData(array|stdClass $data): JsonMessage + { + $this->data = $data; + + return $this; + } + + public function setMessages(array $messages): JsonMessage + { + $this->messages = array_map('__', $messages); + + return $this; + } + + public function addMessage(string $message): JsonMessage + { + $this->messages[] = __($message); + return $this; + } + + /** + * Specify data which should be serialized to JSON + * + * @link http://php.net/manual/en/jsonserializable.jsonserialize.php + * @return array data which can be serialized by json_encode, + * which is a value of any type other than a resource. + * @since 5.4.0 + */ + public function jsonSerialize(): array + { + return $this->getJsonArray(); + } + + /** + * Devolver un array con las propiedades del objeto + */ + public function getJsonArray(): array + { + $out = []; + + foreach ($this as $key => $value) { + $out[$key] = $value; + } + + return $out; + } +} diff --git a/lib/SP/Http/JsonResponse.php b/lib/SP/Http/JsonResponse.php deleted file mode 100644 index d0a03827..00000000 --- a/lib/SP/Http/JsonResponse.php +++ /dev/null @@ -1,211 +0,0 @@ -. - */ - -namespace SP\Http; - -use JsonSerializable; -use stdClass; - -/** - * Class Json para definir la estructura de una respuesta en formato JSON - * - * @package SP\Http - */ -final class JsonResponse implements JsonSerializable -{ - public const JSON_SUCCESS = 0; - public const JSON_SUCCESS_STICKY = 100; - public const JSON_ERROR = 1; - public const JSON_ERROR_STICKY = 101; - public const JSON_WARNING = 2; - public const JSON_WARNING_STICKY = 102; - public const JSON_LOGOUT = 10; - - protected int $status = 1; - protected ?string $description = null; - protected string $action = ''; - protected array $data = []; - protected array $messages = []; - protected string $container = ''; - protected string $csrf = ''; - - /** - * JsonResponse constructor. - */ - public function __construct(?string $description = null) - { - $this->description = $description; - } - - public function getStatus(): int - { - return $this->status; - } - - public function setStatus(int $status): JsonResponse - { - $this->status = $status; - - return $this; - } - - public function getDescription(): ?string - { - return $this->description; - } - - public function setDescription(string $description): JsonResponse - { - $this->description = __($description); - - return $this; - } - - public function getAction(): string - { - return $this->action; - } - - public function setAction(string $action): JsonResponse - { - $this->action = $action; - - return $this; - } - - public function getData(): array - { - return $this->data; - } - - /** - * @param array|stdClass $data - */ - public function setData($data): JsonResponse - { - $this->data = $data; - - return $this; - } - - public function getMessages(): array - { - return $this->messages; - } - - public function setMessages(array $messages): JsonResponse - { - $this->messages = array_map('__', $messages); - - return $this; - } - - public function getContainer(): string - { - return $this->container; - } - - public function setContainer(string $container): JsonResponse - { - $this->container = $container; - - return $this; - } - - public function getCsrf(): string - { - return $this->csrf; - } - - public function setCsrf(string $csrf): JsonResponse - { - $this->csrf = $csrf; - - return $this; - } - - public function addMessage(string $message): JsonResponse - { - $this->messages[] = __($message); - return $this; - } - - /** - * @param mixed $param - * - * @return $this - */ - public function addParam($param): JsonResponse - { - if (is_numeric($param)) { - $param = (int)$param; - } - - $this->data[] = $param; - - return $this; - } - - /** - * Specify data which should be serialized to JSON - * - * @link http://php.net/manual/en/jsonserializable.jsonserialize.php - * @return mixed data which can be serialized by json_encode, - * which is a value of any type other than a resource. - * @since 5.4.0 - */ - public function jsonSerialize(): mixed - { - return $this->getJsonArray(); - } - - /** - * Devolver un array con las propiedades del objeto - */ - public function getJsonArray(): array - { - $out = []; - - foreach ($this as $key => $value) { - $out[$key] = $value; - } - - return $out; - } - - /** - * Establecer los valores por defecto - */ - public function clear(): JsonResponse - { - $this->status = 0; - $this->action = ''; - $this->data = []; - $this->messages = []; - $this->container = ''; - $this->csrf = ''; - - return $this; - } -} \ No newline at end of file diff --git a/lib/SP/Http/Message.php b/lib/SP/Http/Message.php deleted file mode 100644 index 3e5906b6..00000000 --- a/lib/SP/Http/Message.php +++ /dev/null @@ -1,67 +0,0 @@ -. - */ - -namespace SP\Http; - -/** - * Class Message - * - * @package SP\Http - */ -final class Message -{ - protected int $type = 0; - protected ?string $description = null; - protected ?string $hint = null; - - public function getType(): int - { - return $this->type; - } - - public function setType(int $type): void - { - $this->type = $type; - } - - public function getDescription(): ?string - { - return $this->description; - } - - public function setDescription(string $description): void - { - $this->description = $description; - } - - public function getHint(): ?string - { - return $this->hint; - } - - public function setHint(string $hint): void - { - $this->hint = $hint; - } -} \ No newline at end of file diff --git a/lib/SP/Http/Request.php b/lib/SP/Http/Request.php index cc64ab51..2ca2464a 100644 --- a/lib/SP/Http/Request.php +++ b/lib/SP/Http/Request.php @@ -30,6 +30,9 @@ use Klein\DataCollection\HeaderDataCollection; use SP\Core\Crypt\Hash; use SP\Domain\Core\Crypt\CryptPKIInterface; use SP\Domain\Core\Exceptions\SPException; +use SP\Domain\Html\Header; +use SP\Domain\Http\Method; +use SP\Domain\Http\RequestInterface; use SP\Util\Filter; use SP\Util\Util; @@ -50,8 +53,8 @@ class Request implements RequestInterface private HeaderDataCollection $headers; private DataCollection $params; - private ?string $method = null; - private ?bool $https = null; + private Method $method; + private ?bool $https = null; /** * Request constructor. @@ -59,21 +62,18 @@ class Request implements RequestInterface public function __construct(private readonly \Klein\Request $request, private readonly CryptPKIInterface $cryptPKI) { $this->headers = $this->request->headers(); + $this->method = Method::from($this->request->method()); $this->params = $this->getParamsByMethod(); $this->detectHttps(); } private function getParamsByMethod(): DataCollection { - if ($this->request->method('GET')) { - $this->method = 'GET'; - - return $this->request->paramsGet(); - } - - $this->method = 'POST'; - - return $this->request->paramsPost(); + return match ($this->method) { + Method::GET => $this->request->paramsGet(), + Method::POST => $this->request->paramsPost(), + default => new DataCollection(), + }; } /** @@ -142,8 +142,8 @@ class Request implements RequestInterface public function getForwardedFor(): ?array { // eg: Forwarded: by=; for=; host=; proto= - // Forwarded: for=12.34.56.78;host=example.com;proto=https, for=23.45.67.89 - $forwarded = $this->headers->get('HTTP_FORWARDED'); + // Forwarded: for=12.34.56.78;host=example.com;proto=https,for=23.45.67.89 + $forwarded = $this->headers->get(Header::HTTP_FORWARDED->value); if ($forwarded !== null && preg_match_all( @@ -161,7 +161,7 @@ class Request implements RequestInterface } // eg: X-Forwarded-For: 192.0.2.43, 2001:db8:cafe::17 - $xForwarded = $this->headers->get('HTTP_X_FORWARDED_FOR'); + $xForwarded = $this->headers->get(Header::HTTP_X_FORWARDED_FOR->value); if ($xForwarded !== null) { $matches = preg_split( @@ -184,7 +184,7 @@ class Request implements RequestInterface */ public function checkReload(): bool { - return $this->headers->get('Cache-Control') === 'max-age=0'; + return $this->headers->get(Header::CACHE_CONTROL->value) === 'max-age=0'; } public function analyzeEmail( @@ -258,9 +258,9 @@ class Request implements RequestInterface * @return array|null */ public function analyzeArray( - string $param, - callable $mapper = null, - mixed $default = null + string $param, + ?callable $mapper = null, + mixed $default = null ): ?array { $requestValue = $this->params->get($param); @@ -280,7 +280,7 @@ class Request implements RequestInterface */ public function isJson(): bool { - return str_contains($this->headers->get('Accept'), 'application/json'); + return str_contains($this->headers->get(Header::ACCEPT->value), Header::ACCEPT_JSON->value); } /** @@ -288,7 +288,7 @@ class Request implements RequestInterface */ public function isAjax(): bool { - return $this->headers->get('X-Requested-With') === 'XMLHttpRequest' + return $this->headers->get(Header::X_REQUESTED_WITH->value) === 'XMLHttpRequest' || $this->analyzeInt('isAjax', 0) === 1; } @@ -381,7 +381,7 @@ class Request implements RequestInterface */ public function getForwardedData(): ?array { - $forwarded = $this->getHeader('HTTP_FORWARDED'); + $forwarded = $this->getHeader(Header::HTTP_FORWARDED->value); // Check in style of RFC 7239 if (!empty($forwarded) @@ -416,8 +416,8 @@ class Request implements RequestInterface */ public function getXForwardedData(): ?array { - $forwardedHost = $this->getHeader('HTTP_X_FORWARDED_HOST'); - $forwardedProto = $this->getHeader('HTTP_X_FORWARDED_PROTO'); + $forwardedHost = $this->getHeader(Header::HTTP_X_FORWARDED_HOST->value); + $forwardedProto = $this->getHeader(Header::HTTP_X_FORWARDED_PROTO->value); // Check (deprecated) de facto standard if (!empty($forwardedHost) && !empty($forwardedProto)) { @@ -436,7 +436,7 @@ class Request implements RequestInterface return null; } - public function getMethod(): ?string + public function getMethod(): Method { return $this->method; } diff --git a/lib/SP/Http/Uri.php b/lib/SP/Http/Uri.php index 333df89e..7aa8a42a 100644 --- a/lib/SP/Http/Uri.php +++ b/lib/SP/Http/Uri.php @@ -4,7 +4,7 @@ * * @author nuxsmin * @link https://syspass.org - * @copyright 2012-2021, Rubén Domínguez nuxsmin@$syspass.org + * @copyright 2012-2023, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * @@ -28,40 +28,31 @@ use SP\Core\Crypt\Hash; /** * Class Uri - * - * @package SP\Http */ final class Uri { - private string $base; private array $params = []; - /** - * Uri constructor. - * - * @param string $base - */ - public function __construct(string $base) + public function __construct(private readonly string $base) { - $this->base = $base; } private static function mapParts(string $key, string $value): string { - if (strpos($key, '_') === 0) { + if (str_starts_with($key, '_')) { $key = substr($key, 1); } - return $key . '=' . urlencode($value); + return sprintf('%s=%s', $key, urlencode($value)); } /** - * @param string $param Param's name. If an '_' is set at the beginning, it will be a protected param - * @param string|int $value + * @param string $param Param's name. If an '_' is set at the beginning, it will be a protected param + * @param int|string $value * * @return Uri */ - public function addParam(string $param, $value): Uri + public function addParam(string $param, int|string $value): Uri { $this->params[$param] = (string)$value; @@ -70,14 +61,18 @@ final class Uri public function getUri(): string { - return $this->base . '?' . implode('&', array_map([__CLASS__, 'mapParts'], array_keys($this->params), $this->params)); + return sprintf( + '%s?%s', + $this->base, + implode('&', array_map([__CLASS__, 'mapParts'], array_keys($this->params), $this->params)) + ); } public function getUriSigned(string $key): string { $uri = implode('&', array_map([__CLASS__, 'mapParts'], array_keys($this->params), $this->params)); - return $this->base . '?' . $uri . '&h=' . Hash::signMessage($uri, $key); + return sprintf('%s?%s&h=%s', $this->base, $uri, Hash::signMessage($uri, $key)); } /** @@ -90,11 +85,11 @@ final class Uri $this->params = array_filter( $this->params, static function ($key) { - return strpos($key, '_') === 0; + return str_starts_with($key, '_'); }, ARRAY_FILTER_USE_KEY ); return $this; } -} \ No newline at end of file +} diff --git a/lib/SP/Http/Xml.php b/lib/SP/Http/Xml.php deleted file mode 100644 index 37aea492..00000000 --- a/lib/SP/Http/Xml.php +++ /dev/null @@ -1,78 +0,0 @@ -. - */ - -namespace SP\Http; - -use Klein\Response; - -/** - * Class Xml - * - * @package SP\Http - */ -final class Xml -{ - public const SAFE = [ - 'from' => ['&', '<', '>', '"', "\'"], - 'to' => ['&', '<', '>', '"', '''] - ]; - - private Response $response; - - /** - * Xml constructor. - */ - public function __construct(Response $response) - { - $this->response = $response; - } - - /** - * Devuelve una respuesta en formato XML con el estado y el mensaje. - * - * @param string $description mensaje a devolver - * @param int $status devuelve el estado - */ - public function printXml(string $description, int $status = 1): void - { - $xml[] = ''; - $xml[] = ''; - $xml[] = '' . $status . ''; - $xml[] = '' . $this->safeString($description) . ''; - $xml[] = ''; - - $this->response - ->header('Content-Type', 'application/xml') - ->body(implode(PHP_EOL, $xml)) - ->send(true); - } - - /** - * @return array|string|string[] - */ - public function safeString(string $string) - { - return str_replace(self::SAFE['from'], self::SAFE['to'], $string); - } -} \ No newline at end of file diff --git a/lib/SP/Mvc/Controller/ControllerTrait.php b/lib/SP/Mvc/Controller/ControllerTrait.php index c7c9426b..36cdcb30 100644 --- a/lib/SP/Mvc/Controller/ControllerTrait.php +++ b/lib/SP/Mvc/Controller/ControllerTrait.php @@ -4,7 +4,7 @@ * * @author nuxsmin * @link https://syspass.org - * @copyright 2012-2022, Rubén Domínguez nuxsmin@$syspass.org + * @copyright 2012-2023, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * @@ -29,9 +29,9 @@ use Klein\Klein; use SP\Core\Bootstrap\BootstrapBase; use SP\Domain\Config\Ports\ConfigDataInterface; use SP\Domain\Core\Exceptions\SPException; -use SP\Http\Json; +use SP\Domain\Http\RequestInterface; +use SP\Http\JsonMessage; use SP\Http\JsonResponse; -use SP\Http\RequestInterface; use SP\Http\Uri; use SP\Util\Util; @@ -75,10 +75,10 @@ trait ControllerTrait Closure $onRedirect ): void { if ($request->isJson()) { - $jsonResponse = new JsonResponse(__u('Session not started or timed out')); + $jsonResponse = new JsonMessage(__u('Session not started or timed out')); $jsonResponse->setStatus(10); - Json::factory($this->router->response())->returnJson($jsonResponse); + JsonResponse::factory($this->router->response())->send($jsonResponse); } elseif ($request->isAjax()) { Util::logout(); } else { @@ -115,7 +115,7 @@ trait ControllerTrait */ protected function invalidAction(): void { - Json::factory($this->router->response())->returnJson(new JsonResponse(__u('Invalid Action'))); + JsonResponse::factory($this->router->response())->send(new JsonMessage(__u('Invalid Action'))); } /** diff --git a/lib/SP/Mvc/Controller/ItemTrait.php b/lib/SP/Mvc/Controller/ItemTrait.php index 968fb06b..9a5b7841 100644 --- a/lib/SP/Mvc/Controller/ItemTrait.php +++ b/lib/SP/Mvc/Controller/ItemTrait.php @@ -34,7 +34,7 @@ use SP\Domain\Core\Exceptions\SPException; use SP\Domain\CustomField\Ports\CustomFieldServiceInterface; use SP\Domain\CustomField\Services\CustomFieldItem; use SP\Domain\CustomField\Services\CustomFieldService; -use SP\Http\RequestInterface; +use SP\Domain\Http\RequestInterface; use SP\Infrastructure\Common\Repositories\NoSuchItemException; use SP\Util\Filter; @@ -97,7 +97,7 @@ trait ItemTrait * * @param int $moduleId * @param int|int[] $itemId - * @param RequestInterface $request + * @param RequestInterface $request * @param CustomFieldServiceInterface $customFieldService * * @throws ConstraintException @@ -172,7 +172,7 @@ trait ItemTrait * * @param int $moduleId * @param int|int[] $itemId - * @param RequestInterface $request + * @param RequestInterface $request * @param CustomFieldServiceInterface $customFieldService * * @throws ConstraintException diff --git a/lib/SP/Mvc/Controller/SimpleControllerHelper.php b/lib/SP/Mvc/Controller/SimpleControllerHelper.php index c954a0ad..c6c1bbf7 100644 --- a/lib/SP/Mvc/Controller/SimpleControllerHelper.php +++ b/lib/SP/Mvc/Controller/SimpleControllerHelper.php @@ -4,7 +4,7 @@ * * @author nuxsmin * @link https://syspass.org - * @copyright 2012-2022, Rubén Domínguez nuxsmin@$syspass.org + * @copyright 2012-2023, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * @@ -29,7 +29,7 @@ use Klein\Klein; use SP\Core\Acl\Acl; use SP\Core\PhpExtensionChecker; use SP\Domain\Core\UI\ThemeInterface; -use SP\Http\RequestInterface; +use SP\Domain\Http\RequestInterface; /** * Class SimpleControllerHelper diff --git a/lib/SP/Mvc/Controller/WebControllerHelper.php b/lib/SP/Mvc/Controller/WebControllerHelper.php index 89c1ef20..8ff7c143 100644 --- a/lib/SP/Mvc/Controller/WebControllerHelper.php +++ b/lib/SP/Mvc/Controller/WebControllerHelper.php @@ -4,7 +4,7 @@ * * @author nuxsmin * @link https://syspass.org - * @copyright 2012-2022, Rubén Domínguez nuxsmin@$syspass.org + * @copyright 2012-2023, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * @@ -29,7 +29,7 @@ use Klein\Klein; use SP\Core\Acl\Acl; use SP\Core\PhpExtensionChecker; use SP\Domain\Core\UI\ThemeInterface; -use SP\Http\RequestInterface; +use SP\Domain\Http\RequestInterface; use SP\Modules\Web\Controllers\Helpers\LayoutHelper; use SP\Mvc\View\TemplateInterface; use SP\Providers\Auth\Browser\BrowserAuthInterface; diff --git a/lib/SP/Mvc/View/Components/SelectItemAdapter.php b/lib/SP/Mvc/View/Components/SelectItemAdapter.php index 022966de..248983b4 100644 --- a/lib/SP/Mvc/View/Components/SelectItemAdapter.php +++ b/lib/SP/Mvc/View/Components/SelectItemAdapter.php @@ -4,7 +4,7 @@ * * @author nuxsmin * @link https://syspass.org - * @copyright 2012-2022, Rubén Domínguez nuxsmin@$syspass.org + * @copyright 2012-2023, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * @@ -27,7 +27,7 @@ namespace SP\Mvc\View\Components; use RuntimeException; use SP\Domain\Common\Adapters\DataModelInterface; use SP\Domain\Core\Exceptions\SPException; -use SP\Http\Json; +use SP\Http\JsonResponse; use function SP\__u; @@ -83,7 +83,7 @@ final class SelectItemAdapter implements ItemAdapterInterface $out[] = ['id' => $item->getId(), 'name' => $item->getName()]; } - return Json::getJson($out); + return JsonResponse::buildJsonFrom($out); } /** @@ -99,7 +99,7 @@ final class SelectItemAdapter implements ItemAdapterInterface $out[] = ['id' => $key, 'name' => $value]; } - return Json::getJson($out); + return JsonResponse::buildJsonFrom($out); } /** diff --git a/lib/SP/Providers/Auth/Browser/BrowserAuth.php b/lib/SP/Providers/Auth/Browser/BrowserAuth.php index 8cb0fe91..8d8dd035 100644 --- a/lib/SP/Providers/Auth/Browser/BrowserAuth.php +++ b/lib/SP/Providers/Auth/Browser/BrowserAuth.php @@ -26,7 +26,7 @@ namespace SP\Providers\Auth\Browser; use SP\DataModel\UserLoginData; use SP\Domain\Config\Ports\ConfigDataInterface; -use SP\Http\RequestInterface; +use SP\Domain\Http\RequestInterface; use SP\Providers\Auth\AuthInterface; /** diff --git a/lib/SP/Providers/Log/LoggerBase.php b/lib/SP/Providers/Log/LoggerBase.php index 76385ff1..19bc13d2 100644 --- a/lib/SP/Providers/Log/LoggerBase.php +++ b/lib/SP/Providers/Log/LoggerBase.php @@ -32,8 +32,8 @@ use SP\Core\Language; use SP\Domain\Core\Events\EventReceiver; use SP\Domain\Core\Exceptions\InvalidClassException; use SP\Domain\Core\LanguageInterface; +use SP\Domain\Http\RequestInterface; use SP\Http\Request; -use SP\Http\RequestInterface; use SP\Providers\EventsTrait; use SP\Providers\Provider; diff --git a/lib/SP/Providers/Mail/MailHandler.php b/lib/SP/Providers/Mail/MailHandler.php index 9c541309..27cf1e66 100644 --- a/lib/SP/Providers/Mail/MailHandler.php +++ b/lib/SP/Providers/Mail/MailHandler.php @@ -30,10 +30,10 @@ use SP\Core\Events\Event; use SP\Core\Messages\MailMessage; use SP\Core\Messages\TextFormatter; use SP\Domain\Core\Events\EventReceiver; +use SP\Domain\Http\RequestInterface; use SP\Domain\Notification\Ports\MailServiceInterface; use SP\Domain\Notification\Services\MailService; use SP\Http\Request; -use SP\Http\RequestInterface; use SP\Providers\EventsTrait; use SP\Providers\Provider; use SplSubject; diff --git a/lib/SP/Util/HttpUtil.php b/lib/SP/Util/HttpUtil.php index b806278b..3795b580 100644 --- a/lib/SP/Util/HttpUtil.php +++ b/lib/SP/Util/HttpUtil.php @@ -4,7 +4,7 @@ * * @author nuxsmin * @link https://syspass.org - * @copyright 2012-2022, Rubén Domínguez nuxsmin@$syspass.org + * @copyright 2012-2023, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * @@ -25,7 +25,7 @@ namespace SP\Util; use SP\Domain\Config\Ports\ConfigDataInterface; -use SP\Http\RequestInterface; +use SP\Domain\Http\RequestInterface; /** * Class HttpUtil diff --git a/tests/SP/Core/Bootstrap/UriContextTest.php b/tests/SP/Core/Bootstrap/UriContextTest.php index 6f3acc83..4f9f1602 100644 --- a/tests/SP/Core/Bootstrap/UriContextTest.php +++ b/tests/SP/Core/Bootstrap/UriContextTest.php @@ -26,7 +26,7 @@ namespace SP\Tests\Core\Bootstrap; use PHPUnit\Framework\MockObject\Exception; use SP\Core\Bootstrap\UriContext; -use SP\Http\RequestInterface; +use SP\Domain\Http\RequestInterface; use SP\Tests\UnitaryTestCase; /** diff --git a/tests/SP/Core/Crypt/CsrfTest.php b/tests/SP/Core/Crypt/CsrfTest.php index 22ad7610..e7d59203 100644 --- a/tests/SP/Core/Crypt/CsrfTest.php +++ b/tests/SP/Core/Crypt/CsrfTest.php @@ -29,7 +29,7 @@ use SP\Core\Crypt\Csrf; use SP\Core\Crypt\Hash; use SP\Domain\Config\Ports\ConfigDataInterface; use SP\Domain\Core\Context\SessionContextInterface; -use SP\Http\RequestInterface; +use SP\Domain\Http\RequestInterface; use SP\Tests\UnitaryTestCase; /** diff --git a/tests/SP/Core/Crypt/UuidCookieTest.php b/tests/SP/Core/Crypt/UuidCookieTest.php index 102b3eee..c98956cc 100644 --- a/tests/SP/Core/Crypt/UuidCookieTest.php +++ b/tests/SP/Core/Crypt/UuidCookieTest.php @@ -30,7 +30,7 @@ use PHPUnit\Framework\MockObject\Exception; use PHPUnit\Framework\MockObject\MockObject; use SP\Core\Crypt\Hash; use SP\Core\Crypt\UuidCookie; -use SP\Http\RequestInterface; +use SP\Domain\Http\RequestInterface; use SP\Tests\UnitaryTestCase; /** diff --git a/tests/SP/Core/LanguageTest.php b/tests/SP/Core/LanguageTest.php index b2a5ed08..0af36c7a 100644 --- a/tests/SP/Core/LanguageTest.php +++ b/tests/SP/Core/LanguageTest.php @@ -28,8 +28,8 @@ use PHPUnit\Framework\MockObject\MockObject; use SP\Core\Language; use SP\DataModel\UserPreferencesData; use SP\Domain\Config\Ports\ConfigDataInterface; +use SP\Domain\Http\RequestInterface; use SP\Domain\User\Services\UserLoginResponse; -use SP\Http\RequestInterface; use SP\Tests\UnitaryTestCase; /** diff --git a/tests/SP/Domain/Account/Services/PublicLinkServiceTest.php b/tests/SP/Domain/Account/Services/PublicLinkServiceTest.php index afa44a0a..780fa680 100644 --- a/tests/SP/Domain/Account/Services/PublicLinkServiceTest.php +++ b/tests/SP/Domain/Account/Services/PublicLinkServiceTest.php @@ -40,7 +40,7 @@ use SP\Domain\Core\Crypt\CryptInterface; use SP\Domain\Core\Exceptions\ConstraintException; use SP\Domain\Core\Exceptions\QueryException; use SP\Domain\Core\Exceptions\SPException; -use SP\Http\RequestInterface; +use SP\Domain\Http\RequestInterface; use SP\Infrastructure\Common\Repositories\NoSuchItemException; use SP\Infrastructure\Database\QueryResult; use SP\Tests\Generators\PublicLinkDataGenerator; diff --git a/tests/SP/Domain/Install/Services/InstallerTest.php b/tests/SP/Domain/Install/Services/InstallerTest.php index 0d01c969..5cc33ad3 100644 --- a/tests/SP/Domain/Install/Services/InstallerTest.php +++ b/tests/SP/Domain/Install/Services/InstallerTest.php @@ -4,7 +4,7 @@ * * @author nuxsmin * @link https://syspass.org - * @copyright 2012-2022, Rubén Domínguez nuxsmin@$syspass.org + * @copyright 2012-2023, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * @@ -30,6 +30,7 @@ use PHPUnit\Framework\MockObject\Stub; use SP\Domain\Config\Ports\ConfigServiceInterface; use SP\Domain\Core\Exceptions\InvalidArgumentException; use SP\Domain\Core\Exceptions\SPException; +use SP\Domain\Http\RequestInterface; use SP\Domain\Install\Adapters\InstallData; use SP\Domain\Install\Ports\InstallerServiceInterface; use SP\Domain\Install\Services\DatabaseSetupInterface; @@ -38,7 +39,6 @@ use SP\Domain\User\Ports\UserGroupServiceInterface; use SP\Domain\User\Ports\UserProfileServiceInterface; use SP\Domain\User\Ports\UserServiceInterface; use SP\Domain\User\Services\UserService; -use SP\Http\RequestInterface; use SP\Infrastructure\Database\DatabaseConnectionData; use SP\Tests\UnitaryTestCase; use SP\Util\VersionUtil; diff --git a/tests/SP/Providers/Auth/Browser/BrowserAuthTest.php b/tests/SP/Providers/Auth/Browser/BrowserAuthTest.php index de338505..d320724f 100644 --- a/tests/SP/Providers/Auth/Browser/BrowserAuthTest.php +++ b/tests/SP/Providers/Auth/Browser/BrowserAuthTest.php @@ -27,7 +27,7 @@ namespace SP\Tests\Providers\Auth\Browser; use PHPUnit\Framework\MockObject\MockObject; use SP\DataModel\UserLoginData; use SP\Domain\Config\Ports\ConfigDataInterface; -use SP\Http\RequestInterface; +use SP\Domain\Http\RequestInterface; use SP\Providers\Auth\Browser\BrowserAuth; use SP\Providers\Auth\Browser\BrowserAuthData; use SP\Tests\UnitaryTestCase;