Skip to content

Hotfix for structure changes in workgroup api #27

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
imonroe wants to merge 1 commit into
base: 1.x
Choose a base branch
from
Draft

Hotfix for structure changes in workgroup api #27

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
50 changes: 46 additions & 4 deletions src/Service/WorkgroupApi.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,9 +184,22 @@ protected function callApi(string $workgroup = NULL, string $sunet = NULL): ?arr
],
];
$api_url = Settings::get('stanford_samlauth.workgroup_api', self::WORKGROUP_API);

$this->logger->info('Making workgroup API request: @url with options: @options', [
'@url' => $api_url,
'@options' => json_encode($options)
]);

try {
$result = $this->guzzle->request('GET', $api_url, $options);
$result = json_decode($result->getBody(), TRUE, 512, JSON_THROW_ON_ERROR);
$response = $this->guzzle->request('GET', $api_url, $options);
$response_body = $response->getBody()->getContents();

$this->logger->info('Workgroup API raw response (status @status): @body', [
'@status' => $response->getStatusCode(),
'@body' => $response_body
]);

$result = json_decode($response_body, TRUE, 512, JSON_THROW_ON_ERROR);
$this->responses[$type][$id] = $result;
return $result;
}
Expand All @@ -202,9 +215,38 @@ 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) {
$workgroup_names[] = $user_member['name'];
$this->logger->info('Workgroup API response for user @authname: @data', [
'@authname' => $authname,
'@data' => json_encode($user_data)
]);

// Check for various possible keys to handle API variations
$results_key = null;
if (isset($user_data['results']) && is_array($user_data['results'])) {
$results_key = 'results';
} elseif (isset($user_data['result']) && is_array($user_data['result'])) {
$results_key = 'result';
} elseif (isset($user_data['members']) && is_array($user_data['members'])) {
$results_key = 'members';
}

if ($results_key) {
foreach ($user_data[$results_key] as $user_member) {
$workgroup_names[] = $user_member['name'];
}
$this->logger->info('Found @count workgroups for user @authname using key "@key"', [
'@count' => count($workgroup_names),
'@authname' => $authname,
'@key' => $results_key
]);
} else {
$this->logger->warning('Workgroup API response missing expected data keys (results/result/members) for user @authname. Available keys: @keys', [
'@authname' => $authname,
'@keys' => implode(', ', array_keys($user_data))
]);
}
} else {
$this->logger->error('Workgroup API call failed for user @authname', ['@authname' => $authname]);
}
return $workgroup_names;
}
Expand Down
Loading