Merge pull request #59 from MagerValp/fixpagination

Fix handling of req_params for pagination

CHANGELOG.md

@@ -21,6 +21,7 @@
 - Fixes `_get_data` so that it properly preserves all input parameters ([#45](https://github.com/macadmins/simpleMDMpy/issues/45)) - TY [@bryanheinz](https://github.com/bryanheinz)
 - Adds help docs to Devices.get_device() - TY [@bryanheinz](https://github.com/bryanheinz)
 - Add Scripts and ScriptJobs - TY [@MagerValp](https://github.com/MagerValp)
+- Fix pagination - TY [@jcfrt](https://github.com/jcfrt)
 
 ### Issues
 
@@ -32,6 +33,7 @@
 - Closes issue #43
 - Closes issue #29
 - Closes issue #45
+- Closes issue #57
 
 ## [v3.0.6]
 

SimpleMDMpy/SimpleMDM.py

@@ -51,25 +51,27 @@ def _url(self, path): #pylint: disable=no-self-use
     def _is_devices_req(self, url):
         return url.startswith(self._url("/devices"))
 
-    def _get_data(self, url, params={}):
+    def _get_data(self, url, params=None):
         """GET call to SimpleMDM API"""
         has_more = True
         list_data = []
         # by using the local req_params variable, we can set our own defaults if
         # the parameters aren't included with the input params. This is needed
         # so that certain other functions, like Logs.get_logs(), can send custom
         # starting_after and limit parameters.
-        req_params = {}
-        req_params['limit'] = params.get('limit', 100)
-        req_params['starting_after'] = params.get('starting_after', 0)
+        if params is None:
+            req_params = {}
+        else:
+            req_params = params.copy()
+        req_params['limit'] = req_params.get('limit', 100)
         while has_more:
             # Calls to /devices should be rate limited
             if self._is_devices_req(url):
                 if time.time() - self.last_device_req_timestamp < self.device_req_rate_limit:
                     time.sleep(time.time() - self.last_device_req_timestamp)
             self.last_device_req_timestamp = time.time()
             while True:
-                resp = self.session.get(url, params=params, auth=(self.api_key, ""), proxies=self.proxyDict)
+                resp = self.session.get(url, params=req_params, auth=(self.api_key, ""), proxies=self.proxyDict)
                 # A 429 means we've hit the rate limit, so back off and retry
                 if resp.status_code == 429:
                     time.sleep(1)
@@ -86,7 +88,7 @@ def _get_data(self, url, params={}):
             list_data.extend(data)
             has_more = resp_json.get('has_more', False)
             if has_more:
-                params["starting_after"] = data[-1].get('id')
+                req_params["starting_after"] = data[-1].get('id')
         return list_data
 
     def _get_xml(self, url, params=None):