Merge pull request intercom#125 from TyMaszWeb/fix-next-page

jkeyes · web-flow · commit c6682894db60 · 2016-11-15T19:36:17.000Z
Fix connection errors when paginating -- fixes intercom#120
diff --git a/intercom/collection_proxy.py b/intercom/collection_proxy.py
@@ -98,4 +98,6 @@ def paging_info_present(self, response):
     def extract_next_link(self, response):
         if self.paging_info_present(response):
             paging_info = response["pages"]
-            return paging_info["next"]
+            if paging_info["next"]:
+                next_parsed = six.moves.urllib.parse.urlparse(paging_info["next"])
+                return '{}?{}'.format(next_parsed.path, next_parsed.query)
diff --git a/tests/unit/test_collection_proxy.py b/tests/unit/test_collection_proxy.py
@@ -30,7 +30,7 @@ def it_keeps_iterating_if_next_link(self):
         side_effect = [page1, page2]
         with patch.object(Client, 'get', side_effect=side_effect) as mock_method:  # noqa
             emails = [user.email for user in self.client.users.all()]
-            eq_([call('/users', {}), call('https://api.intercom.io/users?per_page=50&page=2', {})],  # noqa
+            eq_([call('/users', {}), call('/users?per_page=50&page=2', {})],  # noqa
                 mock_method.mock_calls)
             eq_(emails, ['user1@example.com', 'user2@example.com', 'user3@example.com'] * 2)  # noqa
 
