companion: use same query parameter for pagination

packages/@uppy/companion/src/server/provider/drive/adapter.js

@@ -77,7 +77,7 @@ exports.getNextPagePath = (data, currentQuery, currentPath) => {
   }
   const query = {
     ...currentQuery,
-    nextPageToken: data.nextPageToken
+    cursor: data.nextPageToken
   }
   return `${currentPath}?${querystring.stringify(query)}`
 }

packages/@uppy/companion/src/server/provider/drive/index.js

@@ -27,7 +27,7 @@ class Drive {
 
     let teamDrivesPromise = Promise.resolve(undefined)
 
-    const shouldListTeamDrives = directory === 'root' && !query.nextPageToken
+    const shouldListTeamDrives = directory === 'root' && !query.cursor
     if (shouldListTeamDrives) {
       teamDrivesPromise = new Promise((resolve) => {
         this.client
@@ -47,7 +47,7 @@ class Drive {
 
     let where = {
       fields: DRIVE_FILES_FIELDS,
-      pageToken: query.nextPageToken,
+      pageToken: query.cursor,
       q: `'${directory}' in parents and trashed=false`,
       includeItemsFromAllDrives: true,
       supportsAllDrives: true

packages/@uppy/companion/src/server/provider/instagram/adapter.js

@@ -77,6 +77,6 @@ exports.getItemThumbnailUrl = (item) => {
 exports.getNextPagePath = (data) => {
   const items = exports.getItemSubList(data)
   if (items.length) {
-    return `recent?max_id=${exports.getItemId(items[items.length - 1])}`
+    return `recent?cursor=${exports.getItemId(items[items.length - 1])}`
   }
 }

packages/@uppy/companion/src/server/provider/instagram/index.js

@@ -16,7 +16,8 @@ class Instagram {
   }
 
   list ({ directory = 'recent', token, query = {} }, done) {
-    const qs = query.max_id ? { max_id: query.max_id } : {}
+    const cursor = query.cursor || query.max_id
+    const qs = cursor ? { max_id: cursor } : {}
     this.client
       .select(`users/self/media/${directory}`)
       .qs(qs)