ti2-ventrata 1.0.25 → 1.0.27

package/index.js

@@ -1,5 +1,3 @@
-const axiosRaw = require('axios');
-const curlirize = require('axios-curlirize');
 const R = require('ramda');
 const Promise = require('bluebird');
 const assert = require('assert');
@@ -12,9 +10,6 @@ const { translateBooking } = require('./resolvers/booking');
 const { translatePickupPoint } = require('./resolvers/pickup-point');
 
 const CONCURRENCY = 3; // is this ok ?
-if (process.env.debug) {
-  curlirize(axiosRaw);
-}
 
 const isNilOrEmpty = R.either(R.isNil, R.isEmpty);
 
@@ -23,7 +18,6 @@ const getHeaders = ({
   acceptLanguage,
   octoEnv,
   resellerId,
-  requestId,
 }) => ({
   Authorization: `Bearer ${apiKey}`,
   ...octoEnv ? { 'Octo-Env': octoEnv } : {},
@@ -31,44 +25,14 @@ const getHeaders = ({
   'Content-Type': 'application/json',
   ...resellerId ? { Referer: resellerId } : {},
   'Octo-Capabilities': 'octo/pricing,octo/pickups,octo/cart',
-  ...requestId ? { requestId } : {},
   // 'Octo-Capabilities': 'octo/pricing',
 });
 
-const axiosSafeRequest = R.pick(['headers', 'method', 'url', 'data']);
-const axiosSafeResponse = response => {
-  const retVal = R.pick(['data', 'status', 'statusText', 'headers', 'request'], response);
-  retVal.request = axiosSafeRequest(retVal.request);
-  return retVal;
-};
-
 class Plugin {
   constructor(params) { // we get the env variables from here
     Object.entries(params).forEach(([attr, value]) => {
       this[attr] = value;
     });
-    if (this.events) {
-      axiosRaw.interceptors.request.use(request => {
-        this.events.emit(`${this.name}.axios.request`, axiosSafeRequest(request));
-        return request;
-      });
-      axiosRaw.interceptors.response.use(response => {
-        this.events.emit(`${this.name}.axios.response`, axiosSafeResponse(response));
-        return response;
-      });
-    }
-    const pluginObj = this;
-    this.axios = async (...args) => axiosRaw(...args).catch(err => {
-      const errMsg = R.omit(['config'], err.toJSON());
-      console.log(`error in ${this.name}`, args[0], errMsg);
-      if (pluginObj.events) {
-        pluginObj.events.emit(`${this.name}.axios.error`, {
-          request: args[0],
-          err: errMsg,
-        });
-      }
-      throw R.pathOr(err, ['response', 'data', 'errorMessage'], err);
-    });
 
     this.tokenTemplate = () => ({
       apiKey: {
@@ -104,6 +68,7 @@ class Plugin {
   }
 
   async validateToken({
+    axios,
     token: {
       apiKey,
       endpoint,
@@ -111,7 +76,6 @@ class Plugin {
       acceptLanguage,
       resellerId,
     },
-    requestId,
   }) {
     const url = `${endpoint || this.endpoint}/whoami?token=${apiKey}`;
     const headers = getHeaders({
@@ -120,10 +84,9 @@ class Plugin {
       octoEnv,
       acceptLanguage,
       resellerId,
-      requestId,
     });
     try {
-      const connectionId = R.path(['data', 'connection', 'id'], await this.axios({
+      const connectionId = R.path(['data', 'connection', 'id'], await axios({
         method: 'get',
         url,
         headers,
@@ -135,6 +98,7 @@ class Plugin {
   }
 
   async searchProducts({
+    axios,
     token: {
       apiKey,
       endpoint,
@@ -147,7 +111,6 @@ class Plugin {
       productTypeDefs,
       productQuery,
     },
-    requestId,
   }) {
     let url = `${endpoint || this.endpoint}/products`;
     if (!isNilOrEmpty(payload)) {
@@ -161,9 +124,8 @@ class Plugin {
       octoEnv,
       acceptLanguage,
       resellerId,
-      requestId,
     });
-    let results = R.pathOr([], ['data'], await this.axios({
+    let results = R.pathOr([], ['data'], await axios({
       method: 'get',
       url,
       headers,
@@ -212,6 +174,7 @@ class Plugin {
   }
 
   async searchAvailability({
+    axios,
     token: {
       apiKey,
       endpoint,
@@ -232,7 +195,6 @@ class Plugin {
       availTypeDefs,
       availQuery,
     },
-    requestId,
   }) {
     assert(this.jwtKey, 'JWT secret should be set');
     assert(
@@ -253,7 +215,6 @@ class Plugin {
       octoEnv,
       acceptLanguage,
       resellerId,
-      requestId,
     });
     const url = `${endpoint || this.endpoint}/availability`;
     const availability = (
@@ -266,7 +227,7 @@ class Plugin {
           units: units[ix].map(u => ({ id: u.unitId, quantity: u.quantity })),
         };
         if (currency) data.currency = currency;
-        const result = R.path(['data'], await this.axios({
+        const result = R.path(['data'], await axios({
           method: 'post',
           url,
           data,
@@ -290,6 +251,7 @@ class Plugin {
   }
 
   async availabilityCalendar({
+    axios,
     token: {
       apiKey,
       endpoint,
@@ -310,7 +272,6 @@ class Plugin {
       availTypeDefs,
       availQuery,
     },
-    requestId,
   }) {
     assert(this.jwtKey, 'JWT secret should be set');
     assert(
@@ -331,7 +292,6 @@ class Plugin {
       octoEnv,
       acceptLanguage,
       resellerId,
-      requestId,
     });
     const url = `${endpoint || this.endpoint}/availability/calendar`;
     const availability = (
@@ -345,7 +305,7 @@ class Plugin {
           units: units[ix].map(u => ({ id: u.unitId, quantity: u.quantity })),
         };
         if (currency) data.currency = currency;
-        const result = await this.axios({
+        const result = await axios({
           method: 'post',
           url,
           data,
@@ -362,6 +322,7 @@ class Plugin {
   }
 
   async createBooking({
+    axios,
     token: {
       apiKey,
       endpoint,
@@ -382,7 +343,6 @@ class Plugin {
       bookingTypeDefs,
       bookingQuery,
     },
-    requestId,
   }) {
     assert(availabilityKey, 'an availability code is required !');
     assert(R.path(['name'], holder), 'first name is required');
@@ -393,10 +353,9 @@ class Plugin {
       octoEnv,
       acceptLanguage,
       resellerId,
-      requestId,
     });
     const dataForCreateBooking = await jwt.verify(availabilityKey, this.jwtKey);
-    let booking = R.path(['data'], await this.axios({
+    let booking = R.path(['data'], await axios({
       method: rebookingId ? 'patch' : 'post',
       url: `${endpoint || this.endpoint}/bookings${rebookingId ? `/${rebookingId}` : ''}`,
       data: {
@@ -421,7 +380,7 @@ class Plugin {
         resellerReference: reference,
         settlementMethod,
       };
-      booking = R.path(['data'], await this.axios({
+      booking = R.path(['data'], await axios({
         method: 'post',
         url: `${endpoint || this.endpoint}/bookings/${booking.uuid}/confirm`,
         data: dataForConfirmBooking,
@@ -438,6 +397,7 @@ class Plugin {
   }
 
   async cancelBooking({
+    axios,
     token: {
       apiKey,
       endpoint,
@@ -454,7 +414,6 @@ class Plugin {
       bookingTypeDefs,
       bookingQuery,
     },
-    requestId,
   }) {
     assert(!isNilOrEmpty(bookingId) || !isNilOrEmpty(id), 'Invalid booking id');
     const headers = getHeaders({
@@ -463,10 +422,9 @@ class Plugin {
       octoEnv,
       acceptLanguage,
       resellerId,
-      requestId,
     });
     const url = `${endpoint || this.endpoint}/bookings/${bookingId || id}`;
-    const booking = R.path(['data'], await this.axios({
+    const booking = R.path(['data'], await axios({
       method: 'delete',
       url,
       data: { reason },
@@ -482,6 +440,7 @@ class Plugin {
   }
 
   async searchBooking({
+    axios,
     token: {
       apiKey,
       endpoint,
@@ -501,7 +460,6 @@ class Plugin {
       bookingTypeDefs,
       bookingQuery,
     },
-    requestId,
   }) {
     assert(
       !isNilOrEmpty(bookingId)
@@ -518,11 +476,10 @@ class Plugin {
       octoEnv,
       acceptLanguage,
       resellerId,
-      requestId,
     });
     const searchByUrl = async url => {
       try {
-        return R.path(['data'], await this.axios({
+        return R.path(['data'], await axios({
           method: 'get',
           url,
           headers,
@@ -542,7 +499,7 @@ class Plugin {
       }
       if (!isNilOrEmpty(resellerReference)) {
         url = `${endpoint || this.endpoint}/bookings?resellerReference=${resellerReference}`;
-        return R.path(['data'], await this.axios({
+        return R.path(['data'], await axios({
           method: 'get',
           url,
           headers,
@@ -550,7 +507,7 @@ class Plugin {
       }
       if (!isNilOrEmpty(supplierBookingId)) {
         url = `${endpoint || this.endpoint}/bookings?supplierReference=${supplierBookingId}`;
-        return R.path(['data'], await this.axios({
+        return R.path(['data'], await axios({
           method: 'get',
           url,
           headers,
@@ -560,7 +517,7 @@ class Plugin {
         const localDateStart = moment(travelDateStart, dateFormat).format();
         const localDateEnd = moment(travelDateEnd, dateFormat).format();
         url = `${endpoint || this.endpoint}/bookings?localDateStart=${encodeURIComponent(localDateStart)}&localDateEnd=${encodeURIComponent(localDateEnd)}`;
-        return R.path(['data'], await this.axios({
+        return R.path(['data'], await axios({
           method: 'get',
           url,
           headers,
@@ -578,6 +535,7 @@ class Plugin {
   }
 
   async getPickupPoints({
+    axios,
     token: {
       apiKey,
       endpoint,
@@ -589,7 +547,6 @@ class Plugin {
       pickupTypeDefs,
       pickupQuery,
     },
-    requestId,
   }) {
     const url = `${endpoint || this.endpoint}/products`;
     const headers = getHeaders({
@@ -598,9 +555,8 @@ class Plugin {
       octoEnv,
       acceptLanguage,
       resellerId,
-      requestId,
     });
-    const products = R.pathOr([], ['data'], await this.axios({
+    const products = R.pathOr([], ['data'], await axios({
       method: 'get',
       url,
       headers,

package/index.test.js

@@ -2,6 +2,7 @@
 const R = require('ramda');
 const moment = require('moment');
 const faker = require('faker');
+const axios = require('axios');
 
 const Plugin = require('./index');
 
@@ -48,12 +49,14 @@ describe('search tests', () => {
     describe('validateToken', () => {
       it('valid token', async () => {
         const retVal = await app.validateToken({
+          axios,
           token,
         });
         expect(retVal).toBeTruthy();
       });
       it('invalid token', async () => {
         const retVal = await app.validateToken({
+          axios,
           token: { someRandom: 'thing' },
         });
         expect(retVal).toBeFalsy();
@@ -94,6 +97,7 @@ describe('search tests', () => {
   describe('booking process', () => {
     it('get for all products, a test product should exist', async () => {
       const retVal = await app.searchProducts({
+        axios,
         token,
         typeDefsAndQueries,
       });
@@ -110,6 +114,7 @@ describe('search tests', () => {
     });
     it('should be able to get a single product', async () => {
       const retVal = await app.searchProducts({
+        axios,
         token,
         payload: {
           productId: testProduct.productId,
@@ -122,6 +127,7 @@ describe('search tests', () => {
     let busProducts = [];
     it('should be able to get a product by name', async () => {
       const retVal = await app.searchProducts({
+        axios,
         token,
         payload: {
           productName: '*bus*',
@@ -134,6 +140,7 @@ describe('search tests', () => {
     });
     it('should be able to get an availability calendar', async () => {
       const retVal = await app.availabilityCalendar({
+        axios,
         token,
         payload: {
           startDate: moment().add(6, 'M').format(dateFormat),
@@ -160,6 +167,7 @@ describe('search tests', () => {
     let availabilityKey;
     it('should be able to get availability', async () => {
       const retVal = await app.searchAvailability({
+        axios,
         token,
         typeDefsAndQueries,
         payload: {
@@ -189,6 +197,7 @@ describe('search tests', () => {
     it('should be able to create a booking', async () => {
       const fullName = faker.name.findName().split(' ');
       const retVal = await app.createBooking({
+        axios,
         token,
         typeDefsAndQueries,
         payload: {
@@ -216,6 +225,7 @@ describe('search tests', () => {
     });
     it('should be able to cancel the booking', async () => {
       const retVal = await app.cancelBooking({
+        axios,
         token,
         typeDefsAndQueries,
         payload: {
@@ -232,6 +242,7 @@ describe('search tests', () => {
     let bookings = [];
     it('it should be able to search bookings by id', async () => {
       const retVal = await app.searchBooking({
+        axios,
         token,
         typeDefsAndQueries,
         payload: {
@@ -244,6 +255,7 @@ describe('search tests', () => {
     });
     it('it should be able to search bookings by reference', async () => {
       const retVal = await app.searchBooking({
+        axios,
         token,
         typeDefsAndQueries,
         payload: {
@@ -256,6 +268,7 @@ describe('search tests', () => {
     });
     it('it should be able to search bookings by supplierBookingId', async () => {
       const retVal = await app.searchBooking({
+        axios,
         token,
         typeDefsAndQueries,
         payload: {
@@ -268,6 +281,7 @@ describe('search tests', () => {
     });
     it('it should be able to search bookings by travelDate', async () => {
       const retVal = await app.searchBooking({
+        axios,
         token,
         typeDefsAndQueries,
         payload: {
@@ -283,6 +297,7 @@ describe('search tests', () => {
     it('should be able to create a booking for a referrer', async () => {
       const fullName = faker.name.findName().split(' ');
       const retVal = await app.createBooking({
+        axios,
         token,
         typeDefsAndQueries,
         payload: {
@@ -310,6 +325,7 @@ describe('search tests', () => {
     });
     it('should be able to get a list of pickuppoints', async () => {
       const retVal = await app.getPickupPoints({
+        axios,
         token,
         typeDefsAndQueries,
       });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ti2-ventrata",
-  "version": "1.0.25",
+  "version": "1.0.27",
   "description": "Ventrata's TI2 Plugin",
   "main": "index.js",
   "scripts": {
@@ -28,8 +28,6 @@
   },
   "dependencies": {
     "@graphql-tools/schema": "^9.0.12",
-    "axios": "^0.24.0",
-    "axios-curlirize": "^1.3.7",
     "bluebird": "^3.7.2",
     "graphql": "^16.6.0",
     "jsonwebtoken": "^8.5.1",
@@ -37,6 +35,7 @@
     "ramda": "^0.27.1"
   },
   "devDependencies": {
+    "axios": "^0.27.2",
     "chalk": "^4.1.2",
     "eslint": "^8.4.1",
     "eslint-config-airbnb": "^19.0.2",