Handle next urls for paginated json when host/port/path don't match. F…

…ixed mybuilder#118
philrhinehart · Oct 23, 2018 · 68d5ce6 · 68d5ce6
1 parent 3c9d032
commit 68d5ce6
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/package.json b/package.json
@@ -29,7 +29,8 @@
     "object-assign": "^4.0.1",
     "pad": "^2.0.3",
     "prettyjson": "^1.1.3",
-    "semver": "^5.5.0"
+    "semver": "^5.5.0",
+    "url": "^0.11.0"
   },
   "devDependencies": {
     "babel-cli": "^6.26.0",

diff --git a/src/adminApi.js b/src/adminApi.js
@@ -1,6 +1,7 @@
 import createRouter from './router';
 import requester from './requester';
-import { parseVersion } from './utils.js'
+import { parseVersion } from './utils.js';
+import { parse, format } from 'url';
 
 let pluginSchemasCache;
 let kongVersionCache;
@@ -80,6 +81,13 @@ function getPluginScheme(plugin, schemaRoute) {
         .then(({fields}) => [plugin, fields]);
 }
 
+function fixNextUri(uri, nextUri) {
+    const { protocol, auth, hostname, port, pathname, path } = parse(uri);
+    const { hash, search, query } = parse(nextUri);
+
+    return format({ protocol, auth, hostname, port, hash, search, query, pathname, path });
+}
+
 function getPaginatedJson(uri) {
     return requester.get(uri)
     .then(response => {
@@ -110,7 +118,7 @@ function getPaginatedJson(uri) {
             return json.data;
         }
 
-        return getPaginatedJson(json.next).then(data => json.data.concat(data));
+        return getPaginatedJson(fixNextUri(uri, json.next)).then(data => json.data.concat(data));
     });
 }