Add regression tests for change

Author: sauntimo

server/lib/multipartRequest.js

@@ -30,7 +30,6 @@ export default async function (
       Object.assign({}, options, { include_totals: true, page: 0 }),
     ]);
 
-    // auth0 SDK v4 returns JSONApiResponse with .data property
     total = response.total || 0;
     pageCount = Math.ceil(total / perPage);
     const data = response[entity] || response || [];
@@ -42,8 +41,7 @@ export default async function (
     const response = await apiCall(client[entity], getter, [
       Object.assign({}, options, { page: page }),
     ]);
-    // auth0 SDK v4 returns JSONApiResponse with .data property
-    const data = response.data || response || [];
+    const data = response || [];
     data.forEach((item) => result.push(item));
     return null;
   };

tests/unit/server/groups-members-route.tests.js

@@ -1,6 +1,7 @@
 import { expect } from 'chai';
 import { getServerData } from '../server';
 import { getToken } from '../mocks/tokens';
+import * as auth0 from '../mocks/auth0';
 
 describe('groups-members-route', async () => {
   let server = null;
@@ -73,6 +74,15 @@ describe('groups-members-route', async () => {
 
     it('should return members', async () => {
       const token = getToken('read:groups');
+      auth0.get(`/api/v2/users/${encodeURIComponent(uid)}`, {
+        user_id: uid,
+        name: 'Test User',
+        email: 'test@example.com',
+        picture: 'https://example.com/pic.jpg',
+        identities: [ { connection: 'Username-Password-Authentication', provider: 'auth0', user_id: 'some_user_id', isSocial: false } ],
+        last_login: new Date().toISOString(),
+        logins_count: 5
+      });
       const options = {
         method: 'GET',
         url: `/api/groups/${guid}/members`,
@@ -85,8 +95,10 @@ describe('groups-members-route', async () => {
       expect(response.statusCode).to.be.equal(200);
       expect(response.result.users).to.be.a('array');
       expect(response.result.users[0].user_id).to.be.equal(uid);
-      expect(response.result.users[1].user_id).to.be.equal('undefined');
+      expect(response.result.users[0].identities).to.be.an('array');
+      expect(response.result.users[0].identities[0].connection).to.be.a('string');
       // auth0 SDK v4 throws FetchError instead of APIError when user not found
+      expect(response.result.users[1].user_id).to.be.equal('undefined');
       expect(response.result.users[1].name).to.be.equal('<Error: FetchError>');
       expect(response.result.total).to.be.equal(2);
     });

tests/unit/server/lib/apiCall.tests.js

@@ -0,0 +1,69 @@
+import { expect } from 'chai';
+import apiCall from '../../../../server/lib/apiCall';
+
+describe('apiCall', () => {
+  it('should unwrap .data from the SDK v4 response', async () => {
+    const user = { user_id: 'auth0|123', identities: [ { connection: 'Username-Password-Authentication' } ] };
+    const method = () => Promise.resolve({ data: user, status: 200, headers: {} });
+
+    const result = await apiCall({}, method, [ { id: 'auth0|123' } ]);
+
+    expect(result).to.deep.equal(user);
+    expect(result.identities).to.be.an('array');
+    expect(result.identities[0].connection).to.equal('Username-Password-Authentication');
+  });
+
+  it('should throw non-retryable errors immediately', async () => {
+    const error = new Error('Not found');
+    error.originalError = { status: 404 };
+    const method = () => Promise.reject(error);
+
+    try {
+      await apiCall({}, method, []);
+      expect.fail('Should have thrown');
+    } catch (err) {
+      expect(err).to.equal(error);
+    }
+  });
+
+  it('should not retry when rate limit reset exceeds max retry timeout', async () => {
+    const ratelimitReset = Math.round(Date.now() / 1000) + 100;
+    const error = new Error('Rate limit');
+    error.originalError = {
+      status: 429,
+      response: { header: { 'x-ratelimit-reset': ratelimitReset } }
+    };
+    const method = () => Promise.reject(error);
+
+    try {
+      await apiCall({}, method, []);
+      expect.fail('Should have thrown');
+    } catch (err) {
+      expect(err).to.equal(error);
+    }
+  });
+
+  it('should retry on 429 and resolve on success', async function() {
+    this.timeout(5000);
+
+    const user = { user_id: 'auth0|123', identities: [ { connection: 'Username-Password-Authentication' } ] };
+    const ratelimitReset = Math.round(Date.now() / 1000);
+    const error = new Error('Rate limit');
+    error.originalError = {
+      status: 429,
+      response: { header: { 'x-ratelimit-reset': ratelimitReset } }
+    };
+
+    let callCount = 0;
+    const method = () => {
+      callCount++;
+      if (callCount === 1) return Promise.reject(error);
+      return Promise.resolve({ data: user, status: 200, headers: {} });
+    };
+
+    const result = await apiCall({}, method, [], 2);
+
+    expect(result).to.deep.equal(user);
+    expect(callCount).to.equal(2);
+  });
+});