fixes three related pagination bugs in the command's org user fetch logic.

Author: cs-raj

packages/contentstack-export-to-csv/src/utils/api-client.ts

@@ -138,22 +138,16 @@ export function getOrgUsers(managementAPIClient: ManagementClient, orgUid: strin
           return reject(new Error('Org UID not found.'));
         }
 
-        if (organization.is_owner === true) {
-          return managementAPIClient
-            .organization(organization.uid)
-            .getInvitations()
-            .then((data: unknown) => {
-              resolve(data as OrgUsersResponse);
-            })
-            .catch(reject);
-        }
-
-        if (!organization.getInvitations && !find(organization.org_roles, 'admin')) {
+        if (!organization.is_owner && !find(organization.org_roles, 'admin')) {
           return reject(new Error(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.limit },
+          );
           return resolve({ items: users || [] });
         } catch (error) {
           return reject(error);
@@ -175,15 +169,18 @@ async function getUsers(
   try {
     const users = await managementAPIClient.organization(organization.uid).getInvitations(params) as unknown as OrgUsersResponse;
 
-    if (!users.items || (users.items && !users.items.length)) {
+    if (!users.items || users.items.length < params.limit) {
+      if (users.items?.length) {
+        result = result.concat(users.items);
+      }
       return result;
-    } else {
-      result = result.concat(users.items);
-      params.skip = params.page * params.limit;
-      params.page++;
-      await wait(200);
-      return getUsers(managementAPIClient, organization, params, result);
     }
+
+    result = result.concat(users.items);
+    params.skip = params.page * params.limit;
+    params.page++;
+    await wait(200);
+    return getUsers(managementAPIClient, organization, params, result);
   } catch {
     return result;
   }

packages/contentstack-export-to-csv/test/unit/utils/api-client.test.ts

@@ -1,4 +1,8 @@
 import { expect } from 'chai';
+import sinon from 'sinon';
+import config from '../../../src/config';
+import { messages } from '../../../src/messages';
+import * as errorHandler from '../../../src/utils/error-handler';
 import {
   getOrganizations,
   getOrganizationsWhereUserIsAdmin,
@@ -18,12 +22,66 @@ import {
   getTaxonomy,
   createImportableCSV,
 } from '../../../src/utils/api-client';
+import type { ManagementClient, OrgUser } from '../../../src/types';
 
-// API client functions are tightly coupled to the Contentstack SDK
-// These tests verify the function signatures and basic structure
-// Full integration testing requires actual SDK mocking or E2E tests
+const ORG_UID = 'org-uid';
+
+function makeUser(index: number): OrgUser {
+  return {
+    email: `user${index}@example.com`,
+    user_uid: `uid-${index}`,
+    invited_by: 'system',
+    status: 'accepted',
+    created_at: '2020-01-01T00:00:00.000Z',
+    updated_at: '2020-01-01T00:00:00.000Z',
+  };
+}
+
+function createPaginatedMockClient(
+  organization: {
+    is_owner?: boolean;
+    org_roles?: Array<{ admin?: boolean }>;
+  },
+  pages: OrgUser[][],
+): { client: ManagementClient; getInvitations: sinon.SinonStub; invitationParams: Array<Record<string, number>> } {
+  const invitationParams: Array<Record<string, number>> = [];
+  const getInvitations = sinon.stub().callsFake(async (params: Record<string, number>) => {
+    invitationParams.push({ ...params });
+    const callIndex = getInvitations.callCount - 1;
+    const items = pages[callIndex] ?? [];
+    return { items };
+  });
+
+  const organizationClient = { getInvitations };
+  const organizationStub = sinon.stub().returns(organizationClient);
+
+  const client = {
+    getUser: sinon.stub().resolves({
+      organizations: [
+        {
+          uid: ORG_UID,
+          name: 'Test Org',
+          ...organization,
+        },
+      ],
+    }),
+    organization: organizationStub,
+  } as unknown as ManagementClient;
+
+  return { client, getInvitations, invitationParams };
+}
 
 describe('api-client', () => {
+  let waitStub: sinon.SinonStub;
+
+  beforeEach(() => {
+    waitStub = sinon.stub(errorHandler, 'wait').resolves();
+  });
+
+  afterEach(() => {
+    waitStub.restore();
+  });
+
   describe('module exports', () => {
     it('should export all expected functions', () => {
       expect(getOrganizations).to.be.a('function');
@@ -46,7 +104,62 @@ describe('api-client', () => {
     });
   });
 
-  // Note: Full functional tests for api-client require mocking the @contentstack/management SDK
-  // This is complex due to the SDK's internal structure. These tests are better suited for 
-  // integration testing with a test stack or using more sophisticated mocking tools.
+  describe('getOrgUsers', () => {
+    it('should paginate getInvitations for organization owners', async () => {
+      const page1 = Array.from({ length: config.limit }, (_, i) => makeUser(i));
+      const page2 = Array.from({ length: config.limit }, (_, i) => makeUser(i + config.limit));
+      const page3 = Array.from({ length: 25 }, (_, i) => makeUser(i + config.limit * 2));
+
+      const { client, getInvitations, invitationParams } = createPaginatedMockClient(
+        { is_owner: true },
+        [page1, page2, page3],
+      );
+
+      const result = await getOrgUsers(client, ORG_UID);
+
+      expect(result.items).to.have.lengthOf(225);
+      expect(getInvitations.callCount).to.equal(3);
+      expect(invitationParams[0]).to.deep.equal({ skip: 0, page: 1, limit: config.limit });
+      expect(invitationParams[1]).to.deep.equal({ skip: config.limit, page: 2, limit: config.limit });
+      expect(invitationParams[2]).to.deep.equal({
+        skip: config.limit * 2,
+        page: 3,
+        limit: config.limit,
+      });
+    });
+
+    it('should paginate getInvitations for organization admins', async () => {
+      const page1 = Array.from({ length: config.limit }, (_, i) => makeUser(i));
+      const page2 = Array.from({ length: config.limit }, (_, i) => makeUser(i + config.limit));
+      const page3 = Array.from({ length: 25 }, (_, i) => makeUser(i + config.limit * 2));
+
+      const { client, getInvitations, invitationParams } = createPaginatedMockClient(
+        { is_owner: false, org_roles: [{ admin: true }] },
+        [page1, page2, page3],
+      );
+
+      const result = await getOrgUsers(client, ORG_UID);
+
+      expect(result.items).to.have.lengthOf(225);
+      expect(getInvitations.callCount).to.equal(3);
+      expect(invitationParams[0]).to.deep.equal({ skip: 0, page: 1, limit: config.limit });
+    });
+
+    it('should reject when user is neither owner nor admin', async () => {
+      const { client, getInvitations } = createPaginatedMockClient(
+        { is_owner: false, org_roles: [{ admin: false }] },
+        [[]],
+      );
+
+      try {
+        await getOrgUsers(client, ORG_UID);
+        expect.fail('Expected getOrgUsers to reject');
+      } catch (error) {
+        expect(error).to.be.instanceOf(Error);
+        expect((error as Error).message).to.equal(messages.ERROR_ADMIN_ACCESS_DENIED);
+      }
+
+      expect(getInvitations.callCount).to.equal(0);
+    });
+  });
 });