airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From scnakand...@apache.org
Subject [1/2] airavata-php-gateway git commit: handling username '@' split differently
Date Fri, 24 Mar 2017 14:20:15 GMT
Repository: airavata-php-gateway
Updated Branches:
  refs/heads/keycloak-integration dd00dd4a7 -> f55323c47


handling username '@' split differently


Project: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/commit/1c6c44d5
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/1c6c44d5
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/1c6c44d5

Branch: refs/heads/keycloak-integration
Commit: 1c6c44d56c187e30b275e4bf9f91556bb08fedee
Parents: 471b380
Author: scnakandala <supun.nakandala@gmail.com>
Authored: Fri Mar 24 10:19:36 2017 -0400
Committer: scnakandala <supun.nakandala@gmail.com>
Committed: Fri Mar 24 10:19:36 2017 -0400

----------------------------------------------------------------------
 app/libraries/GrouperUtilities.php | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/1c6c44d5/app/libraries/GrouperUtilities.php
----------------------------------------------------------------------
diff --git a/app/libraries/GrouperUtilities.php b/app/libraries/GrouperUtilities.php
index e73fdc3..62714f4 100644
--- a/app/libraries/GrouperUtilities.php
+++ b/app/libraries/GrouperUtilities.php
@@ -25,7 +25,7 @@ class GrouperUtilities
         foreach($userPermissionMap as $key=> $value){
             if (strpos($key, '@') !== false) {
                 $parts = explode('@', $key);
-                $key = $parts[0] . "@" . Config::get('pga_config.airavata')['gateway-id'];
+                $key = join('@', array_slice($parts, 0, -1)) . "@" . Config::get('pga_config.airavata')['gateway-id'];
             }else{
                 $key = $key . "@" . Config::get('pga_config.airavata')['gateway-id'];
             }
@@ -45,7 +45,7 @@ class GrouperUtilities
         foreach($userPermissionMap as $key=> $value){
             if (strpos($key, '@') !== false) {
                 $parts = explode('@', $key);
-                $key = $parts[0] . "@" . Config::get('pga_config.airavata')['gateway-id'];
+                $key = join('@', array_slice($parts, 0, -1)) . "@" . Config::get('pga_config.airavata')['gateway-id'];
             }else{
                 $key = $key . "@" . Config::get('pga_config.airavata')['gateway-id'];
             }
@@ -67,7 +67,7 @@ class GrouperUtilities
         foreach ($temp as $key => $u) {
             if (strpos($u, '@') !== false) {
                 $parts = explode('@', $u);
-                $u = $parts[0];
+                $u = $key = join('@', array_slice($parts, 0, -1));
             }
             $userList[] = $u;
         }
@@ -81,7 +81,7 @@ class GrouperUtilities
     public static function createGroup($group){
         if (strpos($group->ownerId, '@') !== false) {
             $parts = explode('@', $group->ownerId);
-            $group->ownerId = $parts[0] . "@" . Config::get('pga_config.airavata')['gateway-id'];
+            $group->ownerId = join('@', array_slice($parts, 0, -1)) . "@" . Config::get('pga_config.airavata')['gateway-id'];
         }else{
             $group->ownerId = $group->ownerId . "@" . Config::get('pga_config.airavata')['gateway-id'];
         }
@@ -95,7 +95,7 @@ class GrouperUtilities
     public static function updateGroup($group){
         if (strpos($group->ownerId, '@') !== false) {
             $parts = explode('@', $group->ownerId);
-            $group->ownerId = $parts[0] . "@" . Config::get('pga_config.airavata')['gateway-id'];
+            $group->ownerId = join('@', array_slice($parts, 0, -1)) . "@" . Config::get('pga_config.airavata')['gateway-id'];
         }else{
             $group->ownerId = $group->ownerId . "@" . Config::get('pga_config.airavata')['gateway-id'];
         }
@@ -110,7 +110,7 @@ class GrouperUtilities
     public static function deleteGroup($groupId, $ownerName){
         if (strpos($ownerName, '@') !== false) {
             $parts = explode('@', $ownerName);
-            $ownerName = $parts[0];
+            $ownerName = join('@', array_slice($parts, 0, -1));
         }
 
         Airavata::deleteGroup(Session::get('authz-token'), $groupId, $ownerName, Config::get('pga_config.airavata')['gateway-id']);
@@ -131,7 +131,7 @@ class GrouperUtilities
     public static function getAllGroupsUserBelongs($userName){
         if (strpos($userName, '@') !== false) {
             $parts = explode('@', $userName);
-            $userName = $parts[0];
+            $userName = join('@', array_slice($parts, 0, -1));
         }
 
         return Airavata::getAllGroupsUserBelongs(Session::get('authz-token'), $userName,


Mime
View raw message