Loading module/Application/src/View/Helper/LayoutViewHelper.php +3 −1 Changes for module/Application/src/View/Helper/LayoutViewHelper.php: 3 added lines, 1 removed line. Original line number Diff line number Diff line Loading @@ -12,6 +12,7 @@ use Laminas\View\Helper\AbstractHtmlElement; use Lieu\Service\StructureServiceAwareTrait; use UnicaenApp\Traits\SessionContainerTrait; use Utilisateur\Entity\Db\Role; use Utilisateur\Provider\UserProvider; /** * Description of UtilisateurViewHelper Loading @@ -30,6 +31,7 @@ class LayoutViewHelper extends AbstractHtmlElement private readonly Navigation $navigation, private readonly UserManager $userManager, private readonly Router $router, private readonly UserProvider $userProvider, ) { Loading Loading @@ -99,7 +101,7 @@ class LayoutViewHelper extends AbstractHtmlElement 'usurpationEnCours' => $this->userManager->isUsurpationEnCours(), 'roles' => $roles, 'route' => $this->router->getCurrentRoute()?->getName(), 'structureId' => null, 'structureId' => $this->userProvider->getCustomStructure()?->getId(), 'structures' => $structures, ]; } Loading module/Application/src/View/Helper/LayoutViewHelperFactory.php +2 −0 Changes for module/Application/src/View/Helper/LayoutViewHelperFactory.php: 2 added lines, 0 removed lines. Original line number Diff line number Diff line Loading @@ -7,6 +7,7 @@ use Unicaen\Framework\Navigation\Navigation; use Unicaen\Framework\Router\Router; use Unicaen\Framework\User\UserManager; use Interop\Container\ContainerInterface; use Utilisateur\Provider\UserProvider; /** * Class LayoutViewHelperFactory Loading @@ -20,6 +21,7 @@ class LayoutViewHelperFactory $container->get(Navigation::class), $container->get(UserManager::class), $container->get(Router::class), $container->get(UserProvider::class), ); return $helper; Loading module/Referentiel/src/Assertion/ReferentielAssertion.php +49 −49 Changes for module/Referentiel/src/Assertion/ReferentielAssertion.php: 49 added lines, 49 removed lines. Original line number Diff line number Diff line Loading @@ -20,6 +20,7 @@ use Service\Service\CampagneSaisieServiceAwareTrait; use Service\Service\RegleStructureValidationServiceAwareTrait; use Service\Service\TypeVolumeHoraireServiceAwareTrait; use Unicaen\Framework\Authorize\Authorize; use Unicaen\Framework\Authorize\UnAuthorizedException; use Workflow\Entity\Db\Validation; use Workflow\Entity\Db\WorkflowEtape; use Workflow\Service\ValidationServiceAwareTrait; Loading Loading @@ -52,61 +53,67 @@ class ReferentielAssertion extends AbstractAssertion /** * @param ResourceInterface $entity * @param string $privilege * * @return boolean */ protected function assertEntity(ResourceInterface $entity, $privilege = null): bool protected function assertEntity(ResourceInterface $entity, ?string $privilege = null): bool { // pareil si le rôle ne possède pas le privilège adéquat if ($privilege && !$this->authorize->isAllowedPrivilege($privilege)) return false; // Si c'est bon alors on affine... switch (true) { case $entity instanceof ServiceReferentiel: case $entity instanceof Intervenant: switch ($privilege) { case Privileges::REFERENTIEL_PREVU_VISUALISATION: case Privileges::REFERENTIEL_REALISE_VISUALISATION: return $this->assertServiceReferentielVisualisation($entity); return $this->assertIntervenantReferentiel($entity, TypeVolumeHoraire::CODE_PREVU, false); case Privileges::REFERENTIEL_PREVU_EDITION: return $this->assertIntervenantReferentiel($entity, TypeVolumeHoraire::CODE_PREVU, true); case Privileges::REFERENTIEL_REALISE_VISUALISATION: return $this->assertIntervenantReferentiel($entity, TypeVolumeHoraire::CODE_REALISE, false); case Privileges::REFERENTIEL_REALISE_EDITION: return $this->assertServiceReferentielEdition($entity); case Privileges::REFERENTIEL_PREVU_VALIDATION: case Privileges::REFERENTIEL_REALISE_VALIDATION: return $this->assertServiceReferentielValidation($entity); return $this->assertIntervenantReferentiel($entity, TypeVolumeHoraire::CODE_REALISE, true); case Privileges::MOTIF_NON_PAIEMENT_VISUALISATION: return true; } break; case $entity instanceof VolumeHoraireReferentiel: case $entity instanceof Validation: switch ($privilege) { case Privileges::REFERENTIEL_PREVU_VALIDATION: case Privileges::REFERENTIEL_REALISE_VALIDATION: return $this->assertVolumeHoraireReferentielValidation($entity); case Privileges::REFERENTIEL_PREVU_AUTOVALIDATION: case Privileges::REFERENTIEL_REALISE_AUTOVALIDATION: return $this->assertValidationValidation($entity); case Privileges::REFERENTIEL_DEVALIDATION: return $this->assertValidationDevalidation($entity); } break; case $entity instanceof Intervenant: case $entity instanceof ServiceReferentiel: switch ($privilege) { case Privileges::REFERENTIEL_PREVU_VISUALISATION: return $this->assertIntervenantReferentiel($entity, TypeVolumeHoraire::CODE_PREVU, false); case Privileges::REFERENTIEL_PREVU_VALIDATION: case Privileges::REFERENTIEL_REALISE_VALIDATION: return $this->assertServiceReferentielValidation($entity); case Privileges::REFERENTIEL_PREVU_EDITION: return $this->assertIntervenantReferentiel($entity, TypeVolumeHoraire::CODE_PREVU, true); case Privileges::REFERENTIEL_PREVU_AUTOVALIDATION: return true; case Privileges::REFERENTIEL_REALISE_AUTOVALIDATION: return true; case Privileges::REFERENTIEL_PREVU_VISUALISATION: return $this->assertServiceReferentielVisualisation($entity); case Privileges::REFERENTIEL_PREVU_EDITION: return $this->assertServiceReferentielEdition($entity); case Privileges::REFERENTIEL_REALISE_VISUALISATION: return $this->assertIntervenantReferentiel($entity, TypeVolumeHoraire::CODE_REALISE, false); return $this->assertServiceReferentielVisualisation($entity); case Privileges::REFERENTIEL_REALISE_EDITION: return $this->assertIntervenantReferentiel($entity, TypeVolumeHoraire::CODE_REALISE, true); return $this->assertServiceReferentielEdition($entity); case Privileges::MOTIF_NON_PAIEMENT_VISUALISATION: return true; } break; case $entity instanceof Validation: case $entity instanceof VolumeHoraireReferentiel: switch ($privilege) { case Privileges::REFERENTIEL_PREVU_VALIDATION: case Privileges::REFERENTIEL_REALISE_VALIDATION: return $this->assertValidationValidation($entity); case Privileges::REFERENTIEL_DEVALIDATION: return $this->assertValidationDevalidation($entity); return $this->assertVolumeHoraireReferentielValidation($entity); case Privileges::REFERENTIEL_PREVU_AUTOVALIDATION: return true; case Privileges::REFERENTIEL_REALISE_AUTOVALIDATION: return true; } break; case $entity instanceof FonctionReferentiel: Loading @@ -117,18 +124,11 @@ class ReferentielAssertion extends AbstractAssertion break; } return true; throw new UnAuthorizedException('Action interdite pour la resource ' . $entity->getResourceId() . ', privilège ' . $privilege); } /** * @param string $controller * @param string $action * @param string $privilege * * @return boolean */ protected function assertController(string $controller, ?string $action): bool { Loading @@ -142,6 +142,10 @@ class ReferentielAssertion extends AbstractAssertion if (!$this->getAssertionService()->assertIntervenant($intervenant)) return false; // si on n'est pas le bon intervenant!! switch ($controller . '.' . $action) { case ServiceReferentielController::class . '.prevu': return $this->assertPageReferentiel($intervenant, TypeVolumeHoraire::CODE_PREVU); case ServiceReferentielController::class . '.realise': return $this->assertPageReferentiel($intervenant, TypeVolumeHoraire::CODE_REALISE); case ServiceReferentielController::class . '.saisie': case ServiceReferentielController::class . '.suppression': $serviceReferentiel = $this->getParam('id') ? $this->entityManager->find(ServiceReferentiel::class, $this->getParam('id')) : null; Loading @@ -155,21 +159,17 @@ class ReferentielAssertion extends AbstractAssertion $serviceReferentiel->setTypeVolumeHoraire($typeVolumeHoraire); } return $this->assertServiceReferentielEdition($serviceReferentiel); case ServiceReferentielController::class . '.initialisation': return true; case ServiceReferentielController::class . '.constatation': return true; case ServiceReferentielController::class . '.validationPrevu': return $this->authorize->isAllowedPrivilege(Privileges::REFERENTIEL_PREVU_VISUALISATION); case ServiceReferentielController::class . '.validationRealise': return $this->authorize->isAllowedPrivilege(Privileges::REFERENTIEL_REALISE_VISUALISATION); case ServiceReferentielController::class . '.referentielPrevu': return $this->assertPageReferentiel($intervenant, TypeVolumeHoraire::CODE_PREVU); case ServiceReferentielController::class . '.referentielRealise': return $this->assertPageReferentiel($intervenant, TypeVolumeHoraire::CODE_REALISE); } return false; throw new UnAuthorizedException('Action de contrôleur ' . $controller . ':' . $action . ' non traitée'); } Loading module/Utilisateur/src/Controller/UtilisateurController.php +3 −0 Changes for module/Utilisateur/src/Controller/UtilisateurController.php: 3 added lines, 0 removed lines. Original line number Diff line number Diff line Loading @@ -17,6 +17,7 @@ use UnicaenAuthentification\Authentication\Storage\Usurpation; use UnicaenAuthentification\Service\UserContext; use Utilisateur\Connecteur\LdapConnecteur; use Utilisateur\Entity\Db\Role; use Utilisateur\Provider\UserProvider; use Utilisateur\Service\UtilisateurServiceAwareTrait; Loading @@ -31,6 +32,7 @@ class UtilisateurController extends AbstractController private readonly UserContext $userContext, private readonly LdapConnecteur $ldap, private readonly AuthenticationService $authenticationService, private readonly UserProvider $userProvider, ) { } Loading @@ -54,6 +56,7 @@ class UtilisateurController extends AbstractController if ($role->getPeutChangerStructure()) { $structure = $this->getServiceStructure()->get($structureId); $profile->setContext('structure', $structure); $this->userProvider->setCustomStructure($structure); } else { /** @var Structure $structure */ $structure = $profile->getContext('structure'); Loading module/Utilisateur/src/Controller/UtilisateurControllerFactory.php +2 −0 Changes for module/Utilisateur/src/Controller/UtilisateurControllerFactory.php: 2 added lines, 0 removed lines. Original line number Diff line number Diff line Loading @@ -7,6 +7,7 @@ use Unicaen\Framework\User\UserManager; use Psr\Container\ContainerInterface; use UnicaenAuthentification\Service\UserContext; use Utilisateur\Connecteur\LdapConnecteur; use Utilisateur\Provider\UserProvider; class UtilisateurControllerFactory { Loading @@ -24,6 +25,7 @@ class UtilisateurControllerFactory $container->get(UserContext::class), $container->get(LdapConnecteur::class), $container->get(AuthenticationService::class), $container->get(UserProvider::class), ); return $controller; Loading Loading
module/Application/src/View/Helper/LayoutViewHelper.php +3 −1 Changes for module/Application/src/View/Helper/LayoutViewHelper.php: 3 added lines, 1 removed line. Original line number Diff line number Diff line Loading @@ -12,6 +12,7 @@ use Laminas\View\Helper\AbstractHtmlElement; use Lieu\Service\StructureServiceAwareTrait; use UnicaenApp\Traits\SessionContainerTrait; use Utilisateur\Entity\Db\Role; use Utilisateur\Provider\UserProvider; /** * Description of UtilisateurViewHelper Loading @@ -30,6 +31,7 @@ class LayoutViewHelper extends AbstractHtmlElement private readonly Navigation $navigation, private readonly UserManager $userManager, private readonly Router $router, private readonly UserProvider $userProvider, ) { Loading Loading @@ -99,7 +101,7 @@ class LayoutViewHelper extends AbstractHtmlElement 'usurpationEnCours' => $this->userManager->isUsurpationEnCours(), 'roles' => $roles, 'route' => $this->router->getCurrentRoute()?->getName(), 'structureId' => null, 'structureId' => $this->userProvider->getCustomStructure()?->getId(), 'structures' => $structures, ]; } Loading
module/Application/src/View/Helper/LayoutViewHelperFactory.php +2 −0 Changes for module/Application/src/View/Helper/LayoutViewHelperFactory.php: 2 added lines, 0 removed lines. Original line number Diff line number Diff line Loading @@ -7,6 +7,7 @@ use Unicaen\Framework\Navigation\Navigation; use Unicaen\Framework\Router\Router; use Unicaen\Framework\User\UserManager; use Interop\Container\ContainerInterface; use Utilisateur\Provider\UserProvider; /** * Class LayoutViewHelperFactory Loading @@ -20,6 +21,7 @@ class LayoutViewHelperFactory $container->get(Navigation::class), $container->get(UserManager::class), $container->get(Router::class), $container->get(UserProvider::class), ); return $helper; Loading
module/Referentiel/src/Assertion/ReferentielAssertion.php +49 −49 Changes for module/Referentiel/src/Assertion/ReferentielAssertion.php: 49 added lines, 49 removed lines. Original line number Diff line number Diff line Loading @@ -20,6 +20,7 @@ use Service\Service\CampagneSaisieServiceAwareTrait; use Service\Service\RegleStructureValidationServiceAwareTrait; use Service\Service\TypeVolumeHoraireServiceAwareTrait; use Unicaen\Framework\Authorize\Authorize; use Unicaen\Framework\Authorize\UnAuthorizedException; use Workflow\Entity\Db\Validation; use Workflow\Entity\Db\WorkflowEtape; use Workflow\Service\ValidationServiceAwareTrait; Loading Loading @@ -52,61 +53,67 @@ class ReferentielAssertion extends AbstractAssertion /** * @param ResourceInterface $entity * @param string $privilege * * @return boolean */ protected function assertEntity(ResourceInterface $entity, $privilege = null): bool protected function assertEntity(ResourceInterface $entity, ?string $privilege = null): bool { // pareil si le rôle ne possède pas le privilège adéquat if ($privilege && !$this->authorize->isAllowedPrivilege($privilege)) return false; // Si c'est bon alors on affine... switch (true) { case $entity instanceof ServiceReferentiel: case $entity instanceof Intervenant: switch ($privilege) { case Privileges::REFERENTIEL_PREVU_VISUALISATION: case Privileges::REFERENTIEL_REALISE_VISUALISATION: return $this->assertServiceReferentielVisualisation($entity); return $this->assertIntervenantReferentiel($entity, TypeVolumeHoraire::CODE_PREVU, false); case Privileges::REFERENTIEL_PREVU_EDITION: return $this->assertIntervenantReferentiel($entity, TypeVolumeHoraire::CODE_PREVU, true); case Privileges::REFERENTIEL_REALISE_VISUALISATION: return $this->assertIntervenantReferentiel($entity, TypeVolumeHoraire::CODE_REALISE, false); case Privileges::REFERENTIEL_REALISE_EDITION: return $this->assertServiceReferentielEdition($entity); case Privileges::REFERENTIEL_PREVU_VALIDATION: case Privileges::REFERENTIEL_REALISE_VALIDATION: return $this->assertServiceReferentielValidation($entity); return $this->assertIntervenantReferentiel($entity, TypeVolumeHoraire::CODE_REALISE, true); case Privileges::MOTIF_NON_PAIEMENT_VISUALISATION: return true; } break; case $entity instanceof VolumeHoraireReferentiel: case $entity instanceof Validation: switch ($privilege) { case Privileges::REFERENTIEL_PREVU_VALIDATION: case Privileges::REFERENTIEL_REALISE_VALIDATION: return $this->assertVolumeHoraireReferentielValidation($entity); case Privileges::REFERENTIEL_PREVU_AUTOVALIDATION: case Privileges::REFERENTIEL_REALISE_AUTOVALIDATION: return $this->assertValidationValidation($entity); case Privileges::REFERENTIEL_DEVALIDATION: return $this->assertValidationDevalidation($entity); } break; case $entity instanceof Intervenant: case $entity instanceof ServiceReferentiel: switch ($privilege) { case Privileges::REFERENTIEL_PREVU_VISUALISATION: return $this->assertIntervenantReferentiel($entity, TypeVolumeHoraire::CODE_PREVU, false); case Privileges::REFERENTIEL_PREVU_VALIDATION: case Privileges::REFERENTIEL_REALISE_VALIDATION: return $this->assertServiceReferentielValidation($entity); case Privileges::REFERENTIEL_PREVU_EDITION: return $this->assertIntervenantReferentiel($entity, TypeVolumeHoraire::CODE_PREVU, true); case Privileges::REFERENTIEL_PREVU_AUTOVALIDATION: return true; case Privileges::REFERENTIEL_REALISE_AUTOVALIDATION: return true; case Privileges::REFERENTIEL_PREVU_VISUALISATION: return $this->assertServiceReferentielVisualisation($entity); case Privileges::REFERENTIEL_PREVU_EDITION: return $this->assertServiceReferentielEdition($entity); case Privileges::REFERENTIEL_REALISE_VISUALISATION: return $this->assertIntervenantReferentiel($entity, TypeVolumeHoraire::CODE_REALISE, false); return $this->assertServiceReferentielVisualisation($entity); case Privileges::REFERENTIEL_REALISE_EDITION: return $this->assertIntervenantReferentiel($entity, TypeVolumeHoraire::CODE_REALISE, true); return $this->assertServiceReferentielEdition($entity); case Privileges::MOTIF_NON_PAIEMENT_VISUALISATION: return true; } break; case $entity instanceof Validation: case $entity instanceof VolumeHoraireReferentiel: switch ($privilege) { case Privileges::REFERENTIEL_PREVU_VALIDATION: case Privileges::REFERENTIEL_REALISE_VALIDATION: return $this->assertValidationValidation($entity); case Privileges::REFERENTIEL_DEVALIDATION: return $this->assertValidationDevalidation($entity); return $this->assertVolumeHoraireReferentielValidation($entity); case Privileges::REFERENTIEL_PREVU_AUTOVALIDATION: return true; case Privileges::REFERENTIEL_REALISE_AUTOVALIDATION: return true; } break; case $entity instanceof FonctionReferentiel: Loading @@ -117,18 +124,11 @@ class ReferentielAssertion extends AbstractAssertion break; } return true; throw new UnAuthorizedException('Action interdite pour la resource ' . $entity->getResourceId() . ', privilège ' . $privilege); } /** * @param string $controller * @param string $action * @param string $privilege * * @return boolean */ protected function assertController(string $controller, ?string $action): bool { Loading @@ -142,6 +142,10 @@ class ReferentielAssertion extends AbstractAssertion if (!$this->getAssertionService()->assertIntervenant($intervenant)) return false; // si on n'est pas le bon intervenant!! switch ($controller . '.' . $action) { case ServiceReferentielController::class . '.prevu': return $this->assertPageReferentiel($intervenant, TypeVolumeHoraire::CODE_PREVU); case ServiceReferentielController::class . '.realise': return $this->assertPageReferentiel($intervenant, TypeVolumeHoraire::CODE_REALISE); case ServiceReferentielController::class . '.saisie': case ServiceReferentielController::class . '.suppression': $serviceReferentiel = $this->getParam('id') ? $this->entityManager->find(ServiceReferentiel::class, $this->getParam('id')) : null; Loading @@ -155,21 +159,17 @@ class ReferentielAssertion extends AbstractAssertion $serviceReferentiel->setTypeVolumeHoraire($typeVolumeHoraire); } return $this->assertServiceReferentielEdition($serviceReferentiel); case ServiceReferentielController::class . '.initialisation': return true; case ServiceReferentielController::class . '.constatation': return true; case ServiceReferentielController::class . '.validationPrevu': return $this->authorize->isAllowedPrivilege(Privileges::REFERENTIEL_PREVU_VISUALISATION); case ServiceReferentielController::class . '.validationRealise': return $this->authorize->isAllowedPrivilege(Privileges::REFERENTIEL_REALISE_VISUALISATION); case ServiceReferentielController::class . '.referentielPrevu': return $this->assertPageReferentiel($intervenant, TypeVolumeHoraire::CODE_PREVU); case ServiceReferentielController::class . '.referentielRealise': return $this->assertPageReferentiel($intervenant, TypeVolumeHoraire::CODE_REALISE); } return false; throw new UnAuthorizedException('Action de contrôleur ' . $controller . ':' . $action . ' non traitée'); } Loading
module/Utilisateur/src/Controller/UtilisateurController.php +3 −0 Changes for module/Utilisateur/src/Controller/UtilisateurController.php: 3 added lines, 0 removed lines. Original line number Diff line number Diff line Loading @@ -17,6 +17,7 @@ use UnicaenAuthentification\Authentication\Storage\Usurpation; use UnicaenAuthentification\Service\UserContext; use Utilisateur\Connecteur\LdapConnecteur; use Utilisateur\Entity\Db\Role; use Utilisateur\Provider\UserProvider; use Utilisateur\Service\UtilisateurServiceAwareTrait; Loading @@ -31,6 +32,7 @@ class UtilisateurController extends AbstractController private readonly UserContext $userContext, private readonly LdapConnecteur $ldap, private readonly AuthenticationService $authenticationService, private readonly UserProvider $userProvider, ) { } Loading @@ -54,6 +56,7 @@ class UtilisateurController extends AbstractController if ($role->getPeutChangerStructure()) { $structure = $this->getServiceStructure()->get($structureId); $profile->setContext('structure', $structure); $this->userProvider->setCustomStructure($structure); } else { /** @var Structure $structure */ $structure = $profile->getContext('structure'); Loading
module/Utilisateur/src/Controller/UtilisateurControllerFactory.php +2 −0 Changes for module/Utilisateur/src/Controller/UtilisateurControllerFactory.php: 2 added lines, 0 removed lines. Original line number Diff line number Diff line Loading @@ -7,6 +7,7 @@ use Unicaen\Framework\User\UserManager; use Psr\Container\ContainerInterface; use UnicaenAuthentification\Service\UserContext; use Utilisateur\Connecteur\LdapConnecteur; use Utilisateur\Provider\UserProvider; class UtilisateurControllerFactory { Loading @@ -24,6 +25,7 @@ class UtilisateurControllerFactory $container->get(UserContext::class), $container->get(LdapConnecteur::class), $container->get(AuthenticationService::class), $container->get(UserProvider::class), ); return $controller; Loading