fix: pagination bug and drop page limit and page limit calculation

lib/base/Version.d.ts

@@ -72,11 +72,11 @@ declare class Version {
 }
 
 declare namespace Version {
-  export interface PageLimitOptions { 
+  export interface PageLimitOptions {
     /**
      * The maximum number of items to fetch
      */
-    limit: number; 
+    limit: number;
     /**
      * The maximum number of items to return with every request
      */
@@ -86,7 +86,6 @@ declare namespace Version {
   export interface PageLimit {
     limit: number;
     pageSize: number;
-    pageLimit: number;
   }
 }
 

lib/base/Version.js

@@ -164,7 +164,6 @@ Version.prototype.page = function(opts) {
  */
 Version.prototype.readLimits = function(opts) {
   var limit = opts.limit;
-  var pageLimit;
   var pageSize = opts.pageSize;
   if (!_.isNil(limit) && (!_.isFinite(limit) || limit <= 0)) {
     throw new TypeError('Parameter limit must be a positive integer');
@@ -174,18 +173,13 @@ Version.prototype.readLimits = function(opts) {
     throw new TypeError('Parameter pageSize must be a positive integer');
   }
 
-  if (limit) {
-    if (!pageSize) {
-      pageSize = limit;
-    }
-
-    pageLimit = parseInt(Math.ceil(limit / parseFloat(pageSize)), 10);
+  if (limit && !pageSize) {
+    pageSize = limit;
   }
 
   return {
     limit: limit,
-    pageSize: pageSize,
-    pageLimit: pageLimit,
+    pageSize: pageSize
   };
 };
 

lib/rest/accounts/v1/credential/aws.js

@@ -131,9 +131,7 @@ AwsList = function AwsList(version) {
           callback(instance, onComplete);
         });
 
-        if ((limits.pageLimit && limits.pageLimit <= currentPage)) {
-          onComplete();
-        } else if (!done) {
+        if (!done) {
           currentPage++;
           fetchNextPage(_.bind(page.nextPage, page));
         }

lib/rest/accounts/v1/credential/publicKey.js

@@ -131,9 +131,7 @@ PublicKeyList = function PublicKeyList(version) {
           callback(instance, onComplete);
         });
 
-        if ((limits.pageLimit && limits.pageLimit <= currentPage)) {
-          onComplete();
-        } else if (!done) {
+        if (!done) {
           currentPage++;
           fetchNextPage(_.bind(page.nextPage, page));
         }

lib/rest/api/v2010/account.js

@@ -204,9 +204,7 @@ AccountList = function AccountList(version) {
           callback(instance, onComplete);
         });
 
-        if ((limits.pageLimit && limits.pageLimit <= currentPage)) {
-          onComplete();
-        } else if (!done) {
+        if (!done) {
           currentPage++;
           fetchNextPage(_.bind(page.nextPage, page));
         }

lib/rest/api/v2010/account/address.js

@@ -224,9 +224,7 @@ AddressList = function AddressList(version, accountSid) {
           callback(instance, onComplete);
         });
 
-        if ((limits.pageLimit && limits.pageLimit <= currentPage)) {
-          onComplete();
-        } else if (!done) {
+        if (!done) {
           currentPage++;
           fetchNextPage(_.bind(page.nextPage, page));
         }

lib/rest/api/v2010/account/address/dependentPhoneNumber.js

@@ -133,9 +133,7 @@ DependentPhoneNumberList = function DependentPhoneNumberList(version,
           callback(instance, onComplete);
         });
 
-        if ((limits.pageLimit && limits.pageLimit <= currentPage)) {
-          onComplete();
-        } else if (!done) {
+        if (!done) {
           currentPage++;
           fetchNextPage(_.bind(page.nextPage, page));
         }

lib/rest/api/v2010/account/application.js

@@ -223,9 +223,7 @@ ApplicationList = function ApplicationList(version, accountSid) {
           callback(instance, onComplete);
         });
 
-        if ((limits.pageLimit && limits.pageLimit <= currentPage)) {
-          onComplete();
-        } else if (!done) {
+        if (!done) {
           currentPage++;
           fetchNextPage(_.bind(page.nextPage, page));
         }

lib/rest/api/v2010/account/authorizedConnectApp.js

@@ -133,9 +133,7 @@ AuthorizedConnectAppList = function AuthorizedConnectAppList(version,
           callback(instance, onComplete);
         });
 
-        if ((limits.pageLimit && limits.pageLimit <= currentPage)) {
-          onComplete();
-        } else if (!done) {
+        if (!done) {
           currentPage++;
           fetchNextPage(_.bind(page.nextPage, page));
         }

lib/rest/api/v2010/account/availablePhoneNumber.js

@@ -141,9 +141,7 @@ AvailablePhoneNumberCountryList = function
           callback(instance, onComplete);
         });
 
-        if ((limits.pageLimit && limits.pageLimit <= currentPage)) {
-          onComplete();
-        } else if (!done) {
+        if (!done) {
           currentPage++;
           fetchNextPage(_.bind(page.nextPage, page));
         }

lib/rest/api/v2010/account/availablePhoneNumber/local.js

@@ -166,9 +166,7 @@ LocalList = function LocalList(version, accountSid, countryCode) {
           callback(instance, onComplete);
         });
 
-        if ((limits.pageLimit && limits.pageLimit <= currentPage)) {
-          onComplete();
-        } else if (!done) {
+        if (!done) {
           currentPage++;
           fetchNextPage(_.bind(page.nextPage, page));
         }

lib/rest/api/v2010/account/availablePhoneNumber/machineToMachine.js

@@ -167,9 +167,7 @@ MachineToMachineList = function MachineToMachineList(version, accountSid,
           callback(instance, onComplete);
         });
 
-        if ((limits.pageLimit && limits.pageLimit <= currentPage)) {
-          onComplete();
-        } else if (!done) {
+        if (!done) {
           currentPage++;
           fetchNextPage(_.bind(page.nextPage, page));
         }

lib/rest/api/v2010/account/availablePhoneNumber/mobile.js

@@ -166,9 +166,7 @@ MobileList = function MobileList(version, accountSid, countryCode) {
           callback(instance, onComplete);
         });
 
-        if ((limits.pageLimit && limits.pageLimit <= currentPage)) {
-          onComplete();
-        } else if (!done) {
+        if (!done) {
           currentPage++;
           fetchNextPage(_.bind(page.nextPage, page));
         }

lib/rest/api/v2010/account/availablePhoneNumber/national.js

@@ -166,9 +166,7 @@ NationalList = function NationalList(version, accountSid, countryCode) {
           callback(instance, onComplete);
         });
 
-        if ((limits.pageLimit && limits.pageLimit <= currentPage)) {
-          onComplete();
-        } else if (!done) {
+        if (!done) {
           currentPage++;
           fetchNextPage(_.bind(page.nextPage, page));
         }

lib/rest/api/v2010/account/availablePhoneNumber/sharedCost.js

@@ -166,9 +166,7 @@ SharedCostList = function SharedCostList(version, accountSid, countryCode) {
           callback(instance, onComplete);
         });
 
-        if ((limits.pageLimit && limits.pageLimit <= currentPage)) {
-          onComplete();
-        } else if (!done) {
+        if (!done) {
           currentPage++;
           fetchNextPage(_.bind(page.nextPage, page));
         }

lib/rest/api/v2010/account/availablePhoneNumber/tollFree.js

@@ -166,9 +166,7 @@ TollFreeList = function TollFreeList(version, accountSid, countryCode) {
           callback(instance, onComplete);
         });
 
-        if ((limits.pageLimit && limits.pageLimit <= currentPage)) {
-          onComplete();
-        } else if (!done) {
+        if (!done) {
           currentPage++;
           fetchNextPage(_.bind(page.nextPage, page));
         }

lib/rest/api/v2010/account/availablePhoneNumber/voip.js

@@ -166,9 +166,7 @@ VoipList = function VoipList(version, accountSid, countryCode) {
           callback(instance, onComplete);
         });
 
-        if ((limits.pageLimit && limits.pageLimit <= currentPage)) {
-          onComplete();
-        } else if (!done) {
+        if (!done) {
           currentPage++;
           fetchNextPage(_.bind(page.nextPage, page));
         }

lib/rest/api/v2010/account/call.js

@@ -294,9 +294,7 @@ CallList = function CallList(version, accountSid) {
           callback(instance, onComplete);
         });
 
-        if ((limits.pageLimit && limits.pageLimit <= currentPage)) {
-          onComplete();
-        } else if (!done) {
+        if (!done) {
           currentPage++;
           fetchNextPage(_.bind(page.nextPage, page));
         }

lib/rest/api/v2010/account/call/event.js

@@ -130,9 +130,7 @@ EventList = function EventList(version, accountSid, callSid) {
           callback(instance, onComplete);
         });
 
-        if ((limits.pageLimit && limits.pageLimit <= currentPage)) {
-          onComplete();
-        } else if (!done) {
+        if (!done) {
           currentPage++;
           fetchNextPage(_.bind(page.nextPage, page));
         }

lib/rest/api/v2010/account/call/notification.js

@@ -139,9 +139,7 @@ NotificationList = function NotificationList(version, accountSid, callSid) {
           callback(instance, onComplete);
         });
 
-        if ((limits.pageLimit && limits.pageLimit <= currentPage)) {
-          onComplete();
-        } else if (!done) {
+        if (!done) {
           currentPage++;
           fetchNextPage(_.bind(page.nextPage, page));
         }

lib/rest/api/v2010/account/call/recording.js

@@ -204,9 +204,7 @@ RecordingList = function RecordingList(version, accountSid, callSid) {
           callback(instance, onComplete);
         });
 
-        if ((limits.pageLimit && limits.pageLimit <= currentPage)) {
-          onComplete();
-        } else if (!done) {
+        if (!done) {
           currentPage++;
           fetchNextPage(_.bind(page.nextPage, page));
         }

lib/rest/api/v2010/account/conference.js

@@ -150,9 +150,7 @@ ConferenceList = function ConferenceList(version, accountSid) {
           callback(instance, onComplete);
         });
 
-        if ((limits.pageLimit && limits.pageLimit <= currentPage)) {
-          onComplete();
-        } else if (!done) {
+        if (!done) {
           currentPage++;
           fetchNextPage(_.bind(page.nextPage, page));
         }

lib/rest/api/v2010/account/conference/participant.js

@@ -298,9 +298,7 @@ ParticipantList = function ParticipantList(version, accountSid, conferenceSid) {
           callback(instance, onComplete);
         });
 
-        if ((limits.pageLimit && limits.pageLimit <= currentPage)) {
-          onComplete();
-        } else if (!done) {
+        if (!done) {
           currentPage++;
           fetchNextPage(_.bind(page.nextPage, page));
         }

lib/rest/api/v2010/account/conference/recording.js

@@ -142,9 +142,7 @@ RecordingList = function RecordingList(version, accountSid, conferenceSid) {
           callback(instance, onComplete);
         });
 
-        if ((limits.pageLimit && limits.pageLimit <= currentPage)) {
-          onComplete();
-        } else if (!done) {
+        if (!done) {
           currentPage++;
           fetchNextPage(_.bind(page.nextPage, page));
         }

lib/rest/api/v2010/account/connectApp.js

@@ -131,9 +131,7 @@ ConnectAppList = function ConnectAppList(version, accountSid) {
           callback(instance, onComplete);
         });
 
-        if ((limits.pageLimit && limits.pageLimit <= currentPage)) {
-          onComplete();
-        } else if (!done) {
+        if (!done) {
           currentPage++;
           fetchNextPage(_.bind(page.nextPage, page));
         }

lib/rest/api/v2010/account/incomingPhoneNumber.js

@@ -152,9 +152,7 @@ IncomingPhoneNumberList = function IncomingPhoneNumberList(version, accountSid)
           callback(instance, onComplete);
         });
 
-        if ((limits.pageLimit && limits.pageLimit <= currentPage)) {
-          onComplete();
-        } else if (!done) {
+        if (!done) {
           currentPage++;
           fetchNextPage(_.bind(page.nextPage, page));
         }

lib/rest/api/v2010/account/incomingPhoneNumber/assignedAddOn.js

@@ -140,9 +140,7 @@ AssignedAddOnList = function AssignedAddOnList(version, accountSid, resourceSid)
           callback(instance, onComplete);
         });
 
-        if ((limits.pageLimit && limits.pageLimit <= currentPage)) {
-          onComplete();
-        } else if (!done) {
+        if (!done) {
           currentPage++;
           fetchNextPage(_.bind(page.nextPage, page));
         }

lib/rest/api/v2010/account/incomingPhoneNumber/assignedAddOn/assignedAddOnExtension.js

@@ -142,9 +142,7 @@ AssignedAddOnExtensionList = function AssignedAddOnExtensionList(version,
           callback(instance, onComplete);
         });
 
-        if ((limits.pageLimit && limits.pageLimit <= currentPage)) {
-          onComplete();
-        } else if (!done) {
+        if (!done) {
           currentPage++;
           fetchNextPage(_.bind(page.nextPage, page));
         }

lib/rest/api/v2010/account/incomingPhoneNumber/local.js

@@ -139,9 +139,7 @@ LocalList = function LocalList(version, accountSid) {
           callback(instance, onComplete);
         });
 
-        if ((limits.pageLimit && limits.pageLimit <= currentPage)) {
-          onComplete();
-        } else if (!done) {
+        if (!done) {
           currentPage++;
           fetchNextPage(_.bind(page.nextPage, page));
         }

lib/rest/api/v2010/account/incomingPhoneNumber/mobile.js

@@ -139,9 +139,7 @@ MobileList = function MobileList(version, accountSid) {
           callback(instance, onComplete);
         });
 
-        if ((limits.pageLimit && limits.pageLimit <= currentPage)) {
-          onComplete();
-        } else if (!done) {
+        if (!done) {
           currentPage++;
           fetchNextPage(_.bind(page.nextPage, page));
         }

lib/rest/api/v2010/account/incomingPhoneNumber/tollFree.js

@@ -139,9 +139,7 @@ TollFreeList = function TollFreeList(version, accountSid) {
           callback(instance, onComplete);
         });
 
-        if ((limits.pageLimit && limits.pageLimit <= currentPage)) {
-          onComplete();
-        } else if (!done) {
+        if (!done) {
           currentPage++;
           fetchNextPage(_.bind(page.nextPage, page));
         }

lib/rest/api/v2010/account/key.js

@@ -133,9 +133,7 @@ KeyList = function KeyList(version, accountSid) {
           callback(instance, onComplete);
         });
 
-        if ((limits.pageLimit && limits.pageLimit <= currentPage)) {
-          onComplete();
-        } else if (!done) {
+        if (!done) {
           currentPage++;
           fetchNextPage(_.bind(page.nextPage, page));
         }

lib/rest/api/v2010/account/message.js

@@ -231,9 +231,7 @@ MessageList = function MessageList(version, accountSid) {
           callback(instance, onComplete);
         });
 
-        if ((limits.pageLimit && limits.pageLimit <= currentPage)) {
-          onComplete();
-        } else if (!done) {
+        if (!done) {
           currentPage++;
           fetchNextPage(_.bind(page.nextPage, page));
         }