Fixed duplicate params when paging.

j-rewerts · j-rewerts · commit 571884397717 · 2019-10-22T10:57:59.000-06:00
diff --git a/lib/Requestable.js b/lib/Requestable.js
@@ -255,7 +255,7 @@ class Requestable {
             }
             results.push(...thisGroup);
 
-            const nextUrl = getNextPage(response.headers.link);
+            let nextUrl = getNextPage(response.headers.link);
             if(nextUrl) {
                if (!options) {
                   options = {};
@@ -266,6 +266,8 @@ class Requestable {
                    .split('=')
                    .pop()
                );
+               // Strip out query string, as we'll use 'options'.
+               nextUrl = nextUrl.split('?', 1)[0];
                if (!(options && typeof options.page !== 'number')) {
                   log(`getting next page: ${nextUrl}`);
                   return this._requestAllPages(nextUrl, options, cb, results);
diff --git a/test/fixtures/search.json b/test/fixtures/search.json
@@ -8939,7 +8939,7 @@
   {
     "scope": "https://api.github.com:443",
     "method": "GET",
-    "path": "/search/repositories?q=tetris+language%3Aassembly&sort=stars&order=desc&type=all&per_page=100&page=2&q=tetris+language:assembly&sort=stars&order=desc&type=all&per_page=100&page=2",
+    "path": "/search/repositories?q=tetris+language:assembly&sort=stars&order=desc&type=all&per_page=100&page=2",
     "body": "",
     "status": 200,
     "response": {
@@ -17876,7 +17876,7 @@
   {
     "scope": "https://api.github.com:443",
     "method": "GET",
-    "path": "/search/repositories?q=tetris+language%3Aassembly&sort=stars&order=desc&type=all&per_page=100&page=3&q=tetris+language:assembly&sort=stars&order=desc&type=all&per_page=100&page=3",
+    "path": "/search/repositories?q=tetris+language:assembly&sort=stars&order=desc&type=all&per_page=100&page=3",
     "body": "",
     "status": 200,
     "response": {
@@ -26813,7 +26813,7 @@
   {
     "scope": "https://api.github.com:443",
     "method": "GET",
-    "path": "/search/repositories?q=tetris+language%3Aassembly&sort=stars&order=desc&type=all&per_page=100&page=4&q=tetris+language:assembly&sort=stars&order=desc&type=all&per_page=100&page=4",
+    "path": "/search/repositories?q=tetris+language:assembly&sort=stars&order=desc&type=all&per_page=100&page=4",
     "body": "",
     "status": 200,
     "response": {
@@ -35750,7 +35750,7 @@
   {
     "scope": "https://api.github.com:443",
     "method": "GET",
-    "path": "/search/repositories?q=tetris+language%3Aassembly&sort=stars&order=desc&type=all&per_page=100&page=5&q=tetris+language:assembly&sort=stars&order=desc&type=all&per_page=100&page=5",
+    "path": "/search/repositories?q=tetris+language:assembly&sort=stars&order=desc&type=all&per_page=100&page=5",
     "body": "",
     "status": 200,
     "response": {
@@ -48946,7 +48946,7 @@
   {
     "scope": "https://api.github.com:443",
     "method": "GET",
-    "path": "/search/issues?q=windows+pip+label%3Abug+language%3Apython+state%3Aopen+&sort=created&order=asc&type=all&per_page=100&page=2&q=windows+pip+label:bug+language:python+state:open+&sort=created&order=asc&type=all&per_page=100&page=2",
+    "path": "/search/issues?q=windows+pip+label:bug+language:python+state:open+&sort=created&order=asc&type=all&per_page=100&page=2",
     "body": "",
     "status": 200,
     "response": {
