Merge pull request #472 from gibkigonzo/bugfix/442

add error status code as number in apiError

Author: pkarw

CHANGELOG.md

@@ -9,9 +9,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Fixed
 
-- get proper tax calculation for multistore - @didkan (#464)
-- create only one ES client instance per app - @gibkigonzo (#393)
-
+- AAdd error status code as number in `apiError` - @gibkigonzo (#442)
+- Get proper tax calculation for multistore - @didkan (#464)
+- Create only one ES client instance per app - @gibkigonzo (#393)
 
 ## [1.12.0] - 2020.06.01
 

src/api/catalog.ts

@@ -118,6 +118,7 @@ export default ({config, db}) => async function (req, res, body) {
       auth: auth
     }, async (_err, _res, _resBody) => { // TODO: add caching layer to speed up SSR? How to invalidate products (checksum on the response BEFORE processing it)
       if (_err || _resBody.error) {
+        console.error(_err || _resBody.error)
         apiError(res, _err || _resBody.error)
         return
       }

src/lib/util.js

@@ -86,14 +86,14 @@ export function apiStatus (res, result = 'OK', code = 200, meta = null) {
  *  @return {json} [result='OK']    Text message or result information object
  */
 export function apiError (res, error) {
-  let errorCode = error.code || error.status || 500;
+  let errorCode = error.code || error.status;
   let errorMessage = error.errorMessage || error;
   if (error instanceof Error) {
     // Class 'Error' is not serializable with JSON.stringify, extract data explicitly.
     errorCode = error.code || errorCode;
     errorMessage = error.message;
   }
-  return apiStatus(res, errorMessage, errorCode);
+  return apiStatus(res, errorMessage, Number(errorCode) || 500);
 }
 
 export function encryptToken (textToken, secret) {