Commit 7eb20f46 authored by Laurent Lecluse's avatar Laurent Lecluse
Browse files

Possibilité de spécifier une liste de privilèges pour le rôle de dév, ce qui...

Possibilité de spécifier une liste de privilèges pour le rôle de dév, ce qui évite d'aller dans l'admin des privilèges à chaque fois en DEV
parent 8b7a25a4
Loading
Loading
Loading
Loading
+5 −28
Changes for config/autoload/unicaen-auth.global.php: 5 added lines, 28 removed lines.
Original line number Diff line number Diff line
@@ -13,8 +13,6 @@ $settings = [
     */
    'enable_registration'        => false,

    'enable_privileges' => true,

    'entity_manager_name'    => 'doctrine.entitymanager.orm_default', // nom du gestionnaire d'entités à utiliser

    /**
@@ -106,22 +104,11 @@ if (AppConfig::get('cas', 'actif')) {
    ];
}

$localConfig = [
return [
    'unicaen-auth' => $settings,
    'bjyauthorize' => [
        /* this module uses a meta-role that inherits from any roles that should
                 * be applied to the active user. the identity provider tells us which
                 * roles the "identity role" should inherit from.
                 *
                 * for ZfcUser, this will be your default identity provider
                 */
        //'identity_provider' => 'UnicaenAuth\Provider\Identity\Chain',

        /* role providers simply provide a list of roles that should be inserted
         * into the Laminas\Acl instance. the module comes with two providers, one
         * to specify roles in a config file and one to load roles using a
         * Laminas\Db adapter.
         */
        'role_providers' => [
            /**
             * Fournit les rôles issus de la base de données éventuelle de l'appli.
@@ -136,15 +123,6 @@ $localConfig = [
             */
            //'UnicaenAuth\Provider\Role\Username' => [],
        ],
    ],
    'zfcuser'      => [
        $k = 'enable_registration' => isset($settings[$k]) ? $settings[$k] : false,
    ],
];

if ($settings['enable_privileges']) {
    $privileges = [
        'bjyauthorize' => [

        'resource_providers' => [
            /**
@@ -191,9 +169,8 @@ if ($settings['enable_privileges']) {
            ],
        ],
    ],
    ];
} else {
    $privileges = [];
}

return array_merge_recursive($localConfig, $privileges);
 No newline at end of file
    'zfcuser' => [
        $k = 'enable_registration' => isset($settings[$k]) ? $settings[$k] : false,
    ],
];
 No newline at end of file
+9 −3
Changes for module/Application/src/Service/Factory/PrivilegeServiceFactory.php: 9 added lines, 3 removed lines.
Original line number Diff line number Diff line
@@ -25,11 +25,17 @@ class PrivilegeServiceFactory
     */
    public function __invoke(ContainerInterface $container, $requestedName, $options = null)
    {
        $service = new PrivilegeService();
        $service->setEntityManager($container->get(Constants::BDD));
        $config = $container->get('Config');

        if (isset($config['application']['privileges'])) {
            $privilegesRolesConfig = $config['application']['privileges'];
        } else {
            $privilegesRolesConfig = [];
        }

        $service = new PrivilegeService($privilegesRolesConfig);
        $service->setEntityManager($container->get(Constants::BDD));

        $config = $container->get('Config');

        if (!isset($config['unicaen-auth']['privilege_entity_class'])) {
            $config['unicaen-auth']['privilege_entity_class'] = Privilege::class;
+18 −2
Changes for module/Application/src/Service/PrivilegeService.php: 18 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -16,8 +16,21 @@ class PrivilegeService extends \UnicaenAuth\Service\PrivilegeService
{
    use ContextServiceAwareTrait;


    private array $privilegesCache       = [];

    private array $privilegesRolesConfig = [];



    /**
     * @param array $privilegesRolesConfig
     */
    public function __construct(array $privilegesRolesConfig)
    {
        $this->privilegesRolesConfig = $privilegesRolesConfig;
    }



    /**
@@ -45,13 +58,16 @@ class PrivilegeService extends \UnicaenAuth\Service\PrivilegeService

    public function makePrivilegesRoles(Annee $annee)
    {
        $privilegesRoles = [];
        $privilegesRoles = $this->privilegesRolesConfig;

        /* L'administrateur a tous les privilèges obligatoirement */
        $rc         = new \ReflectionClass(\Application\Provider\Privilege\Privileges::class);
        $privileges = array_values($rc->getConstants());
        foreach ($privileges as $privilege) {
            $privilegesRoles[$privilege] = [Role::ADMINISTRATEUR];
            if (!isset($privilegesRoles[$privilege])) {
                $privilegesRoles[$privilege] = [];
            }
            $privilegesRoles[$privilege][] = Role::ADMINISTRATEUR;
        }

        $sql   = "