fleetmap-reports 2.0.89 → 2.0.92

package/package.json

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

package/src/speeding-report.js

@@ -126,8 +126,9 @@ async function createSpeedingReportByDriver (from, to, userData, traccarInstance
 
 async function getEvents (traccarInstance, from, to, devices, userData, deviceCount, totalDevices, sliceSize) {
   if (processServerSide()) {
+    const cookie = await axios.get('/pinmeapi/cookie/get', { withCredentials: true }).then(d => d.data)
     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)
+    return axios.post(url, { from, to, devices, userData, deviceCount, totalDevices, sliceSize, cookie }, { withCredentials: true }).then(d => d.data)
   } else {
     const geofencesFeatures = userData.geofences.filter(g => g.area.startsWith('POLYGON') &&
       g.attributes.speedLimit).map(g => convertToFeature(g))

package/src/util/utils.js

@@ -3,6 +3,7 @@ const {
   getUserPartner
 } = require('fleetmap-partners')
 const messages = require('../../lang')
+const axios = require('axios').default
 const distance = require('@turf/distance')
 const { devicesToProcess } = require('./device')
 
@@ -230,10 +231,10 @@ function weekDaySelected (date, weekDays) {
     (date.getDay() === 6 && weekDays.saturday))
 }
 
-async function executeServerSide (type, sliced, from, to, userData, totalItems, { axios }, maxRequests = 10) {
+async function executeServerSide (type, sliced, from, to, userData, totalItems, traccar, maxRequests = 10) {
   let itemsCount = 0
   console.log('PROGRESS_PERC:1')
-  const cookie = await axios.get(`https://${getServerHost()}/pinmeapi/cookie/get`, { withCredentials: true }).then(d => d.data)
+  const cookie = await axios.get('/pinmeapi/cookie/get', { withCredentials: true }).then(d => d.data)
   const reportData = []
   for (let i = 0; i < sliced.length; i += maxRequests) {
     const _sliced = sliced.slice(i, i + maxRequests)