#569 _requestAllPages parse options

tamer1an · web-flow · commit 85b7c9826a38 · 2019-07-17T01:54:42.000+02:00
#569 _requestAllPages parse options.page from nextUrl
diff --git a/lib/Requestable.js b/lib/Requestable.js
@@ -256,9 +256,17 @@ 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) {
+               options.page = parseInt(
+                 nextUrl.match(/(&page=[0-9]*)/g)
+                   .shift()
+                   .split('=')
+                   .pop()
+               );
+               if (!(options && typeof options.page !== 'number')) {
+                  log('getting next page: ' + nextUrl);
+                  return _this2._requestAllPages(nextUrl, options, cb, results);
+               }
             }
 
             if (cb) {
