@edgeiq/edgeiq-api-js 1.5.5 → 1.5.7

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (2) hide show
  1. package/dist/core/handleResponseError.js +20 -16
  2. package/package.json +1 -1
package/dist/core/handleResponseError.js CHANGED
@@ -70,10 +70,11 @@ var handlePasswordReset = function (error) {
70
70
  };
71
71
  var errorMessages = function (error) { var _a, _b; return (_b = (_a = error.response) === null || _a === void 0 ? void 0 : _a.data.messages) === null || _b === void 0 ? void 0 : _b.join('\n'); };
72
72
  var handleOtherErrors = function (error) {
73
- var _a, _b;
73
+ var _a, _b, _c, _d;
74
74
  var path = null;
75
75
  var model = null;
76
76
  var action = '';
77
+ var errorName = '';
77
78
  if (((_a = error.response) === null || _a === void 0 ? void 0 : _a.request) &&
78
79
  error.response.request.path &&
79
80
  error.response.config &&
@@ -86,12 +87,11 @@ var handleOtherErrors = function (error) {
86
87
  switch ((_b = error.response) === null || _b === void 0 ? void 0 : _b.config.method) {
87
88
  case 'put':
88
89
  if (model === constants_1.BaseEndpoints.deviceConfig && parseErrorMessages) {
89
- error.response.data = parseErrorMessages;
90
- return Promise.reject(createError(error.response.data, constants_1.ResponseErrorsNames.deviceConfig));
90
+ errorName = constants_1.ResponseErrorsNames.deviceConfig;
91
91
  }
92
92
  else if (error.response.data.error === constants_1.ResponseErrorsNames.validationError &&
93
93
  parseErrorMessages) {
94
- return Promise.reject(createError(parseErrorMessages, constants_1.ResponseErrorsNames.validationError));
94
+ errorName = constants_1.ResponseErrorsNames.validationError;
95
95
  }
96
96
  action = constants_1.MethodsActions.put;
97
97
  break;
@@ -109,42 +109,46 @@ var handleOtherErrors = function (error) {
109
109
  var text = error.response.data.messages[0];
110
110
  if (model === constants_1.BaseEndpoints.device) {
111
111
  if (text && text.indexOf(constants_1.ErrorParts.deviceExists) !== -1) {
112
- error.response.data = createError(text, constants_1.ResponseErrorsNames.duplicatedDevice);
112
+ errorName = constants_1.ResponseErrorsNames.duplicatedDevice;
113
113
  }
114
114
  else if (error.response.data.messages[0] === constants_1.ErrorParts.uniqueIdError) {
115
- error.response.data = createError(constants_1.ResponseErrorsMessages.deviceCharacters, constants_1.ResponseErrorsNames.deviceCharacters);
115
+ errorName = constants_1.ResponseErrorsNames.deviceCharacters;
116
116
  }
117
117
  }
118
118
  else if (model === constants_1.BaseEndpoints.deviceConfig && parseErrorMessages) {
119
- error.response.data = createError(parseErrorMessages, constants_1.ResponseErrorsNames.deviceConfig);
119
+ errorName = constants_1.ResponseErrorsNames.deviceConfig;
120
120
  }
121
121
  else if (text && text.indexOf(constants_1.ErrorParts.uniqueConstraint) !== -1) {
122
- error.response.data = createError(constants_1.ResponseErrorsMessages.uniqueConstraint(model), constants_1.ResponseErrorsNames.uniqueConstraint);
122
+ errorName = constants_1.ResponseErrorsNames.uniqueConstraint;
123
123
  }
124
124
  else if (text && text.indexOf(constants_1.ErrorParts.duplicateKey) !== -1) {
125
+ errorName = constants_1.ResponseErrorsNames.duplicateKey;
125
126
  error.response.data = createError(text, constants_1.ResponseErrorsNames.duplicateKey);
126
127
  }
127
128
  else if (error.response.data.error === constants_1.ResponseErrorsNames.createError &&
128
129
  parseErrorMessages) {
129
- error.response.data = createError(parseErrorMessages, constants_1.ResponseErrorsNames.createError);
130
+ errorName = constants_1.ResponseErrorsNames.createError;
131
+ }
132
+ else if (error.response.data.error === constants_1.ResponseErrorsNames.validationError &&
133
+ parseErrorMessages) {
134
+ errorName = constants_1.ResponseErrorsNames.validationError;
130
135
  }
131
- return Promise.reject(error.response.data);
132
136
  }
133
137
  action = constants_1.MethodsActions.post;
134
138
  break;
135
139
  case 'delete':
136
140
  action = constants_1.MethodsActions.delete;
137
- if (parseErrorMessages) {
138
- return Promise.reject(createError(parseErrorMessages, action));
139
- }
140
141
  break;
141
142
  case 'get':
142
143
  action = constants_1.MethodsActions.get;
143
- if (parseErrorMessages) {
144
- return Promise.reject(createError(parseErrorMessages, action));
145
- }
146
144
  break;
147
145
  }
146
+ if (parseErrorMessages) {
147
+ return Promise.reject(createError(parseErrorMessages, errorName || action));
148
+ }
149
+ if ((_d = (_c = error === null || error === void 0 ? void 0 : error.response) === null || _c === void 0 ? void 0 : _c.data) === null || _d === void 0 ? void 0 : _d.error) {
150
+ return Promise.reject(createError(error.response.data.error, constants_1.ResponseErrorsNames.unexpected));
151
+ }
148
152
  var errorMessage = mapModelError(model, action);
149
153
  return Promise.reject(createError(errorMessage, constants_1.ResponseErrorsNames.unexpected));
150
154
  };
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@edgeiq/edgeiq-api-js",
3
- "version": "1.5.5",
3
+ "version": "1.5.7",
4
4
  "author": "EdgeIQ",
5
5
  "license": "ISC",
6
6
  "description": "This project presents EdgeIQ API SDK.",