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
d42aebe4
Commit
d42aebe4
authored
Sep 30, 2019
by
Laurent Lécluse
Browse files
Merge branches 'develop' and 'master' of
https://git.unicaen.fr/lib/unicaen/auth
parents
7eaaa058
d881c569
Pipeline
#5379
failed with stage
in 9 seconds
Changes
2
Pipelines
2
Hide whitespace changes
Inline
Side-by-side
Module.php
View file @
d42aebe4
...
@@ -69,14 +69,6 @@ class Module implements AutoloaderProviderInterface, ConfigProviderInterface, Se
...
@@ -69,14 +69,6 @@ class Module implements AutoloaderProviderInterface, ConfigProviderInterface, Se
/* @var $services \Zend\ServiceManager\ServiceManager */
/* @var $services \Zend\ServiceManager\ServiceManager */
$services
=
$application
->
getServiceManager
();
$services
=
$application
->
getServiceManager
();
if
(
$services
->
has
(
'BjyAuthorize\Service\Authorize'
))
{
// transmission des ACL aux aides de vue de navigation
$authorizeService
=
$services
->
get
(
'BjyAuthorize\Service\Authorize'
);
/* @var $authorizeService \BjyAuthorize\Service\Authorize */
Navigation
::
setDefaultAcl
(
$authorizeService
->
getAcl
());
Navigation
::
setDefaultRole
(
$authorizeService
->
getIdentity
());
}
/* @var $options ModuleOptions */
/* @var $options ModuleOptions */
$this
->
options
=
$services
->
get
(
'unicaen-auth_module_options'
);
$this
->
options
=
$services
->
get
(
'unicaen-auth_module_options'
);
...
...
src/UnicaenAuth/Service/AuthorizeService.php
View file @
d42aebe4
...
@@ -13,18 +13,8 @@ class AuthorizeService extends \BjyAuthorize\Service\Authorize
...
@@ -13,18 +13,8 @@ class AuthorizeService extends \BjyAuthorize\Service\Authorize
{
{
use
UserContextServiceAwareTrait
;
use
UserContextServiceAwareTrait
;
/**
* Loading...
*
* @var boolean
*/
protected
$loading
;
/**
/**
* @deprecated this method will be removed in BjyAuthorize 1.4.x+,
* please retrieve the identity from the
* `BjyAuthorize\Provider\Identity\ProviderInterface` service
*
*
* @return string
* @return string
*/
*/
...
@@ -47,38 +37,4 @@ class AuthorizeService extends \BjyAuthorize\Service\Authorize
...
@@ -47,38 +37,4 @@ class AuthorizeService extends \BjyAuthorize\Service\Authorize
return
null
;
return
null
;
}
}
/**
* Retourne la liste des rôles fournis par l'ensemble des providers
*/
public
function
getRoles
()
{
$roles
=
[];
foreach
(
$this
->
roleProviders
as
$provider
)
{
$r
=
$provider
->
getRoles
();
foreach
(
$r
as
$role
)
{
$roles
[
$role
->
getRoleId
()]
=
$role
;
}
}
return
$roles
;
}
/**
* Initializes the service
*
* @internal
*
* @return void
*/
public
function
load
()
{
$this
->
loading
=
true
;
parent
::
load
();
$this
->
loading
=
false
;
}
}
}
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