Allow optional context for getRoles

This allows the identity to return different roles for different contexts. A scenario would be a user having different roles for different projects and the project name is passed in as the context. Implements Solution 1 in ZF-Commons#258 (comment)
zionsg · Jun 5, 2015 · 0d1a57e · 0d1a57e
1 parent 651176f
commit 0d1a57e
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/src/ZfcRbac/Identity/IdentityInterface.php b/src/ZfcRbac/Identity/IdentityInterface.php
@@ -29,7 +29,8 @@ interface IdentityInterface
     /**
      * Get the list of roles of this identity
      *
+     * @param  string $context Optional context for determining roles returned, eg. project name as context
      * @return string[]|\Rbac\Role\RoleInterface[]
      */
-    public function getRoles();
+    public function getRoles($context = null);
 }
diff --git a/src/ZfcRbac/Service/AuthorizationService.php b/src/ZfcRbac/Service/AuthorizationService.php
@@ -121,7 +121,7 @@ public function getIdentity()
      */
     public function isGranted($permission, $context = null)
     {
-        $roles = $this->roleService->getIdentityRoles();
+        $roles = $this->roleService->getIdentityRoles($context);
 
         if (empty($roles)) {
             return false;

diff --git a/src/ZfcRbac/Service/RoleService.php b/src/ZfcRbac/Service/RoleService.php
@@ -107,10 +107,11 @@ public function getIdentity()
     /**
      * Get the identity roles from the current identity, applying some more logic
      *
+     * @param  string $context Optional context for determining roles returned, eg. project name as context
      * @return RoleInterface[]
      * @throws Exception\RuntimeException
      */
-    public function getIdentityRoles()
+    public function getIdentityRoles($context = null)
     {
         if (!$identity = $this->getIdentity()) {
             return $this->convertRoles([$this->guestRole]);
@@ -123,7 +124,7 @@ public function getIdentityRoles()
             ));
         }
 
-        return $this->convertRoles($identity->getRoles());
+        return $this->convertRoles($identity->getRoles($context));
     }
 
     /**