Merge branch '5.x' into release/8.0-perimetres (1856c309) · Commits · lib / unicaen / privilege

composer.json

+1 −1

Changes for composer.json: 1 added line, 1 removed line.
Original line number	Diff line number	Diff line
		{
		"name": "unicaen/privilege",
		"description": "Module reprenant la gestion des privileges - Version laminas",
		"description": "Module reprenant la gestion des privileges",
		"repositories": [
		{
		"type": "composer",

config/merged/perimetre.config.php

0 → 100644

+264 −0

Changes for config/merged/perimetre.config.php: 264 added lines, 0 removed lines.
Original line number	Diff line number	Diff line
		<?php

		use UnicaenPrivilege\Assertion\Perimetre\AbstractPerimetreAssertionFactory;
		use UnicaenPrivilege\Controller\PerimetreCategorieController;
		use UnicaenPrivilege\Controller\PerimetreCategorieControllerFactory;
		use UnicaenPrivilege\Controller\PerimetreController;
		use UnicaenPrivilege\Controller\PerimetreControllerFactory;
		use UnicaenPrivilege\Form\Perimetre\CategorieForm;
		use UnicaenPrivilege\Form\Perimetre\CategorieFormFactory;
		use UnicaenPrivilege\Form\Perimetre\PerimetreForm;
		use UnicaenPrivilege\Form\Perimetre\PerimetreFormFactory;
		use UnicaenPrivilege\Provider\Privilege\PerimetrePrivileges;
		use UnicaenPrivilege\Service\Perimetre\PerimetreCategorieService;
		use UnicaenPrivilege\Service\Perimetre\PerimetreCategorieServiceFactory;
		use UnicaenPrivilege\Service\Perimetre\PerimetreService;
		use UnicaenPrivilege\Service\Perimetre\PerimetreServiceFactory;
		use UnicaenPrivilege\View\Helper\Perimetre\PerimetreCategorieViewHelper;

		return [
		'bjyauthorize' => [
		'guards' => [
		UnicaenPrivilege\Guard\PrivilegeController::class => [
		[
		'controller' => PerimetreController::class,
		'action' => [
		'index',
		],
		'privileges' => [
		PerimetrePrivileges::CONSULTER,
		],
		],
		[
		'controller' => PerimetreController::class,
		'action' => [
		'ajouter',
		'modifier'
		],
		'privileges' => [
		PerimetrePrivileges::EDITER,
		],
		],
		[
		'controller' => PerimetreController::class,
		'action' => [
		'supprimer',
		],
		'privileges' => [
		PerimetrePrivileges::SUPPRIMER,
		],
		],
		[
		'controller' => PerimetreCategorieController::class,
		'action' => [
		'index',
		'gerer',
		],
		'privileges' => [
		PerimetrePrivileges::CONSULTER,
		],
		],
		[
		'controller' => PerimetreCategorieController::class,
		'action' => [
		'activer',
		],
		'privileges' => [
		PerimetrePrivileges::ATTRIBUER,
		],
		],
		[
		'controller' => PerimetreCategorieController::class,
		'action' => [
		'ajouter',
		'modifier',
		],
		'privileges' => [
		PerimetrePrivileges::EDITER,
		],
		],
		[
		'controller' => PerimetreCategorieController::class,
		'action' => [
		'supprimer',
		],
		'privileges' => [
		PerimetrePrivileges::SUPPRIMER,
		],
		],
		],
		],
		],

		'router' => [
		'routes' => [
		'unicaen-perimetre' => [
		'type' => Literal::class,
		'options' => [
		'route' => '/perimetre',
		'defaults' => [
		'controller' => PerimetreController::class,
		'action' => 'index',
		],
		],
		'may_terminate' => true,
		'child_routes' => [
		'ajouter' => [
		'type' => Segment::class,
		'options' => [
		'route' => '/ajouter/:categorie',
		'defaults' => [
		'controller' => PerimetreController::class,
		'action' => 'ajouter',
		],
		'constraints' => [
		'categorie' => '\d+',
		],
		],
		],
		'modifier' => [
		'type' => Segment::class,
		'options' => [
		'route' => '/modifier/:perimetre',
		'defaults' => [
		'controller' => PerimetreController::class,
		'action' => 'modifier',
		],
		'constraints' => [
		'perimetre' => '\d+',
		],
		],
		],
		'supprimer' => [
		'type' => Segment::class,
		'options' => [
		'route' => '/supprimer/:perimetre',
		'defaults' => [
		'controller' => PerimetreController::class,
		'action' => 'supprimer',
		],
		'constraints' => [
		'perimetre' => '\d+',
		],
		],
		],
		'categorie' => [
		'type' => Literal::class,
		'options' => [
		'route' => '/categorie',
		'defaults' => [
		'controller' => PerimetreCategorieController::class,
		'action' => 'index',
		],
		],
		'may_terminate' => true,
		'child_routes' => [
		'activer' => [
		'type' => Segment::class,
		'options' => [
		'route' => '/activer/:role/:categorie',
		'defaults' => [
		'controller' => PerimetreCategorieController::class,
		'action' => 'activer',
		],
		'constraints' => [
		'role' => '\d+',
		'categorie' => '\d+',
		],
		],
		],
		'ajouter' => [
		'type' => Literal::class,
		'options' => [
		'route' => '/ajouter',
		'defaults' => [
		'controller' => PerimetreCategorieController::class,
		'action' => 'ajouter',
		],
		],
		],
		'gerer' => [
		'type' => Segment::class,
		'options' => [
		'route' => '/gerer/:categorie',
		'defaults' => [
		'controller' => PerimetreCategorieController::class,
		'action' => 'gerer',
		],
		'constraints' => [
		'categorie' => '\d+',
		],
		],
		'may_terminate' => true,
		],
		'modifier' => [
		'type' => Segment::class,
		'options' => [
		'route' => '/modifier/:categorie',
		'defaults' => [
		'controller' => PerimetreCategorieController::class,
		'action' => 'modifier',
		],
		'constraints' => [
		'categorie' => '\d+',
		],
		],
		'may_terminate' => true,
		],
		'supprimer' => [
		'type' => Segment::class,
		'options' => [
		'route' => '/supprimer/:categorie',
		'defaults' => [
		'controller' => PerimetreCategorieController::class,
		'action' => 'supprimer',
		],
		'constraints' => [
		'categorie' => '\d+',
		],
		],
		'may_terminate' => true,
		],
		],
		],
		],
		],
		],
		],

		'controllers' => [
		'factories' => [
		PerimetreCategorieController::class => PerimetreCategorieControllerFactory::class,
		PerimetreController::class => PerimetreControllerFactory::class,
		],
		],

		'service_manager' => [
		'factories' => [
		PerimetreCategorieService::class => PerimetreCategorieServiceFactory::class,
		PerimetreService::class => PerimetreServiceFactory::class,
		],
		'abstract_factories' => [
		AbstractPerimetreAssertionFactory::class,
		],
		],

		'form_elements' => [
		'factories' => [
		CategorieForm::class => CategorieFormFactory::class,
		PerimetreForm::class => PerimetreFormFactory::class,
		],
		],

		'hydrators' => [
		'invokables' => [
		'perimetre' => PerimetreViewHelper::class,
		],
		],

		'view_helpers' => [
		'invokables' => [
		'perimetreCategorie' => PerimetreCategorieViewHelper::class,
		],
		],
		];

config/merged/privilege.config.php

+32 −7

Changes for config/merged/privilege.config.php: 32 added lines, 7 removed lines.
Original line number	Diff line number	Diff line
		@@ -17,7 +17,7 @@ use UnicaenPrivilege\Service\Privilege\PrivilegeCategorieService;
		use UnicaenPrivilege\Service\Privilege\PrivilegeCategorieServiceFactory;
		use UnicaenPrivilege\Service\Privilege\PrivilegeService;
		use UnicaenPrivilege\Service\Privilege\PrivilegeServiceFactory;
		use UnicaenPrivilege\View\Privilege\PrivilegeViewHelper;
		use UnicaenPrivilege\View\Helper\Privilege\PrivilegeViewHelper;
		use Laminas\Router\Http\Literal;
		use Laminas\Router\Http\Segment;

		@@ -127,23 +127,30 @@ return [
		],
		'may_terminate' => true,
		'child_routes' => [
		'attribuer' => [
		'ajouter' => [
		'type' => Segment::class,
		'options' => [
		'route' => '/attribuer/:role/:privilege',
		'route' => '/ajouter/:categorie',
		'defaults' => [
		'controller' => PrivilegeController::class,
		'action' => 'attribuer',
		'action' => 'ajouter',
		],
		'constraints' => [
		'categorie' => '\d+',
		],
		],
		'ajouter' => [
		],
		'attribuer' => [
		'type' => Segment::class,
		'options' => [
		'route' => '/ajouter/:categorie',
		'route' => '/attribuer/:role/:privilege',
		'defaults' => [
		'controller' => PrivilegeController::class,
		'action' => 'ajouter',
		'action' => 'attribuer',
		],
		'constraints' => [
		'role' => '\d+',
		'privilege' => '\d+',
		],
		],
		],
		@@ -155,6 +162,9 @@ return [
		'controller' => PrivilegeController::class,
		'action' => 'modifier',
		],
		'constraints' => [
		'privilege' => '\d+',
		],
		],
		],
		'supprimer' => [
		@@ -165,6 +175,9 @@ return [
		'controller' => PrivilegeController::class,
		'action' => 'supprimer',
		],
		'constraints' => [
		'privilege' => '\d+',
		],
		],
		],
		'categorie' => [
		@@ -196,6 +209,9 @@ return [
		'controller' => PrivilegeCategorieController::class,
		'action' => 'gerer',
		],
		'constraints' => [
		'categorie' => '\d+',
		],
		],
		'may_terminate' => true,
		],
		@@ -207,6 +223,9 @@ return [
		'controller' => PrivilegeCategorieController::class,
		'action' => 'provider',
		],
		'constraints' => [
		'categorie' => '\d+',
		],
		],
		'may_terminate' => true,
		],
		@@ -218,6 +237,9 @@ return [
		'controller' => PrivilegeCategorieController::class,
		'action' => 'modifier',
		],
		'constraints' => [
		'categorie' => '\d+',
		],
		],
		'may_terminate' => true,
		],
		@@ -229,6 +251,9 @@ return [
		'controller' => PrivilegeCategorieController::class,
		'action' => 'supprimer',
		],
		'constraints' => [
		'categorie' => '\d+',
		],
		],
		'may_terminate' => true,
		],

config/unicaen-perimetre.global.php.dist

0 → 100644

+62 −0

Changes for config/unicaen-perimetre.global.php.dist: 62 added lines, 0 removed lines.
Original line number	Diff line number	Diff line
		<?php

		use UnicaenPrivilege\Entity\Db\Perimetre;
		use UnicaenPrivilege\Provider\Privilege\PerimetrePrivileges;


		$settings = [
		/**
		* L'entité associée aux périmètres peut être spécifiée via la clef de configuration ['unicaen_auth']['perimetre_entity_class']
		* Si elle est manquante alors la classe @see \UnicaenPrivilege\Entity\Db\Perimetre est utilisée
		* NB: la classe spécifiée doit hériter de @see \UnicaenPrivilege\Entity\Db\AbstractPerimetre
		*/
		'perimetre_entity_class' => Perimetre::class,

		'enable_perimetres' => false,
		];

		$config = [
		'unicaen-auth' => $settings,
		];

		if ($settings['enable_perimetres']) {
		$perimetres = [

		'unicaen-perimetre' => [
		/**
		* Liste des assertions utilisées et des services associés.
		*
		* Important :
		* - le nom de l'assertion au niveau des routes doit respecter le format 'Perimetre\\<nom_de_l_assertion>'
		* (ex : 'assertion' => 'Perimetre\\Structure')
		* - le service associé doit hériter de @see \UnicaenPrivilege\Assertion\Perimetre\AbstractPerimetreAssertion
		*/
		'assertions' => [
		// 'Structure' => StructureAssertion::class,
		],
		],

		'navigation' => [
		'default' => [
		'home' => [
		'pages' => [
		'droits' => [
		'pages' => [
		[
		'label' => "Gérer les périmètres",
		'title' => "Gérer les périmetres",
		'route' => 'unicaen-perimetre',
		'resource' => PerimetrePrivileges::getResourceId(PerimetrePrivileges::CONSULTER),
		],
		],
		],
		],
		],
		],
		],
		];
		} else {
		$perimetres = [];
		}

		return array_merge_recursive($config, $perimetres);
		No newline at end of file

config/unicaen-privilege.global.php.dist

+5 −5

Changes for config/unicaen-privilege.global.php.dist: 5 added lines, 5 removed lines.
Original line number	Diff line number	Diff line
		<?php

		use UnicaenPrivilege\Entity\Db\Perimetre;
		use UnicaenPrivilege\Entity\Db\Privilege;
		use UnicaenPrivilege\Provider\Privilege\PrivilegePrivileges;
		use UnicaenPrivilege\Provider\Rule\PrivilegeRuleProvider;
		use UnicaenPrivilege\Service\Privilege\PrivilegeService;
		use UnicaenPrivilege\Entity\Db\Privilege;
		use UnicaenUtilisateur\Provider\Privilege\RolePrivileges;


		$settings = [
		@@ -43,14 +43,14 @@ if ($settings['unicaen-auth']['enable_privileges']) {
		'default' => [
		'home' => [
		'pages' => [
		//Sur les anciennes application qui avait besoin de la route droits
		// Pour les anciennes applications qui avaient besoin de la route "droits"
		'droits' => [
		'label' => "Droit",
		'title' => "Droit",
		'route' => "unicaen-privilege",
		'visible' => false,
		],
		//Pour les nouvelle application qui utilise la route Administration
		// Pour les nouvelles applications qui utilisent la route "administration"
		'administration' => [
		'label' => "Administration",
		'title' => "Administration",
		@@ -60,7 +60,7 @@ if ($settings['unicaen-auth']['enable_privileges']) {
		'label' => "Gérer les privilèges",
		'title' => "Gérer les privilèges",
		'route' => 'unicaen-privilege',
		'resource' => RolePrivileges::getResourceId(PrivilegePrivileges::PRIVILEGE_VOIR),
		'resource' => PrivilegePrivileges::getResourceId(PrivilegePrivileges::PRIVILEGE_VOIR),
		],
		],
		],