refactor: [WIP] Migrate client controller.

Signed-off-by: Rubén D <nuxsmin@syspass.org>

app/modules/web/Controllers/Client/ClientSaveBase.php

@@ -0,0 +1,58 @@
+<?php
+/*
+ * sysPass
+ *
+ * @author nuxsmin
+ * @link https://syspass.org
+ * @copyright 2012-2022, Rubén Domínguez nuxsmin@$syspass.org
+ *
+ * This file is part of sysPass.
+ *
+ * sysPass is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * sysPass is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with sysPass.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+namespace SP\Modules\Web\Controllers\Client;
+
+
+use SP\Core\Application;
+use SP\Domain\Client\ClientServiceInterface;
+use SP\Domain\CustomField\CustomFieldServiceInterface;
+use SP\Modules\Web\Controllers\ControllerBase;
+use SP\Modules\Web\Forms\ClientForm;
+use SP\Mvc\Controller\WebControllerHelper;
+
+/**
+ * Class ClientSaveBase
+ */
+abstract class ClientSaveBase extends ControllerBase
+{
+    protected ClientServiceInterface      $clientService;
+    protected CustomFieldServiceInterface $customFieldService;
+    protected ClientForm                  $form;
+
+    public function __construct(
+        Application $application,
+        WebControllerHelper $webControllerHelper,
+        ClientServiceInterface $clientService,
+        CustomFieldServiceInterface $customFieldService
+    ) {
+        parent::__construct($application, $webControllerHelper);
+
+        $this->checkLoggedIn();
+
+        $this->clientService = $clientService;
+        $this->customFieldService = $customFieldService;
+        $this->form = new ClientForm($application, $this->request);
+    }
+}

app/modules/web/Controllers/Client/ClientViewBase.php

@@ -0,0 +1,109 @@
+<?php
+/*
+ * sysPass
+ *
+ * @author nuxsmin
+ * @link https://syspass.org
+ * @copyright 2012-2022, Rubén Domínguez nuxsmin@$syspass.org
+ *
+ * This file is part of sysPass.
+ *
+ * sysPass is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * sysPass is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with sysPass.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+namespace SP\Modules\Web\Controllers\Client;
+
+
+use SP\Core\Acl\Acl;
+use SP\Core\Acl\ActionsInterface;
+use SP\Core\Application;
+use SP\Core\Exceptions\ConstraintException;
+use SP\Core\Exceptions\QueryException;
+use SP\Core\Exceptions\SPException;
+use SP\DataModel\ClientData;
+use SP\Domain\Client\ClientServiceInterface;
+use SP\Domain\CustomField\CustomFieldServiceInterface;
+use SP\Infrastructure\Common\Repositories\NoSuchItemException;
+use SP\Modules\Web\Controllers\ControllerBase;
+use SP\Mvc\Controller\ItemTrait;
+use SP\Mvc\Controller\WebControllerHelper;
+
+/**
+ * Class ClientViewBase
+ */
+abstract class ClientViewBase extends ControllerBase
+{
+    use ItemTrait;
+
+    private ClientServiceInterface      $clientService;
+    private CustomFieldServiceInterface $customFieldService;
+
+    public function __construct(
+        Application $application,
+        WebControllerHelper $webControllerHelper,
+        ClientServiceInterface $clientService,
+        CustomFieldServiceInterface $customFieldService
+    ) {
+        parent::__construct($application, $webControllerHelper);
+
+        $this->checkLoggedIn();
+
+        $this->clientService = $clientService;
+        $this->customFieldService = $customFieldService;
+    }
+
+    /**
+     * Sets view data for displaying client's data
+     *
+     * @param  int|null  $clientId
+     *
+     * @throws ConstraintException
+     * @throws NoSuchItemException
+     * @throws QueryException
+     * @throws SPException
+     * @throws \SP\Domain\Common\Services\ServiceException
+     */
+    protected function setViewData(?int $clientId = null): void
+    {
+        $this->view->addTemplate('client', 'itemshow');
+
+        $client = $clientId
+            ? $this->clientService->getById($clientId)
+            : new ClientData();
+
+        $this->view->assign('client', $client);
+
+        $this->view->assign(
+            'nextAction',
+            Acl::getActionRoute(ActionsInterface::ITEMS_MANAGE)
+        );
+
+        if ($this->view->isView === true) {
+            $this->view->assign('disabled', 'disabled');
+            $this->view->assign('readonly', 'readonly');
+        } else {
+            $this->view->assign('disabled', false);
+            $this->view->assign('readonly', false);
+        }
+
+        $this->view->assign(
+            'showViewCustomPass',
+            $this->acl->checkUserAccess(ActionsInterface::CUSTOMFIELD_VIEW_PASS)
+        );
+        $this->view->assign(
+            'customFields',
+            $this->getCustomFieldsForItem(ActionsInterface::CLIENT, $clientId, $this->customFieldService)
+        );
+    }
+}

app/modules/web/Controllers/Client/CreateController.php

@@ -0,0 +1,75 @@
+<?php
+/*
+ * sysPass
+ *
+ * @author nuxsmin
+ * @link https://syspass.org
+ * @copyright 2012-2022, Rubén Domínguez nuxsmin@$syspass.org
+ *
+ * This file is part of sysPass.
+ *
+ * sysPass is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * sysPass is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with sysPass.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+namespace SP\Modules\Web\Controllers\Client;
+
+
+use Exception;
+use SP\Core\Acl\ActionsInterface;
+use SP\Core\Events\Event;
+use SP\Http\JsonResponse;
+use SP\Modules\Web\Controllers\Traits\JsonTrait;
+
+/**
+ * Class CreateController
+ */
+final class CreateController extends ClientViewBase
+{
+    use JsonTrait;
+
+    /**
+     * @return bool
+     * @throws \JsonException
+     */
+    public function createAction(): bool
+    {
+        try {
+            if (!$this->acl->checkUserAccess(ActionsInterface::CLIENT_CREATE)) {
+                return $this->returnJsonResponse(
+                    JsonResponse::JSON_ERROR,
+                    __u('You don\'t have permission to do this operation')
+                );
+            }
+
+            $this->view->assign('header', __('New Client'));
+            $this->view->assign('isView', false);
+            $this->view->assign('route', 'client/saveCreate');
+
+            $this->setViewData();
+
+            $this->eventDispatcher->notifyEvent('show.client.create', new Event($this));
+
+            return $this->returnJsonResponseData(['html' => $this->render()]);
+        } catch (Exception $e) {
+            processException($e);
+
+            $this->eventDispatcher->notifyEvent(
+                'exception',
+                new Event($e)
+            );
+
+            return $this->returnJsonResponseException($e);
+        }
+    }
+}

app/modules/web/Controllers/Client/DeleteController.php

@@ -0,0 +1,102 @@
+<?php
+/*
+ * sysPass
+ *
+ * @author nuxsmin
+ * @link https://syspass.org
+ * @copyright 2012-2022, Rubén Domínguez nuxsmin@$syspass.org
+ *
+ * This file is part of sysPass.
+ *
+ * sysPass is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * sysPass is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with sysPass.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+namespace SP\Modules\Web\Controllers\Client;
+
+
+use Exception;
+use SP\Core\Acl\ActionsInterface;
+use SP\Core\Events\Event;
+use SP\Core\Events\EventMessage;
+use SP\Http\JsonResponse;
+use SP\Modules\Web\Controllers\Traits\JsonTrait;
+use SP\Mvc\Controller\ItemTrait;
+
+/**
+ * Class DeleteController
+ */
+final class DeleteController extends ClientSaveBase
+{
+    use JsonTrait, ItemTrait;
+
+    /**
+     * Delete action
+     *
+     * @param  int|null  $id
+     *
+     * @return bool
+     * @throws \JsonException
+     */
+    public function deleteAction(?int $id = null): bool
+    {
+        try {
+            if (!$this->acl->checkUserAccess(ActionsInterface::CLIENT_DELETE)) {
+                return $this->returnJsonResponse(
+                    JsonResponse::JSON_ERROR,
+                    __u('You don\'t have permission to do this operation')
+                );
+            }
+
+            if ($id === null) {
+                $this->clientService->deleteByIdBatch($this->getItemsIdFromRequest($this->request));
+
+                $this->deleteCustomFieldsForItem(ActionsInterface::CLIENT, $id, $this->customFieldService);
+
+                $this->eventDispatcher->notifyEvent(
+                    'delete.client.selection',
+                    new Event(
+                        $this,
+                        EventMessage::factory()->addDescription(__u('Clients deleted'))
+                    )
+                );
+
+                return $this->returnJsonResponse(JsonResponse::JSON_SUCCESS, __u('Clients deleted'));
+            }
+            $this->clientService->delete($id);
+
+            $this->deleteCustomFieldsForItem(ActionsInterface::CLIENT, $id, $this->customFieldService);
+
+            $this->eventDispatcher->notifyEvent(
+                'delete.client',
+                new Event(
+                    $this,
+                    EventMessage::factory()
+                        ->addDescription(__u('Client deleted'))
+                        ->addDetail(__u('Client'), $id)
+                )
+            );
+
+            return $this->returnJsonResponse(
+                JsonResponse::JSON_SUCCESS,
+                __u('Client deleted')
+            );
+        } catch (Exception $e) {
+            processException($e);
+
+            $this->eventDispatcher->notifyEvent('exception', new Event($e));
+
+            return $this->returnJsonResponseException($e);
+        }
+    }
+}

app/modules/web/Controllers/Client/EditController.php

@@ -0,0 +1,76 @@
+<?php
+/*
+ * sysPass
+ *
+ * @author nuxsmin
+ * @link https://syspass.org
+ * @copyright 2012-2022, Rubén Domínguez nuxsmin@$syspass.org
+ *
+ * This file is part of sysPass.
+ *
+ * sysPass is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * sysPass is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with sysPass.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+namespace SP\Modules\Web\Controllers\Client;
+
+
+use Exception;
+use SP\Core\Acl\ActionsInterface;
+use SP\Core\Events\Event;
+use SP\Http\JsonResponse;
+use SP\Modules\Web\Controllers\Traits\JsonTrait;
+
+/**
+ * Class EditController
+ */
+final class EditController extends ClientViewBase
+{
+    use JsonTrait;
+
+    /**
+     * Edit action
+     *
+     * @param  int  $id
+     *
+     * @return bool
+     * @throws \JsonException
+     */
+    public function editAction(int $id): bool
+    {
+        try {
+            if (!$this->acl->checkUserAccess(ActionsInterface::CLIENT_EDIT)) {
+                return $this->returnJsonResponse(
+                    JsonResponse::JSON_ERROR,
+                    __u('You don\'t have permission to do this operation')
+                );
+            }
+
+            $this->view->assign('header', __('Edit Client'));
+            $this->view->assign('isView', false);
+            $this->view->assign('route', 'client/saveEdit/'.$id);
+
+            $this->setViewData($id);
+
+            $this->eventDispatcher->notifyEvent('show.client.edit', new Event($this));
+
+            return $this->returnJsonResponseData(['html' => $this->render()]);
+        } catch (Exception $e) {
+            processException($e);
+
+            $this->eventDispatcher->notifyEvent('exception', new Event($e));
+
+            return $this->returnJsonResponseException($e);
+        }
+    }
+}

app/modules/web/Controllers/Client/SaveCreateController.php

@@ -0,0 +1,92 @@
+<?php
+/*
+ * sysPass
+ *
+ * @author nuxsmin
+ * @link https://syspass.org
+ * @copyright 2012-2022, Rubén Domínguez nuxsmin@$syspass.org
+ *
+ * This file is part of sysPass.
+ *
+ * sysPass is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * sysPass is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with sysPass.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+namespace SP\Modules\Web\Controllers\Client;
+
+
+use Exception;
+use SP\Core\Acl\ActionsInterface;
+use SP\Core\Events\Event;
+use SP\Core\Events\EventMessage;
+use SP\Core\Exceptions\ValidationException;
+use SP\Http\JsonResponse;
+use SP\Modules\Web\Controllers\Traits\JsonTrait;
+use SP\Mvc\Controller\ItemTrait;
+
+/**
+ * Class SaveCreateController
+ */
+final class SaveCreateController extends ClientSaveBase
+{
+    use JsonTrait, ItemTrait;
+
+    /**
+     * @return bool
+     * @throws \JsonException
+     */
+    public function saveCreateAction(): bool
+    {
+        try {
+            if (!$this->acl->checkUserAccess(ActionsInterface::CLIENT_CREATE)) {
+                return $this->returnJsonResponse(
+                    JsonResponse::JSON_ERROR,
+                    __u('You don\'t have permission to do this operation')
+                );
+            }
+
+            $this->form->validateFor(ActionsInterface::CLIENT_CREATE);
+
+            $itemData = $this->form->getItemData();
+
+            $id = $this->clientService->create($itemData);
+
+            $this->eventDispatcher->notifyEvent(
+                'create.client',
+                new Event(
+                    $this,
+                    EventMessage::factory()
+                        ->addDescription(__u('Client added'))
+                        ->addDetail(__u('Client'), $itemData->getName())
+                )
+            );
+
+            $this->addCustomFieldsForItem(
+                ActionsInterface::CLIENT,
+                $id,
+                $this->request,
+                $this->customFieldService
+            );
+
+            return $this->returnJsonResponse(JsonResponse::JSON_SUCCESS, __u('Client added'));
+        } catch (ValidationException $e) {
+            return $this->returnJsonResponseException($e);
+        } catch (Exception $e) {
+            processException($e);
+
+            $this->eventDispatcher->notifyEvent('exception', new Event($e));
+
+            return $this->returnJsonResponseException($e);
+        }
+    }
+}

app/modules/web/Controllers/Client/SaveEditController.php

@@ -0,0 +1,92 @@
+<?php
+/*
+ * sysPass
+ *
+ * @author nuxsmin
+ * @link https://syspass.org
+ * @copyright 2012-2022, Rubén Domínguez nuxsmin@$syspass.org
+ *
+ * This file is part of sysPass.
+ *
+ * sysPass is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * sysPass is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with sysPass.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+namespace SP\Modules\Web\Controllers\Client;
+
+
+use Exception;
+use SP\Core\Acl\ActionsInterface;
+use SP\Core\Events\Event;
+use SP\Core\Events\EventMessage;
+use SP\Core\Exceptions\ValidationException;
+use SP\Http\JsonResponse;
+use SP\Modules\Web\Controllers\Traits\JsonTrait;
+use SP\Mvc\Controller\ItemTrait;
+
+/**
+ * Class SaveEditController
+ */
+final class SaveEditController extends ClientSaveBase
+{
+    use JsonTrait, ItemTrait;
+
+    /**
+     * Saves edit action
+     *
+     * @param  int  $id
+     *
+     * @return bool
+     * @throws \JsonException
+     */
+    public function saveEditAction(int $id): bool
+    {
+        try {
+            if (!$this->acl->checkUserAccess(ActionsInterface::CLIENT_EDIT)) {
+                return $this->returnJsonResponse(
+                    JsonResponse::JSON_ERROR,
+                    __u('You don\'t have permission to do this operation')
+                );
+            }
+
+            $this->form->validateFor(ActionsInterface::CLIENT_EDIT, $id);
+
+            $this->clientService->update($this->form->getItemData());
+
+            $this->eventDispatcher->notifyEvent(
+                'edit.client',
+                new Event(
+                    $this,
+                    EventMessage::factory()->addDescription(__u('Client updated'))->addDetail(__u('Client'), $id)
+                )
+            );
+
+            $this->updateCustomFieldsForItem(
+                ActionsInterface::CLIENT,
+                $id,
+                $this->request,
+                $this->customFieldService
+            );
+
+            return $this->returnJsonResponse(JsonResponse::JSON_SUCCESS, __u('Client updated'));
+        } catch (ValidationException $e) {
+            return $this->returnJsonResponseException($e);
+        } catch (Exception $e) {
+            processException($e);
+
+            $this->eventDispatcher->notifyEvent('exception', new Event($e));
+
+            return $this->returnJsonResponseException($e);
+        }
+    }
+}

app/modules/web/Controllers/Client/SearchController.php

@@ -0,0 +1,106 @@
+<?php
+/*
+ * sysPass
+ *
+ * @author nuxsmin
+ * @link https://syspass.org
+ * @copyright 2012-2022, Rubén Domínguez nuxsmin@$syspass.org
+ *
+ * This file is part of sysPass.
+ *
+ * sysPass is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * sysPass is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with sysPass.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+namespace SP\Modules\Web\Controllers\Client;
+
+
+use SP\Core\Acl\ActionsInterface;
+use SP\Core\Application;
+use SP\Core\Exceptions\ConstraintException;
+use SP\Core\Exceptions\QueryException;
+use SP\Core\Exceptions\SPException;
+use SP\Domain\Client\ClientServiceInterface;
+use SP\Html\DataGrid\DataGridInterface;
+use SP\Http\JsonResponse;
+use SP\Modules\Web\Controllers\ControllerBase;
+use SP\Modules\Web\Controllers\Helpers\Grid\ClientGrid;
+use SP\Modules\Web\Controllers\Traits\JsonTrait;
+use SP\Mvc\Controller\ItemTrait;
+use SP\Mvc\Controller\WebControllerHelper;
+
+/**
+ * Class SearchController
+ */
+final class SearchController extends ControllerBase
+{
+    use JsonTrait, ItemTrait;
+
+    private ClientServiceInterface $clientService;
+    private ClientGrid             $clientGrid;
+
+    public function __construct(
+        Application $application,
+        WebControllerHelper $webControllerHelper,
+        ClientServiceInterface $clientService,
+        ClientGrid $clientGrid
+    ) {
+        parent::__construct($application, $webControllerHelper);
+
+        $this->checkLoggedIn();
+
+        $this->clientService = $clientService;
+        $this->clientGrid = $clientGrid;
+    }
+
+    /**
+     * Search action
+     *
+     * @return bool
+     * @throws ConstraintException
+     * @throws QueryException
+     * @throws SPException
+     * @throws \JsonException
+     */
+    public function searchAction(): bool
+    {
+        if (!$this->acl->checkUserAccess(ActionsInterface::CLIENT_SEARCH)) {
+            return $this->returnJsonResponse(
+                JsonResponse::JSON_ERROR,
+                __u('You don\'t have permission to do this operation')
+            );
+        }
+
+        $this->view->addTemplate('datagrid-table', 'grid');
+        $this->view->assign('index', $this->request->analyzeInt('activetab', 0));
+        $this->view->assign('data', $this->getSearchGrid());
+
+        return $this->returnJsonResponseData(['html' => $this->render()]);
+    }
+
+    /**
+     * getSearchGrid
+     *
+     * @throws ConstraintException
+     * @throws QueryException
+     */
+    protected function getSearchGrid(): DataGridInterface
+    {
+        $itemSearchData = $this->getSearchData($this->configData->getAccountCount(), $this->request);
+
+        return $this->clientGrid->updatePager(
+            $this->clientGrid->getGrid($this->clientService->search($itemSearchData)),
+            $itemSearchData
+        );
+    }
+}

app/modules/web/Controllers/Client/ViewController.php

@@ -0,0 +1,76 @@
+<?php
+/*
+ * sysPass
+ *
+ * @author nuxsmin
+ * @link https://syspass.org
+ * @copyright 2012-2022, Rubén Domínguez nuxsmin@$syspass.org
+ *
+ * This file is part of sysPass.
+ *
+ * sysPass is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * sysPass is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with sysPass.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+namespace SP\Modules\Web\Controllers\Client;
+
+use Exception;
+use SP\Core\Acl\ActionsInterface;
+use SP\Core\Events\Event;
+use SP\Http\JsonResponse;
+use SP\Modules\Web\Controllers\Traits\JsonTrait;
+
+/**
+ * Class ViewController
+ *
+ * @package SP\Modules\Web\Controllers
+ */
+final class ViewController extends ClientViewBase
+{
+    use JsonTrait;
+
+    /**
+     * View action
+     *
+     * @param  int  $id
+     *
+     * @return bool
+     * @throws \JsonException
+     */
+    public function viewAction(int $id): bool
+    {
+        try {
+            if (!$this->acl->checkUserAccess(ActionsInterface::CLIENT_VIEW)) {
+                return $this->returnJsonResponse(
+                    JsonResponse::JSON_ERROR,
+                    __u('You don\'t have permission to do this operation')
+                );
+            }
+
+            $this->view->assign('header', __('View Client'));
+            $this->view->assign('isView', true);
+
+            $this->setViewData($id);
+
+            $this->eventDispatcher->notifyEvent('show.client', new Event($this));
+
+            return $this->returnJsonResponseData(['html' => $this->render()]);
+        } catch (Exception $e) {
+            processException($e);
+
+            $this->eventDispatcher->notifyEvent('exception', new Event($e));
+
+            return $this->returnJsonResponseException($e);
+        }
+    }
+}

app/modules/web/Controllers/ClientController.php

@@ -1,489 +0,0 @@
-<?php
-/*
- * sysPass
- *
- * @author nuxsmin
- * @link https://syspass.org
- * @copyright 2012-2021, Rubén Domínguez nuxsmin@$syspass.org
- *
- * This file is part of sysPass.
- *
- * sysPass is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * sysPass is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with sysPass.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-namespace SP\Modules\Web\Controllers;
-
-
-use DI\DependencyException;
-use DI\NotFoundException;
-use Exception;
-use SP\Core\Acl\Acl;
-use SP\Core\Acl\ActionsInterface;
-use SP\Core\Events\Event;
-use SP\Core\Events\EventMessage;
-use SP\Core\Exceptions\ConstraintException;
-use SP\Core\Exceptions\QueryException;
-use SP\Core\Exceptions\SessionTimeout;
-use SP\Core\Exceptions\SPException;
-use SP\Core\Exceptions\ValidationException;
-use SP\DataModel\ClientData;
-use SP\Domain\Auth\Services\AuthException;
-use SP\Domain\Client\Services\ClientService;
-use SP\Html\DataGrid\DataGridInterface;
-use SP\Http\JsonResponse;
-use SP\Infrastructure\Common\Repositories\NoSuchItemException;
-use SP\Modules\Web\Controllers\Helpers\Grid\ClientGrid;
-use SP\Modules\Web\Controllers\Traits\JsonTrait;
-use SP\Modules\Web\Forms\ClientForm;
-use SP\Mvc\Controller\CrudControllerInterface;
-use SP\Mvc\Controller\ItemTrait;
-
-/**
- * Class ClientController
- *
- * @package SP\Modules\Web\Controllers
- */
-final class ClientController extends ControllerBase implements CrudControllerInterface
-{
-    use JsonTrait, ItemTrait;
-
-    protected ?ClientService $clientService = null;
-
-    /**
-     * Search action
-     *
-     * @return bool
-     * @throws DependencyException
-     * @throws NotFoundException
-     * @throws ConstraintException
-     * @throws QueryException
-     * @throws SPException
-     * @throws \JsonException
-     */
-    public function searchAction(): bool
-    {
-        if (!$this->acl->checkUserAccess(ActionsInterface::CLIENT_SEARCH)) {
-            return $this->returnJsonResponse(
-                JsonResponse::JSON_ERROR,
-                __u('You don\'t have permission to do this operation')
-            );
-        }
-
-        $this->view->addTemplate('datagrid-table', 'grid');
-        $this->view->assign(
-            'index',
-            $this->request->analyzeInt('activetab', 0)
-        );
-        $this->view->assign('data', $this->getSearchGrid());
-
-        return $this->returnJsonResponseData(['html' => $this->render()]);
-    }
-
-    /**
-     * getSearchGrid
-     *
-     * @throws DependencyException
-     * @throws NotFoundException
-     * @throws ConstraintException
-     * @throws QueryException
-     */
-    protected function getSearchGrid(): DataGridInterface
-    {
-        $itemSearchData = $this->getSearchData(
-            $this->configData->getAccountCount(),
-            $this->request
-        );
-
-        $clientGrid = $this->dic->get(ClientGrid::class);
-
-        return $clientGrid->updatePager(
-            $clientGrid->getGrid($this->clientService->search($itemSearchData)),
-            $itemSearchData
-        );
-    }
-
-    /**
-     * @return bool
-     * @throws DependencyException
-     * @throws NotFoundException
-     * @throws \JsonException
-     */
-    public function createAction(): bool
-    {
-        try {
-            if (!$this->acl->checkUserAccess(ActionsInterface::CLIENT_CREATE)) {
-                return $this->returnJsonResponse(
-                    JsonResponse::JSON_ERROR,
-                    __u('You don\'t have permission to do this operation')
-                );
-            }
-
-            $this->view->assign('header', __('New Client'));
-            $this->view->assign('isView', false);
-            $this->view->assign('route', 'client/saveCreate');
-
-            $this->setViewData();
-
-            $this->eventDispatcher->notifyEvent(
-                'show.client.create',
-                new Event($this)
-            );
-
-            return $this->returnJsonResponseData(['html' => $this->render()]);
-        } catch (Exception $e) {
-            processException($e);
-
-            $this->eventDispatcher->notifyEvent(
-                'exception',
-                new Event($e)
-            );
-
-            return $this->returnJsonResponseException($e);
-        }
-    }
-
-    /**
-     * Sets view data for displaying client's data
-     *
-     * @param int|null $clientId
-     *
-     * @throws ConstraintException
-     * @throws DependencyException
-     * @throws NoSuchItemException
-     * @throws NotFoundException
-     * @throws QueryException
-     * @throws SPException
-     * @throws \SP\Domain\Common\Services\ServiceException
-     */
-    protected function setViewData(?int $clientId = null): void
-    {
-        $this->view->addTemplate('client', 'itemshow');
-
-        $client = $clientId
-            ? $this->clientService->getById($clientId)
-            : new ClientData();
-
-        $this->view->assign('client', $client);
-
-        $this->view->assign(
-            'nextAction',
-            Acl::getActionRoute(ActionsInterface::ITEMS_MANAGE)
-        );
-
-        if ($this->view->isView === true) {
-            $this->view->assign('disabled', 'disabled');
-            $this->view->assign('readonly', 'readonly');
-        } else {
-            $this->view->assign('disabled', false);
-            $this->view->assign('readonly', false);
-        }
-
-        $this->view->assign(
-            'showViewCustomPass',
-            $this->acl->checkUserAccess(ActionsInterface::CUSTOMFIELD_VIEW_PASS)
-        );
-        $this->view->assign(
-            'customFields',
-            $this->getCustomFieldsForItem(ActionsInterface::CLIENT, $clientId)
-        );
-    }
-
-    /**
-     * Edit action
-     *
-     * @param int $id
-     *
-     * @return bool
-     * @throws \DI\DependencyException
-     * @throws \DI\NotFoundException
-     * @throws \JsonException
-     */
-    public function editAction(int $id): bool
-    {
-        try {
-            if (!$this->acl->checkUserAccess(ActionsInterface::CLIENT_EDIT)) {
-                return $this->returnJsonResponse(
-                    JsonResponse::JSON_ERROR,
-                    __u('You don\'t have permission to do this operation')
-                );
-            }
-
-            $this->view->assign('header', __('Edit Client'));
-            $this->view->assign('isView', false);
-            $this->view->assign('route', 'client/saveEdit/' . $id);
-
-            $this->setViewData($id);
-
-            $this->eventDispatcher->notifyEvent(
-                'show.client.edit',
-                new Event($this)
-            );
-
-            return $this->returnJsonResponseData(['html' => $this->render()]);
-        } catch (Exception $e) {
-            processException($e);
-
-            $this->eventDispatcher->notifyEvent(
-                'exception',
-                new Event($e)
-            );
-
-            return $this->returnJsonResponseException($e);
-        }
-    }
-
-    /**
-     * Delete action
-     *
-     * @param int|null $id
-     *
-     * @return bool
-     * @throws DependencyException
-     * @throws NotFoundException
-     * @throws \JsonException
-     */
-    public function deleteAction(?int $id = null): bool
-    {
-        try {
-            if (!$this->acl->checkUserAccess(ActionsInterface::CLIENT_DELETE)) {
-                return $this->returnJsonResponse(
-                    JsonResponse::JSON_ERROR,
-                    __u('You don\'t have permission to do this operation')
-                );
-            }
-
-            if ($id === null) {
-                $this->clientService
-                    ->deleteByIdBatch($this->getItemsIdFromRequest($this->request));
-
-                $this->deleteCustomFieldsForItem(ActionsInterface::CLIENT, $id);
-
-                $this->eventDispatcher->notifyEvent(
-                    'delete.client.selection',
-                    new Event(
-                        $this,
-                        EventMessage::factory()
-                            ->addDescription(__u('Clients deleted'))
-                    )
-                );
-
-                return $this->returnJsonResponse(
-                    JsonResponse::JSON_SUCCESS,
-                    __u('Clients deleted')
-                );
-            }
-            $this->clientService->delete($id);
-
-            $this->deleteCustomFieldsForItem(ActionsInterface::CLIENT, $id);
-
-            $this->eventDispatcher->notifyEvent(
-                'delete.client',
-                new Event(
-                    $this,
-                    EventMessage::factory()
-                        ->addDescription(__u('Client deleted'))
-                        ->addDetail(__u('Client'), $id)
-                )
-            );
-
-            return $this->returnJsonResponse(
-                JsonResponse::JSON_SUCCESS,
-                __u('Client deleted')
-            );
-        } catch (Exception $e) {
-            processException($e);
-
-            $this->eventDispatcher->notifyEvent(
-                'exception',
-                new Event($e)
-            );
-
-            return $this->returnJsonResponseException($e);
-        }
-    }
-
-    /**
-     * @return bool
-     * @throws DependencyException
-     * @throws NotFoundException
-     * @throws \JsonException
-     */
-    public function saveCreateAction(): bool
-    {
-        try {
-            if (!$this->acl->checkUserAccess(ActionsInterface::CLIENT_CREATE)) {
-                return $this->returnJsonResponse(
-                    JsonResponse::JSON_ERROR,
-                    __u('You don\'t have permission to do this operation')
-                );
-            }
-
-            $form = new ClientForm($this->dic);
-            $form->validateFor(ActionsInterface::CLIENT_CREATE, null);
-
-            $itemData = $form->getItemData();
-
-            $id = $this->clientService->create($itemData);
-
-            $this->eventDispatcher->notifyEvent(
-                'create.client',
-                new Event(
-                    $this,
-                    EventMessage::factory()
-                        ->addDescription(__u('Client added'))
-                        ->addDetail(__u('Client'), $itemData->getName())
-                )
-            );
-
-            $this->addCustomFieldsForItem(
-                ActionsInterface::CLIENT,
-                $id,
-                $this->request
-            );
-
-            return $this->returnJsonResponse(
-                JsonResponse::JSON_SUCCESS,
-                __u('Client added')
-            );
-        } catch (ValidationException $e) {
-            return $this->returnJsonResponseException($e);
-        } catch (Exception $e) {
-            processException($e);
-
-            $this->eventDispatcher->notifyEvent(
-                'exception',
-                new Event($e)
-            );
-
-            return $this->returnJsonResponseException($e);
-        }
-    }
-
-    /**
-     * Saves edit action
-     *
-     * @param int $id
-     *
-     * @return bool
-     * @throws DependencyException
-     * @throws NotFoundException
-     * @throws \JsonException
-     */
-    public function saveEditAction(int $id): bool
-    {
-        try {
-            if (!$this->acl->checkUserAccess(ActionsInterface::CLIENT_EDIT)) {
-                return $this->returnJsonResponse(
-                    JsonResponse::JSON_ERROR,
-                    __u('You don\'t have permission to do this operation')
-                );
-            }
-
-            $form = new ClientForm($this->dic, $id);
-            $form->validateFor(ActionsInterface::CLIENT_EDIT, null);
-
-            $this->clientService->update($form->getItemData());
-
-            $this->eventDispatcher->notifyEvent(
-                'edit.client',
-                new Event(
-                    $this,
-                    EventMessage::factory()
-                        ->addDescription(__u('Client updated'))
-                        ->addDetail(__u('Client'), $id)
-                )
-            );
-
-            $this->updateCustomFieldsForItem(
-                ActionsInterface::CLIENT,
-                $id,
-                $this->request
-            );
-
-            return $this->returnJsonResponse(
-                JsonResponse::JSON_SUCCESS,
-                __u('Client updated')
-            );
-        } catch (ValidationException $e) {
-            return $this->returnJsonResponseException($e);
-        } catch (Exception $e) {
-            processException($e);
-
-            $this->eventDispatcher->notifyEvent(
-                'exception',
-                new Event($e)
-            );
-
-            return $this->returnJsonResponseException($e);
-        }
-    }
-
-    /**
-     * View action
-     *
-     * @param int $id
-     *
-     * @return bool
-     * @throws DependencyException
-     * @throws NotFoundException
-     * @throws \JsonException
-     */
-    public function viewAction(int $id): bool
-    {
-        try {
-            if (!$this->acl->checkUserAccess(ActionsInterface::CLIENT_VIEW)) {
-                return $this->returnJsonResponse(
-                    JsonResponse::JSON_ERROR,
-                    __u('You don\'t have permission to do this operation')
-                );
-            }
-
-            $this->view->assign('header', __('View Client'));
-            $this->view->assign('isView', true);
-
-            $this->setViewData($id);
-
-            $this->eventDispatcher->notifyEvent(
-                'show.client',
-                new Event($this)
-            );
-
-            return $this->returnJsonResponseData(['html' => $this->render()]);
-        } catch (Exception $e) {
-            processException($e);
-
-            $this->eventDispatcher->notifyEvent(
-                'exception',
-                new Event($e)
-            );
-
-            return $this->returnJsonResponseException($e);
-        }
-    }
-
-    /**
-     * Initialize class
-     *
-     * @throws AuthException
-     * @throws DependencyException
-     * @throws NotFoundException
-     * @throws SessionTimeout
-     */
-    protected function initialize(): void
-    {
-        $this->checkLoggedIn();
-
-        $this->clientService = $this->dic->get(ClientService::class);
-    }
-}