ti2-tourplan 1.0.8 → 1.0.10

package/index.js

@@ -1,10 +1,9 @@
-// const axios = require('axios');
 const R = require('ramda');
 const assert = require('assert');
 const moment = require('moment');
 const js2xmlparser = require('js2xmlparser');
 const xml2js = require('xml2js');
-const axios = require('axios');
+const axiosRaw = require('axios');
 
 const Normalizer = require('./normalizer');
 
@@ -20,10 +19,11 @@ const xmlOptions = {
   },
 };
 
-const getHeaders = ({ length }) => ({
+const getHeaders = ({ length, requestId }) => ({
   Accept: 'application/xml',
   'Content-Type': 'application/xml; charset=utf-8',
   'Content-Length': length,
+  ...requestId ? { requestId } : {},
 });
 
 class Plugin {
@@ -31,6 +31,43 @@ class Plugin {
     Object.entries(params).forEach(([attr, value]) => {
       this[attr] = value;
     });
+    if (this.events) {
+      axiosRaw.interceptors.request.use(request => {
+        this.events.emit(`${this.name}.axios.request`, JSON.parse(JSON.stringify(request)));
+        return request;
+      });
+      axiosRaw.interceptors.response.use(response => {
+        this.events.emit(`${this.name}.axios.response`, JSON.parse(JSON.stringify(response)));
+        return response;
+      });
+    }
+    const pluginObj = this;
+    this.axios = async (...args) => axiosRaw(...args).catch(err => {
+      console.log('error in ti2-tourplan', err);
+      if (pluginObj.events) {
+        pluginObj.events.emit(`${this.name}.axios.error`, { request: args[0], err });
+      }
+      throw err;
+    });
+    this.tokenTemplate = () => ({
+      endpoint: {
+        type: 'text',
+        regExp: /^(?!mailto:)(?:(?:http|https|ftp):\/\/)(?:\S+(?::\S*)?@)?(?:(?:(?:[1-9]\d?|1\d\d|2[01]\d|22[0-3])(?:\.(?:1?\d{1,2}|2[0-4]\d|25[0-5])){2}(?:\.(?:[0-9]\d?|1\d\d|2[0-4]\d|25[0-4]))|(?:(?:[a-z\u00a1-\uffff0-9]+-?)*[a-z\u00a1-\uffff0-9]+)(?:\.(?:[a-z\u00a1-\uffff0-9]+-?)*[a-z\u00a1-\uffff0-9]+)*(?:\.(?:[a-z\u00a1-\uffff]{2,})))|localhost)(?::\d{2,5})?(?:(\/|\?|#)[^\s]*)?$/i,
+        description: 'The uri for the tourplan adapter',
+      },
+      username: {
+        type: 'text',
+        regExp: /.+/,
+        description: 'The tourplan provided username',
+        default: 'en',
+      },
+      password: {
+        type: 'text',
+        regExp: /.+/,
+        description: 'The tourplan provided password',
+        default: 'en',
+      },
+    });
   }
 
   async validateToken({
@@ -39,6 +76,7 @@ class Plugin {
       username,
       password,
     },
+    requestId,
   }) {
     try {
       const model = {
@@ -51,11 +89,12 @@ class Plugin {
         js2xmlparser.parse('Request', model, xmlOptions),
       );
       data = data.replace(xmlOptions.dtd.name, `Request SYSTEM "${xmlOptions.dtd.name}"`);
-      const reply = R.path(['data'], await axios({
+      const reply = R.path(['data'], await this.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) === '');
@@ -78,6 +117,7 @@ class Plugin {
       keyPath,
       appliesTo: appliesToFilter,
     },
+    requestId,
   }) {
     const verbose = R.path(['verbose'], this);
     const cleanLog = inputString =>
@@ -110,11 +150,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 axios({
+    const reply = R.path(['data'], await this.axios({
       metod: 'post',
       url: endpoint,
       data,
-      headers: getHeaders({ length: data.length }),
+      headers: getHeaders({ length: data.length, requestId }),
     }));
     if (verbose) console.log('reply', cleanLog(reply));
     const returnObj = await xmlParser.parseStringPromise(reply);

package/index.test.js

@@ -56,6 +56,31 @@ describe('search tests', () => {
         expect(retVal).toBeFalsy();
       });
     });
+    describe('template tests', () => {
+      let template;
+      it('get the template', async () => {
+        template = await app.tokenTemplate();
+        const rules = Object.keys(template);
+        expect(rules).toContain('endpoint');
+        expect(rules).toContain('password');
+        expect(rules).toContain('username');
+      });
+      it('username', () => {
+        const username = template.username.regExp;
+        expect(username.test('')).toBeFalsy();
+        expect(username.test('someuser')).toBeTruthy();
+      });
+      it('endpoint', () => {
+        const endpoint = template.endpoint.regExp;
+        expect(endpoint.test('something')).toBeFalsy();
+        expect(endpoint.test('https://www.google.com')).toBeTruthy();
+      });
+      it('password', () => {
+        const password = template.password.regExp;
+        expect(password.test('')).toBeFalsy();
+        expect(password.test('somepassword')).toBeTruthy();
+      });
+    });
   });
   it('read allotment empty', async () => {
     const request = axios.mockImplementation(getFixture);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ti2-tourplan",
-  "version": "1.0.8",
+  "version": "1.0.10",
   "description": "Tourplan's TI2 Plugin",
   "main": "index.js",
   "scripts": {