feat: open the logs to every administrative role
This commit is contained in:
1 parent
ade30c6b06
commit
1a733a6ba6
9 files changed
+28
-22
No files matched your search
@@ -22,9 +22,9 @@ security:
|
|||||||
users: []
|
users: []
|
||||||
|
|
||||||
role_hierarchy:
|
role_hierarchy:
|
||||||
# ROLE_CUSTOMER_EXPERT gates the booking-draft and log surfaces, which used to be
|
# ROLE_CUSTOMER_EXPERT gates the customer-service surfaces (booking drafts, travel
|
||||||
# ROLE_ADMIN only. Inheriting it here is what keeps those surfaces open to administrators
|
# mailing). Inheriting it here is what keeps them open to administrators: the booking
|
||||||
# after the #[IsGranted] attributes moved to the narrower role.
|
# drafts used to be ROLE_ADMIN only before their #[IsGranted] moved to the narrower role.
|
||||||
ROLE_ADMIN:
|
ROLE_ADMIN:
|
||||||
- ROLE_GROUPS_ADMIN
|
- ROLE_GROUPS_ADMIN
|
||||||
- ROLE_CUSTOMER_EXPERT
|
- ROLE_CUSTOMER_EXPERT
|
||||||
|
|||||||
@@ -4,6 +4,7 @@ declare(strict_types=1);
|
|||||||
|
|
||||||
namespace App\Controller\Admin\Log;
|
namespace App\Controller\Admin\Log;
|
||||||
|
|
||||||
|
use App\Security\Voter\AdministrativeAccessVoter;
|
||||||
use App\Service\XmlDumpReader;
|
use App\Service\XmlDumpReader;
|
||||||
use League\Flysystem\FilesystemException;
|
use League\Flysystem\FilesystemException;
|
||||||
use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
|
use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
|
||||||
@@ -12,7 +13,7 @@ use Symfony\Component\HttpFoundation\ResponseHeaderBag;
|
|||||||
use Symfony\Component\Routing\Attribute\Route;
|
use Symfony\Component\Routing\Attribute\Route;
|
||||||
use Symfony\Component\Security\Http\Attribute\IsGranted;
|
use Symfony\Component\Security\Http\Attribute\IsGranted;
|
||||||
|
|
||||||
#[IsGranted('ROLE_CUSTOMER_EXPERT')]
|
#[IsGranted(AdministrativeAccessVoter::ADMINISTRATIVE_ACCESS)]
|
||||||
class DownloadController extends AbstractController
|
class DownloadController extends AbstractController
|
||||||
{
|
{
|
||||||
public function __construct(private readonly XmlDumpReader $xmlDumpReader)
|
public function __construct(private readonly XmlDumpReader $xmlDumpReader)
|
||||||
|
|||||||
@@ -8,13 +8,14 @@ use App\Controller\Traits\ListFilterTrait;
|
|||||||
use App\Form\Admin\Filter\LogEntryFilterType;
|
use App\Form\Admin\Filter\LogEntryFilterType;
|
||||||
use App\Form\Model\Filter\LogEntryFilterDto;
|
use App\Form\Model\Filter\LogEntryFilterDto;
|
||||||
use App\Repository\LogEntryRepository;
|
use App\Repository\LogEntryRepository;
|
||||||
|
use App\Security\Voter\AdministrativeAccessVoter;
|
||||||
use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
|
use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
|
||||||
use Symfony\Component\HttpFoundation\Request;
|
use Symfony\Component\HttpFoundation\Request;
|
||||||
use Symfony\Component\HttpFoundation\Response;
|
use Symfony\Component\HttpFoundation\Response;
|
||||||
use Symfony\Component\Routing\Attribute\Route;
|
use Symfony\Component\Routing\Attribute\Route;
|
||||||
use Symfony\Component\Security\Http\Attribute\IsGranted;
|
use Symfony\Component\Security\Http\Attribute\IsGranted;
|
||||||
|
|
||||||
#[IsGranted('ROLE_CUSTOMER_EXPERT')]
|
#[IsGranted(AdministrativeAccessVoter::ADMINISTRATIVE_ACCESS)]
|
||||||
class FilterController extends AbstractController
|
class FilterController extends AbstractController
|
||||||
{
|
{
|
||||||
use ListFilterTrait;
|
use ListFilterTrait;
|
||||||
|
|||||||
@@ -8,6 +8,7 @@ use App\Controller\Traits\ListFilterTrait;
|
|||||||
use App\Form\Admin\Filter\LogEntryFilterType;
|
use App\Form\Admin\Filter\LogEntryFilterType;
|
||||||
use App\Form\Model\Filter\LogEntryFilterDto;
|
use App\Form\Model\Filter\LogEntryFilterDto;
|
||||||
use App\Repository\LogEntryRepository;
|
use App\Repository\LogEntryRepository;
|
||||||
|
use App\Security\Voter\AdministrativeAccessVoter;
|
||||||
use Knp\Component\Pager\PaginatorInterface;
|
use Knp\Component\Pager\PaginatorInterface;
|
||||||
use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
|
use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
|
||||||
use Symfony\Component\HttpFoundation\Request;
|
use Symfony\Component\HttpFoundation\Request;
|
||||||
@@ -15,7 +16,7 @@ use Symfony\Component\HttpFoundation\Response;
|
|||||||
use Symfony\Component\Routing\Attribute\Route;
|
use Symfony\Component\Routing\Attribute\Route;
|
||||||
use Symfony\Component\Security\Http\Attribute\IsGranted;
|
use Symfony\Component\Security\Http\Attribute\IsGranted;
|
||||||
|
|
||||||
#[IsGranted('ROLE_CUSTOMER_EXPERT')]
|
#[IsGranted(AdministrativeAccessVoter::ADMINISTRATIVE_ACCESS)]
|
||||||
class IndexController extends AbstractController
|
class IndexController extends AbstractController
|
||||||
{
|
{
|
||||||
use ListFilterTrait;
|
use ListFilterTrait;
|
||||||
|
|||||||
@@ -5,6 +5,7 @@ declare(strict_types=1);
|
|||||||
namespace App\Controller\Admin\Log;
|
namespace App\Controller\Admin\Log;
|
||||||
|
|
||||||
use App\Entity\LogEntry;
|
use App\Entity\LogEntry;
|
||||||
|
use App\Security\Voter\AdministrativeAccessVoter;
|
||||||
use App\Service\XmlDumpReader;
|
use App\Service\XmlDumpReader;
|
||||||
use League\Flysystem\FilesystemException;
|
use League\Flysystem\FilesystemException;
|
||||||
use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
|
use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
|
||||||
@@ -12,7 +13,7 @@ use Symfony\Component\HttpFoundation\Response;
|
|||||||
use Symfony\Component\Routing\Attribute\Route;
|
use Symfony\Component\Routing\Attribute\Route;
|
||||||
use Symfony\Component\Security\Http\Attribute\IsGranted;
|
use Symfony\Component\Security\Http\Attribute\IsGranted;
|
||||||
|
|
||||||
#[IsGranted('ROLE_CUSTOMER_EXPERT')]
|
#[IsGranted(AdministrativeAccessVoter::ADMINISTRATIVE_ACCESS)]
|
||||||
class XmlDumpController extends AbstractController
|
class XmlDumpController extends AbstractController
|
||||||
{
|
{
|
||||||
public function __construct(private readonly XmlDumpReader $xmlDumpReader)
|
public function __construct(private readonly XmlDumpReader $xmlDumpReader)
|
||||||
|
|||||||
@@ -17,7 +17,8 @@ interface DashboardWidgetProviderInterface
|
|||||||
{
|
{
|
||||||
/**
|
/**
|
||||||
* The role this widget requires, checked with isGranted() — so a widget requiring
|
* The role this widget requires, checked with isGranted() — so a widget requiring
|
||||||
* ROLE_GROUPS_MANAGER also appears for the roles above it in the hierarchy.
|
* ROLE_GROUPS_MANAGER also appears for the roles above it in the hierarchy. A voter
|
||||||
|
* attribute such as ADMINISTRATIVE_ACCESS works too, for a widget every admin-area role sees.
|
||||||
*/
|
*/
|
||||||
public function getRequiredRole(): string;
|
public function getRequiredRole(): string;
|
||||||
|
|
||||||
|
|||||||
@@ -9,7 +9,7 @@ use App\Entity\LogEntry;
|
|||||||
use App\Model\DashboardWidget;
|
use App\Model\DashboardWidget;
|
||||||
use App\Model\DashboardWidgetEntry;
|
use App\Model\DashboardWidgetEntry;
|
||||||
use App\Repository\LogEntryRepository;
|
use App\Repository\LogEntryRepository;
|
||||||
use App\Security\Role;
|
use App\Security\Voter\AdministrativeAccessVoter;
|
||||||
use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
|
use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -37,7 +37,7 @@ class RecentLogEntriesWidgetProvider implements DashboardWidgetProviderInterface
|
|||||||
|
|
||||||
public function getRequiredRole(): string
|
public function getRequiredRole(): string
|
||||||
{
|
{
|
||||||
return Role::CUSTOMER_EXPERT;
|
return AdministrativeAccessVoter::ADMINISTRATIVE_ACCESS;
|
||||||
}
|
}
|
||||||
|
|
||||||
public function getPriority(): int
|
public function getPriority(): int
|
||||||
|
|||||||
@@ -81,16 +81,6 @@ class AdminMenuBuilder
|
|||||||
]);
|
]);
|
||||||
}
|
}
|
||||||
if ($this->security->isGranted('ROLE_CUSTOMER_EXPERT')) {
|
if ($this->security->isGranted('ROLE_CUSTOMER_EXPERT')) {
|
||||||
$menu->addChild('Logs', [
|
|
||||||
'route' => 'app_admin_log',
|
|
||||||
'linkAttributes' => [
|
|
||||||
'title' => 'Logs',
|
|
||||||
],
|
|
||||||
'extras' => [
|
|
||||||
'icon' => 'list',
|
|
||||||
'routes' => [['pattern' => '/^app_admin_log/']],
|
|
||||||
],
|
|
||||||
]);
|
|
||||||
$menu->addChild('Reise-Mailingliste', [
|
$menu->addChild('Reise-Mailingliste', [
|
||||||
'route' => 'app_admin_travelmailing',
|
'route' => 'app_admin_travelmailing',
|
||||||
'linkAttributes' => [
|
'linkAttributes' => [
|
||||||
@@ -102,6 +92,17 @@ class AdminMenuBuilder
|
|||||||
]);
|
]);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
$menu->addChild('Logs', [
|
||||||
|
'route' => 'app_admin_log',
|
||||||
|
'linkAttributes' => [
|
||||||
|
'title' => 'Logs',
|
||||||
|
],
|
||||||
|
'extras' => [
|
||||||
|
'icon' => 'list',
|
||||||
|
'routes' => [['pattern' => '/^app_admin_log/']],
|
||||||
|
],
|
||||||
|
]);
|
||||||
|
|
||||||
$this->addLogoutItem($menu);
|
$this->addLogoutItem($menu);
|
||||||
|
|
||||||
return $menu;
|
return $menu;
|
||||||
|
|||||||
@@ -7,7 +7,7 @@ namespace App\Tests\Dashboard;
|
|||||||
use App\Dashboard\Widget\RecentLogEntriesWidgetProvider;
|
use App\Dashboard\Widget\RecentLogEntriesWidgetProvider;
|
||||||
use App\Entity\LogEntry;
|
use App\Entity\LogEntry;
|
||||||
use App\Repository\LogEntryRepository;
|
use App\Repository\LogEntryRepository;
|
||||||
use App\Security\Role;
|
use App\Security\Voter\AdministrativeAccessVoter;
|
||||||
use PHPUnit\Framework\TestCase;
|
use PHPUnit\Framework\TestCase;
|
||||||
use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
|
use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
|
||||||
|
|
||||||
@@ -57,7 +57,7 @@ class RecentLogEntriesWidgetProviderTest extends TestCase
|
|||||||
|
|
||||||
$provider = new RecentLogEntriesWidgetProvider($repository, $this->urlGenerator());
|
$provider = new RecentLogEntriesWidgetProvider($repository, $this->urlGenerator());
|
||||||
|
|
||||||
$this->assertSame(Role::CUSTOMER_EXPERT, $provider->getRequiredRole());
|
$this->assertSame(AdministrativeAccessVoter::ADMINISTRATIVE_ACCESS, $provider->getRequiredRole());
|
||||||
$this->assertNotNull($provider->build());
|
$this->assertNotNull($provider->build());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in new issue
Block a user