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

* [FIX] Fixed wrong behaviour when deleting accounts. The account was not saved into the history.

Browse Source 
* [ADD] Accounts can now be restored from history
* [ADD] Unit testing. Work in progress
* [MOD] Improved file handlers
* [MOD] Code refactoring
This commit is contained in:
nuxsmin
2018-08-07 21:30:06 +02:00
parent 4622e92ef9
commit e92637bccd
52 changed files with 3721 additions and 1711 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
app/modules/web/Controllers/AccessManagerController.php
View File

@@ -27,7 +27,11 @@ namespace SP\Modules\Web\Controllers;
use SP\Core\Acl\Acl;
use SP\Core\Events\Event;
use SP\DataModel\ItemSearchData;
use SP\Modules\Web\Controllers\Helpers\ItemsGridHelper;
use SP\Modules\Web\Controllers\Helpers\Grid\AuthTokenGrid;
use SP\Modules\Web\Controllers\Helpers\Grid\PublicLinkGrid;
use SP\Modules\Web\Controllers\Helpers\Grid\UserGrid;
use SP\Modules\Web\Controllers\Helpers\Grid\UserGroupGrid;
use SP\Modules\Web\Controllers\Helpers\Grid\UserProfileGrid;
use SP\Modules\Web\Controllers\Helpers\TabsGridHelper;
use SP\Services\AuthToken\AuthTokenService;
use SP\Services\PublicLink\PublicLinkService;
@@ -46,10 +50,6 @@ final class AccessManagerController extends ControllerBase
* @var ItemSearchData
*/
protected $itemSearchData;
/**
* @var ItemsGridHelper
*/
protected $itemsGridHelper;
/**
* @var TabsGridHelper
*/
@@ -75,11 +75,8 @@ final class AccessManagerController extends ControllerBase
$this->itemSearchData = new ItemSearchData();
$this->itemSearchData->setLimitCount($this->configData->getAccountCount());
$this->itemsGridHelper = $this->dic->get(ItemsGridHelper::class);
$this->tabsGridHelper = $this->dic->get(TabsGridHelper::class);
$this->itemsGridHelper->setQueryTimeStart(microtime(true));
if ($this->checkAccess(Acl::USER)) {
$this->tabsGridHelper->addTab($this->getUsersList());
}
@@ -117,7 +114,9 @@ final class AccessManagerController extends ControllerBase
protected function getUsersList()
{
return $this->itemsGridHelper->getUsersGrid($this->dic->get(UserService::class)->search($this->itemSearchData))->updatePager();
return $this->dic->get(UserGrid::class)
->getGrid($this->dic->get(UserService::class)->search($this->itemSearchData))
->updatePager();
}
/**
@@ -129,7 +128,9 @@ final class AccessManagerController extends ControllerBase
*/
protected function getUsersGroupList()
{
return $this->itemsGridHelper->getUserGroupsGrid($this->dic->get(UserGroupService::class)->search($this->itemSearchData))->updatePager();
return $this->dic->get(UserGroupGrid::class)
->getGrid($this->dic->get(UserGroupService::class)->search($this->itemSearchData))
->updatePager();
}
/**
@@ -141,7 +142,9 @@ final class AccessManagerController extends ControllerBase
*/
protected function getUsersProfileList()
{
return $this->itemsGridHelper->getUserProfilesGrid($this->dic->get(UserProfileService::class)->search($this->itemSearchData))->updatePager();
return $this->dic->get(UserProfileGrid::class)
->getGrid($this->dic->get(UserProfileService::class)->search($this->itemSearchData))
->updatePager();
}
/**
@@ -153,7 +156,9 @@ final class AccessManagerController extends ControllerBase
*/
protected function getApiTokensList()
{
return $this->itemsGridHelper->getAuthTokensGrid($this->dic->get(AuthTokenService::class)->search($this->itemSearchData))->updatePager();
return $this->dic->get(AuthTokenGrid::class)
->getGrid($this->dic->get(AuthTokenService::class)->search($this->itemSearchData))
->updatePager();
}
/**
@@ -165,7 +170,9 @@ final class AccessManagerController extends ControllerBase
*/
protected function getPublicLinksList()
{
return $this->itemsGridHelper->getPublicLinksGrid($this->dic->get(PublicLinkService::class)->search($this->itemSearchData))->updatePager();
return $this->dic->get(PublicLinkGrid::class)
->getGrid($this->dic->get(PublicLinkService::class)->search($this->itemSearchData))
->updatePager();
}
/**