fix: address review feedback

- Restructure the Entra group pagination loop guard-first: check the page
  cap and warn/break before doing the request, per review.
- Reword the changelog entry for the pagination fix.

Author: lfrancke

CHANGELOG.md

@@ -27,9 +27,9 @@ All notable changes to this project will be documented in this file.
 
 ### Fixed
 
-- The Entra user-info-fetcher backend now follows Microsoft Graph's `@odata.nextLink` pagination,
-  so users with more group memberships than fit on a single response page receive their complete
-  group list. Following the link is bounded to 100 pages as a safeguard ([#859]).
+- The user-info-fetcher Entra backend now follows Microsoft Graph's `@odata.nextLink` pagination
+  links - up to 100 times - to fetch 999 group memberships per result page, resulting in a maximum
+  of 99900 fetched memberships for a single user ([#859]).
 
 ### Removed
 

rust/user-info-fetcher/src/backend/entra.rs

@@ -230,6 +230,19 @@ impl ResolvedEntraBackend {
         let mut pages_remaining = MAX_GROUP_PAGES;
 
         while let Some(url) = next_url {
+            // Bound the loop so we can't run into an infinite loop for any reason
+            if pages_remaining == 0 {
+                tracing::warn!(
+                    user.id = %user_info.id,
+                    max_pages = MAX_GROUP_PAGES,
+                    "reached the maximum number of Entra group membership pages; \
+                     the resolved group list may be incomplete"
+                );
+
+                break;
+            }
+            pages_remaining -= 1;
+
             let response = send_json_request::<GroupMembershipResponse>(
                 self.http_client.get(url).bearer_auth(&authn.access_token),
             )
@@ -245,20 +258,6 @@ impl ResolvedEntraBackend {
                 .next_link
                 .map(|next_link| entra_backend.next_page(&next_link))
                 .transpose()?;
-
-            // Bound the loop so we can't run into an infinite loop for any reason
-            pages_remaining -= 1;
-            if pages_remaining == 0 {
-                if next_url.is_some() {
-                    tracing::warn!(
-                        user.id = %user_info.id,
-                        max_pages = MAX_GROUP_PAGES,
-                        "reached the maximum number of Entra group membership pages; \
-                         the resolved group list may be incomplete"
-                    );
-                }
-                break;
-            }
         }
 
         Ok(UserInfo {