Merge branch 'zf-3.x' (124850bb) · Commits · Christophe Turbout / auth

Module.php

+15 −1

Original line number	Diff line number	Diff line
		@@ -90,7 +90,7 @@ class Module implements AutoloaderProviderInterface, ConfigProviderInterface, Se
		*/
		private function reconfigureRoutesForAuth(ServiceLocatorInterface $sl)
		{
		/* @var $router \Zend\Mvc\Router\Http\TreeRouteStack */
		/* @var $router \Zend\Router\Http\TreeRouteStack */
		$router = $sl->get('router');

		// si l'auth CAS est activée, modif de la route de connexion pour zapper le formulaire d'auth maison.
		@@ -118,7 +118,21 @@ class Module implements AutoloaderProviderInterface, ConfigProviderInterface, Se
		public function getServiceConfig()
		{
		return [
		//========== repris du module zf-commons/zfc-user-doctrine-orm abandonné =========
		'aliases' => array(
		'zfcuser_doctrine_em' => 'Doctrine\ORM\EntityManager',
		),
		//===========================================


		'factories' => [
		//========== repris du module zf-commons/zfc-user-doctrine-orm abandonné =========
		'zfcuser_module_options' => function ($sm) {
		$config = $sm->get('Configuration');
		return new Options\ModuleOptions(isset($config['zfcuser']) ? $config['zfcuser'] : array());
		},
		//===========================================

		// verrue pour forcer le label de l'identifiant qqsoit l'options 'auth_identity_fields'
		'zfcuser_login_form' => function ($sm) {
		$options = $sm->get('zfcuser_module_options');

composer.json

+6 −8

Original line number	Diff line number	Diff line
		@@ -8,15 +8,13 @@
		}
		],
		"require": {
		"unicaen/app": "^1.3",
		"zf-commons/zfc-user-doctrine-orm": ">=0.1",
		"jasig/phpcas": ">=1.3.3",
		"bjyoungblood/bjy-authorize": ">=1.4",
		"ramsey/uuid": "^3.7",
		"beberlei/assert": "^2.9"
		"unicaen/app": "dev-zf-3.x",
		"unicaen/bjy-authorize": "dev-zf-3.x",
		"jasig/phpcas": "^1.3",
		"ramsey/uuid": "^3.7"
		},
		"require-dev": {
		"phpunit/PHPUnit": ">=3.7"
		"phpunit/phpunit": "^5.6"
		},
		"autoload": {
		"psr-0": {

composer.lock

+1874 −1443

File changed.

Preview size limit exceeded, changes collapsed.

config/module.config.php

+100 −33

Original line number	Diff line number	Diff line
		<?php

		use UnicaenAuth\Authentication\Storage\DbFactory;
		use UnicaenAuth\Authentication\Storage\LdapFactory;
		use UnicaenAuth\Authentication\Storage\ShibFactory;
		use UnicaenAuth\Controller\AuthControllerFactory;
		use UnicaenAuth\Controller\DroitsControllerFactory;
		use UnicaenAuth\Controller\UtilisateurControllerFactory;
		use UnicaenAuth\Form\Droits\RoleFormFactory;
		use UnicaenAuth\Guard\PrivilegeControllerFactory;
		use UnicaenAuth\Guard\PrivilegeRouteFactory;
		use UnicaenAuth\Provider\Rule\PrivilegeRuleProviderFactory;
		use UnicaenAuth\Service\ShibService;
		use UnicaenAuth\Service\ShibServiceFactory;
		use UnicaenAuth\Service\UserContextFactory;
		use UnicaenAuth\Service\UserFactory;
		use UnicaenAuth\Service\UserMapperFactory;
		use UnicaenAuth\View\Helper\LdapConnectViewHelper;
		use UnicaenAuth\View\Helper\LdapConnectViewHelperFactory;
		use UnicaenAuth\View\Helper\LocalConnectViewHelper;
		use UnicaenAuth\View\Helper\LocalConnectViewHelperFactory;
		use UnicaenAuth\View\Helper\ShibConnectViewHelper;
		use UnicaenAuth\View\Helper\ShibConnectViewHelperFactory;
		use UnicaenAuth\View\Helper\UserConnection;
		use UnicaenAuth\View\Helper\UserConnectionFactory;
		use UnicaenAuth\View\Helper\UserCurrent;
		use UnicaenAuth\View\Helper\UserCurrentFactory;
		use UnicaenAuth\View\Helper\UserInfo;
		use UnicaenAuth\View\Helper\UserInfoFactory;
		use UnicaenAuth\View\Helper\UserProfile;
		use UnicaenAuth\View\Helper\UserProfileFactory;
		use UnicaenAuth\View\Helper\UserProfileSelect;
		use UnicaenAuth\View\Helper\UserProfileSelectFactory;
		use UnicaenAuth\View\Helper\UserProfileSelectRadioItem;
		use UnicaenAuth\View\Helper\UserProfileSelectRadioItemFactory;
		use UnicaenAuth\View\Helper\UserStatus;
		use UnicaenAuth\View\Helper\UserStatusFactory;
		use UnicaenAuth\View\Helper\UserUsurpationHelper;
		use UnicaenAuth\View\Helper\UserUsurpationHelperFactory;
		use Zend\Authentication\AuthenticationService;
		use Zend\ServiceManager\Proxy\LazyServiceFactory;

		$settings = [

		@@ -140,22 +170,22 @@ return [
		* You may omit the 'action' index to allow access to the entire controller
		*/
		'BjyAuthorize\Guard\Controller' => [
		['controller' => 'index', 'action' => 'index', 'roles' => []],
		['controller' => 'zfcuser', 'roles' => []],
		['controller' => 'Application\Controller\Index', 'roles' => []],
		['controller' => 'index', 'action' => 'index', 'roles' => 'guest'],
		['controller' => 'zfcuser', 'roles' => 'guest'],
		['controller' => 'Application\Controller\Index', 'roles' => 'guest'],

		['controller' => 'UnicaenApp\Controller\Application', 'action' => 'etab', 'roles' => []],
		['controller' => 'UnicaenApp\Controller\Application', 'action' => 'apropos', 'roles' => []],
		['controller' => 'UnicaenApp\Controller\Application', 'action' => 'contact', 'roles' => []],
		['controller' => 'UnicaenApp\Controller\Application', 'action' => 'plan', 'roles' => []],
		['controller' => 'UnicaenApp\Controller\Application', 'action' => 'mentions-legales', 'roles' => []],
		['controller' => 'UnicaenApp\Controller\Application', 'action' => 'informatique-et-libertes', 'roles' => []],
		['controller' => 'UnicaenApp\Controller\Application', 'action' => 'refresh-session', 'roles' => []],
		['controller' => 'UnicaenAuth\Controller\Utilisateur', 'action' => 'selectionner-profil', 'roles' => []],
		['controller' => 'UnicaenApp\Controller\Application', 'action' => 'etab', 'roles' => 'guest'],
		['controller' => 'UnicaenApp\Controller\Application', 'action' => 'apropos', 'roles' => 'guest'],
		['controller' => 'UnicaenApp\Controller\Application', 'action' => 'contact', 'roles' => 'guest'],
		['controller' => 'UnicaenApp\Controller\Application', 'action' => 'plan', 'roles' => 'guest'],
		['controller' => 'UnicaenApp\Controller\Application', 'action' => 'mentions-legales', 'roles' => 'guest'],
		['controller' => 'UnicaenApp\Controller\Application', 'action' => 'informatique-et-libertes', 'roles' => 'guest'],
		['controller' => 'UnicaenApp\Controller\Application', 'action' => 'refresh-session', 'roles' => 'guest'],
		['controller' => 'UnicaenAuth\Controller\Utilisateur', 'action' => 'selectionner-profil', 'roles' => 'guest'],

		['controller' => 'UnicaenAuth\Controller\Auth', 'action' => 'shibboleth', 'roles' => []],
		['controller' => 'UnicaenAuth\Controller\Auth', 'action' => 'requestPasswordReset', 'roles' => []],
		['controller' => 'UnicaenAuth\Controller\Auth', 'action' => 'changePassword', 'roles' => []],
		['controller' => 'UnicaenAuth\Controller\Auth', 'action' => 'shibboleth', 'roles' => 'guest'],
		['controller' => 'UnicaenAuth\Controller\Auth', 'action' => 'requestPasswordReset', 'roles' => 'guest'],
		['controller' => 'UnicaenAuth\Controller\Auth', 'action' => 'changePassword', 'roles' => 'guest'],
		],
		],
		],
		@@ -411,20 +441,24 @@ return [
		],
		],
		],
		//
		//( ! ) Warning: Declaration of
		// Application\Service\UserContextServiceAwareTrait::setUserContextService(Application\Service\UserContextService $userContextService)
		// should be compatible with
		// UnicaenAuth\Controller\UtilisateurController::setUserContextService(UnicaenAuth\Service\UserContext $userContextService)
		// in /var/www/sygal/module/Application/src/Application/Controller/UtilisateurController.php on line 34
		'service_manager' => [
		'aliases' => [
		'Zend\Authentication\AuthenticationService' => 'zfcuser_auth_service',
		'UnicaenAuth\Privilege\PrivilegeProvider' => 'UnicaenAuth\Service\Privilege',
		'\UnicaenAuth\Guard\PrivilegeController' => 'UnicaenAuth\Guard\PrivilegeController',

		'unicaen-auth_user_service' => 'UnicaenAuth\Service\User', // pour la compatibilité
		'authUserContext' => 'UnicaenAuth\Service\UserContext', // pour la compatibilité
		'AuthUserContext' => 'UnicaenAuth\Service\UserContext', // pour la compatibilité
		],
		'invokables' => [
		'UnicaenAuth\Authentication\Storage\Db' => 'UnicaenAuth\Authentication\Storage\Db',
		'UnicaenAuth\Authentication\Storage\Ldap' => 'UnicaenAuth\Authentication\Storage\Ldap',
		'UnicaenAuth\Authentication\Storage\Shib' => 'UnicaenAuth\Authentication\Storage\Shib',
		'UnicaenAuth\View\RedirectionStrategy' => 'UnicaenAuth\View\RedirectionStrategy',
		'UnicaenAuth\Service\User' => 'UnicaenAuth\Service\User',
		'UnicaenAuth\Service\CategoriePrivilege' => 'UnicaenAuth\Service\CategoriePrivilegeService',
		],
		'abstract_factories' => [
		@@ -449,6 +483,24 @@ return [
		'UnicaenAuth\Service\UserContext' => UserContextFactory::class,
		'zfcuser_user_mapper' => UserMapperFactory::class,
		'MouchardCompleterAuth' => 'UnicaenAuth\Mouchard\MouchardCompleterAuthFactory',
		'UnicaenAuth\Authentication\Storage\Db' => DbFactory::class,
		'UnicaenAuth\Authentication\Storage\Ldap' => LdapFactory::class,
		'UnicaenAuth\Authentication\Storage\Shib' => ShibFactory::class,
		'UnicaenAuth\Service\User' => UserFactory::class,
		'UnicaenAuth\Guard\PrivilegeController' => PrivilegeControllerFactory::class,
		'UnicaenAuth\Guard\PrivilegeRoute' => PrivilegeRouteFactory::class,
		'UnicaenAuth\Provider\Rule\PrivilegeRuleProvider' => PrivilegeRuleProviderFactory::class,
		],
		'lazy_services' => [
		// Mapping services to their class names is required since the ServiceManager is not a declarative DIC.
		'class_map' => [
		'zfcuser_auth_service' => AuthenticationService::class,
		],
		],
		'delegators' => [
		'zfcuser_auth_service' => [
		LazyServiceFactory::class,
		],
		],
		'shared' => [
		'MouchardCompleterAuth' => false,
		@@ -460,33 +512,48 @@ return [

		'controllers' => [
		'invokables' => [
		'UnicaenAuth\Controller\Utilisateur' => 'UnicaenAuth\Controller\UtilisateurController',
		'UnicaenAuth\Controller\Droits' => 'UnicaenAuth\Controller\DroitsController',
		],
		'factories' => [
		'UnicaenAuth\Controller\Auth' => AuthControllerFactory::class,
		'UnicaenAuth\Controller\Utilisateur' => UtilisateurControllerFactory::class,
		'UnicaenAuth\Controller\Droits' => DroitsControllerFactory::class,
		],
		],

		'form_elements' => [
		'invokables' => [
		'UnicaenAuth\Form\Droits\Role' => 'UnicaenAuth\Form\Droits\RoleForm',
		],
		'factories' => [
		'UnicaenAuth\Form\Droits\Role' => RoleFormFactory::class,
		],
		],

		'view_helpers' => [
		'aliases' => [
		'userConnection' => UserConnection::class,
		'userCurrent' => UserCurrent::class,
		'userStatus' => UserStatus::class,
		'userProfile' => UserProfile::class,
		'userInfo' => UserInfo::class,
		'userProfileSelect' => UserProfileSelect::class,
		'userProfileSelectRadioItem' => UserProfileSelectRadioItem::class,
		'userUsurpation' => UserUsurpationHelper::class,
		'localConnect' => LocalConnectViewHelper::class,
		'ldapConnect' => LdapConnectViewHelper::class,
		'shibConnect' => ShibConnectViewHelper::class,
		],
		'factories' => [
		'userConnection' => 'UnicaenAuth\View\Helper\UserConnectionFactory',
		'userCurrent' => 'UnicaenAuth\View\Helper\UserCurrentFactory',
		'userStatus' => 'UnicaenAuth\View\Helper\UserStatusFactory',
		'userProfile' => 'UnicaenAuth\View\Helper\UserProfileFactory',
		'userInfo' => 'UnicaenAuth\View\Helper\UserInfoFactory',
		'userProfileSelect' => 'UnicaenAuth\View\Helper\UserProfileSelectFactory',
		'userProfileSelectRadioItem' => 'UnicaenAuth\View\Helper\UserProfileSelectRadioItemFactory',
		'userUsurpation' => UserUsurpationHelperFactory::class,
		'localConnect' => LocalConnectViewHelperFactory::class,
		'ldapConnect' => LdapConnectViewHelperFactory::class,
		'shibConnect' => ShibConnectViewHelperFactory::class,
		UserConnection::class => UserConnectionFactory::class,
		UserCurrent::class => UserCurrentFactory::class,
		UserStatus::class => UserStatusFactory::class,
		UserProfile::class => UserProfileFactory::class,
		UserInfo::class => UserInfoFactory::class,
		UserProfileSelect::class => UserProfileSelectFactory::class,
		UserProfileSelectRadioItem::class => UserProfileSelectRadioItemFactory::class,
		UserUsurpationHelper::class => UserUsurpationHelperFactory::class,
		LocalConnectViewHelper::class => LocalConnectViewHelperFactory::class,
		LdapConnectViewHelper::class => LdapConnectViewHelperFactory::class,
		ShibConnectViewHelper::class => ShibConnectViewHelperFactory::class,
		],
		'invokables' => [
		'appConnection' => 'UnicaenAuth\View\Helper\AppConnection',

doc/installation.md

+1 −1

Original line number	Diff line number	Diff line
		@@ -35,7 +35,7 @@ La commande ci-dessus fonctionne seulement si le binaire composer.phar se trouve

		'modules' => array(
		'Application',
		'ZfcBase', 'DoctrineModule', 'DoctrineORMModule', 'ZfcUser', 'ZfcUserDoctrineORM', 'BjyAuthorize',
		'ZfcBase', 'DoctrineModule', 'DoctrineORMModule', 'ZfcUser', 'BjyAuthorize',
		'UnicaenApp', 'AssetManager',
		'UnicaenAuth',
		// ...