commit 3240dfc42a9e82afcb6fd1cda4a6804376e115d3
author Isuru Ranawaka <irjanith@gmail.com> Wed Aug 19 09:48:27 2020 -0400
committer Isuru Ranawaka <irjanith@gmail.com> Wed Aug 19 09:48:27 2020 -0400
tree 314566dc5ae5d55a32ff6a7e959d1a8ccf5bac92
parent 33988736a5a96dac49deefe76fcf66b899b4e606

remove gateway appending

app/libraries/GrouperUtilities.php

diff --git a/app/libraries/GrouperUtilities.php b/app/libraries/GrouperUtilities.php
index a167a3d..28961e2 100644
--- a/app/libraries/GrouperUtilities.php
+++ b/app/libraries/GrouperUtilities.php
@@ -19,12 +19,8 @@
      */
     public static function shareResourceWithUsers($resourceId, $userPermissionMap)
     {
-        $newUserPermissionsMap = [];
-        foreach($userPermissionMap as $key=> $value){
-            $key = $key . "@" . Config::get('pga_config.airavata')['gateway-id'];
-            $newUserPermissionsMap[$key] = $value;
-        }
-        Airavata::shareResourceWithUsers(Session::get('authz-token'), $resourceId, $newUserPermissionsMap);
+
+        Airavata::shareResourceWithUsers(Session::get('authz-token'), $resourceId, $userPermissionMap);
     }
 
     /**
@@ -33,12 +29,8 @@
      */
     public static function revokeSharingOfResourceFromUsers($resourceId, $userPermissionMap)
     {
-        $newUserPermissionsMap = [];
-        foreach($userPermissionMap as $key=> $value){
-            $key = $key . "@" . Config::get('pga_config.airavata')['gateway-id'];
-            $newUserPermissionsMap[$key] = $value;
-        }
-        Airavata::revokeSharingOfResourceFromUsers(Session::get('authz-token'), $resourceId, $newUserPermissionsMap);
+
+        Airavata::revokeSharingOfResourceFromUsers(Session::get('authz-token'), $resourceId, $userPermissionMap);
     }
 
     /**
@@ -65,7 +57,7 @@
      * @param $group            Airavata/Model/Group/GrouoModel
      */
     public static function createGroup($group){
-        $group->ownerId = $group->ownerId . "@" . Config::get('pga_config.airavata')['gateway-id'];
+
         Airavata::createGroup(Session::get('authz-token'),$group);
     }
 
@@ -74,7 +66,7 @@
      * @param $group            Airavata/Model/Group/GrouoModel
      */
     public static function updateGroup($group){
-        $group->ownerId = $group->ownerId . "@" . Config::get('pga_config.airavata')['gateway-id'];
+
         Airavata::updateGroup(Session::get('authz-token'),$group);
     }