Merge pull request #575 from tamer1an/#569-tamer1an-fix-requestAllPages

j-rewerts · web-flow · commit 2b6db007c1cc · 2019-08-25T13:29:17.000-06:00
#569 tamer1an fix for get all pages in _requestAllPages
diff --git a/lib/Requestable.js b/lib/Requestable.js
@@ -256,9 +256,20 @@ class Requestable {
             results.push(...thisGroup);
 
             const nextUrl = getNextPage(response.headers.link);
-            if (nextUrl && !(options && typeof options.page !== 'number')) {
-               log(`getting next page: ${nextUrl}`);
-               return this._requestAllPages(nextUrl, options, cb, results);
+            if(nextUrl) {
+               if (!options) {
+                  options = {};
+               }
+               options.page = parseInt(
+                 nextUrl.match(/(page=[0-9]*)/g)
+                   .shift()
+                   .split('=')
+                   .pop()
+               );
+               if (!(options && typeof options.page !== 'number')) {
+                   log(`getting next page: ${nextUrl}`);
+                   return this._requestAllPages(nextUrl, options, cb, results);
+               }
             }
 
             if (cb) {
