Merge pull request #99 from vyskocilpavel/fix_entitlement

Fix entitlement

Author: vyskocilpavel

CHANGELOG.md

@@ -2,6 +2,11 @@
 All notable changes to this project will be documented in this file.
 
 ## [Unreleased]
+#### Fixed
+- Fixed releasing entitlement for Virtual Organization
+    - Before: einfra:members
+    - Now: einfra
+
 #### Changed
 - Releasing forwardedEduPersonEntitlement is now optional (forwardedEduPersonEntitlement are released by default)
 

lib/Auth/Process/PerunEntitlement.php

@@ -114,6 +114,9 @@ private function getEduPersonEntitlement(&$request)
 
         $eduPersonEntitlement = [];
         foreach ($groups as $group) {
+            $groupName = $group->getUniqueName();
+            $groupName = preg_replace('/^(\w*)\:members$/', '$1', $groupName);
+
             if (isset($request['SPMetadata']['groupNameAARC']) || $this->groupNameAARC) {
                 # https://aarc-project.eu/wp-content/uploads/2017/11/AARC-JRA1.4A-201710.pdf
                 # Group name is URL encoded by RFC 3986 (http://www.ietf.org/rfc/rfc3986.txt)
@@ -125,10 +128,9 @@ private function getEduPersonEntitlement(&$request)
                         '\'groupNameAuthority\' or \'groupNamePrefix\'.'
                     );
                 }
-
-                $groupName = $this->groupNameWrapper($group->getUniqueName());
+                $groupName = $this->groupNameWrapper($groupName);
             } else {
-                $groupName = $this->mapGroupName($request, $group->getUniqueName());
+                $groupName = $this->mapGroupName($request, $groupName);
             }
             array_push($eduPersonEntitlement, $groupName);
         }