Merge pull request #48 from tomasmatulis0/master

Fixed errors = null case and for 500 error, do not return error_descr…

CHANGELOG.md

@@ -4,6 +4,13 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+## 2.0.2
+### Fixed
+- `resolveByResponseErrors` handled `{ errors: null }` case
+- `resolveHttpErrorMessage` now for `500` instead of `error_description` it returns a default translated message
+### Added
+- `resolveErrorResponseDescription` a function to resolve error description, for `500` returns null
+
 ## 2.0.1
 ### Fixed
 - `resolveCorrelationId` additionally checks if error is network error and if yes it returns null

package.json

@@ -1,6 +1,6 @@
 {
     "name": "@paysera/error-message-resolver",
-    "version": "2.0.1",
+    "version": "2.0.2",
     "description": "Library that helps resolve error messages",
     "main": "dist/main.js",
     "module": "es/index.js",

src/__tests__/resolveHttpErrorMessage.test.js

@@ -110,6 +110,17 @@ describe('resolveHttpErrorMessage', () => {
     );
 
     test.each([
+        [
+            {
+                status: 500,
+                data: {
+                    error: 'internal_server_error',
+                    errors: null,
+                    error_description: 'Internal error',
+                },
+            },
+            'Internal server error',
+        ],
         [
             {
                 status: 400,

src/condition/resolveErrorResponseDescription.js

@@ -0,0 +1,8 @@
+import get from 'lodash/get';
+
+export const resolveErrorResponseDescription = (errorResponse) => {
+    if (errorResponse.getStatus() === 500) {
+        return null;
+    }
+    return get(errorResponse.getData(), 'error_description', null);
+};

src/messageResolver/__tests__/resolveByResponseErrors.test.js

@@ -18,6 +18,11 @@ describe('resolveByResponseStatus', () => {
             (new ErrorResponse()).setData({ errors: ['error1', 'error2'] }),
             null,
         ],
+        [
+            'Response data errors is array of strings',
+            (new ErrorResponse()).setData({ errors: null }),
+            null,
+        ],
         [
             'Resolves first message from response data errors',
             (new ErrorResponse()).setData({

src/messageResolver/resolveByResponseErrors.js

@@ -9,6 +9,10 @@ import isUndefined from 'lodash/isUndefined';
 export default (errorResponse) => {
     const { errors = [] } = errorResponse.getData() || {};
 
+    if (errors === null) {
+        return null;
+    }
+
     const firstErrorMessage = errors.find(error => (
         isObject(error)
         && !isUndefined(error.message)

src/resolveHttpErrorMessage.js

@@ -12,6 +12,7 @@ import responseErrorCondition from './condition/responseErrorCondition';
 import responseStatusErrorCondition from './condition/responseStatusErrorCondition';
 import tooManyRequestsErrorCondition from './condition/tooManyRequestsErrorCondition';
 import maintenanceCondition from './condition/maintenanceCondition';
+import { resolveErrorResponseDescription } from './condition/resolveErrorResponseDescription';
 
 /**
  * @param {*} error
@@ -37,7 +38,7 @@ export default async (error, message) => {
         () => tooManyRequestsErrorCondition(errorResponse, message.getTooManyRequests()),
         () => responseStatusErrorCondition(errorResponse, message.getStatus()),
         () => resolveByResponseErrors(errorResponse),
-        () => get(errorResponse.getData(), 'error_description', null),
+        () => resolveErrorResponseDescription(errorResponse),
         () => defaultErrorMessageCondition(errorResponse),
     ];