Merge branch 'pagination-url'

jdalrymple · Jun 12, 2019 · 4614a49 · 4614a49
2 parents 688c1f2 + 2b290b5
commit 4614a49
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/src/infrastructure/RequestHelper.ts b/src/infrastructure/RequestHelper.ts
@@ -40,7 +40,9 @@ export async function get(
   // Rescurse through pagination results
   if (!query.page && underLimit && pagination.next) {
     const { next } = Li.parse(headers.link);
-    const more = await get(service, next.replace(`${service.url}/`, ''), {
+    const leaf = service.url.split('/').pop() || ""
+    const regex = new RegExp(`.+\/api\/v\d(\/${leaf})?\/`)
+    const more = await get(service, next.replace(regex, ''), {
       maxPages,
       sudo,
       showPagination: true