Merge pull request #47 from Coaktion/fix/return-zaf-api-error

Fix/return zaf api error

src/base.ts

@@ -274,7 +274,8 @@ export class BaseClient implements BaseClientInterface {
    * @throws {InvalidAuthOptions}
    */
   retryDelay = (retryCount: number, error: AxiosError | any): number => {
-    if (retryCount >= this.clientOptions.tries) throw error;
+    if (retryCount >= this.clientOptions.tries)
+      throw error.response ? error.response : error;
     return error.response.status ===
       HttpStatusCodesRetryCondition.TooManyRequests
       ? parseInt(error.response.headers[this.clientOptions.rateLimitKey])

src/exceptions.ts

@@ -1,3 +1,5 @@
+import { ZendeskError } from './types';
+
 /**
  * EndpointNotSet Error
  * @description
@@ -34,9 +36,12 @@ export class AuthProviderNotFound extends Error {
 
 export class ZendeskRequestError extends Error {
   response: object;
-  constructor(message: object) {
+  constructor(message: ZendeskError) {
     super(JSON.stringify(message));
     this.name = 'ZendeskRequestError';
-    this.response = message;
+    this.response = {
+      status: message.status,
+      message: message.message
+    };
   }
 }

src/types.ts

@@ -277,3 +277,8 @@ export type SearchAllStrategyReturn = {
   hasMore: boolean;
   paramsAux: any;
 };
+
+export type ZendeskError = {
+  status: number;
+  message: string;
+};

src/zendesk.ts

@@ -51,10 +51,16 @@ export class ZendeskClient
       });
     } catch (error) {
       if (!error.status) throw new Error(String(error));
-      const instanceError = new ZendeskRequestError(error);
+      const instanceError = new ZendeskRequestError({
+        status: error.status,
+        message: error.responseJSON.message
+      });
+
       if (this.retryCondition(instanceError)) {
         await sleep(this.retryDelay(payload.retryCount, instanceError));
         this.makeRequest(payload);
+      } else {
+        throw instanceError.response;
       }
     }
   }

tests/base.test.ts

@@ -231,4 +231,14 @@ describe('BaseClient', () => {
     expect(result.fullFetched).toBe(true);
     expect(result.dataFetched).toEqual(['someData', 'someData2']);
   });
+
+  it('should throw with error response if exists on retryDelay', async () => {
+    try {
+      clientBasic.retryDelay(1, {
+        response: { status: 500, message: 'requestError' }
+      });
+    } catch (error) {
+      expect(error).toEqual({ status: 500, message: 'requestError' });
+    }
+  });
 });

tests/zendesk.test.ts

@@ -282,14 +282,17 @@ describe('ZendeskClientBase', () => {
     zendeskClientBase.retryCondition = jest.fn().mockReturnValueOnce(true);
     zendeskClientBase.retryDelay = jest.fn().mockReturnValueOnce(100);
     sleep as jest.Mock;
-    const error = { status: 500 };
+    const error = { status: 500, message: 'requestError' };
     const instanceError = new ZendeskRequestError(error);
 
     const payload: PayloadRequestZendesk = {
       url: 'url',
       method: 'method'
     };
-    (mockZendeskClient.request as jest.Mock).mockRejectedValueOnce(error);
+    (mockZendeskClient.request as jest.Mock).mockRejectedValueOnce({
+      status: 500,
+      responseJSON: { message: 'requestError' }
+    });
     await zendeskClientBase.makeRequest(payload);
 
     expect(sleep).toHaveBeenCalledWith(100);
@@ -411,4 +414,22 @@ describe('ZendeskClientBase', () => {
     });
     expect(mockZendeskClient.request).toHaveBeenCalledTimes(1);
   });
+
+  it('should throw ZendeskReuqestError when not on retry', async () => {
+    zendeskClientBase.retryCondition = jest.fn().mockReturnValueOnce(false);
+    const payload: PayloadRequestZendesk = {
+      url: 'url',
+      method: 'method'
+    };
+    (mockZendeskClient.request as jest.Mock).mockRejectedValueOnce({
+      status: 500,
+      responseJSON: { message: 'requestError' }
+    });
+
+    try {
+      await zendeskClientBase.makeRequest(payload);
+    } catch (error) {
+      expect(error).toEqual({ status: 500, message: 'requestError' });
+    }
+  });
 });