@contentstack/cli-cm-export-to-csv 1.12.3 → 1.12.4

package/lib/utils/api-client.js

@@ -115,20 +115,11 @@ function getOrgUsers(managementAPIClient, orgUid) {
             if (!organization) {
                 return reject(new Error('Org UID not found.'));
             }
-            if (organization.is_owner === true) {
-                return managementAPIClient
-                    .organization(organization.uid)
-                    .getInvitations()
-                    .then((data) => {
-                    resolve(data);
-                })
-                    .catch(reject);
-            }
-            if (!organization.getInvitations && !(0, find_1.default)(organization.org_roles, 'admin')) {
+            if (!organization.is_owner && !(0, find_1.default)(organization.org_roles, 'admin')) {
                 return reject(new Error(messages_1.messages.ERROR_ADMIN_ACCESS_DENIED));
             }
             try {
-                const users = await getUsers(managementAPIClient, { uid: organization.uid }, { skip: 0, page: 1, limit: 100 });
+                const users = await getUsers(managementAPIClient, { uid: organization.uid }, { skip: 0, page: 1, limit: config_1.default.limit });
                 return resolve({ items: users || [] });
             }
             catch (error) {
@@ -142,20 +133,22 @@ function getOrgUsers(managementAPIClient, orgUid) {
  * Get users with pagination.
  */
 async function getUsers(managementAPIClient, organization, params, result = []) {
+    var _a;
     try {
         const users = await managementAPIClient.organization(organization.uid).getInvitations(params);
-        if (!users.items || (users.items && !users.items.length)) {
+        if (!users.items || users.items.length < params.limit) {
+            if ((_a = users.items) === null || _a === void 0 ? void 0 : _a.length) {
+                result = result.concat(users.items);
+            }
             return result;
         }
-        else {
-            result = result.concat(users.items);
-            params.skip = params.page * params.limit;
-            params.page++;
-            await (0, error_handler_1.wait)(200);
-            return getUsers(managementAPIClient, organization, params, result);
-        }
+        result = result.concat(users.items);
+        params.skip = params.page * params.limit;
+        params.page++;
+        await (0, error_handler_1.wait)(200);
+        return getUsers(managementAPIClient, organization, params, result);
     }
-    catch (_a) {
+    catch (_b) {
         return result;
     }
 }

package/oclif.manifest.json

@@ -167,5 +167,5 @@
       ]
     }
   },
-  "version": "1.12.3"
+  "version": "1.12.4"
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@contentstack/cli-cm-export-to-csv",
   "description": "Export entries, taxonomies, terms, or organization users to CSV",
-  "version": "1.12.3",
+  "version": "1.12.4",
   "author": "Contentstack",
   "bugs": "https://github.com/contentstack/cli/issues",
   "dependencies": {