uapi-json 1.17.4 → 1.17.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "uapi-json",
-  "version": "1.17.4",
+  "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/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));