Merge branch 'zf-3.x' into develop (e2e24dba) · Commits · Christophe Turbout / auth

Module.php

+3 −5

Original line number	Diff line number	Diff line
		@@ -9,7 +9,7 @@ use Zend\EventManager\EventInterface;
		use Zend\ModuleManager\Feature\AutoloaderProviderInterface;
		use Zend\ModuleManager\Feature\ConfigProviderInterface;
		use Zend\ModuleManager\Feature\ServiceProviderInterface;
		use Zend\ServiceManager\Exception\ServiceNotFoundException;
		use Zend\ModuleManager\ModuleManager;
		use Zend\ServiceManager\ServiceLocatorInterface;
		use Zend\View\Helper\Navigation;
		use ZfcUser\Form\Login;
		@@ -69,14 +69,12 @@ class Module implements AutoloaderProviderInterface, ConfigProviderInterface, Se
		/* @var $services \Zend\ServiceManager\ServiceManager */
		$services = $application->getServiceManager();

		if ($services->has('BjyAuthorize\Service\Authorize')) {
		// transmission des ACL aux aides de vue de navigation
		try {
		$authorizeService = $services->get('BjyAuthorize\Service\Authorize');
		/* @var $authorizeService \BjyAuthorize\Service\Authorize */
		Navigation::setDefaultAcl($authorizeService->getAcl());
		Navigation::setDefaultRole($authorizeService->getIdentity());
		} catch (ServiceNotFoundException $snfe) {
		// pas de module BjyAuthorize : pas d'ACL
		}

		/* @var $options ModuleOptions */

config/module.config.php

+4 −0

Original line number	Diff line number	Diff line
		@@ -9,6 +9,7 @@ use UnicaenAuth\Controller\UtilisateurControllerFactory;
		use UnicaenAuth\Form\Droits\RoleFormFactory;
		use UnicaenAuth\Guard\PrivilegeControllerFactory;
		use UnicaenAuth\Guard\PrivilegeRouteFactory;
		use UnicaenAuth\ORM\Event\Listeners\HistoriqueListenerFactory;
		use UnicaenAuth\Provider\Rule\PrivilegeRuleProviderFactory;
		use UnicaenAuth\Service\ShibService;
		use UnicaenAuth\Service\ShibServiceFactory;
		@@ -490,6 +491,9 @@ return [
		'UnicaenAuth\Guard\PrivilegeController' => PrivilegeControllerFactory::class,
		'UnicaenAuth\Guard\PrivilegeRoute' => PrivilegeRouteFactory::class,
		'UnicaenAuth\Provider\Rule\PrivilegeRuleProvider' => PrivilegeRuleProviderFactory::class,

		'UnicaenApp\HistoriqueListener' => HistoriqueListenerFactory::class,
		'UnicaenAuth\HistoriqueListener' => HistoriqueListenerFactory::class,
		],
		'lazy_services' => [
		// Mapping services to their class names is required since the ServiceManager is not a declarative DIC.

src/UnicaenAuth/Authentication/Adapter/AbstractFactory.php

+1 −1

Original line number	Diff line number	Diff line
		@@ -104,7 +104,7 @@ class AbstractFactory implements AbstractFactoryInterface
		$userService = $container->get('unicaen-auth_user_service');
		$adapter->setUserService($userService);

		/** @var TreeRouteStack $router */
		/** @var mixed $router */
		$router = $container->get('router');
		$adapter->setRouter($router);

src/UnicaenAuth/Authentication/Adapter/Cas.php

+12 −6

Original line number	Diff line number	Diff line
		@@ -2,6 +2,7 @@

		namespace UnicaenAuth\Authentication\Adapter;

		use Exception;
		use phpCAS;
		use UnicaenApp\Mapper\Ldap\People as LdapPeopleMapper;
		use UnicaenAuth\Options\ModuleOptions;
		@@ -13,7 +14,8 @@ use Zend\EventManager\EventInterface;
		use Zend\EventManager\EventManager;
		use Zend\EventManager\EventManagerAwareInterface;
		use Zend\EventManager\EventManagerInterface;
		use Zend\Router\Http\TreeRouteStack;
		use Zend\Router\RouteInterface;
		use Zend\Router\RouteStackInterface;
		use ZfcUser\Authentication\Adapter\AbstractAdapter;
		use ZfcUser\Authentication\Adapter\ChainableAdapter;

		@@ -63,14 +65,14 @@ class Cas extends AbstractAdapter implements EventManagerAwareInterface
		}

		/**
		* @var TreeRouteStack
		* @var RouteInterface
		*/
		private $router;

		/**
		* @param TreeRouteStack $router
		* @param RouteInterface $router
		*/
		public function setRouter(TreeRouteStack $router)
		public function setRouter(RouteInterface $router)
		{
		$this->router = $router;
		}
		@@ -263,10 +265,14 @@ class Cas extends AbstractAdapter implements EventManagerAwareInterface
		}

		/**
		* @param TreeRouteStack $router
		* @param RouteInterface $router
		*/
		public function reconfigureRoutesForCasAuth(TreeRouteStack $router)
		public function reconfigureRoutesForCasAuth(RouteInterface $router)
		{
		if(!$router instanceof RouteStackInterface) {
		return;
		}

		$router->addRoutes([
		// remplace les routes existantes (cf. config du module)
		'zfcuser' => [

src/UnicaenAuth/Controller/UtilisateurController.php

+11 −17

Original line number	Diff line number	Diff line
		@@ -7,8 +7,8 @@ use UnicaenApp\Mapper\Ldap\People as LdapPeopleMapper;
		use UnicaenAuth\Entity\Db\AbstractUser;
		use UnicaenAuth\Entity\Ldap\People;
		use UnicaenAuth\Entity\Shibboleth\ShibUser;
		use UnicaenAuth\Formatter\RoleFormatter;
		use UnicaenAuth\Options\ModuleOptions;
		use UnicaenAuth\Service\ShibService;
		use UnicaenAuth\Service\Traits\ShibServiceAwareTrait;
		use UnicaenAuth\Service\Traits\UserContextServiceAwareTrait;
		use UnicaenAuth\Service\UserContext;
		@@ -16,7 +16,7 @@ use Zend\Authentication\AuthenticationService;
		use Zend\Http\Request;
		use Zend\Http\Response;
		use Zend\Mvc\Controller\AbstractActionController;
		use ZfcUser\Mapper\User as UserMapper;
		use ZfcUser\Mapper\UserInterface;

		/**
		* @author Bertrand GAUTHIER <bertrand.gauthier at unicaen.fr>
		@@ -40,7 +40,7 @@ class UtilisateurController extends AbstractActionController
		}

		/**
		* @var UserMapper
		* @var UserInterface
		*/
		private $userMapper;

		@@ -55,9 +55,9 @@ class UtilisateurController extends AbstractActionController
		protected $options;

		/**
		* @param UserMapper $userMapper
		* @param UserInterface $userMapper
		*/
		public function setUserMapper(UserMapper $userMapper)
		public function setUserMapper(UserInterface $userMapper)
		{
		$this->userMapper = $userMapper;
		}
		@@ -78,15 +78,6 @@ class UtilisateurController extends AbstractActionController
		$this->options = $options;
		}

		/**
		* @param UserContext $userContextService
		* @deprecated Utiliser UserContextServiceAwareTrait::setServiceUserContext() à la place, svp.
		*/
		public function setUserContextService(UserContext $userContextService)
		{
		$this->serviceUserContext = $userContextService;
		}

		/**
		* Traite les requêtes AJAX POST de sélection d'un profil utilisateur.
		* La sélection est mémorisé en session par le service AuthUserContext.
		@@ -111,8 +102,11 @@ class UtilisateurController extends AbstractActionController
		}

		if ($addFlashMessage) {
		$selectedRole = $this->serviceUserContext->getSelectedIdentityRoleToString();
		$message = sprintf("Vous endossez à présent le profil utilisateur <strong>%s</strong>.", $selectedRole);
		$selectedRole = $this->serviceUserContext->getSelectedIdentityRole();
		$message = sprintf(
		"Vous endossez à présent le rôle utilisateur '<strong>%s</strong>'.",
		(new RoleFormatter())->format($selectedRole)
		);
		$this->flashMessenger()->setNamespace('UnicaenAuth/success')->addMessage($message);
		}

		@@ -212,7 +206,7 @@ class UtilisateurController extends AbstractActionController
		}

		/**
		* @return UserMapper
		* @return UserInterface
		*/
		public function getUserMapper()
		{