ti2 1.0.55 → 1.0.57

package/auth/authHandler.js

@@ -11,7 +11,7 @@ const {
   },
 } = process;
 
-const invalid = (res, msg) => res.status(401).json({ error: msg || 'Unauthorized' });
+const invalid = (res, msg) => res.status(401).send({ error: msg || 'Unauthorized' });
 
 const getToken = ({ req }) => {
   if (

package/controllers/allotment.js

@@ -4,6 +4,7 @@ const { UserAppKey } = require('../models/index');
 
 const queryAllotment = plugins => async (req, res, next) => {
   const {
+    axios,
     params: {
       appKey,
       hint,
@@ -25,6 +26,7 @@ const queryAllotment = plugins => async (req, res, next) => {
     const token = await userAppKeys.token;
     assert(app.queryAllotment, 'could not find the allotment method');
     const results = await app.queryAllotment({
+      axios,
       token,
       payload: query,
       requestId: req.requestId,

package/controllers/app.js

@@ -167,6 +167,7 @@ const deleteAppToken = async (req, res, next) => {
 
 const validateAppToken = plugins => async (req, res, next) => {
   const {
+    axios,
     body: {
       tokenHint: hint,
     },
@@ -189,6 +190,7 @@ const validateAppToken = plugins => async (req, res, next) => {
     const token = await userAppKeys.token;
     assert(app.validateToken, `could not find the validateToken method for ${appKey}`);
     const valid = await app.validateToken({
+      axios,
       token,
       requestId: req.requestId,
     });

package/controllers/bookings.js

@@ -22,6 +22,7 @@ const typeDefsAndQueries = {
 
 const bookingsSearch = plugins => async (req, res, next) => {
   const {
+    axios,
     params: { appKey, userId, hint },
     body,
   } = req;
@@ -38,6 +39,7 @@ const bookingsSearch = plugins => async (req, res, next) => {
     const token = await userAppKeys.token;
     const search = (app.searchHotelBooking || app.searchBooking).bind(app);
     const results = await search({
+      axios,
       token,
       payload: body,
       typeDefsAndQueries,
@@ -51,6 +53,7 @@ const bookingsSearch = plugins => async (req, res, next) => {
 
 const bookingsCancel = plugins => async (req, res, next) => {
   const {
+    axios,
     params: { appKey, userId, hint },
     body,
   } = req;
@@ -67,6 +70,7 @@ const bookingsCancel = plugins => async (req, res, next) => {
     assert(userAppKeys, 'could not find the app key');
     const token = await userAppKeys.token;
     const results = await app.cancelBooking({
+      axios,
       token,
       payload: body,
       typeDefsAndQueries,
@@ -79,6 +83,7 @@ const bookingsCancel = plugins => async (req, res, next) => {
 };
 
 const $bookingsProductSearch = plugins => async ({
+  axios,
   appKey,
   userId,
   hint,
@@ -97,6 +102,7 @@ const $bookingsProductSearch = plugins => async ({
   assert(userAppKeys, 'could not find the app key');
   const token = await userAppKeys.token;
   const results = await app.searchProducts({
+    axios,
     token,
     payload,
     typeDefsAndQueries,
@@ -107,12 +113,18 @@ const $bookingsProductSearch = plugins => async ({
 
 const bookingsProductSearch = plugins => async (req, res, next) => {
   const {
+    axios,
     params,
     body: payload,
     requestId,
   } = req;
   try {
-    return res.json(await $bookingsProductSearch(plugins)({ ...params, payload, requestId }));
+    return res.json(await $bookingsProductSearch(plugins)({
+      axios,
+      ...params,
+      payload,
+      requestId,
+    }));
   } catch (err) {
     return next(err);
   }
@@ -120,6 +132,7 @@ const bookingsProductSearch = plugins => async (req, res, next) => {
 
 const bookingsAvailabilitySearch = plugins => async (req, res, next) => {
   const {
+    axios,
     params: { appKey, userId, hint },
     body: payload,
   } = req;
@@ -136,6 +149,7 @@ const bookingsAvailabilitySearch = plugins => async (req, res, next) => {
     assert(userAppKeys, 'could not find the app key');
     const token = await userAppKeys.token;
     const results = await app.searchAvailability({
+      axios,
       token,
       payload,
       typeDefsAndQueries,
@@ -148,6 +162,7 @@ const bookingsAvailabilitySearch = plugins => async (req, res, next) => {
 };
 
 const $bookingsAvailabilityCalendar = plugins => async ({
+  axios,
   appKey,
   userId,
   hint,
@@ -166,6 +181,7 @@ const $bookingsAvailabilityCalendar = plugins => async ({
   assert(userAppKeys, 'could not find the app key');
   const token = await userAppKeys.token;
   return app.availabilityCalendar({
+    axios,
     token,
     payload,
     typeDefsAndQueries,
@@ -175,12 +191,14 @@ const $bookingsAvailabilityCalendar = plugins => async ({
 
 const bookingsAvailabilityCalendar = plugins => async (req, res, next) => {
   const {
+    axios,
     params,
     body: payload,
     requestId,
   } = req;
   try {
     return res.json(await $bookingsAvailabilityCalendar(plugins)({
+      axios,
       ...params,
       payload,
       requestId,
@@ -192,6 +210,7 @@ const bookingsAvailabilityCalendar = plugins => async (req, res, next) => {
 
 const searchQuote = plugins => async (req, res, next) => {
   const {
+    axios,
     params: { appKey, userId, hint },
     body: payload,
   } = req;
@@ -209,6 +228,7 @@ const searchQuote = plugins => async (req, res, next) => {
     const token = await userAppKeys.token;
     assert(payload.id, 'the availability id is required');
     const results = await app.searchQuote({
+      axios,
       token,
       payload,
       typeDefsAndQueries,
@@ -222,6 +242,7 @@ const searchQuote = plugins => async (req, res, next) => {
 
 const createBooking = plugins => async (req, res, next) => {
   const {
+    axios,
     params: { appKey, userId, hint },
     body: payload,
   } = req;
@@ -239,6 +260,7 @@ const createBooking = plugins => async (req, res, next) => {
     const token = await userAppKeys.token;
     assert(payload.id, 'the quote id is required');
     const results = await app.createBooking({
+      axios,
       token,
       payload,
       typeDefsAndQueries,
@@ -252,6 +274,7 @@ const createBooking = plugins => async (req, res, next) => {
 
 const getAffiliateAgents = plugins => async (req, res, next) => {
   const {
+    axios,
     params: { appKey, userId, hint },
     body: payload,
   } = req;
@@ -269,6 +292,7 @@ const getAffiliateAgents = plugins => async (req, res, next) => {
     const token = await userAppKeys.token;
     assert(app.getAffiliateAgents, `getAffiliateAgents is not available for ${appKey}`);
     const results = await app.getAffiliateAgents({
+      axios,
       token,
       payload,
       requestId: req.requestId,
@@ -281,6 +305,7 @@ const getAffiliateAgents = plugins => async (req, res, next) => {
 
 const getAffiliateDesks = plugins => async (req, res, next) => {
   const {
+    axios,
     params: { appKey, userId, hint },
     body: payload,
   } = req;
@@ -298,6 +323,7 @@ const getAffiliateDesks = plugins => async (req, res, next) => {
     const token = await userAppKeys.token;
     assert(app.getAffiliateDesks, `getAffiliateDesks is not available for ${appKey}`);
     const results = await app.getAffiliateDesks({
+      axios,
       token,
       payload,
       requestId: req.requestId,
@@ -310,6 +336,7 @@ const getAffiliateDesks = plugins => async (req, res, next) => {
 
 const getPickupPoints = plugins => async (req, res, next) => {
   const {
+    axios,
     params: { appKey, userId, hint },
     body: payload,
   } = req;
@@ -327,6 +354,7 @@ const getPickupPoints = plugins => async (req, res, next) => {
     const token = await userAppKeys.token;
     assert(app.getPickupPoints, `getPickupPoints is not available for ${appKey}`);
     const results = await app.getPickupPoints({
+      axios,
       token,
       payload,
       typeDefsAndQueries,

package/index.js

@@ -12,10 +12,15 @@ const { Op } = require('sequelize');
 const R = require('ramda');
 const { v4: uuidv4 } = require('uuid');
 const EventEmitter = require('eventemitter2');
+const axios = require('axios');
+const curlirize = require('axios-curlirize');
+
+if (process.env.debug) {
+  curlirize(axios);
+}
 
 const cacheSettings = {
   '*': [
-    'tokenTemplate',
     'getAffiliateAgents',
     'getAffiliateDesks',
     'getPickupPoints',
@@ -46,6 +51,14 @@ const rebuild = fn => obj =>
 
 const isNumber = value => !Number.isNaN(Number(value));
 
+const axiosSafeRequest = R.pick(['headers', 'method', 'url', 'data']);
+const axiosSafeResponse = response => {
+  const retVal = R.pick(['data', 'status', 'statusText', 'headers', 'request', 'config'], response);
+  retVal.request = axiosSafeRequest(retVal.request);
+  retVal.config = axiosSafeRequest(retVal.config);
+  return retVal;
+};
+
 module.exports = async ({
   apiDocs = true,
   plugins: pluginsParam = {},
@@ -67,7 +80,11 @@ module.exports = async ({
       const nuName = attr.replace(/_/g, '-').replace(`ti2-${pluginName}-`, '');
       params[nuName] = value;
     });
-    const pluginInstance = await new Plugin({ name: pluginName, events: ti2Events, ...params });
+    const pluginInstance = await new Plugin({
+      name: pluginName,
+      events: ti2Events,
+      ...params,
+    });
     return pluginInstance;
   });
   if (worker) {
@@ -185,6 +202,36 @@ module.exports = async ({
           responseStatusCode: res.statusCode,
         });
       });
+
+      const axiosPlugin = axios.create({ headers: { requestId: req.requestId } });
+      const pluginName = R.pathOr(
+        R.pathOr('ti2', ['params', 'app'], body),
+        ['params', 'appKey'],
+        body,
+      );
+      const userId = R.pathOr(undefined, ['params', 'userId'], body);
+      axiosPlugin.interceptors.request.use(request => {
+        ti2Events.emit(`${pluginName}.axios.request`, { ...axiosSafeRequest(request), userId });
+        request.headers.common.requestId = req.requestId;
+        return request;
+      });
+      axiosPlugin.interceptors.response.use(response => {
+        ti2Events.emit(`${pluginName}.axios.response`, { ...axiosSafeResponse(response), userId });
+        return response;
+      });
+      req.axios = async (...args) => axiosPlugin(...args).catch(err => {
+        const errMsg = R.omit(['config'], err.toJSON());
+        console.log(`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);
+      });
+      req.axios = axiosPlugin;
+
       next();
     });
 
@@ -209,12 +256,14 @@ module.exports = async ({
           }
           const realSend = res.json;
           res.json = newData => { // new res.json
-            cache.save({
-              pluginName: req.pathParams.appKey,
-              key: cacheKey,
-              value: newData,
-              ttl: 60 * 60 * 24, // one day
-            });
+            if (res.statusCode === 200) {
+              cache.save({
+                pluginName: req.pathParams.appKey,
+                key: cacheKey,
+                value: newData,
+                ttl: 60 * 60 * 24, // one day
+              });
+            }
             // console.log('newData', cacheKey);
             if (!res.headersSent) {
               // console.log('send new data', cacheKey);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ti2",
-  "version": "1.0.55",
+  "version": "1.0.57",
   "description": "Tourist Industry Exchange (TI2)",
   "main": "index.js",
   "scripts": {
@@ -25,6 +25,8 @@
   },
   "homepage": "https://github.com/ti2travel/ti2#readme",
   "dependencies": {
+    "axios": "^0.27.2",
+    "axios-curlirize": "^1.3.7",
     "bluebird": "^3.7.2",
     "bull": "^4.8.2",
     "commander": "^9.2.0",