Plugin: Azure: Catch exception when getting group members - refs BT#21930

pull/5763/head
Angel Fernando Quiroz Campos 1 year ago
parent 2b5eeb58ad
commit f5d563c361
No known key found for this signature in database
GPG Key ID: B284841AE3E562CD
  1. 12
      plugin/azure_active_directory/src/AzureSyncUsergroupsCommand.php
  2. 9
      plugin/azure_active_directory/src/AzureSyncUsersCommand.php

@ -48,10 +48,16 @@ class AzureSyncUsergroupsCommand extends AzureCommand
yield sprintf('Obtaining members for group (ID %d)', $groupId);
foreach ($this->getAzureGroupMembers($azureGroupUid) as $azureGroupMember) {
if ($userId = $this->plugin->getUserIdByVerificationOrder($azureGroupMember, 'id')) {
$newGroupMembers[] = $userId;
try {
foreach ($this->getAzureGroupMembers($azureGroupUid) as $azureGroupMember) {
if ($userId = $this->plugin->getUserIdByVerificationOrder($azureGroupMember, 'id')) {
$newGroupMembers[] = $userId;
}
}
} catch (Exception $e) {
yield $e->getMessage();
continue;
}
if ($newGroupMembers) {

@ -42,7 +42,14 @@ class AzureSyncUsersCommand extends AzureCommand
$em = Database::getManager();
foreach ($roleGroups as $userRole => $groupUid) {
$azureGroupMembersInfo = iterator_to_array($this->getAzureGroupMembers($groupUid));
try {
$azureGroupMembersInfo = iterator_to_array($this->getAzureGroupMembers($groupUid));
} catch (Exception $e) {
yield $e->getMessage();
continue;
}
$azureGroupMembersUids = array_column($azureGroupMembersInfo, 'id');
foreach ($azureGroupMembersUids as $azureGroupMembersUid) {

Loading…
Cancel
Save