Expanded rights to also manage actions instead of just a cruds

2025-09-13 13:57:10 +02:00 · 2019-02-21 18:46:57 +01:00
parent 465d6d6d01
commit 3e91aed050
27 changed files with 91 additions and 98 deletions
--- a/application/symfony/src/Controller/DefaultController.php
+++ b/application/symfony/src/Controller/DefaultController.php
@@ -4,11 +4,6 @@ namespace Infinito\Controller;

 use Symfony\Component\Routing\Annotation\Route;
 use Symfony\Component\HttpFoundation\Response;
-use Infinito\Domain\MVCManagement\MVCRoutineServiceInterface;
-use Infinito\Domain\RequestManagement\Action\RequestedActionServiceInterface;
-use Infinito\DBAL\Types\ActionType;
-use Infinito\Domain\FixtureManagement\FixtureSource\ImpressumFixtureSource;
-use Infinito\DBAL\Types\Meta\Right\LayerType;

 /**
 * This controller offers the standart routes for the template.
@@ -17,22 +12,6 @@ use Infinito\DBAL\Types\Meta\Right\LayerType;
 */
 final class DefaultController extends AbstractController
 {
-    /**
-     * @deprecated Use load via source instead of fixed route
-     *
-     * @todo Optimize function!
-     * @Route("/imprint.{_format}", defaults={"_format"="json"}, name="imprint")
-     */
-    public function imprint(MVCRoutineServiceInterface $mvcRoutineService, RequestedActionServiceInterface $requestedActionService): Response
-    {
-        $requestedActionService->setActionType(ActionType::READ);
-        $requestedActionService->setLayer(LayerType::SOURCE);
-        $requestedActionService->getRequestedEntity()->setSlug(ImpressumFixtureSource::SLUG);
-        $view = $mvcRoutineService->process();
-
-        return $this->handleView($view);
-    }
-
    /**
     * @Route("/", name="homepage")
     */
--- a/application/symfony/src/DBAL/Types/Meta/Right/CRUDType.php
+++ b/application/symfony/src/DBAL/Types/Meta/Right/CRUDType.php
@@ -6,6 +6,8 @@ use Fresh\DoctrineEnumBundle\DBAL\Types\AbstractEnumType;

 /**
 * @author kevinfrantz
+ *
+ * @see https://de.wikipedia.org/wiki/CRUD
 */
 class CRUDType extends AbstractEnumType
 {
--- a/application/symfony/src/Domain/FixtureManagement/FixtureSource/ImpressumFixtureSource.php
+++ b/application/symfony/src/Domain/FixtureManagement/FixtureSource/ImpressumFixtureSource.php
@@ -6,7 +6,7 @@ use Infinito\Entity\Source\SourceInterface;
 use Infinito\Entity\Source\Primitive\Text\TextSource;
 use Infinito\Entity\Meta\Right;
 use Infinito\DBAL\Types\Meta\Right\LayerType;
-use Infinito\DBAL\Types\Meta\Right\CRUDType;
+use Infinito\DBAL\Types\ActionType;

 /**
 * @author kevinfrantz
@@ -28,7 +28,7 @@ final class ImpressumFixtureSource extends AbstractFixtureSource
        $right = new Right();
        $right->setSource($impressumSource);
        $right->setLayer(LayerType::SOURCE);
-        $right->setCrud(CRUDType::READ);
+        $right->setActionType(ActionType::READ);
        $right->setLaw($impressumSource->getLaw());
        $impressumSource->getLaw()->getRights()->add($right);

--- a/application/symfony/src/Domain/LawManagement/LawPermissionChecker.php
+++ b/application/symfony/src/Domain/LawManagement/LawPermissionChecker.php
@@ -49,9 +49,9 @@ final class LawPermissionChecker implements LawPermissionCheckerInterface
     *
     * @return Collection|RightInterface[]
     */
-    private function getRightsByCrud(Collection $rights, string $type): Collection
+    private function getRightsByActionType(Collection $rights, string $type): Collection
    {
-        return $this->getFilteredRights($rights, $type, 'Crud');
+        return $this->getFilteredRights($rights, $type, 'ActionType');
    }

    /**
@@ -149,7 +149,7 @@ final class LawPermissionChecker implements LawPermissionCheckerInterface
        $right = $rights[0];
        $rightChecker = new RightChecker($right);

-        return $rightChecker->isGranted($client->getLayer(), $client->getCrud(), $client->getReciever());
+        return $rightChecker->isGranted($client->getLayer(), $client->getActionType(), $client->getReciever());
    }

    /**
@@ -168,7 +168,7 @@ final class LawPermissionChecker implements LawPermissionCheckerInterface
    public function hasPermission(RightInterface $clientRight): bool
    {
        $rights = clone $this->law->getRights();
-        $rights = $this->getRightsByCrud($rights, $clientRight->getCrud());
+        $rights = $this->getRightsByActionType($rights, $clientRight->getActionType());
        $rights = $this->getRightsByLayer($rights, $clientRight->getLayer());
        $rights = $this->getRightsByReciever($rights, $clientRight);
        $rights = $this->sortByPriority($rights);
--- a/application/symfony/src/Domain/RequestManagement/Action/RequestedAction.php
+++ b/application/symfony/src/Domain/RequestManagement/Action/RequestedAction.php
@@ -51,7 +51,7 @@ class RequestedAction extends RequestedUser implements RequestedActionInterface
    private function setRequestedRightCrudType(string $actionType): void
    {
        $crudType = $this->getCrudType($actionType);
-        $this->requestedRight->setCrud($crudType);
+        $this->requestedRight->setActionType($crudType);
    }

    /**
--- a/application/symfony/src/Domain/RequestManagement/Right/AbstractRequestedRightFacade.php
+++ b/application/symfony/src/Domain/RequestManagement/Right/AbstractRequestedRightFacade.php
@@ -78,21 +78,21 @@ abstract class AbstractRequestedRightFacade implements RequestedRightInterface
    /**
     * {@inheritdoc}
     *
-     * @see \Infinito\Attribut\CrudAttributInterface::setCrud()
+     * @see \Infinito\Attribut\ActionTypeAttributInterface::setActionType()
     */
-    public function setCrud(string $crud): void
+    public function setActionType(string $actionType): void
    {
-        $this->requestedRight->setCrud($crud);
+        $this->requestedRight->setActionType($actionType);
    }

    /**
     * {@inheritdoc}
     *
-     * @see \Infinito\Attribut\CrudAttributInterface::getCrud()
+     * @see \Infinito\Attribut\ActionTypeAttributInterface::getActionType()
     */
-    public function getCrud(): string
+    public function getActionType(): string
    {
-        return $this->requestedRight->getCrud();
+        return $this->requestedRight->getActionType();
    }

    /**
--- a/application/symfony/src/Domain/RequestManagement/Right/RequestedRight.php
+++ b/application/symfony/src/Domain/RequestManagement/Right/RequestedRight.php
@@ -3,7 +3,6 @@
 namespace Infinito\Domain\RequestManagement\Right;

 use Infinito\Entity\Source\SourceInterface;
-use Infinito\Attribut\CrudAttribut;
 use Infinito\Attribut\LayerAttribut;
 use Infinito\Attribut\RecieverAttribut;
 use Infinito\Exception\PreconditionFailedException;
@@ -12,6 +11,7 @@ use Infinito\Attribut\RequestedEntityAttribut;
 use Infinito\Entity\Meta\MetaInterface;
 use Infinito\Exception\NotCorrectInstanceException;
 use Infinito\Domain\RequestManagement\Entity\RequestedEntity;
+use Infinito\Attribut\ActionTypeAttribut;

 /**
 * @author kevinfrantz
@@ -20,7 +20,7 @@ use Infinito\Domain\RequestManagement\Entity\RequestedEntity;
 */
 class RequestedRight implements RequestedRightInterface
 {
-    use CrudAttribut, LayerAttribut, RecieverAttribut, RequestedEntityAttribut;
+    use ActionTypeAttribut, LayerAttribut, RecieverAttribut, RequestedEntityAttribut;

    /**
     * @var SourceInterface
--- a/application/symfony/src/Domain/RequestManagement/Right/RequestedRightInterface.php
+++ b/application/symfony/src/Domain/RequestManagement/Right/RequestedRightInterface.php
@@ -2,16 +2,16 @@

 namespace Infinito\Domain\RequestManagement\Right;

-use Infinito\Attribut\CrudAttributInterface;
 use Infinito\Attribut\RecieverAttributInterface;
 use Infinito\Attribut\LayerAttributInterface;
 use Infinito\Entity\Source\SourceInterface;
 use Infinito\Attribut\RequestedEntityAttributInterface;
+use Infinito\Attribut\ActionTypeAttributInterface;

 /**
 * @author kevinfrantz
 */
-interface RequestedRightInterface extends CrudAttributInterface, RecieverAttributInterface, LayerAttributInterface, RequestedEntityAttributInterface
+interface RequestedRightInterface extends ActionTypeAttributInterface, RecieverAttributInterface, LayerAttributInterface, RequestedEntityAttributInterface
 {
    /**
     * {@inheritdoc}
--- a/application/symfony/src/Domain/RightManagement/RightChecker.php
+++ b/application/symfony/src/Domain/RightManagement/RightChecker.php
@@ -60,7 +60,7 @@ final class RightChecker implements RightCheckerInterface
     */
    private function isTypeEqual(string $type): bool
    {
-        return $this->right->getCrud() === $type;
+        return $this->right->getActionType() === $type;
    }

    /**
--- a/application/symfony/src/Entity/Meta/Right.php
+++ b/application/symfony/src/Entity/Meta/Right.php
@@ -2,7 +2,6 @@

 namespace Infinito\Entity\Meta;

-use Infinito\Attribut\CrudAttribut;
 use Doctrine\ORM\Mapping as ORM;
 use Fresh\DoctrineEnumBundle\Validator\Constraints as DoctrineAssert;
 use Infinito\Attribut\LawAttribut;
@@ -14,6 +13,7 @@ use Infinito\Attribut\LayerAttribut;
 use Infinito\Attribut\RelationAttribut;
 use Infinito\Attribut\PriorityAttribut;
 use Infinito\Entity\Source\SourceInterface;
+use Infinito\Attribut\ActionTypeAttribut;

 /**
 * @todo Remove relation attribut!
@@ -24,7 +24,7 @@ use Infinito\Entity\Source\SourceInterface;
 */
 class Right extends AbstractMeta implements RightInterface
 {
-    use CrudAttribut,LawAttribut, RelationAttribut, GrantAttribut,ConditionAttribut,RecieverAttribut,LayerAttribut,PriorityAttribut;
+    use ActionTypeAttribut,LawAttribut, RelationAttribut, GrantAttribut,ConditionAttribut,RecieverAttribut,LayerAttribut,PriorityAttribut;

    /**
     * @ORM\OneToOne(targetEntity="Infinito\Entity\Source\AbstractSource",cascade={"persist", "remove"})
@@ -74,12 +74,12 @@ class Right extends AbstractMeta implements RightInterface
    protected $grant;

    /**
-     * @ORM\Column(name="crud", type="CRUDType", nullable=false)
-     * @DoctrineAssert\Enum(entity="Infinito\DBAL\Types\Meta\Right\CRUDType")
+     * @ORM\Column(name="action", type="ActionType", nullable=false)
+     * @DoctrineAssert\Enum(entity="Infinito\DBAL\Types\ActionType")
     *
     * @var string
     */
-    protected $crud;
+    protected $actionType;

    /**
     * @ORM\OneToOne(targetEntity="Infinito\Entity\Source\Operation\AbstractOperation",cascade={"persist"})
--- a/application/symfony/src/Entity/Meta/RightInterface.php
+++ b/application/symfony/src/Entity/Meta/RightInterface.php
@@ -2,7 +2,6 @@

 namespace Infinito\Entity\Meta;

-use Infinito\Attribut\CrudAttributInterface;
 use Infinito\Attribut\LawAttributInterface;
 use Infinito\Attribut\RecieverAttributInterface;
 use Infinito\Attribut\GrantAttributInterface;
@@ -10,10 +9,11 @@ use Infinito\Attribut\ConditionAttributInterface;
 use Infinito\Attribut\LayerAttributInterface;
 use Infinito\Attribut\RelationAttributInterface;
 use Infinito\Attribut\PriorityAttributInterface;
+use Infinito\Attribut\ActionTypeAttributInterface;

 /**
 * @author kevinfrantz
 */
-interface RightInterface extends CrudAttributInterface, LawAttributInterface, GrantAttributInterface, RecieverAttributInterface, RelationAttributInterface, ConditionAttributInterface, LayerAttributInterface, MetaInterface, PriorityAttributInterface
+interface RightInterface extends ActionTypeAttributInterface, LawAttributInterface, GrantAttributInterface, RecieverAttributInterface, RelationAttributInterface, ConditionAttributInterface, LayerAttributInterface, MetaInterface, PriorityAttributInterface
 {
 }
--- a/application/symfony/src/Subscriber/UserMenuSubscriber.php
+++ b/application/symfony/src/Subscriber/UserMenuSubscriber.php
@@ -8,6 +8,7 @@ use Symfony\Component\Translation\TranslatorInterface;
 use Knp\Menu\ItemInterface;
 use Infinito\Event\Menu\MenuEvent;
 use Infinito\DBAL\Types\MenuEventType;
+use Infinito\Domain\FixtureManagement\FixtureSource\ImpressumFixtureSource;

 class UserMenuSubscriber implements EventSubscriberInterface
 {
@@ -27,6 +28,9 @@ class UserMenuSubscriber implements EventSubscriberInterface
        $this->translator = $translator;
    }

+    /**
+     * @param MenuEvent $event
+     */
    public function onUserMenuConfigure(MenuEvent $event): void
    {
        $menu = $event->getItem();
@@ -38,7 +42,7 @@ class UserMenuSubscriber implements EventSubscriberInterface
        ]);

        $menu->addChild($this->translator->trans('imprint'), [
-            'route' => 'imprint',
+            'uri' => 'rest/api/source/'.strtolower(ImpressumFixtureSource::SLUG).'.html',
            'attributes' => [
                'icon' => 'fas fa-address-card',
            ],