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

…1930
AngelFQC · Sep 17, 2024 · f5d563c · f5d563c
1 parent 2b5eeb5
commit f5d563c
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 4 deletions.
diff --git a/plugin/azure_active_directory/src/AzureSyncUsergroupsCommand.php b/plugin/azure_active_directory/src/AzureSyncUsergroupsCommand.php
@@ -48,10 +48,16 @@ public function __invoke(): Generator
 
             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) {

diff --git a/plugin/azure_active_directory/src/AzureSyncUsersCommand.php b/plugin/azure_active_directory/src/AzureSyncUsersCommand.php
@@ -42,7 +42,14 @@ public function __invoke(): Generator
         $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) {