Merge remote-tracking branch 'origin/master' into stable

Travelport-Ukraine · Dec 4, 2020 · 64ca189 · 64ca189
2 parents 144b3f3 + b6a8bb6
commit 64ca189
Show file tree

Hide file tree

Showing 5 changed files with 66 additions and 6 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "uapi-json",
-  "version": "1.8.3",
+  "version": "1.8.4",
   "description": "Travelport Universal API",
   "main": "src/",
   "files": [

diff --git a/src/Request/RequestErrors.js b/src/Request/RequestErrors.js
@@ -28,6 +28,7 @@ Object.assign(RequestRuntimeError, createErrorsList({
   VersionParsingError: 'Error during parsing version of uapi',
   UnhandledError: 'Error during request. Please try again later',
   ResultsMissing: 'Missing results in response',
+  UAPIServiceError: 'UAPI Service responded with an error',
 }, RequestRuntimeError));
 
 // Soap errors

diff --git a/src/Services/Air/AirParser.js b/src/Services/Air/AirParser.js
@@ -425,6 +425,14 @@ function airPriceRspPricingSolutionXML(obj) {
   };
 }
 
+const processUAPIError = (rsp) => {
+  if (rsp.faultstring) {
+    throw new RequestRuntimeError.UAPIServiceError(rsp);
+  }
+
+  throw new RequestRuntimeError.UnhandledError(null, new AirRuntimeError(rsp));
+};
+
 const AirErrorHandler = function (rsp) {
   let errorInfo;
   let code;
@@ -435,7 +443,7 @@ const AirErrorHandler = function (rsp) {
     );
     code = errorInfo[`common_${this.uapi_version}:Code`];
   } catch (err) {
-    throw new RequestRuntimeError.UnhandledError(null, new AirRuntimeError(rsp));
+    processUAPIError(rsp);
   }
   const pcc = utils.getErrorPcc(rsp.faultstring);
   switch (code) {
@@ -467,7 +475,7 @@ const AirErrorHandler = function (rsp) {
     case '3037': // No availability on chosen flights, unable to fare quote
       throw new AirRuntimeError.NoResultsFound(rsp);
     default:
-      throw new RequestRuntimeError.UnhandledError(null, new AirRuntimeError(rsp));
+      processUAPIError(rsp);
   }
 };
 
@@ -706,7 +714,7 @@ function airGetTicketsErrorHandler(rsp) {
     );
     code = errorInfo[`common_${this.uapi_version}:Code`];
   } catch (err) {
-    throw new RequestRuntimeError.UnhandledError(null, new AirRuntimeError(rsp));
+    processUAPIError(rsp);
   }
   // General Air Service error
   if (code === '3000') {
@@ -720,7 +728,7 @@ function airGetTicketsErrorHandler(rsp) {
         pcc: utils.getErrorPcc(rsp.faultstring),
       });
     default:
-      throw new RequestRuntimeError.UnhandledError(null, new AirRuntimeError(rsp));
+      return processUAPIError(rsp);
   }
 }
 

diff --git a/test/Air/AirParser.test.js b/test/Air/AirParser.test.js
@@ -258,6 +258,23 @@ describe('#AirParser', () => {
           airParser.AIR_GET_TICKETS, airParser.AIR_GET_TICKETS_ERROR_HANDLER
         );
         throw new Error('Skipped error!');
+      } catch (err) {
+        expect(err).to.be.an.instanceof(RequestRuntimeError.UAPIServiceError);
+        expect(err.data).to.deep.eq({
+          faultcode: 'Server.Business',
+          faultstring: 'Record locator not found.',
+          detail: {
+            'common_v47_0:ErrorInfo': {
+              'common_v47_0:Code': '3130', 'common_v47_0:Service': 'WEBSVC', 'common_v47_0:Type': 'Business', 'common_v47_0:Description': 'Record locator not found.', 'common_v47_0:TransactionId': '838261280A07425809813A4629F6C7D1', 'xmlns:common_v47_0': 'http://www.travelport.com/schema/common_v47_0'
+            }
+          }
+        });
+      }
+    });
+    it('should correctly handle errors without faultstring', async () => {
+      try {
+        airParser.AIR_GET_TICKETS_ERROR_HANDLER.uapi_version = 'v47_0';
+        airParser.AIR_GET_TICKETS_ERROR_HANDLER({ faultcode: 'Server.Security' });
       } catch (err) {
         expect(err).to.be.an.instanceof(RequestRuntimeError.UnhandledError);
       }
@@ -866,6 +883,40 @@ describe('#AirParser', () => {
         );
     });
 
+    it('should handle uapi error', async () => {
+      const uParser = new Parser('air:AirRetrieveDocumentRsp', 'v47_0', {});
+      const parseFunction = airParser.AIR_ERRORS;
+      const xml = fs.readFileSync(`${xmlFolder}/AirGetTickets-error-general.xml`).toString();
+      return uParser.parse(xml)
+        .then(
+          (json) => {
+            const errData = uParser.mergeLeafRecursive(json['SOAP:Fault'][0]); // parse error data
+            return parseFunction.call(uParser, errData);
+          }
+        )
+        .catch((err) => {
+          expect(err).to.be.an.instanceof(RequestRuntimeError.UAPIServiceError);
+          expect(err.data).to.deep.eq({
+            faultcode: 'Server.Business',
+            faultstring: 'Record locator not found.',
+            detail: {
+              'common_v47_0:ErrorInfo': {
+                'common_v47_0:Code': '3130', 'common_v47_0:Service': 'WEBSVC', 'common_v47_0:Type': 'Business', 'common_v47_0:Description': 'Record locator not found.', 'common_v47_0:TransactionId': '838261280A07425809813A4629F6C7D1', 'xmlns:common_v47_0': 'http://www.travelport.com/schema/common_v47_0'
+              }
+            }
+          });
+        });
+    });
+
+    it('should correctly handle errors without faultstring', async () => {
+      try {
+        airParser.AIR_ERRORS.uapi_version = 'v47_0';
+        airParser.AIR_ERRORS({ faultcode: 'Server.Security' });
+      } catch (err) {
+        expect(err).to.be.an.instanceof(RequestRuntimeError.UnhandledError);
+      }
+    });
+
     it('should throw AirRuntimeError.NoResultsFound error2', () => {
       const uParser = new Parser('SOAP:Fault', 'v47_0', {});
       const parseFunction = airParser.AIR_ERRORS.bind(uParser);