Fixing User.all() to return all users, not just the first page

Steve Dorazio · Steve Dorazio · commit a305c14021fd · 2013-07-02T11:30:27.000-04:00
diff --git a/intercom/intercom.py b/intercom/intercom.py
@@ -110,7 +110,7 @@ def _create_or_update_user(cls, method, **kwargs):
         return user_dict
 
     @classmethod
-    def get_users(cls):
+    def get_users(cls, **kwargs):
         """ Return a dict for the user represented by the specified email
         or user_id.
 
@@ -121,7 +121,7 @@ def get_users(cls):
         3
 
         """
-        user_dict = Intercom._call('GET', Intercom.api_endpoint + 'users')
+        user_dict = Intercom._call('GET', Intercom.api_endpoint + 'users', params=kwargs)
         return user_dict
 
     @classmethod
diff --git a/intercom/user.py b/intercom/user.py
@@ -141,8 +141,15 @@ def all(cls):
         u'first.user@example.com'
 
         """
-        resp = Intercom.get_users()
-        return [cls(u) for u in resp['users']]
+        page = 1
+        total_pages = 1
+        users = []
+        while page <= total_pages:
+            resp = Intercom.get_users(page=page)
+            page += 1
+            total_pages = resp['total_pages']
+            users.extend([cls(u) for u in resp['users']])
+        return users
 
     def save(self):
         """ Creates or updates a User.
