From 1e12f2f3fb0c95ff6d755111e89353f74c89c6c0 Mon Sep 17 00:00:00 2001
From: Alex Oskotsky <aoskotsky@amplify.com>
Date: Fri, 15 May 2020 02:16:51 -0400
Subject: [PATCH] use a do while loop instead

---
 src/index.ts | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/src/index.ts b/src/index.ts
index 00fa1ef8..e6d765da 100644
--- 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;
     }
 }