use a do while loop instead

amplify-education · May 15, 2020 · 1e12f2f · 1e12f2f
1 parent 9744b5c
commit 1e12f2f
Showing 1 changed file with 11 additions and 5 deletions.
diff --git a/src/index.ts b/src/index.ts
@@ -806,13 +806,19 @@ class ServerlessCustomDomain {
         params: object,
     ): Promise<any[]> {
         let results = [];
-        let response = await service[funcName](params).promise();
-        results = results.concat(response[resultsKey]);
-        while (response.hasOwnProperty(nextRequestTokenKey)) {
-            params[nextTokenKey] = response[nextRequestTokenKey];
+        let response = {};
+
+        do {
             response = await service[funcName](params).promise();
             results = results.concat(response[resultsKey]);
-        }
+
+            // append the next token key to the request parameters of the next request
+            if(response.hasOwnProperty(nextRequestTokenKey)) {
+                params[nextTokenKey] = response[nextRequestTokenKey];
+            }
+
+        }  while (response.hasOwnProperty(nextRequestTokenKey) && response[nextRequestTokenKey]);
+
         return results;
     }
 }