fleetmap-reports 2.0.253 → 2.0.255

package/package.json

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

package/src/location-report.js

@@ -5,12 +5,13 @@ const { getStyle } = require('./reportStyle')
 const { getUserPartner } = require('fleetmap-partners')
 const {
   convertToLocaleString, getTranslations,
-  getLanguage
+  getLanguage, isClientSide
 } = require('./util/utils')
 const traccarHelper = require('./util/traccar')
 const { devicesToProcess } = require('./util/device')
 const automaticReports = require('./automaticReports')
 const { getDriverName, getDriverData } = require('./util/driver')
+const { default: axios } = require('axios')
 
 const fileName = 'LocationReport'
 
@@ -20,6 +21,11 @@ async function createLocationReport (from, to, userData, traccar) {
 
   if (userData.byDriver) {
     console.log('ByDriver')
+    if (isClientSide()) {
+      const cookie = await axios.get('/pinmeapi/cookie/get', { withCredentials: true }).then(d => d.data)
+      const url = `https://${process.env.SERVER_HOST}/pinmeapi/reports/location-report`
+      return axios.post(url, { from, to, userData, cookie }).then(d => d.data)
+    }
     const report = await createLocationReportByDriver(from, to, userData, traccar)
     reportData.push(report)
   } else if (userData.byGroup) {

package/src/util/traccar.js

@@ -2,7 +2,6 @@ const automaticReports = require('../automaticReports')
 const { convertFromUTC, isClientSide, convertFromLocal } = require('./utils')
 const path = require('path')
 const { cleanPositions, filterPosition } = require('./route')
-const Piscina = require("piscina");
 async function getRoute (traccar, from, to, devices) {
   const devicesToSlice = devices.slice()