Merge pull request #62 from Luidog/login-bugfix

Login fix

Author: Luidog

package-lock.json

@@ -39,17 +39,17 @@
   },
   "homepage": "https://github.com/Luidog/fms-api-client",
   "dependencies": {
-    "axios": "^0.19.0",
+    "axios": "^0.19.1",
     "axios-cookiejar-support": "^0.5.1",
     "form-data": "^3.0.0",
     "into-stream": "^5.1.1",
     "lodash": "^4.17.15",
     "marpat": "^3.0.0",
-    "mime-types": "^2.1.25",
+    "mime-types": "^2.1.26",
     "moment": "^2.24.0",
     "object-sizeof": "^1.5.2",
     "prettysize": "^2.0.0",
-    "snyk": "^1.272.0",
+    "snyk": "^1.278.1",
     "stream-to-array": "^2.3.0",
     "tough-cookie": "^3.0.1",
     "uuid": "^3.3.3"
@@ -66,7 +66,7 @@
     "eslint-config-prettier": "^6.9.0",
     "eslint-plugin-prettier": "^3.1.2",
     "fs-extra": "^8.1.0",
-    "handlebars": "^4.5.3",
+    "handlebars": "^4.7.2",
     "http-proxy": "^1.18.0",
     "jsdoc": "^3.6.3",
     "jsdoc-to-markdown": "^5.0.3",
@@ -81,7 +81,7 @@
     "mos-plugin-snippet": "^2.1.3",
     "nyc": "^15.0.0",
     "prettier": "^1.19.1",
-    "sinon": "^8.0.2",
+    "sinon": "^8.0.4",
     "varium": "^2.0.6"
   },
   "snyk": true

package.json

@@ -1,13 +1,19 @@
 'use strict';
 
+const axios = require('axios');
+const axiosCookieJarSupport = require('axios-cookiejar-support').default;
 const fs = require('fs');
 const path = require('path');
 const toArray = require('stream-to-array');
 const { CookieJar } = require('tough-cookie');
 const mime = require('mime-types');
 const uuidv4 = require('uuid/v4');
 const _ = require('lodash');
-const { instance } = require('./request.service');
+const { interceptResponse } = require('./request.service')
+
+const instance = axios.create();
+
+axiosCookieJarSupport(instance);
 
 /**
  * @class Container Service
@@ -19,7 +25,7 @@ const { instance } = require('./request.service');
  * @param  {Any} error We publishing error.
  */
 instance.interceptors.response.use(
-  response => response,
+  response => interceptResponse(response),
   error => handleError(error)
 );
 

src/services/container.service.js

@@ -24,14 +24,6 @@ axiosCookieJarSupport(instance);
 const interceptError = error => {
   if (error.code) {
     return Promise.reject({ code: error.code, message: error.message });
-  } else if (
-    error.response.status === 502 ||
-    typeof error.response.data !== 'object'
-  ) {
-    return Promise.reject({
-      message: 'The Data API is currently unavailable',
-      code: '1630'
-    });
   } else if (
     error.response.status === 400 &&
     error.request.path.includes('RCType=EmbeddedRCFileProcessor')
@@ -40,6 +32,15 @@ const interceptError = error => {
       message: 'FileMaker WPE rejected the request',
       code: '9'
     });
+  } else if (
+    error.response.status === 502 ||
+    typeof error.response.data !== 'object' ||
+    !error.response.data.messages
+  ) {
+    return Promise.reject({
+      message: 'The Data API is currently unavailable',
+      code: '1630'
+    });
   } else {
     return Promise.reject(error.response.data.messages[0]);
   }
@@ -77,5 +78,6 @@ instance.interceptors.response.use(
 );
 
 module.exports = {
-  instance
+  instance,
+  interceptResponse
 };

src/services/request.service.js

@@ -143,7 +143,9 @@ describe('Authentication Capabilities', () => {
         .catch(error => error)
     )
       .to.eventually.be.an('object')
-      .that.has.all.keys('code', 'message');
+      .that.has.all.keys('code', 'message')
+      .and.property('code')
+      .to.equal('212');
   });
 
   it('should reject if it can not create a new data api session', () => {