Merge pull request #603 from Travelport-Ukraine/master

1.14.3

package.json

@@ -1,6 +1,6 @@
 {
   "name": "uapi-json",
-  "version": "1.14.2",
+  "version": "1.14.3",
   "description": "Travelport Universal API",
   "main": "src/",
   "files": [
@@ -35,7 +35,7 @@
   ],
   "license": "MIT",
   "dependencies": {
-    "@hapi/joi": "^15.1.0",
+    "joi": "^17.6.2",
     "axios": "^0.21.1",
     "galileo-screen": "1.0.5",
     "handlebars": "^4.7.7",

src/Request/RequestErrors.js

@@ -29,7 +29,7 @@ Object.assign(RequestRuntimeError, createErrorsList({
   UnhandledError: 'Error during request. Please try again later',
   ResultsMissing: 'Missing results in response',
   UAPIServiceError: 'UAPI Service responded with an error',
-  UAPIServiceTimeout: 'UAPI Service timeout',
+  UAPIServiceTimeout: ['UAPI Service timeout', 400],
 }, RequestRuntimeError));
 
 // Soap errors

src/Services/Air/validators/fop-credit-card.js

@@ -1,4 +1,4 @@
-const Joi = require('@hapi/joi');
+const Joi = require('joi');
 
 const { AirValidationError } = require('../AirErrors');
 
@@ -13,10 +13,10 @@ module.exports = (params) => {
       name: Joi.string().max(50).required(),
       expDate: Joi.string().regex(/^[0-9]{2}\/[0-9]{2}$/).required(),
       cvv2: Joi.string().regex(/^[0-9]{3}$/).required(),
-      type: Joi.string().valid(['CA', 'VI', 'AX', 'DC', 'JC']).optional(),
+      type: Joi.string().valid('CA', 'VI', 'AX', 'DC', 'JC').optional(),
     }).required();
 
-    const result = Joi.validate(params.creditCard, schema);
+    const result = schema.validate(params.creditCard);
     if (result.error) {
       // NOTE: doesn't leak CC data into exception
       throw new AirValidationError.CreditCardMissing(result.error.toString());