ti2 1.0.60 → 1.0.62

package/controllers/__tests__/allotments.js

@@ -106,7 +106,10 @@ describe('allotment', () => {
     expect(call.token).toEqual(token);
   });
   it('should be able to receive an axios error', async () => {
+    const mock = new MockAdapter(axios);
+    mock.onGet('http://www.example.com').reply(500, { what: 'nothing here' });
     let urlParamsError = new URLSearchParams({
+
       ...payload,
       keyPath: 'errorAxios',
     }).toString();
@@ -116,7 +119,7 @@ describe('allotment', () => {
       expectStatusCode: 500,
     });
     expect(returnValue.allotments).toBeFalsy();
-    expect(returnValue.message).toBe('ECONNREFUSED');
+    expect(returnValue.message).toBe('nothing here');
   });
   it('should be able to receive an error from a regular response', async () => {
     const mock = new MockAdapter(axios);

package/index.js

@@ -223,7 +223,9 @@ module.exports = async ({
           if (process.env.debug) console.error(`error in ${pluginName}`, errMsg);
           if (ti2Events.events) {
             ti2Events.events.emit(`${pluginName}.axios.error`, {
+              userId,
               response: axiosSafeResponse(response),
+              requestId: req.requestId,
               err: errMsg,
             });
           }
@@ -232,11 +234,14 @@ module.exports = async ({
         return response;
       }, err => {
         const errMsg = getErrorMessage({ err, handlers: errorPathsAxiosErrors });
-        if (process.env.debug) console.error(`error in ${pluginName}`, args[0], errMsg);
+        if (process.env.debug) console.error(`error in ${pluginName}`, errMsg);
         if (ti2Events.events) {
           ti2Events.events.emit(`${pluginName}.axios.error`, {
-            request: args[0],
+            userId,
+            requestId: req.requestId,
             err: errMsg,
+            ...(err.request ? { request: axiosSafeRequest(err.request) } : {}),
+            ...(err.response ? { response: axiosSafeRequest(err.response) } : {}),
           });
         }
         return Promise.reject(errMsg);
@@ -293,12 +298,12 @@ module.exports = async ({
     app.use(middleware.mock());
     // global error Handling
     app.use((err, req, res, next) => {
-      if (res.headersSent) {
-        return next(err);
-      }
       if (process.env.CONSOLE_ERRORS || process.env.JEST_WORKER_ID) {
         console.error(R.pathOr(err, ['response', 'data'], err));
       }
+      if (res.headersSent) {
+        return next(err);
+      }
       return res.status((() => {
         if (!isNumber(err.status)) return 500;
         return Number(err.status);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ti2",
-  "version": "1.0.60",
+  "version": "1.0.62",
   "description": "Tourist Industry Exchange (TI2)",
   "main": "index.js",
   "scripts": {

package/test/plugin.js

@@ -60,7 +60,7 @@ class Plugin {
         payload,
       } = args;
       if (payload.keyPath === 'errorAxios') {
-        await axios.get('http://localhost:1235/');
+        await axios.get('http://www.example.com');
       }
       if (payload.keyPath === 'errorGeneral') {
         await axios.get('http://www.example.com');
@@ -75,7 +75,7 @@ class Plugin {
       },
     }));
     this.errorPathsAxiosErrors = jestPlugin.fn(() => ([
-      ['code'],
+      ['response', 'data', 'what'],
     ]));
     this.errorPathsAxiosAny = jestPlugin.fn(() => ([
       err => {