ti2-tourplan 1.0.42 → 1.0.44

package/index.js

@@ -12,6 +12,7 @@ const Normalizer = require('./normalizer');
 
 const xmlParser = new xml2js.Parser();
 const fastParser = new XMLParser();
+const BAD_XML_CHARS = /[\u0000-\u0008\u000B\u000C\u000E-\u001F\u007f-\u0084\u0086-\u009f\uD800-\uDFFF\uFDD0-\uFDFF\uFFFF\uC008\uFEFF]/g;
 
 const defaultXmlOptions = {
   prettyPrinting: { enabled: false },
@@ -142,12 +143,14 @@ class Plugin {
       if (!replyObj) {
         // in case of error /xmlproxy, fallback to call tourplan directly
         // and then use pyfilematch xml2json to parse the xml
-        const reply = R.path(['data'], await axios({
+        const axiospayload = {
           method: 'post',
           url: endpoint,
           data,
           headers: getHeaders({ length: data.length }),
-        }));
+        };
+        // console.log(axiospayload)
+        const reply = R.path(['data'], await axios(axiospayload));
         if (this.xmlProxyUrl) {
           try {
             // using raw axios to avoid logging the large xml request
@@ -208,20 +211,21 @@ class Plugin {
           Twin: 'TW',
           Triple: 'TR',
           Quad: 'QD',
+          Other: 'OT',
         })[roomType];
         if (RoomType) RoomConfig.RoomType = RoomType;
         if (passengers && passengers.length && !noPaxList) {
           RoomConfig.PaxList = passengers.map(p => {
             const PaxDetails = {
-              Forename: p.firstName,
-              Surname: p.lastName,
+              Forename: this.escapeInvalidXmlChars(p.firstName),
+              Surname: this.escapeInvalidXmlChars(p.lastName),
               PaxType: {
                 Adult: 'A',
                 Child: 'C',
                 Infant: 'I',
               }[p.passengerType] || 'A',
             };
-            if (p.salutation) PaxDetails.Title = p.salutation;
+            if (p.salutation) PaxDetails.Title = this.escapeInvalidXmlChars(p.salutation);
             if (p.dob) PaxDetails.DateOfBirth = p.dob;
             if (!R.isNil(p.age) && !isNaN(p.age)) {
               if (!(p.passengerType === 'Adult' && p.age === 0)) {
@@ -237,7 +241,10 @@ class Plugin {
       });
     this.escapeInvalidXmlChars = str => {
       if (!str) return '';
-      return str.replace(/[^\x00-\x7F]+/g, '')
+      const convertAccentedChars = s => {
+        return s.normalize('NFD').replace(/[\u0300-\u036f]/g, '');
+      }
+      return convertAccentedChars(str)
         .replace(/’/g, "'")
         .replace(/‘/g, "'")
         .replace(/“/g, '"')
@@ -248,6 +255,7 @@ class Plugin {
         .replace(/>/g, '>')
         .replace(/"/g, '"')
         .replace(/'/g, ''')
+        .replace(BAD_XML_CHARS, '')
     };
 
     // this.errorPathsAxiosErrors = () => ([ // axios triggered errors
@@ -694,7 +702,7 @@ class Plugin {
           ${doInfo.flightDetails ? `Flight: ${doInfo.flightDetails || 'NA'},` : ''}
           `),
         } : {}),
-        Remarks: this.escapeInvalidXmlChars(`${notes || ''} ${extraText ? `\nExtras: ${extraText}` : ''}`).slice(0, 240),
+        Remarks: this.escapeInvalidXmlChars(`${notes || ''} ${extraText ? `\nExtras: ${extraText}` : ''}`).slice(0, 220),
         Opt: optionId,
         DateFrom: startDate,
         RateId: 'Default',
@@ -773,10 +781,10 @@ class Plugin {
     });
     let searchCriterias = [];
     if (bookingId) {
-      searchCriterias = ['BookingId', 'Ref', 'AgentRef'].map(key => ({ [key]: bookingId }));
+      searchCriterias = ['BookingId', 'Ref', 'AgentRef'].map(key => ({ [key]: this.escapeInvalidXmlChars(bookingId) }));
     }
     if (name) {
-      searchCriterias.push({ NameContains: name });
+      searchCriterias.push({ NameContains: this.escapeInvalidXmlChars(name) });
     }
     const allSearches = searchCriterias.length
       ? searchCriterias.map(async keyObj => {

package/package.json

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

package/resolvers/product.js

@@ -36,7 +36,8 @@ const translateTCMLCollection = async ({ rootValue, typeDefs, query }) => {
 
 const translateTPOption = ({ optionsGroupedBySupplierId, supplierData }) => {
   return {
-    productId: supplierData.supplierId,
+    // LLM sends the product id as string
+    productId: supplierData.supplierId + "",
     productName: supplierData.supplierName,
     address: supplierData.supplierAddress,
     serviceTypes: supplierData.serviceTypes,