fleetmap-reports 2.0.3 → 2.0.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fleetmap-reports",
-  "version": "2.0.3",
+  "version": "2.0.5",
   "description": "",
   "main": "src/index.js",
   "scripts": {
@@ -18,7 +18,7 @@
     "country-reverse-geocoding": "^0.2.2",
     "docx": "^7.3.0",
     "file-saver": "^2.0.5",
-    "fleetmap-partners": "^1.0.144",
+    "fleetmap-partners": "^1.0.160",
     "json-as-xlsx": "^1.2.1",
     "jspdf": "^2.5.1",
     "jspdf-autotable": "3.6.0",

package/src/index.js

@@ -1,4 +1,4 @@
-function Reports (config, axios, cookieJar) {
+function Reports (config, axios) {
   const { ReportsApi, PositionsApi, SessionApi, DevicesApi, GroupsApi, DriversApi, GeofencesApi } = require('traccar-api')
   this.traccar = {
     reports: new ReportsApi(config, null, axios),
@@ -8,8 +8,7 @@ function Reports (config, axios, cookieJar) {
     groups: new GroupsApi(config, null, axios),
     drivers: new DriversApi(config, null, axios),
     geofences: new GeofencesApi(config, null, axios),
-    axios: axios || require('axios').create({ ...config.baseOptions, baseURL: config.basePath }),
-    cookieJar
+    axios: axios || require('axios').create({ ...config.baseOptions, baseURL: config.basePath })
   }
   this.getUserData = async () => {
     return {

package/src/tests/index.js

@@ -1,24 +1,21 @@
 const { SessionApi } = require('traccar-api')
-const axiosCookieJarSupport = require('axios-cookiejar-support').default
-const tough = require('tough-cookie')
 const Index = require('../index')
-const cookieJar = new tough.CookieJar()
+const { isClientSide } = require('../util/utils')
+const { newDomains } = require('fleetmap-partners')
+const serverHost = isClientSide() && newDomains.includes(window.location.hostname) ? window.location.hostname : 'api.pinme.io'
 const traccarConfig = {
-  basePath: process.env.SERVER_HOST || 'https://api.pinme.io/api',
+  basePath: `https://${serverHost}/api`,
   baseOptions: {
-    withCredentials: true,
-    jar: cookieJar
+    withCredentials: true
   }
 }
 const axios = require('axios').create({ ...traccarConfig.baseOptions, baseURL: traccarConfig.basePath })
 
-axiosCookieJarSupport(axios)
-
 const getReports = async (email, password) => {
   try {
     console.log('email / pass', process.env.email || email, process.env.password || password)
     await new SessionApi(traccarConfig, null, axios).sessionPost(email || process.env.email, password || process.env.password)
-    return new Index(traccarConfig, axios, cookieJar)
+    return new Index(traccarConfig, axios)
   } catch (e) {
     console.error(e)
   }

package/src/zone-report.js

@@ -11,7 +11,10 @@ require('jspdf-autotable')
 const traccarHelper = require('./util/traccar')
 const { headerFromUser, addTable } = require('./util/pdfDocument')
 const { getStyle } = require('./reportStyle')
-const { getUserPartner } = require('fleetmap-partners')
+const {
+  getUserPartner,
+  newDomains
+} = require('fleetmap-partners')
 const { devicesToProcess } = require('./util/device')
 const axios = require('axios')
 const {
@@ -33,8 +36,12 @@ async function createZoneReport (from, to, userData, traccar) {
     xpert: devices.filter(d => d.attributes.xpert).length > 0
   }
 
+  const serverHost = isClientSide() && newDomains.includes(window.location.hostname)
+    ? window.location.hostname
+    : process.env.SERVER_HOST
+
   if (isClientSide()) {
-    const url = `https://${process.env.SERVER_HOST}/reports/zone-report`
+    const url = `https://${serverHost}/reports/zone-report`
     return axios.post(url, { from, to, userData }, { withCredentials: true })
       .then(d => d.data)
   }