Update workgroup api response structure (#37)

Author: pookmish

config/install/stanford_samlauth.settings.yml

@@ -12,4 +12,5 @@ role_mapping:
     cert: ''
     key: ''
     timeout: 30
+    include_admins: false
   mapping: {}

config/schema/stanford_samlauth.schema.yml

@@ -67,6 +67,9 @@ stanford_samlauth.settings:
             timeout:
               type: integer
               label: API Request timeout limit
+            include_admins:
+              type: boolean
+              label: Include administrators for role mapping
         reevaluate:
           type: string
           label: Reevaluation rule

src/Service/WorkgroupApi.php

@@ -202,10 +202,19 @@ protected function callApi(string $workgroup = NULL, string $sunet = NULL): ?arr
   public function getAllUserWorkgroups(string $authname): array {
     $workgroup_names = [];
     if ($user_data = $this->callApi(NULL, $authname)) {
-      foreach ($user_data['results'] as $user_member) {
+      foreach ($user_data['members'] as $user_member) {
         $workgroup_names[] = $user_member['name'];
       }
+      $includeAdmins = $this->configFactory->get('stanford_samlauth.settings')
+        ->get('role_mapping.workgroup_api.include_admins');
+
+      if ($includeAdmins) {
+        foreach ($user_data['administrators'] as $user_member) {
+          $workgroup_names[] = $user_member['name'];
+        }
+      }
     }
+
     return $workgroup_names;
   }
 

tests/src/Unit/Service/WorkgroupApiTest.php

@@ -86,13 +86,13 @@ public function guzzleRequestCallback($method, $url, $options) {
     switch ($options['query']['id']) {
       case 'uit:sws':
         $body = [
-          'results' => [],
+          'members' => [],
         ];
         break;
 
       case $this->authname:
         $body = [
-          'results' => [['name' => 'valid:workgroup']],
+          'members' => [['name' => 'valid:workgroup']],
         ];
         break;