From 66f587a5f92ef2871b9d4a1609decf256ecdd3e0 Mon Sep 17 00:00:00 2001 From: dannyrb Date: Sun, 28 Apr 2019 15:14:20 -0400 Subject: [PATCH] Pull info from node env var, not package.json --- src/config.js | 39 +++++++++++++++++++-------------------- 1 file changed, 19 insertions(+), 20 deletions(-) diff --git a/src/config.js b/src/config.js index 773dc2b5d..8385e7ead 100644 --- a/src/config.js +++ b/src/config.js @@ -1,38 +1,37 @@ -import dicomParser from 'dicom-parser'; -import cornerstone from 'cornerstone-core'; -import cornerstoneWADOImageLoader from 'cornerstone-wado-image-loader'; -import OHIF from 'ohif-core'; -import version from './version.js'; -import { homepage } from '../package.json'; +import dicomParser from 'dicom-parser' +import cornerstone from 'cornerstone-core' +import cornerstoneWADOImageLoader from 'cornerstone-wado-image-loader' +import OHIF from 'ohif-core' +import version from './version.js' window.info = { version, - homepage -}; + homepage: `${process.env.PUBLIC_URL}`, +} // For debugging -window.cornerstone = cornerstone; -window.cornerstoneWADOImageLoader = cornerstoneWADOImageLoader; +window.cornerstone = cornerstone +window.cornerstoneWADOImageLoader = cornerstoneWADOImageLoader -cornerstoneWADOImageLoader.external.cornerstone = cornerstone; -cornerstoneWADOImageLoader.external.dicomParser = dicomParser; +cornerstoneWADOImageLoader.external.cornerstone = cornerstone +cornerstoneWADOImageLoader.external.dicomParser = dicomParser OHIF.user.getAccessToken = () => { // TODO: Get the Redux store from somewhere else - const state = window.store.getState(); + const state = window.store.getState() if (!state.oidc || !state.oidc.user) { - return; + return } - return state.oidc.user.access_token; -}; + return state.oidc.user.access_token +} cornerstoneWADOImageLoader.configure({ beforeSend: function(xhr) { - const headers = OHIF.DICOMWeb.getAuthorizationHeader(); + const headers = OHIF.DICOMWeb.getAuthorizationHeader() if (headers.Authorization) { - xhr.setRequestHeader('Authorization', headers.Authorization); + xhr.setRequestHeader('Authorization', headers.Authorization) } - } -}); + }, +})