Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
lib
unicaen
auth
Commits
bcd2532e
Commit
bcd2532e
authored
Mar 14, 2019
by
Bertrand Gauthier
Browse files
Merge branch 'zf-3.x' of
https://git.unicaen.fr/lib/unicaen/auth
into zf-3.x
parents
cb8b152d
853ef257
Pipeline
#4021
passed with stage
in 20 seconds
Changes
6
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
src/UnicaenAuth/Authentication/Adapter/Cas.php
View file @
bcd2532e
...
...
@@ -9,12 +9,12 @@ use UnicaenAuth\Service\User;
use
Zend\Authentication\Exception\UnexpectedValueException
;
use
Zend\Authentication\Result
as
AuthenticationResult
;
use
Zend\EventManager\Event
;
use
Zend\EventManager\EventInterface
;
use
Zend\EventManager\EventManager
;
use
Zend\EventManager\EventManagerAwareInterface
;
use
Zend\EventManager\EventManagerInterface
;
use
Zend\Router\Http\TreeRouteStack
;
use
ZfcUser\Authentication\Adapter\AbstractAdapter
;
use
ZfcUser\Authentication\Adapter\AdapterChainEvent
as
AuthEvent
;
use
ZfcUser\Authentication\Adapter\ChainableAdapter
;
/**
...
...
@@ -78,12 +78,15 @@ class Cas extends AbstractAdapter implements EventManagerAwareInterface
/**
* Réalise l'authentification.
*
* @param Event $e
* @param Event
Interface
$e
* @throws UnexpectedValueException
* @see ChainableAdapter
*/
public
function
authenticate
(
Event
$e
)
public
function
authenticate
(
Event
Interface
$e
)
{
// NB: Dans la version 3.0.0 de zf-commons/zfc-user, cette méthode prend un EventInterface.
// Mais dans la branche 3.x, c'est un AdapterChainEvent !
// Si un jour c'est un AdapterChainEvent qui est attendu, plus besoin de faire $e->getTarget().
$e
=
$e
->
getTarget
();
// if ($e->getIdentity()) {
...
...
src/UnicaenAuth/Authentication/Adapter/Db.php
View file @
bcd2532e
...
...
@@ -6,9 +6,8 @@ use Interop\Container\ContainerInterface;
use
UnicaenApp\ServiceManager\ServiceLocatorAwareInterface
;
use
UnicaenApp\ServiceManager\ServiceLocatorAwareTrait
;
use
UnicaenAuth\Options\ModuleOptions
;
use
Zend\EventManager\EventInterface
;
use
Zend\ServiceManager\Exception\ServiceNotFoundException
;
use
ZfcUser\Authentication\Adapter\AdapterChainEvent
as
AuthEvent
;
use
ZfcUser\Options\AuthenticationOptionsInterface
;
/**
* Adpater d'authentification à partir de la base de données.
...
...
@@ -40,13 +39,16 @@ class Db extends \ZfcUser\Authentication\Adapter\Db implements ServiceLocatorAwa
/**
* Authentification.
*
* @param
Auth
Event
|\Zend\EventManager\Event
$e
* @param Event
Interface
$e
* @return boolean
*/
public
function
authenticate
(
\
Zend\EventManager\Event
$e
)
public
function
authenticate
(
EventInterface
$e
)
{
// NB: Dans la version 3.0.0 de zf-commons/zfc-user, cette méthode prend un EventInterface.
// Mais dans la branche 3.x, c'est un AdapterChainEvent !
// Si un jour c'est un AdapterChainEvent qui est attendu, plus besoin de faire $e->getTarget().
if
(
$e
->
getTarget
()
->
getIdentity
())
{
return
;
return
true
;
}
try
{
...
...
@@ -60,10 +62,10 @@ class Db extends \ZfcUser\Authentication\Adapter\Db implements ServiceLocatorAwa
}
/**
* @param
AuthenticationOptionsInterface
$options
* @param
\ZfcUser\Options\ModuleOptions
$options
* @return self
*/
public
function
setOptions
(
AuthenticationOptionsInterface
$options
)
public
function
setOptions
(
\
ZfcUser\Options\ModuleOptions
$options
)
{
$this
->
options
=
$options
;
return
$this
;
...
...
src/UnicaenAuth/Authentication/Adapter/Ldap.php
View file @
bcd2532e
...
...
@@ -10,6 +10,7 @@ use Zend\Authentication\Adapter\Ldap as LdapAuthAdapter;
use
Zend\Authentication\Exception\ExceptionInterface
;
use
Zend\Authentication\Result
as
AuthenticationResult
;
use
Zend\EventManager\Event
;
use
Zend\EventManager\EventInterface
;
use
Zend\EventManager\EventManager
;
use
Zend\EventManager\EventManagerAwareInterface
;
use
Zend\EventManager\EventManagerInterface
;
...
...
@@ -78,14 +79,17 @@ class Ldap extends AbstractAdapter implements EventManagerAwareInterface
/**
*
* @param Event $e
* @param Event
Interface
$e
* @return boolean
* @throws \Zend\Authentication\Adapter\Exception\ExceptionInterface
* @throws \Zend\Ldap\Exception\LdapException
* @see ChainableAdapter
*/
public
function
authenticate
(
Event
$e
)
public
function
authenticate
(
Event
Interface
$e
)
{
// NB: Dans la version 3.0.0 de zf-commons/zfc-user, cette méthode prend un EventInterface.
// Mais dans la branche 3.x, c'est un AdapterChainEvent !
// Si un jour c'est un AdapterChainEvent qui est attendu, plus besoin de faire $e->getTarget().
$e
=
$e
->
getTarget
();
if
(
$this
->
isSatisfied
())
{
...
...
src/UnicaenAuth/Controller/AuthControllerFactory.php
View file @
bcd2532e
...
...
@@ -2,27 +2,27 @@
namespace
UnicaenAuth\Controller
;
use
Interop\Container\ContainerInterface
;
use
UnicaenAuth\Service\ShibService
;
use
UnicaenAuth\Service\User
as
UserService
;
use
Zend\Authentication\AuthenticationService
;
use
Zend\Mvc\Controller\ControllerManager
;
class
AuthControllerFactory
{
/**
* @param Cont
rollerManager $cm
* @param Cont
ainerInterface $container
* @return AuthController
*/
public
function
__invoke
(
Cont
rollerManager
$cm
)
public
function
__invoke
(
Cont
ainerInterface
$container
)
{
/** @var ShibService $shibService */
$shibService
=
$c
m
->
get
(
ShibService
::
class
);
$shibService
=
$c
ontainer
->
get
(
ShibService
::
class
);
/* @var $userService UserService */
$userService
=
$c
m
->
get
(
'unicaen-auth_user_service'
);
$userService
=
$c
ontainer
->
get
(
'unicaen-auth_user_service'
);
/** @var AuthenticationService $authService */
$authService
=
$c
m
->
get
(
'zfcuser_auth_service'
);
$authService
=
$c
ontainer
->
get
(
'zfcuser_auth_service'
);
$controller
=
new
AuthController
();
$controller
->
setShibService
(
$shibService
);
...
...
src/UnicaenAuth/Controller/DroitsControllerFactory.php
View file @
bcd2532e
...
...
@@ -2,25 +2,25 @@
namespace
UnicaenAuth\Controller
;
use
Interop\Container\ContainerInterface
;
use
UnicaenAuth\Form\Droits\RoleForm
;
use
UnicaenAuth\Service\PrivilegeService
;
use
UnicaenAuth\Service\RoleService
;
use
Zend\Mvc\Controller\ControllerManager
;
class
DroitsControllerFactory
{
/**
* @param Cont
rollerManager $cm
* @param Cont
ainerInterface $container
* @return DroitsController
*/
public
function
__invoke
(
Cont
rollerManager
$cm
)
public
function
__invoke
(
Cont
ainerInterface
$container
)
{
/** @var RoleService $serviceRole */
$serviceRole
=
$c
m
->
get
(
'UnicaenAuth\Service\Role'
);
$serviceRole
=
$c
ontainer
->
get
(
'UnicaenAuth\Service\Role'
);
/** @var RoleForm $formDroitsRole */
$formDroitsRole
=
$c
m
->
get
(
'FormElementManager'
)
->
get
(
'UnicaenAuth\Form\Droits\Role'
);
$formDroitsRole
=
$c
ontainer
->
get
(
'FormElementManager'
)
->
get
(
'UnicaenAuth\Form\Droits\Role'
);
/** @var PrivilegeService $servicePrivilege */
$servicePrivilege
=
$c
m
->
get
(
'UnicaenAuth\Service\Privilege'
);
$servicePrivilege
=
$c
ontainer
->
get
(
'UnicaenAuth\Service\Privilege'
);
$controller
=
new
DroitsController
();
$controller
->
setServiceRole
(
$serviceRole
);
...
...
src/UnicaenAuth/Controller/UtilisateurControllerFactory.php
View file @
bcd2532e
...
...
@@ -2,39 +2,39 @@
namespace
UnicaenAuth\Controller
;
use
Interop\Container\ContainerInterface
;
use
UnicaenApp\Mapper\Ldap\People
as
LdapPeopleMapper
;
use
UnicaenAuth\Options\ModuleOptions
;
use
UnicaenAuth\Service\ShibService
;
use
UnicaenAuth\Service\UserContext
;
use
Zend\Authentication\AuthenticationService
;
use
Zend\Mvc\Controller\ControllerManager
;
use
ZfcUser\Mapper\UserInterface
as
UserMapper
;
class
UtilisateurControllerFactory
{
/**
* @param Cont
rollerManager $cm
* @param Cont
ainerInterface $container
* @return UtilisateurController
*/
public
function
__invoke
(
Cont
rollerManager
$cm
)
public
function
__invoke
(
Cont
ainerInterface
$container
)
{
/** @var UserMapper $mapper */
$userMapper
=
$c
m
->
get
(
'zfcuser_user_mapper'
);
$userMapper
=
$c
ontainer
->
get
(
'zfcuser_user_mapper'
);
/** @var AuthenticationService $authenticationService */
$authenticationService
=
$c
m
->
get
(
AuthenticationService
::
class
);
$authenticationService
=
$c
ontainer
->
get
(
AuthenticationService
::
class
);
/** @var ModuleOptions $options */
$options
=
$c
m
->
get
(
'unicaen-auth_module_options'
);
$options
=
$c
ontainer
->
get
(
'unicaen-auth_module_options'
);
/** @var ShibService $shibService */
$shibService
=
$c
m
->
get
(
ShibService
::
class
);
$shibService
=
$c
ontainer
->
get
(
ShibService
::
class
);
/** @var UserContext $userContextService */
$userContextService
=
$c
m
->
get
(
'AuthUserContext'
);
$userContextService
=
$c
ontainer
->
get
(
'AuthUserContext'
);
/** @var LdapPeopleMapper $mapper */
$ldapPeopleMapper
=
$c
m
->
get
(
'ldap_people_mapper'
);
$ldapPeopleMapper
=
$c
ontainer
->
get
(
'ldap_people_mapper'
);
$controller
=
new
UtilisateurController
();
$controller
->
setLdapPeopleMapper
(
$ldapPeopleMapper
);
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment