fleetmap-reports 2.0.80 → 2.0.83

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fleetmap-reports",
-  "version": "2.0.80",
+  "version": "2.0.83",
   "description": "",
   "main": "src/index.js",
   "scripts": {

package/src/speeding-report.js

@@ -126,7 +126,7 @@ async function createSpeedingReportByDriver (from, to, userData, traccarInstance
 
 async function getEvents (traccarInstance, from, to, devices, userData, deviceCount, totalDevices, sliceSize) {
   if (processServerSide()) {
-    const url = `https://${getServerHost()}/reports/speeding-report/getEvents`
+    const url = `https://${getServerHost()}/pinmeapi/reports/speeding-report/getEvents`
     return axios.post(url, { from, to, devices, userData, deviceCount, totalDevices, sliceSize }, { withCredentials: true }).then(d => d.data)
   } else {
     const geofencesFeatures = userData.geofences.filter(g => g.area.startsWith('POLYGON') &&

package/src/util/utils.js

@@ -1,7 +1,6 @@
 const turf = require('@turf/helpers')
 const {
-  getUserPartner,
-  newDomains
+  getUserPartner
 } = require('fleetmap-partners')
 const messages = require('../../lang')
 const distance = require('@turf/distance')
@@ -238,7 +237,7 @@ async function executeServerSide (type, sliced, from, to, userData, totalItems,
   for (let i = 0; i < sliced.length; i += maxRequests) {
     const _sliced = sliced.slice(i, i + maxRequests)
     await Promise.all(_sliced.map(async items => {
-      const url = `https://${getServerHost()}/reports/${type}`
+      const url = `https://${getServerHost()}/pinmeapi/reports/${type}`
       try {
         await axios.post(url, {
           from,
@@ -325,8 +324,5 @@ exports.processServerSide = (userData) => {
   return devices.length > 100 && isClientSide()
 }
 
-const getServerHost = () =>
-  newDomains.includes(window.location.hostname)
-    ? `${window.location.hostname}/pinmeapi`
-    : process.env.SERVER_HOST
+const getServerHost = () => process.env.SERVER_HOST
 exports.getServerHost = getServerHost

package/src/zone-report.js

@@ -4,8 +4,7 @@ const {
   calculateDistance,
   sortPositions, getDates, convertToLocaleDateString, convertToLocaleTimeString,
   isClientSide,
-  getLanguage, convertFromUTC, convertFromLocal,
-  getServerHost
+  getLanguage, convertFromUTC, convertFromLocal
 } = require('./util/utils')
 const jsPDF = require('jspdf')
 require('jspdf-autotable')
@@ -23,7 +22,7 @@ const {
 const { checkGeofenceIn } = require('./util/geofence')
 const { parallel } = require('./util/parallel')
 const { getDataByDay } = require('./util/trips')
-const axios = require('axios')
+const axios = require('axios').default
 const sliceSize = 100
 const deviceChunk = 5
 const fileName = 'ZoneReport'
@@ -37,10 +36,9 @@ async function createZoneReport (from, to, userData, traccar) {
   }
 
   if (isClientSide()) {
-    const url = 'https://alb.fleetmap.pt/reports/zone-report/'
     const cookie = await axios.get('/pinmeapi/cookie/get', { withCredentials: true }).then(d => d.data)
-    return traccar.axios.post(url, { from, to, userData }, { headers: {cookie} })
-      .then(d => d.data)
+    const url = `https://${process.env.SERVER_HOST}/pinmeapi/reports/zone-report?cookie=${encodeURIComponent(cookie)}`
+    return axios.post(url, { from, to, userData }).then(d => d.data)
   }
   const types = ['geofenceEnter', 'geofenceExit']