@things-factory/dataset 7.0.23 → 7.0.26

package/dist-server/controllers/shiny-report.js

@@ -1,10 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.renderShinyReport = renderShinyReport;
+const tslib_1 = require("tslib");
 const env_1 = require("@things-factory/env");
 const config_resolver_1 = require("../utils/config-resolver");
-const querystring = require('querystring');
-const debug = require('debug')('things-factory:dataset:shiny-report');
+const debug_1 = tslib_1.__importDefault(require("debug"));
+const debug = (0, debug_1.default)('things-factory:dataset:shiny-report');
 const dataReportConfig = env_1.config.get('dataReport');
 const { shiny: { endpoint: ENDPOINT, datasource: { database: DATABASE } } } = Object.assign({
     shiny: {
@@ -15,21 +16,15 @@ const { shiny: { endpoint: ENDPOINT, datasource: { database: DATABASE } } } = Ob
 async function renderShinyReport(context) {
     debug('render:context', context);
     try {
-        const { access_token: token } = querystring.parse(context.header.cookie, ';');
-        const { state: { domain }, query, response, } = context;
-        const urlParams = querystring.stringify(Object.assign(Object.assign({ token }, query), { database: DATABASE,
-            domain: domain === null || domain === void 0 ? void 0 : domain.subdomain }));
-        // const jsonParams = JSON.stringify({ 
-        //   ...query, 
-        //   ...{ database: DATABASE,  
-        //   domain: domain?.subdomain }
-        // })
+        const cookies = new URLSearchParams(context.header.cookie.replace(/; /g, '&'));
+        const token = cookies.get('access_token');
+        const { state: { domain }, query, response } = context;
+        const urlParams = new URLSearchParams(Object.assign(Object.assign({ token }, query), { database: DATABASE, domain: domain === null || domain === void 0 ? void 0 : domain.subdomain })).toString();
         const subpath = (query === null || query === void 0 ? void 0 : query.reportView) || '';
         if (!subpath) {
-            return context.body = '';
+            return (context.body = '');
         }
         const url = (0, config_resolver_1.getEndpointUrl)(ENDPOINT, subpath);
-        // const reportUrl = `${protocol}${url}/?params=${jsonParams}`
         const reportUrl = `${url}/?${urlParams}`;
         response.redirect(reportUrl);
     }

package/dist-server/controllers/shiny-report.js.map

@@ -1 +1 @@
-{"version":3,"file":"shiny-report.js","sourceRoot":"","sources":["../../server/controllers/shiny-report.ts"],"names":[],"mappings":";;AAoBA,8CAuCC;AAzDD,6CAA4C;AAC5C,8DAAyD;AAEzD,MAAM,WAAW,GAAG,OAAO,CAAC,aAAa,CAAC,CAAA;AAC1C,MAAM,KAAK,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC,qCAAqC,CAAC,CAAA;AACrE,MAAM,gBAAgB,GAAG,YAAM,CAAC,GAAG,CAAC,YAAY,CAAC,CAAA;AACjD,MAAM,EACJ,KAAK,EAAE,EACL,QAAQ,EAAE,QAAQ,EAClB,UAAU,EAAE,EAAE,QAAQ,EAAE,QAAQ,EAAE,EACnC,EACF,GAAG,MAAM,CAAC,MAAM,CAAC;IAChB,KAAK,EAAE;QACL,QAAQ,EAAE,EAAE;QACZ,UAAU,EAAE,EAAE;KACf;CAAC,EAAE,gBAAgB,CAAC,CAAA;AAGhB,KAAK,UAAU,iBAAiB,CAAC,OAAY;IAClD,KAAK,CAAC,gBAAgB,EAAE,OAAO,CAAC,CAAA;IAEhC,IAAI,CAAC;QACH,MAAM,EAAE,YAAY,EAAE,KAAK,EAAE,GAAG,WAAW,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAA;QAC7E,MAAM,EACJ,KAAK,EAAE,EAAE,MAAM,EAAE,EACjB,KAAK,EACL,QAAQ,GACT,GAAG,OAAO,CAAA;QAEX,MAAM,SAAS,GAAG,WAAW,CAAC,SAAS,+BACrC,KAAK,IACF,KAAK,GACL,EAAE,QAAQ,EAAE,QAAQ;YACvB,MAAM,EAAE,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,SAAS,EAAE,EAC3B,CAAA;QAEF,uCAAuC;QACvC,eAAe;QACf,+BAA+B;QAC/B,gCAAgC;QAChC,KAAK;QAEL,MAAM,OAAO,GAAG,CAAA,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,UAAU,KAAI,EAAE,CAAA;QAEvC,IAAI,CAAC,OAAO,EAAE,CAAC;YACb,OAAO,OAAO,CAAC,IAAI,GAAG,EAAE,CAAA;QAC1B,CAAC;QAED,MAAM,GAAG,GAAG,IAAA,gCAAc,EAAC,QAAQ,EAAE,OAAO,CAAC,CAAA;QAC7C,8DAA8D;QAC9D,MAAM,SAAS,GAAG,GAAG,GAAG,KAAK,SAAS,EAAE,CAAA;QAExC,QAAQ,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAA;IAC9B,CAAC;IAAC,OAAM,EAAE,EAAE,CAAC;QACX,OAAO,CAAC,IAAI,GAAG,UAAU,EAAE,CAAC,OAAO,QAAQ,CAAA;IAC7C,CAAC;AAEH,CAAC","sourcesContent":["import FormData from 'form-data'\nimport fetch from 'node-fetch'\nimport { config } from '@things-factory/env'\nimport { getEndpointUrl } from '../utils/config-resolver'\n\nconst querystring = require('querystring')\nconst debug = require('debug')('things-factory:dataset:shiny-report')\nconst dataReportConfig = config.get('dataReport')\nconst {\n  shiny: {\n    endpoint: ENDPOINT,\n    datasource: { database: DATABASE }\n  }\n} = Object.assign({\n  shiny: {\n    endpoint: {},\n    datasource: {}\n  }}, dataReportConfig)\n\n\nexport async function renderShinyReport(context: any) {\n  debug('render:context', context)\n  \n  try {\n    const { access_token: token } = querystring.parse(context.header.cookie, ';')\n    const {\n      state: { domain },\n      query,\n      response,\n    } = context\n    \n    const urlParams = querystring.stringify({ \n      token,\n      ...query, \n      ...{ database: DATABASE,  \n      domain: domain?.subdomain }\n    })\n    \n    // const jsonParams = JSON.stringify({ \n    //   ...query, \n    //   ...{ database: DATABASE,  \n    //   domain: domain?.subdomain }\n    // })\n    \n    const subpath = query?.reportView || ''\n\n    if (!subpath) {\n      return context.body = ''\n    }\n\n    const url = getEndpointUrl(ENDPOINT, subpath)\n    // const reportUrl = `${protocol}${url}/?params=${jsonParams}`\n    const reportUrl = `${url}/?${urlParams}`\n\n    response.redirect(reportUrl)\n  } catch(ex) {\n    context.body = `Error: ${ex.message} || ''`\n  }\n  \n}\n"]}
+{"version":3,"file":"shiny-report.js","sourceRoot":"","sources":["../../server/controllers/shiny-report.ts"],"names":[],"mappings":";;AAqBA,8CAgCC;;AArDD,6CAA4C;AAC5C,8DAAyD;AAEzD,0DAA4B;AAC5B,MAAM,KAAK,GAAG,IAAA,eAAQ,EAAC,qCAAqC,CAAC,CAAA;AAC7D,MAAM,gBAAgB,GAAG,YAAM,CAAC,GAAG,CAAC,YAAY,CAAC,CAAA;AACjD,MAAM,EACJ,KAAK,EAAE,EACL,QAAQ,EAAE,QAAQ,EAClB,UAAU,EAAE,EAAE,QAAQ,EAAE,QAAQ,EAAE,EACnC,EACF,GAAG,MAAM,CAAC,MAAM,CACf;IACE,KAAK,EAAE;QACL,QAAQ,EAAE,EAAE;QACZ,UAAU,EAAE,EAAE;KACf;CACF,EACD,gBAAgB,CACjB,CAAA;AAEM,KAAK,UAAU,iBAAiB,CAAC,OAAY;IAClD,KAAK,CAAC,gBAAgB,EAAE,OAAO,CAAC,CAAA;IAEhC,IAAI,CAAC;QACH,MAAM,OAAO,GAAG,IAAI,eAAe,CAAC,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC,CAAA;QAC9E,MAAM,KAAK,GAAG,OAAO,CAAC,GAAG,CAAC,cAAc,CAAC,CAAA;QACzC,MAAM,EACJ,KAAK,EAAE,EAAE,MAAM,EAAE,EACjB,KAAK,EACL,QAAQ,EACT,GAAG,OAAO,CAAA;QAEX,MAAM,SAAS,GAAG,IAAI,eAAe,+BACnC,KAAK,IACF,KAAK,KACR,QAAQ,EAAE,QAAQ,EAClB,MAAM,EAAE,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,SAAS,IACzB,CAAC,QAAQ,EAAE,CAAA;QAEb,MAAM,OAAO,GAAG,CAAA,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,UAAU,KAAI,EAAE,CAAA;QAEvC,IAAI,CAAC,OAAO,EAAE,CAAC;YACb,OAAO,CAAC,OAAO,CAAC,IAAI,GAAG,EAAE,CAAC,CAAA;QAC5B,CAAC;QAED,MAAM,GAAG,GAAG,IAAA,gCAAc,EAAC,QAAQ,EAAE,OAAO,CAAC,CAAA;QAC7C,MAAM,SAAS,GAAG,GAAG,GAAG,KAAK,SAAS,EAAE,CAAA;QAExC,QAAQ,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAA;IAC9B,CAAC;IAAC,OAAO,EAAE,EAAE,CAAC;QACZ,OAAO,CAAC,IAAI,GAAG,UAAU,EAAE,CAAC,OAAO,QAAQ,CAAA;IAC7C,CAAC;AACH,CAAC","sourcesContent":["import { config } from '@things-factory/env'\nimport { getEndpointUrl } from '../utils/config-resolver'\n\nimport debugLib from 'debug'\nconst debug = debugLib('things-factory:dataset:shiny-report')\nconst dataReportConfig = config.get('dataReport')\nconst {\n  shiny: {\n    endpoint: ENDPOINT,\n    datasource: { database: DATABASE }\n  }\n} = Object.assign(\n  {\n    shiny: {\n      endpoint: {},\n      datasource: {}\n    }\n  },\n  dataReportConfig\n)\n\nexport async function renderShinyReport(context: any) {\n  debug('render:context', context)\n\n  try {\n    const cookies = new URLSearchParams(context.header.cookie.replace(/; /g, '&'))\n    const token = cookies.get('access_token')\n    const {\n      state: { domain },\n      query,\n      response\n    } = context\n\n    const urlParams = new URLSearchParams({\n      token,\n      ...query,\n      database: DATABASE,\n      domain: domain?.subdomain\n    }).toString()\n\n    const subpath = query?.reportView || ''\n\n    if (!subpath) {\n      return (context.body = '')\n    }\n\n    const url = getEndpointUrl(ENDPOINT, subpath)\n    const reportUrl = `${url}/?${urlParams}`\n\n    response.redirect(reportUrl)\n  } catch (ex) {\n    context.body = `Error: ${ex.message} || ''`\n  }\n}\n"]}