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

test(IT): Test account index

Browse Source 
Signed-off-by: Rubén D <nuxsmin@syspass.org>
This commit is contained in:
Rubén D
2024-08-04 20:00:03 +02:00
parent c8471a6737
commit 3f8f52d7cd
12 changed files with 143 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
app/modules/web/Controllers/Account/IndexController.php
View File

@@ -24,7 +24,6 @@
namespace SP\Modules\Web\Controllers\Account;
use Exception;
use SP\Core\Application;
use SP\Core\Events\Event;
@@ -32,24 +31,20 @@ use SP\Modules\Web\Controllers\Helpers\Account\AccountSearchHelper;
use SP\Modules\Web\Util\ErrorUtil;
use SP\Mvc\Controller\WebControllerHelper;
use function SP\processException;
/**
* Class IndexController
*/
final class IndexController extends AccountControllerBase
{
private AccountSearchHelper $accountSearchHelper;
public function __construct(
Application $application,
WebControllerHelper $webControllerHelper,
AccountSearchHelper $accountSearchHelper
Application $application,
WebControllerHelper $webControllerHelper,
private readonly AccountSearchHelper $accountSearchHelper
) {
parent::__construct(
$application,
$webControllerHelper
);
$this->accountSearchHelper = $accountSearchHelper;
parent::__construct($application, $webControllerHelper);
}
/**

22
app/modules/web/Controllers/Account/RequestAccessController.php
View File

@@ -27,6 +27,7 @@ namespace SP\Modules\Web\Controllers\Account;
use Exception;
use SP\Core\Application;
use SP\Core\Events\Event;
use SP\Domain\Account\Dtos\AccountEnrichedDto;
use SP\Domain\Account\Ports\AccountService;
use SP\Domain\Core\Acl\AclActionsInterface;
use SP\Modules\Web\Controllers\ControllerBase;
@@ -34,39 +35,36 @@ use SP\Modules\Web\Controllers\Helpers\Account\AccountRequestHelper;
use SP\Modules\Web\Util\ErrorUtil;
use SP\Mvc\Controller\WebControllerHelper;
use function SP\processException;
/**
* Class RequestAccessController
*/
final class RequestAccessController extends ControllerBase
{
private AccountRequestHelper $accountRequestHelper;
private AccountService $accountService;
public function __construct(
Application $application,
WebControllerHelper $webControllerHelper,
AccountService $accountService,
AccountRequestHelper $accountRequestHelper
Application $application,
WebControllerHelper $webControllerHelper,
private readonly AccountService $accountService,
private readonly AccountRequestHelper $accountRequestHelper
) {
parent::__construct($application, $webControllerHelper);
$this->accountRequestHelper = $accountRequestHelper;
$this->accountService = $accountService;
}
/**
* Obtener los datos para mostrar el interface de solicitud de cambios en una cuenta
*
* @param int $id Account's ID
* @param int $id Account's ID
*
*/
public function requestAccessAction(int $id): void
{
try {
$this->accountRequestHelper->initializeFor(AclActionsInterface::ACCOUNT_REQUEST);
$this->accountRequestHelper->setIsView(true);
$this->accountRequestHelper->setViewForRequest(
$this->accountService->getByIdEnriched($id),
AclActionsInterface::ACCOUNT_REQUEST
new AccountEnrichedDto($this->accountService->getByIdEnriched($id))
);
$this->view->addTemplate('account-request');

7
app/modules/web/Controllers/Helpers/Account/AccountActionsHelper.php
View File

@@ -24,7 +24,6 @@
namespace SP\Modules\Web\Controllers\Helpers\Account;
use SP\Core\Acl\Acl;
use SP\Core\Application;
use SP\Domain\Account\Adapters\AccountPermission;
use SP\Domain\Account\Adapters\AccountSearchItem;
@@ -67,8 +66,8 @@ final class AccountActionsHelper extends HelperBase
$action->addClass('btn-action');
$action->setIcon($this->icons->view());
$action->setRuntimeFilter(AccountSearchItem::class, 'isShowView');
$action->addData('action-route', Acl::getActionRoute(AclActionsInterface::ACCOUNT_VIEW));
$action->addData('onclick', Acl::getActionRoute(AclActionsInterface::ACCOUNT_VIEW));
$action->addData('action-route', $this->acl->getRouteFor(AclActionsInterface::ACCOUNT_VIEW));
$action->addData('onclick', $this->acl->getRouteFor(AclActionsInterface::ACCOUNT_VIEW));
$action->addAttribute('type', 'button');
return $action;
@@ -137,7 +136,7 @@ final class AccountActionsHelper extends HelperBase
public function getBackAction(): DataGridAction
{
$action = new DataGridAction();
$action->setId('btnBack');
$action->setId(0);
$action->setName(__('Back'));
$action->setTitle(__('Back'));
$action->addClass('btn-action');

2
app/modules/web/Controllers/Helpers/Account/AccountHelper.php
View File

@@ -118,7 +118,7 @@ final class AccountHelper extends AccountHelperBase
public function setViewForAccount(AccountEnrichedDto $accountDetailsResponse): void
{
if (!$this->actionGranted) {
throw UnauthorizedActionException::error('This view requires initialization');
throw new UnauthorizedActionException();
}
$this->accountId = $accountDetailsResponse->getAccountView()->getId();

32
app/modules/web/Controllers/Helpers/Account/AccountRequestHelper.php
View File

@@ -24,13 +24,9 @@
namespace SP\Modules\Web\Controllers\Helpers\Account;
use SP\Domain\Account\Adapters\AccountPermission;
use SP\Domain\Account\Dtos\AccountEnrichedDto;
use SP\Domain\Common\Services\ServiceException;
use SP\Domain\Core\Acl\UnauthorizedPageException;
use SP\Domain\User\Services\UpdatedMasterPassException;
use SP\Infrastructure\Common\Repositories\NoSuchItemException;
use SP\Domain\Core\Acl\UnauthorizedActionException;
/**
* Class AccountRequestHelper
@@ -41,23 +37,17 @@ final class AccountRequestHelper extends AccountHelperBase
* Sets account's view variables
*
* @param AccountEnrichedDto $accountDetailsResponse
* @param int $actionId
*
* @return bool
* @throws UnauthorizedPageException
* @throws NoSuchItemException
* @throws ServiceException
* @throws UpdatedMasterPassException
* @throws UnauthorizedActionException
*/
public function setViewForRequest(
AccountEnrichedDto $accountDetailsResponse,
int $actionId
): bool {
$this->accountId = $accountDetailsResponse->getAccountView()->getId();
$this->actionId = $actionId;
$this->accountAcl = new AccountPermission($actionId);
public function setViewForRequest(AccountEnrichedDto $accountDetailsResponse,): bool
{
if (!$this->actionGranted) {
throw new UnauthorizedActionException();
}
$this->initializeFor();
$accountId = $accountDetailsResponse->getAccountView()->getId();
$accountPermission = new AccountPermission($this->actionId);
$accountData = $accountDetailsResponse->getAccountView();
@@ -66,9 +56,9 @@ final class AccountRequestHelper extends AccountHelperBase
$this->view->assign(
'accountActions',
$this->accountActionsHelper->getActionsForAccount(
$this->accountAcl,
$accountPermission,
new AccountActionsDto(
$this->accountId,
$accountId,
null,
$accountData->getParentId()
)

60
app/modules/web/Controllers/Helpers/Account/AccountSearchHelper.php
View File

@@ -26,7 +26,6 @@ namespace SP\Modules\Web\Controllers\Helpers\Account;
use DI\DependencyException;
use DI\NotFoundException;
use SP\Core\Acl\Acl;
use SP\Core\Application;
use SP\Domain\Account\Adapters\AccountSearchItem;
use SP\Domain\Account\Dtos\AccountSearchFilterDto;
@@ -35,9 +34,11 @@ use SP\Domain\Account\Ports\AccountSearchService;
use SP\Domain\Category\Ports\CategoryService;
use SP\Domain\Client\Ports\ClientService;
use SP\Domain\Core\Acl\AclActionsInterface;
use SP\Domain\Core\Acl\AclInterface;
use SP\Domain\Core\Exceptions\ConstraintException;
use SP\Domain\Core\Exceptions\QueryException;
use SP\Domain\Core\Exceptions\SPException;
use SP\Domain\Core\UI\ThemeInterface;
use SP\Domain\Http\Ports\RequestService;
use SP\Domain\Tag\Ports\TagService;
use SP\Domain\User\Models\ProfileData;
@@ -53,6 +54,7 @@ use SP\Modules\Web\Controllers\Helpers\HelperBase;
use SP\Mvc\View\Components\SelectItemAdapter;
use SP\Mvc\View\TemplateInterface;
use function SP\__;
use function SP\getElapsedTime;
/**
@@ -65,38 +67,30 @@ final class AccountSearchHelper extends HelperBase
/**
* @var bool Indica si el filtrado de cuentas está activo
*/
private bool $filterOn = false;
private bool $isAjax = false;
private int $queryTimeStart;
private bool $filterOn = false;
private bool $isAjax = false;
private int $queryTimeStart;
private bool $isIndex;
private ?AccountSearchFilterDto $accountSearchFilter = null;
private ClientService $clientService;
private AccountSearchService $accountSearchService;
private AccountActionsHelper $accountActionsHelper;
private CategoryService $categoryService;
private TagService $tagService;
public function __construct(
Application $application,
TemplateInterface $template,
RequestService $request,
ClientService $clientService,
CategoryService $categoryService,
TagService $tagService,
AccountSearchService $accountSearchService,
AccountActionsHelper $accountActionsHelper,
private readonly AccountSearchData $accountSearchData
Application $application,
TemplateInterface $template,
RequestService $request,
private readonly ClientService $clientService,
private readonly CategoryService $categoryService,
private readonly TagService $tagService,
private readonly AccountSearchService $accountSearchService,
private readonly AccountActionsHelper $accountActionsHelper,
private readonly AccountSearchData $accountSearchData,
private readonly AclInterface $acl,
private readonly ThemeInterface $theme
) {
parent::__construct($application, $template, $request);
$this->clientService = $clientService;
$this->categoryService = $categoryService;
$this->tagService = $tagService;
$this->accountSearchService = $accountSearchService;
$this->accountActionsHelper = $accountActionsHelper;
$this->queryTimeStart = microtime(true);
$this->isIndex = $this->request->analyzeString('r') === Acl::getActionRoute(AclActionsInterface::ACCOUNT);
$this->isIndex = $this->request->analyzeString('r') ===
$this->acl->getRouteFor(AclActionsInterface::ACCOUNT);
$this->setVars();
}
@@ -124,10 +118,10 @@ final class AccountSearchHelper extends HelperBase
$this->view->assign('searchTxt', $this->accountSearchFilter->getTxtSearch());
$this->view->assign('searchGlobal', $this->accountSearchFilter->getGlobalSearch());
$this->view->assign('searchFavorites', $this->accountSearchFilter->isSearchFavorites());
$this->view->assign('searchRoute', Acl::getActionRoute(AclActionsInterface::ACCOUNT_SEARCH));
$this->view->assign('favoriteRouteOn', Acl::getActionRoute(AclActionsInterface::ACCOUNT_FAVORITE_ADD));
$this->view->assign('favoriteRouteOff', Acl::getActionRoute(AclActionsInterface::ACCOUNT_FAVORITE_DELETE));
$this->view->assign('viewAccountRoute', Acl::getActionRoute(AclActionsInterface::ACCOUNT_VIEW));
$this->view->assign('searchRoute', $this->acl->getRouteFor(AclActionsInterface::ACCOUNT_SEARCH));
$this->view->assign('favoriteRouteOn', $this->acl->getRouteFor(AclActionsInterface::ACCOUNT_FAVORITE_ADD));
$this->view->assign('favoriteRouteOff', $this->acl->getRouteFor(AclActionsInterface::ACCOUNT_FAVORITE_DELETE));
$this->view->assign('viewAccountRoute', $this->acl->getRouteFor(AclActionsInterface::ACCOUNT_VIEW));
}
/**
@@ -264,12 +258,10 @@ final class AccountSearchHelper extends HelperBase
* Devuelve la matriz a utilizar en la vista
*
* @return DataGrid
* @throws DependencyException
* @throws NotFoundException
*/
private function getGrid(): DataGrid
{
$icons = $this->view->getTheme()->getIcons();
$icons = $this->theme->getIcons();
$gridActionOptional = new DataGridAction();
$gridActionOptional->setId(0);
@@ -301,7 +293,7 @@ final class AccountSearchHelper extends HelperBase
|| ($userPreferences->getUserId() === 0
&& $this->configData->isResultsAsCards());
$dataGrid = new DataGrid($this->view->getTheme());
$dataGrid = new DataGrid($this->theme);
$dataGrid->setId('gridSearch');
$dataGrid->setDataHeaderTemplate('account/search-header');
$dataGrid->setDataRowTemplate(
@@ -342,7 +334,7 @@ final class AccountSearchHelper extends HelperBase
*/
private function getHeaderSort(): DataGridHeaderSort
{
$icons = $this->view->getTheme()->getIcons();
$icons = $this->theme->getIcons();
$gridSortCustomer = new DataGridSort();
$gridSortCustomer->setName(__('Client'))

7
lib/SP/Html/DataGrid/Action/DataGridActionBase.php
View File

@@ -51,10 +51,6 @@ abstract class DataGridActionBase implements DataGridActionInterface
* Action's title
*/
protected ?string $title = null;
/**
* Action's title ID
*/
protected ?string $id = null;
/**
* The JavaScript function to be triggered on OnClick event
*/
@@ -103,9 +99,8 @@ abstract class DataGridActionBase implements DataGridActionInterface
/**
* DataGridActionBase constructor.
*/
public function __construct(?int $id = null)
public function __construct(protected ?string $id = null)
{
$this->id = $id;
}
/**

1
lib/SP/Html/DataGrid/Action/DataGridActionInterface.php
View File

@@ -1,4 +1,5 @@
<?php
declare(strict_types=1);
/**
* sysPass

2
lib/SP/Html/DataGrid/Action/DataGridActionSearch.php
View File

@@ -42,7 +42,7 @@ final class DataGridActionSearch extends DataGridActionBase
/**
* DataGridActionSearch constructor.
*/
public function __construct(?int $id = null)
public function __construct(?string $id = null)
{
parent::__construct($id);

1
lib/SP/Infrastructure/File/FileCache.php
View File

@@ -1,4 +1,5 @@
<?php
declare(strict_types=1);
/**
* sysPass

7
lib/SP/Infrastructure/File/FileHandler.php
View File

@@ -30,6 +30,7 @@ use RuntimeException;
use SP\Domain\File\Ports\FileHandlerInterface;
use SP\Util\Util;
use SplFileObject;
use ValueError;
use function SP\__;
use function SP\__u;
@@ -73,7 +74,11 @@ final class FileHandler extends SplFileObject implements FileHandlerInterface
{
$this->autoDetectEOL();
$data = $this->fread($this->getSize());
try {
$data = $this->fread($this->getSize());
} catch (ValueError $e) {
throw FileException::error(sprintf(__('Unable to read from file (%s)'), $this->file, $e->getCode(), $e));
}
if ($data === false) {
throw FileException::error(sprintf(__('Unable to read from file (%s)'), $this->file));

76
tests/SP/Modules/Web/Controllers/Account/IndexControllerTest.php Normal file
View File

@@ -0,0 +1,76 @@
<?php
/**
* sysPass
*
* @author nuxsmin
* @link https://syspass.org
* @copyright 2012-2024, 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/>.
*/
declare(strict_types=1);
namespace SP\Tests\Modules\Web\Controllers\Account;
use PHPUnit\Framework\Attributes\Group;
use PHPUnit\Framework\MockObject\Exception;
use Psr\Container\ContainerExceptionInterface;
use Psr\Container\NotFoundExceptionInterface;
use SP\Domain\Core\Exceptions\InvalidClassException;
use SP\Infrastructure\File\FileException;
use SP\Mvc\View\OutputHandlerInterface;
use SP\Tests\IntegrationTestCase;
use Symfony\Component\DomCrawler\Crawler;
/**
* Class IndexControllerTest
*/
#[Group('integration')]
class IndexControllerTest extends IntegrationTestCase
{
/**
* @throws NotFoundExceptionInterface
* @throws Exception
* @throws InvalidClassException
* @throws FileException
* @throws ContainerExceptionInterface
*/
public function testIndexAction()
{
$definitions = $this->getModuleDefinitions();
$definitions[OutputHandlerInterface::class] = $this->setupOutputHandler(function (string $output): void {
$crawler = new Crawler($output);
$filter = $crawler->filterXPath(
'//div[@id="searchbox"]/form[@name="frmSearch"]|//div[@id="res-content"]'
)->extract(['id']);
assert(!empty($output));
assert(count($filter) === 2);
$this->assertTrue(true);
});
$container = $this->buildContainer(
$definitions,
$this->buildRequest('get', 'index.php', ['r' => 'account'])
);
$this->runApp($container);
}
}