Fixing reading members list

internet2 · Mar 29, 2023 · 36dc382 · 36dc382
1 parent 436ee5b
commit 36dc382
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 0 deletions.
diff --git a/Controller/GrouperGroupsController.php b/Controller/GrouperGroupsController.php
@@ -160,6 +160,12 @@ public function groupSubscribers()
       $this->Flash->set(_txt('pl.grouperlite.message.flash.group-detail-members-failed'), array('key' => 'error'));
     }
     if(count($subscribers) < 1){
+      $this->response->type('json');
+      $this->response->statusCode(404);
+      //$this->response->body(json_encode(array('status' => 'ERROR', 'message' => 'NO ACCESS')));
+      $this->response->send();
+      $subscribers = '';
+    } elseif (count($subscribers) == 1 && $subscribers[0]['sourceId'] == "NoAccess") {
       $this->response->type('json');
       $this->response->statusCode(403);
       //$this->response->body(json_encode(array('status' => 'ERROR', 'message' => 'NO ACCESS')));

diff --git a/Lib/GrouperApiAccess.php b/Lib/GrouperApiAccess.php
@@ -292,6 +292,11 @@ public function getMembersInGroup(array $queryData)
       $results = $this->http->sendRequest('POST', $connectionUrl, json_encode($usersToShow));
 
       // Parse out relevant records to send front end
+      if(isset($results['WsGetMembersResults']['results'][0]['resultMetadata']['resultCode']) && $results['WsGetMembersResults']['results'][0]['resultMetadata']['resultCode'] != NULL){
+        if ($results['WsGetMembersResults']['results'][0]['resultMetadata']['resultCode'] == 'GROUP_NOT_FOUND'){
+          return array(array("sourceId" => "NoAccess", "name" => "", "id" => ""));
+        }
+      }
       if (isset($results['WsGetMembersResults']['results'][0]['wsSubjects']) && $results['WsGetMembersResults']['results'][0]['wsSubjects'] != NULL) {
         return $results['WsGetMembersResults']['results'][0]['wsSubjects'];
       }