fix paginated projects retrieving

Fixes #1310
atlassian-api · Mar 2, 2024 · 1a16347 · 1a16347
1 parent 0a5bc5e
commit 1a16347
Showing 1 changed file with 10 additions and 5 deletions.
diff --git a/atlassian/jira.py b/atlassian/jira.py
@@ -2324,13 +2324,18 @@ def projects_from_cloud(self, included_archived=None, expand=None):
             included_archived=included_archived,
             expand=expand,
         )
-        while not projects.get("isLast"):
-            projects["values"].extend(
-                self.paginated_projects(
+        is_last_page = projects.get("isLast")
+        next_page_url = projects.get("nextPage")
+        while not is_last_page:
+            next_page_projects = self.paginated_projects(
                     included_archived=included_archived,
                     expand=expand,
-                    url=projects["nextPage"],
-                )["values"]
+                    url=next_page_url,
+                )
+            next_page_url = next_page_projects.get("nextPage")
+            is_last_page = next_page_projects.get("isLast")
+            projects["values"].extend(
+                next_page_projects["values"]
             )
         return projects["values"]