ti2-tourplan 1.0.11 → 1.0.12

package/index.js

@@ -3,7 +3,6 @@ const assert = require('assert');
 const moment = require('moment');
 const js2xmlparser = require('js2xmlparser');
 const xml2js = require('xml2js');
-const axiosRaw = require('axios');
 
 const Normalizer = require('./normalizer');
 
@@ -19,47 +18,17 @@ const xmlOptions = {
   },
 };
 
-const getHeaders = ({ length, requestId }) => ({
+const getHeaders = ({ length }) => ({
   Accept: 'application/xml',
   'Content-Type': 'application/xml; charset=utf-8',
   'Content-Length': length,
-  ...requestId ? { requestId } : {},
 });
 
-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 err;
-    });
     this.tokenTemplate = () => ({
       endpoint: {
         type: 'text',
@@ -82,12 +51,12 @@ class Plugin {
   }
 
   async validateToken({
+    axios,
     token: {
       endpoint,
       username,
       password,
     },
-    requestId,
   }) {
     try {
       const model = {
@@ -100,12 +69,11 @@ class Plugin {
         js2xmlparser.parse('Request', model, xmlOptions),
       );
       data = data.replace(xmlOptions.dtd.name, `Request SYSTEM "${xmlOptions.dtd.name}"`);
-      const reply = R.path(['data'], await this.axios({
+      const reply = R.path(['data'], await axios({
         metod: 'post',
         url: endpoint,
         data,
         headers: getHeaders({ length: data.length }),
-        requestId,
       }));
       const replyObj = await xmlParser.parseStringPromise(reply);
       assert(R.path(['Reply', 'AuthenticationReply', 0], replyObj) === '');
@@ -116,6 +84,7 @@ class Plugin {
   }
 
   async queryAllotment({
+    axios,
     token: {
       endpoint = this.endpoint,
       username = this.username,
@@ -128,7 +97,6 @@ class Plugin {
       keyPath,
       appliesTo: appliesToFilter,
     },
-    requestId,
   }) {
     const verbose = R.path(['verbose'], this);
     const cleanLog = inputString =>
@@ -161,11 +129,11 @@ class Plugin {
     );
     data = data.replace(xmlOptions.dtd.name, `Request SYSTEM "${xmlOptions.dtd.name}"`);
     if (verbose) console.log('request', cleanLog(data));
-    const reply = R.path(['data'], await this.axios({
+    const reply = R.path(['data'], await axios({
       metod: 'post',
       url: endpoint,
       data,
-      headers: getHeaders({ length: data.length, requestId }),
+      headers: getHeaders({ length: data.length }),
     }));
     if (verbose) console.log('reply', cleanLog(reply));
     const returnObj = await xmlParser.parseStringPromise(reply);

package/index.test.js

@@ -44,6 +44,7 @@ describe('search tests', () => {
       it('valid token', async () => {
         axios.mockImplementation(getFixture);
         const retVal = await app.validateToken({
+          axios,
           token,
         });
         expect(retVal).toBeTruthy();
@@ -51,6 +52,7 @@ describe('search tests', () => {
       it('invalid token', async () => {
         axios.mockImplementation(getFixture);
         const retVal = await app.validateToken({
+          axios,
           token: { ...token, username: 'somerandom' },
         });
         expect(retVal).toBeFalsy();
@@ -85,6 +87,7 @@ describe('search tests', () => {
   it('read allotment empty', async () => {
     const request = axios.mockImplementation(getFixture);
     const retVal = await app.queryAllotment({
+      axios,
       token,
       payload: {
         dateFormat,
@@ -107,6 +110,7 @@ describe('search tests', () => {
   it('read allotment not empty', async () => {
     const request = axios.mockImplementation(getFixture);
     const retVal = await app.queryAllotment({
+      axios,
       token,
       payload: {
         dateFormat,
@@ -142,6 +146,7 @@ describe('search tests', () => {
   it('read allotment that applies to more products', async () => {
     const request = axios.mockImplementation(getFixture);
     const retVal = await app.queryAllotment({
+      axios,
       token,
       payload: {
         dateFormat,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ti2-tourplan",
-  "version": "1.0.11",
+  "version": "1.0.12",
   "description": "Tourplan's TI2 Plugin",
   "main": "index.js",
   "scripts": {
@@ -27,7 +27,6 @@
     "testTimeout": 10000
   },
   "dependencies": {
-    "axios": "^0.24.0",
     "bluebird": "^3.7.2",
     "js2xmlparser": "^4.0.2",
     "jsonwebtoken": "^8.5.1",
@@ -37,6 +36,7 @@
     "xml2js": "^0.4.23"
   },
   "devDependencies": {
+    "axios": "^0.24.0",
     "eslint": "^8.4.1",
     "eslint-config-airbnb": "^19.0.2",
     "eslint-plugin-import": "^2.25.4",