uapi-json 1.17.3 → 1.17.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "uapi-json",
-  "version": "1.17.3",
+  "version": "1.17.5",
   "description": "Travelport Universal API",
   "main": "src/",
   "files": [
@@ -37,7 +37,7 @@
   ],
   "license": "MIT",
   "dependencies": {
-    "axios": "^1.7.7",
+    "axios": "^1.9.0",
     "galileo-screen": "1.0.5",
     "handlebars": "^4.7.8",
     "handlebars-helper-equal": "^1.0.0",
@@ -53,11 +53,11 @@
     "eslint": "^8.39.0",
     "eslint-config-airbnb-base": "^15.0.0",
     "eslint-plugin-import": "^2.29.0",
-    "mocha": "^10.7.3",
+    "mocha": "^11.5.0",
     "nyc": "^17.1.0",
     "proxyquire": "^2.1.3",
     "readline2": "^1.0.1",
-    "sinon": "^19.0.2",
+    "sinon": "^20.0.0",
     "sinon-chai": "^3.7.0"
   }
 }

package/src/Services/Air/AirParser.js

@@ -585,9 +585,8 @@ function getTicketFromEtr(etr, obj, allowNoProviderLocatorCodeRetrieval = false)
   const exchangedTickets = [];
 
   const allCoupons = ticketsList.map((ticket) => {
-    return Object.entries(ticket['air:Coupon']).map(([couponKey, coupon]) => {
+    return Object.values(ticket['air:Coupon']).map((coupon) => {
       return {
-        key: couponKey,
         ticketNumber: ticket.TicketNumber,
         couponNumber: coupon.CouponNumber,
         from: coupon.Origin,
@@ -607,59 +606,54 @@ function getTicketFromEtr(etr, obj, allowNoProviderLocatorCodeRetrieval = false)
     return all.concat(nextChunk);
   }, []);
 
-  const tickets = ticketsList.map(
-    (ticket) => {
-      if (ticket['air:ExchangedTicketInfo']) {
-        ticket['air:ExchangedTicketInfo'].forEach(
-          (t) => exchangedTickets.push(t.Number)
-        );
-      }
+  // Filling exchanged tickets array
+  ticketsList.forEach((ticket) => {
+    if (ticket['air:ExchangedTicketInfo']) {
+      ticket['air:ExchangedTicketInfo'].forEach(
+        (t) => exchangedTickets.push(t.Number)
+      );
+    }
+  });
 
-      const coupons = Object.keys(ticket['air:Coupon']).map(
-        (couponKey) => {
-          const allCouponsIndex = allCoupons.findIndex((ac) => ac.key === couponKey);
-          const coupon = allCoupons[allCouponsIndex];
-          const nextCoupon = allCoupons[allCouponsIndex + 1];
-
-          let bookingInfo = null;
-          // looking for fareInfo by it's fareBasis
-          // and for bookingInfo by correct FareInfoRef
-          if (airPricingInfo && airPricingInfo['air:FareInfo']) {
-            Object.keys(airPricingInfo['air:FareInfo']).forEach(
-              (fareKey) => {
-                const fare = airPricingInfo['air:FareInfo'][fareKey];
-                if (fare.FareBasis === coupon.FareBasis
-                  && airPricingInfo['air:BookingInfo']) {
-                  const bInfo = airPricingInfo['air:BookingInfo'].find(
-                    (info) => info.FareInfoRef === fareKey
-                  );
-
-                  if (bInfo) {
-                    bookingInfo = bInfo;
-                  }
-                }
-              }
+  // Getting ticket coupons
+  const ticketsObject = allCoupons.reduce((acc, coupon, index) => {
+    const { ticketNumber } = coupon;
+    const ticket = acc[ticketNumber] || { ticketNumber, coupons: [] };
+    const { coupons } = ticket;
+    const nextCoupon = allCoupons[index + 1];
+
+    let bookingInfo = null;
+    // looking for fareInfo by it's fareBasis
+    // and for bookingInfo by correct FareInfoRef
+    if (airPricingInfo && airPricingInfo['air:FareInfo']) {
+      Object.keys(airPricingInfo['air:FareInfo']).forEach(
+        (fareKey) => {
+          const fare = airPricingInfo['air:FareInfo'][fareKey];
+          if (fare.FareBasis === coupon.FareBasis && airPricingInfo['air:BookingInfo']) {
+            const bInfo = airPricingInfo['air:BookingInfo'].find(
+              (info) => info.FareInfoRef === fareKey
             );
-          }
 
-          return {
-            ...coupon,
-            stopover: (
-              nextCoupon
-                ? nextCoupon.stopover
-                : true
-            ),
-            ...(bookingInfo !== null ? { serviceClass: bookingInfo.CabinClass } : null)
-          };
+            if (bInfo) {
+              bookingInfo = bInfo;
+            }
+          }
         }
       );
-
-      return {
-        ticketNumber: ticket.TicketNumber,
-        coupons,
-      };
     }
-  );
+    const couponData = {
+      ...coupon,
+      stopover: (
+        nextCoupon
+          ? nextCoupon.stopover
+          : true
+      ),
+      ...(bookingInfo !== null ? { serviceClass: bookingInfo.CabinClass } : null)
+    };
+    return { ...acc, [ticketNumber]: { ...ticket, coupons: [...coupons, couponData] } };
+  }, {});
+
+  const tickets = Object.values(ticketsObject);
 
   const taxes = (airPricingInfo && airPricingInfo['air:TaxInfo'])
     ? Object.keys(airPricingInfo['air:TaxInfo']).map(

package/src/Services/Terminal/Terminal.js

@@ -117,50 +117,49 @@ module.exports = function (settings) {
   };
 
   // Getting session token
-  const getSessionToken = () => new Promise((resolve, reject) => {
+  const getSessionToken = async () => {
+    // Return error if not in correct state
     if (state.terminalState === TERMINAL_STATE_BUSY) {
-      reject(new TerminalRuntimeError.TerminalIsBusy());
-      return;
+      throw new TerminalRuntimeError.TerminalIsBusy();
     }
     if (state.terminalState === TERMINAL_STATE_CLOSED) {
-      reject(new TerminalRuntimeError.TerminalIsClosed());
-      return;
+      throw new TerminalRuntimeError.TerminalIsClosed();
     }
-    Object.assign(state, {
-      terminalState: TERMINAL_STATE_BUSY,
-    });
+
+    state.terminalState = TERMINAL_STATE_BUSY;
+
     // Return token if already obtained
     if (state.sessionToken !== null) {
-      resolve(state.sessionToken);
-      return;
+      return state.sessionToken;
+    }
+
+    const { sessionToken } = await service.getSessionToken({ timeout });
+    state.sessionToken = sessionToken;
+
+    if (!emulatePcc) {
+      state.terminalState = TERMINAL_STATE_READY;
+      return state.sessionToken;
+    }
+
+    const response = await service.executeCommand({
+      sessionToken,
+      command: `SEM/${emulatePcc}/AG`,
+    });
+
+    if (response[0].match(/duty code not authorised/i)) {
+      throw new TerminalRuntimeError.TerminalAuthIssue(response);
+    }
+
+    if (response[0].match(/INVALID ACCOUNT/)) {
+      throw new TerminalRuntimeError.InvalidAccount(response);
     }
-    // Getting token
-    service.getSessionToken({ timeout })
-      .then((tokenData) => {
-        // Remember sesion token
-        Object.assign(state, tokenData);
-        // Return if no emulation needed
-        if (!emulatePcc) {
-          return tokenData.sessionToken;
-        }
-        // Emulate pcc
-        return service.executeCommand({
-          sessionToken: tokenData.sessionToken,
-          command: `SEM/${emulatePcc}/AG`,
-        }).then((response) => {
-          if (response[0].match(/duty code not authorised/i)) {
-            return Promise.reject(new TerminalRuntimeError.TerminalAuthIssue(response));
-          }
-
-          if (!response[0].match(/^PROCEED/)) {
-            return Promise.reject(new TerminalRuntimeError.TerminalEmulationFailed(response));
-          }
-          return Promise.resolve(tokenData.sessionToken);
-        });
-      })
-      .then(resolve)
-      .catch(reject);
-  });
+
+    if (!response[0].match(/^PROCEED/)) {
+      throw new TerminalRuntimeError.TerminalEmulationFailed(response);
+    }
+
+    return sessionToken;
+  };
 
   // Runtime error handling
   const executeCommandWithRetry = async (command, times = DEFAULT_RETRY_TIMES) => {
@@ -210,7 +209,12 @@ module.exports = function (settings) {
   const getTerminalId = (sessionToken) => getHashSubstr(sessionToken);
 
   const terminal = {
-    getToken: getSessionToken,
+    getToken: async () => {
+      await getSessionToken();
+      // Needed here as getSessionToken marks terminal as busy
+      state.terminalState = TERMINAL_STATE_READY;
+      return state.sessionToken;
+    },
     executeCommand: async (command, stopMD = defaultStopMD) => {
       try {
         const sessionToken = await getSessionToken();

package/src/Services/Terminal/TerminalErrors.js

@@ -47,6 +47,7 @@ Object.assign(TerminalRuntimeError, createErrorsList({
   ErrorClosingSession: 'Error closing session',
   NoAgreement: ['There is no agreement between current pcc and you trying to reach', errorCodes.Validation],
   TerminalAuthIssue: ['Temporary terminal auth issue. Please, try again later', errorCodes.Validation],
+  InvalidAccount: ['Invalid account', errorCodes.Validation],
   TerminalUnexpectedError: ['Unexpected error message is returned by Travelport system. Please check PNR and try again later.', errorCodes.Validation],
   TerminalUnexpectedFinancialError: ['Unexpected error message is returned by Travelport system. Please check PNR and new Fare calculation. If the problem persists, contact your local helpdesk.', errorCodes.Validation],
 }, TerminalRuntimeError));