Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
A
auth
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Christophe Turbout
auth
Commits
12c05066
Commit
12c05066
authored
5 years ago
by
Laurent Lecluse
Browse files
Options
Downloads
Patches
Plain Diff
Suite migration vers le ZF3
parent
61990a88
No related branches found
No related tags found
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/UnicaenAuth/Assertion/AbstractAssertion.php
+29
-56
29 additions, 56 deletions
src/UnicaenAuth/Assertion/AbstractAssertion.php
src/UnicaenAuth/Assertion/AssertionFactory.php
+40
-0
40 additions, 0 deletions
src/UnicaenAuth/Assertion/AssertionFactory.php
with
69 additions
and
56 deletions
src/UnicaenAuth/Assertion/AbstractAssertion.php
+
29
−
56
View file @
12c05066
...
...
@@ -3,11 +3,11 @@
namespace
UnicaenAuth\Assertion
;
use
BjyAuthorize\Service\Authorize
;
use
UnicaenA
pp
\Service
Manager\ServiceLocatorAwareInterfa
ce
;
use
UnicaenA
pp
\Service
Manager\ServiceLocator
AwareTrait
;
use
UnicaenA
uth
\Service
\AuthorizeServi
ce
;
use
UnicaenA
uth
\Service
\Traits\AuthorizeService
AwareTrait
;
use
UnicaenAuth\Service\Traits\UserContextServiceAwareTrait
;
use
UnicaenAuth\Service\UserContext
;
use
Zend\Mvc\MvcEvent
;
use
Zend\Mvc\Plugin\FlashMessenger\FlashMessenger
;
use
Zend\Permissions\Acl\Acl
;
use
Zend\Permissions\Acl\Assertion\AssertionInterface
;
use
Zend\Permissions\Acl\Resource\ResourceInterface
;
...
...
@@ -18,10 +18,10 @@ use Zend\Permissions\Acl\Role\RoleInterface;
*
* @author Laurent LÉCLUSE <laurent.lecluse at unicaen.fr>
*/
abstract
class
AbstractAssertion
implements
AssertionInterface
,
ServiceLocatorAwareInterface
abstract
class
AbstractAssertion
implements
AssertionInterface
{
use
ServiceLocatorAwareTrait
;
use
UserContextServiceAwareTrait
;
use
AuthorizeServiceAwareTrait
;
/**
* @var Acl
...
...
@@ -34,9 +34,22 @@ abstract class AbstractAssertion implements AssertionInterface, ServiceLocatorAw
private
$role
=
false
;
/**
* @var
FlashMessenger
* @var
MvcEvent
*/
private
$fm
;
private
$mvcEvent
;
public
function
__construct
(
MvcEvent
$mvcEvent
,
AuthorizeService
$serviceAuthorize
,
UserContext
$serviceUserContext
)
{
$this
->
setMvcEvent
(
$mvcEvent
);
$this
->
setServiceAuthorize
(
$serviceAuthorize
);
$this
->
setServiceUserContext
(
$serviceUserContext
);
}
...
...
@@ -120,6 +133,7 @@ abstract class AbstractAssertion implements AssertionInterface, ServiceLocatorAw
if
(
!
$this
->
acl
)
{
$this
->
acl
=
$this
->
getServiceAuthorize
()
->
getAcl
();
}
return
$this
->
acl
;
}
...
...
@@ -150,6 +164,7 @@ abstract class AbstractAssertion implements AssertionInterface, ServiceLocatorAw
$this
->
role
=
$sUserContext
->
getSelectedIdentityRole
();
}
}
return
$this
->
role
;
}
...
...
@@ -295,19 +310,15 @@ abstract class AbstractAssertion implements AssertionInterface, ServiceLocatorAw
return
true
;
}
/**
* @var MvcEvent
*/
private
$mvcEvent
;
/**
* @param MvcEvent $mvcEvent
*/
public
function
setMvcEvent
(
MvcEvent
$mvcEvent
)
{
$this
->
mvcEvent
=
$mvcEvent
;
}
/**
* @return MvcEvent
*/
...
...
@@ -316,42 +327,4 @@ abstract class AbstractAssertion implements AssertionInterface, ServiceLocatorAw
return
$this
->
mvcEvent
;
}
/**
* @var Authorize
*/
private
$serviceAuthorize
;
/**
* @param Authorize $serviceAuthorize
*/
public
function
setServiceAuthorize
(
Authorize
$serviceAuthorize
)
{
$this
->
serviceAuthorize
=
$serviceAuthorize
;
}
/**
* @return Authorize
*/
private
function
getServiceAuthorize
()
{
return
$this
->
serviceAuthorize
;
}
/**
* @param FlashMessenger $fm
* @deprecated Merci d'abandonner cette méthode : SoC violation !
*/
public
function
setFlashMessenger
(
FlashMessenger
$fm
)
{
$this
->
fm
=
$fm
;
}
/**
* @return FlashMessenger
* @deprecated Merci d'abandonner cette méthode : SoC violation !
*/
protected
function
flashMessenger
()
{
return
$this
->
fm
;
}
}
\ No newline at end of file
This diff is collapsed.
Click to expand it.
src/UnicaenAuth/Assertion/AssertionFactory.php
0 → 100644
+
40
−
0
View file @
12c05066
<?php
namespace
UnicaenAuth\Assertion
;
use
BjyAuthorize\Service\Authorize
;
use
Interop\Container\ContainerInterface
;
use
Zend\Authentication\AuthenticationService
;
use
Zend\Mvc\Application
;
use
Zend\ServiceManager\Factory\FactoryInterface
;
/**
* Class AssertionFactory
*
* @package UnicaenAuth\Assertion
*/
class
AssertionFactory
implements
FactoryInterface
{
/**
* @param ContainerInterface $container
*
* @return UserContext
*/
public
function
__invoke
(
ContainerInterface
$container
,
$requestedName
,
array
$options
=
null
)
{
/* @var $application Application */
$application
=
$container
->
get
(
'Application'
);
$mvcEvent
=
$application
->
getMvcEvent
();
/* @var $serviceAuthorize Authorize */
$serviceAuthorize
=
$container
->
get
(
'BjyAuthorize\Service\Authorize'
);
/** @var UserContext $serviceUserContext */
$serviceUserContext
=
$container
->
get
(
'UnicaenAuth\Service\UserContext'
);
/* @var $assertion AbstractAssertion */
$assertion
=
new
$requestedName
(
$mvcEvent
,
$serviceAuthorize
,
$serviceUserContext
);
return
$assertion
;
}
}
\ No newline at end of file
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
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!
Save comment
Cancel
Please
register
or
sign in
to comment