@things-factory/dataset 7.0.24 → 7.0.28

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/dataset",
-  "version": "7.0.24",
+  "version": "7.0.28",
   "main": "dist-server/index.js",
   "browser": "dist-client/index.js",
   "things-factory": true,
@@ -40,21 +40,21 @@
     "@operato/shell": "^7.0.0",
     "@operato/styles": "^7.0.0",
     "@operato/utils": "^7.0.0",
-    "@things-factory/auth-base": "^7.0.22",
-    "@things-factory/aws-base": "^7.0.22",
-    "@things-factory/board-service": "^7.0.23",
-    "@things-factory/env": "^7.0.14",
-    "@things-factory/integration-base": "^7.0.23",
-    "@things-factory/organization": "^7.0.22",
-    "@things-factory/personalization": "^7.0.22",
-    "@things-factory/scheduler-client": "^7.0.22",
-    "@things-factory/shell": "^7.0.19",
-    "@things-factory/work-shift": "^7.0.22",
-    "@things-factory/worklist": "^7.0.23",
+    "@things-factory/auth-base": "^7.0.28",
+    "@things-factory/aws-base": "^7.0.28",
+    "@things-factory/board-service": "^7.0.28",
+    "@things-factory/env": "^7.0.28",
+    "@things-factory/integration-base": "^7.0.28",
+    "@things-factory/organization": "^7.0.28",
+    "@things-factory/personalization": "^7.0.28",
+    "@things-factory/scheduler-client": "^7.0.28",
+    "@things-factory/shell": "^7.0.28",
+    "@things-factory/work-shift": "^7.0.28",
+    "@things-factory/worklist": "^7.0.28",
     "cron-parser": "^4.3.0",
     "moment-timezone": "^0.5.45",
     "simple-statistics": "^7.8.3",
     "statistics": "^3.3.0"
   },
-  "gitHead": "fbcc1bcca6ff68ef3c53330ca8b3e39f08570320"
+  "gitHead": "05a06c851e7fbdf76b3fdc039a0067d6c0439a25"
 }

package/server/controllers/shiny-report.ts

@@ -1,60 +1,54 @@
-import FormData from 'form-data'
-import fetch from 'node-fetch'
 import { config } from '@things-factory/env'
 import { getEndpointUrl } from '../utils/config-resolver'
 
-const querystring = require('querystring')
-const debug = require('debug')('things-factory:dataset:shiny-report')
+import debugLib from 'debug'
+const debug = debugLib('things-factory:dataset:shiny-report')
 const dataReportConfig = config.get('dataReport')
 const {
   shiny: {
     endpoint: ENDPOINT,
     datasource: { database: DATABASE }
   }
-} = Object.assign({
-  shiny: {
-    endpoint: {},
-    datasource: {}
-  }}, dataReportConfig)
-
+} = Object.assign(
+  {
+    shiny: {
+      endpoint: {},
+      datasource: {}
+    }
+  },
+  dataReportConfig
+)
 
 export async function renderShinyReport(context: any) {
   debug('render:context', context)
-  
+
   try {
-    const { access_token: token } = querystring.parse(context.header.cookie, ';')
+    const cookies = new URLSearchParams(context.header.cookie.replace(/; /g, '&'))
+    const token = cookies.get('access_token')
     const {
       state: { domain },
       query,
-      response,
+      response
     } = context
-    
-    const urlParams = querystring.stringify({ 
+
+    const urlParams = new URLSearchParams({
       token,
-      ...query, 
-      ...{ database: DATABASE,  
-      domain: domain?.subdomain }
-    })
-    
-    // const jsonParams = JSON.stringify({ 
-    //   ...query, 
-    //   ...{ database: DATABASE,  
-    //   domain: domain?.subdomain }
-    // })
-    
+      ...query,
+      database: DATABASE,
+      domain: domain?.subdomain
+    }).toString()
+
     const subpath = query?.reportView || ''
 
     if (!subpath) {
-      return context.body = ''
+      return (context.body = '')
     }
 
     const url = getEndpointUrl(ENDPOINT, subpath)
-    // const reportUrl = `${protocol}${url}/?params=${jsonParams}`
     const reportUrl = `${url}/?${urlParams}`
 
     response.redirect(reportUrl)
-  } catch(ex) {
+  } catch (ex) {
     context.body = `Error: ${ex.message} || ''`
   }
-  
 }