Commit 60a0918c authored by Jean-Philippe Metivier's avatar Jean-Philippe Metivier
Browse files

Adaptation au rôle affichable

parent 01b39a53

composer.json

+1 −0
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ 
    ],

    "require": {

      "unicaen/app": ">=6.0",

      "unicaen/utilisateur": "^6.2",

      "unicaen/bjy-authorize": "^6.0",

      "apereo/phpcas": "1.5.*",

      "ramsey/uuid": "^3.7"

src/UnicaenAuthentification/Service/UserContext.php

+4 −2
Original line number Diff line number Diff line
@@ -219,8 +219,10 @@ class UserContext extends AbstractService implements EventManagerAwareInterface 
        $f = new RoleFormatter();

        $rolesToStrings = [];



        $roles = $this->getIdentityRoles();



        foreach ($this->getIdentityRoles() as $identityRole) {

            $rolesToStrings[$identityRole->getRoleId()] = $f->format($identityRole);

                if (!$identityRole instanceof AbstractRole OR $identityRole->isDisplayed()) $rolesToStrings[$identityRole->getRoleId()] = $f->format($identityRole);

        }



        return $rolesToStrings;
@@ -236,7 +238,7 @@ class UserContext extends AbstractService implements EventManagerAwareInterface 
    public function getSelectableIdentityRoles()

    {

        $filter = function ($r) {

            return !($r instanceof NamedRole && !$r->getSelectable());

            return !($r instanceof NamedRole && !$r->getSelectable()) && ($r instanceof  AbstractRole AND $r->isDisplayed());

        };

        $roles  = array_filter($this->getIdentityRoles(), $filter);