Commit 09961a66 authored by Bertrand Gauthier's avatar Bertrand Gauthier
Browse files

Merge branch 'develop'

parents 82b553a4 ec4628f9

composer.json

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ 
        "ext-gettext":                   "*",

        "ext-zip":                       "*",

        "unicaen/app":                   "^3.0",

        "unicaen/auth":                  "dev-release-3.1.0",

        "unicaen/auth":                  "^3.1",

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

        "unicaen/db-import":             "dev-master",

        "unicaen/faq":                   "^3.0",

composer.lock

+300 −386

File changed.

Preview size limit exceeded, changes collapsed.

module/Application/src/Application/Controller/UtilisateurController.php

+1 −1
Original line number Diff line number Diff line
@@ -333,7 +333,7 @@ class UtilisateurController extends \UnicaenAuth\Controller\UtilisateurControlle 
            $shibService->activateUsurpation($fromShibUser, $toShibUser);

        }



        $authenticationService->getStorage()->write($individuId);

        $authenticationService->getStorage()->write($utilisateur->getId());



        return $this->redirect()->toRoute('home');

    }

module/Application/src/Application/Service/UserContextService.php

+0 −18
Original line number Diff line number Diff line
@@ -24,24 +24,6 @@ class UserContextService extends BaseUserContextService 
    use EtablissementServiceAwareTrait;

    use SourceCodeStringHelperAwareTrait;



    /**

     * @var RoleInterface

     */

    protected $selectedIdentityRole;



    /**

     * @return Role|RoleInterface|null

     */

    public function getSelectedIdentityRole()

    {

        if ($this->selectedIdentityRole === null) {

            $role = parent::getSelectedIdentityRole();

            $this->selectedIdentityRole = $this->roleAsEntity($role);

        }



        return $this->selectedIdentityRole;

    }



    private $roleAsEntityCache = [];



    /**