fix remove group showing error

internet2 · Feb 2, 2021 · 99e212e · 99e212e
1 parent 4a4e60b
commit 99e212e
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/Lib/GrouperApiAccess.php b/Lib/GrouperApiAccess.php
@@ -163,16 +163,20 @@ public function grouperGroupLeaveOrJoin(array $queryData) {
 
     if ($groupLeaveOrJoin == "Leave") {
       $memberRequest = "WsRestDeleteMemberRequest";
+      $resultResponse = 'WsDeleteMemberResults';
+      $resultGroup = 'wsGroup';
     } elseif ($groupLeaveOrJoin == "Join") {
       $memberRequest = "WsRestAddMemberRequest";
+      $resultResponse = 'WsAddMemberResults';
+      $resultGroup = 'wsGroupAssigned';
     } else {
       CakeLog::write('error',
         "GrouperLite API - grouperGroupLeaveOrJoin: Option of $groupLeaveOrJoin is not supported");
       throw new GrouperLiteException("Receved option of $groupLeaveOrJoin  which is not supported");
     }
 
     //Build request logic
-    $groupToLeave = array(
+    $groupCommand = array(
       $memberRequest => array(
         "actAsSubjectLookup" => array(
           "subjectId" => $userId
@@ -187,10 +191,10 @@ public function grouperGroupLeaveOrJoin(array $queryData) {
     $connectionUrl = "{$this->config['fullUrl']}/groups/{$groupName}/members";
 
     try {
-      $results = $this->http->sendRequest('PUT', $connectionUrl, json_encode($groupToLeave));
+      $results = $this->http->sendRequest('PUT', $connectionUrl, json_encode($groupCommand));
 
-      if (isset($results['WsAddMemberResults']['wsGroupAssigned']) && $results['WsAddMemberResults']['wsGroupAssigned'] != NULL) {
-        $groupAssigned = $results['WsAddMemberResults']['wsGroupAssigned']['name'];
+      if (isset($results[$resultResponse][$resultGroup]) && $results[$resultResponse][$resultGroup] != NULL) {
+        $groupAssigned = $results[$resultResponse][$resultGroup]['name'];
         if ($groupAssigned == urldecode($groupName)) {
           return true;
         }