ti2 1.0.57 → 1.0.59

package/controllers/graphql-schemas/availability.js

@@ -38,7 +38,7 @@ const typeDefs = `
     available: Boolean
     pricing: Pricing
     unitPricing: [Pricing]
-    offer: Offer
+    offer: [Offer]
     pickupAvailable: Boolean
     pickupRequired: Boolean
     pickupPoints: [PickupPoint]

package/index.js

@@ -15,10 +15,6 @@ const EventEmitter = require('eventemitter2');
 const axios = require('axios');
 const curlirize = require('axios-curlirize');
 
-if (process.env.debug) {
-  curlirize(axios);
-}
-
 const cacheSettings = {
   '*': [
     'getAffiliateAgents',
@@ -210,6 +206,10 @@ module.exports = async ({
         body,
       );
       const userId = R.pathOr(undefined, ['params', 'userId'], body);
+      const plugin = plugins.find(({ name }) => name === pluginName);
+      const errorPathsAxiosErrors = R.pathOr(() => [], ['errorPathsAxiosErrors'], plugin)();
+      const errorPathsAxiosAny = R.pathOr(() => [], ['errorPathsAxiosAny'], plugin)();
+
       axiosPlugin.interceptors.request.use(request => {
         ti2Events.emit(`${pluginName}.axios.request`, { ...axiosSafeRequest(request), userId });
         request.headers.common.requestId = req.requestId;
@@ -217,20 +217,45 @@ module.exports = async ({
       });
       axiosPlugin.interceptors.response.use(response => {
         ti2Events.emit(`${pluginName}.axios.response`, { ...axiosSafeResponse(response), userId });
+        if (errorPathsAxiosAny.length > 0) {
+          const pathMatch = errorPathsAxiosAny.find(errorPath => R.path(errorPath, response));
+          if (pathMatch) {
+            const errMsg = R.path(pathMatch, response);
+            if (process.env.debug) console.error(`error in ${pluginName}`, errMsg);
+            if (ti2Events.events) {
+              ti2Events.events.emit(`${pluginName}.axios.error`, {
+                response: axiosSafeResponse(response),
+                err: errMsg,
+              });
+            }
+            throw new Eror(errMsg);
+          }
+        }
         return response;
       });
+      if (process.env.debug) {
+        curlirize(axiosPlugin);
+      }
       req.axios = async (...args) => axiosPlugin(...args).catch(err => {
-        const errMsg = R.omit(['config'], err.toJSON());
-        console.log(`error in ${pluginName}`, args[0], errMsg);
+        const errMsg = (() => {
+          const defaultErr = R.omit(['config'], err.toJSON()); // default error
+          if (errorPathsAxiosErrors.length > 0) {
+            const pathMatch = errorPathsAxiosErrors.find(errorPath => R.path(errorPath, err));
+            if (pathMatch) {
+              return R.path(pathMatch, err);
+            }
+          }
+          return defaultErr;
+        })();
+        if (process.env.debug) console.error(`error in ${pluginName}`, args[0], errMsg);
         if (ti2Events.events) {
           ti2Events.events.emit(`${pluginName}.axios.error`, {
             request: args[0],
             err: errMsg,
           });
         }
-        throw R.pathOr(err, ['response', 'data', 'errorMessage'], err);
+        throw new Error(errMsg);
       });
-      req.axios = axiosPlugin;
 
       next();
     });
@@ -284,7 +309,7 @@ module.exports = async ({
         return next(err);
       }
       if (process.env.CONSOLE_ERRORS || process.env.JEST_WORKER_ID) {
-        console.error(R.path(['response', 'data'], err), err);
+        console.error(R.path(['response', 'data'], err));
       }
       return res.status((() => {
         if (!isNumber(err.status)) return 500;

package/package.json

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