diff --git a/docs/latest/deployment/recipes/embedded-viewer.md b/docs/latest/deployment/recipes/embedded-viewer.md index 384c22b78..3018d97c2 100644 --- a/docs/latest/deployment/recipes/embedded-viewer.md +++ b/docs/latest/deployment/recipes/embedded-viewer.md @@ -53,9 +53,6 @@ window.config = { qidoSupportsIncludeField: true, imageRendering: 'wadors', thumbnailRendering: 'wadors', - requestOptions: { - requestFromBrowser: true, - }, }, ], }, diff --git a/docs/latest/essentials/configuration.md b/docs/latest/essentials/configuration.md index 64662abb0..182eaa0ca 100644 --- a/docs/latest/essentials/configuration.md +++ b/docs/latest/essentials/configuration.md @@ -59,9 +59,6 @@ window.config = { qidoSupportsIncludeField: true, imageRendering: 'wadors', thumbnailRendering: 'wadors', - requestOptions: { - requestFromBrowser: true, - }, }, ], }, diff --git a/platform/core/src/DICOMWeb/getAuthorizationHeader.js b/platform/core/src/DICOMWeb/getAuthorizationHeader.js index c7d391571..7d4109896 100644 --- a/platform/core/src/DICOMWeb/getAuthorizationHeader.js +++ b/platform/core/src/DICOMWeb/getAuthorizationHeader.js @@ -6,17 +6,21 @@ import user from '../user'; /** * Returns the Authorization header as part of an Object. * - * @returns {Object} + * @export + * @param {Object} [server={}] + * @param {Object} [server.requestOptions] + * @param {string} [server.requestOptions.auth] + * @returns {Object} { Authorization } */ -export default function getAuthorizationHeader(server) { +export default function getAuthorizationHeader({ requestOptions } = {}) { const headers = {}; // Check for OHIF.user since this can also be run on the server const accessToken = user && user.getAccessToken && user.getAccessToken(); - if (server && server.requestOptions && server.requestOptions.auth) { + if (requestOptions && requestOptions.auth) { // HTTP Basic Auth (user:password) - headers.Authorization = `Basic ${btoa(server.requestOptions.auth)}`; + headers.Authorization = `Basic ${btoa(requestOptions.auth)}`; } else if (accessToken) { headers.Authorization = `Bearer ${accessToken}`; } diff --git a/platform/core/src/utils/addServer.test.js b/platform/core/src/utils/addServer.test.js index c5981bb4b..dc6a71593 100644 --- a/platform/core/src/utils/addServer.test.js +++ b/platform/core/src/utils/addServer.test.js @@ -11,9 +11,6 @@ describe('addServers', () => { qidoSupportsIncludeField: true, imageRendering: 'wadors', thumbnailRendering: 'wadors', - requestOptions: { - requestFromBrowser: true, - }, }, ], oidc: [ @@ -52,7 +49,6 @@ describe('addServers', () => { name: 'DCM4CHEE', qidoRoot: 'https://server.dcmjs.org/dcm4chee-arc/aets/DCM4CHEE/rs', qidoSupportsIncludeField: true, - requestOptions: { requestFromBrowser: true }, thumbnailRendering: 'wadors', type: 'dicomWeb', wadoRoot: 'https://server.dcmjs.org/dcm4chee-arc/aets/DCM4CHEE/rs', diff --git a/platform/viewer/public/config/default.js b/platform/viewer/public/config/default.js index 55339be37..639b627f7 100644 --- a/platform/viewer/public/config/default.js +++ b/platform/viewer/public/config/default.js @@ -13,9 +13,6 @@ window.config = { qidoSupportsIncludeField: true, imageRendering: 'wadors', thumbnailRendering: 'wadors', - requestOptions: { - requestFromBrowser: true, - }, }, ], }, diff --git a/platform/viewer/public/config/demo.js b/platform/viewer/public/config/demo.js index eca2a470c..816a02e25 100644 --- a/platform/viewer/public/config/demo.js +++ b/platform/viewer/public/config/demo.js @@ -12,9 +12,6 @@ window.config = { qidoSupportsIncludeField: true, imageRendering: 'wadors', thumbnailRendering: 'wadors', - requestOptions: { - requestFromBrowser: true, - }, }, ], }, diff --git a/platform/viewer/public/config/docker_nginx-orthanc.js b/platform/viewer/public/config/docker_nginx-orthanc.js index 45b563d6e..812972475 100644 --- a/platform/viewer/public/config/docker_nginx-orthanc.js +++ b/platform/viewer/public/config/docker_nginx-orthanc.js @@ -11,9 +11,6 @@ window.config = { qidoSupportsIncludeField: false, imageRendering: 'wadors', thumbnailRendering: 'wadors', - requestOptions: { - requestFromBrowser: true, - }, }, ], }, diff --git a/platform/viewer/public/config/docker_openresty-orthanc-keycloak.js b/platform/viewer/public/config/docker_openresty-orthanc-keycloak.js index 4a57db574..a872f4a44 100644 --- a/platform/viewer/public/config/docker_openresty-orthanc-keycloak.js +++ b/platform/viewer/public/config/docker_openresty-orthanc-keycloak.js @@ -14,11 +14,10 @@ window.config = { thumbnailRendering: 'wadors', // REQUIRED TAG: // TODO: Remove tag after https://github.com/OHIF/ohif-core/pull/19 is merged and we bump version - requestOptions: { - // undefined to use JWT + Bearer auth - // auth: 'orthanc:orthanc', - requestFromBrowser: true, - }, + // requestOptions: { + // undefined to use JWT + Bearer auth + // auth: 'orthanc:orthanc', + // }, }, ], }, diff --git a/platform/viewer/public/config/docker_openresty-orthanc.js b/platform/viewer/public/config/docker_openresty-orthanc.js index aa10446a7..d23915fc7 100644 --- a/platform/viewer/public/config/docker_openresty-orthanc.js +++ b/platform/viewer/public/config/docker_openresty-orthanc.js @@ -12,15 +12,11 @@ window.config = { qidoSupportsIncludeField: false, imageRendering: 'wadors', thumbnailRendering: 'wadors', - // REQUIRED TAG: - // https://github.com/OHIF/ohif-core/blob/59e1e04b92be24aee5d4402445cb3dcedb746995/src/studies/retrieveStudyMetadata.js#L54 - // TODO: Remove tag after https://github.com/OHIF/ohif-core/pull/19 is merged and we bump version - requestOptions: { - // undefined to use JWT + Bearer auth - // auth: 'orthanc:orthanc', - requestFromBrowser: true, - }, + // requestOptions: { + // undefined to use JWT + Bearer auth + // auth: 'orthanc:orthanc', + // }, }, ], }, -} +}; diff --git a/platform/viewer/public/config/local_dcm4chee.js b/platform/viewer/public/config/local_dcm4chee.js index 112c28756..1dc87f528 100644 --- a/platform/viewer/public/config/local_dcm4chee.js +++ b/platform/viewer/public/config/local_dcm4chee.js @@ -14,11 +14,10 @@ window.config = { imageRendering: 'wadors', thumbnailRendering: 'wadors', requestOptions: { - requestFromBrowser: true, auth: 'admin:admin', }, }, ], }, studyListFunctionsEnabled: true, -} +}; diff --git a/platform/viewer/public/config/netlify.js b/platform/viewer/public/config/netlify.js index d4a6f6956..e01f19189 100644 --- a/platform/viewer/public/config/netlify.js +++ b/platform/viewer/public/config/netlify.js @@ -11,9 +11,6 @@ window.config = { qidoSupportsIncludeField: true, imageRendering: 'wadors', thumbnailRendering: 'wadors', - requestOptions: { - requestFromBrowser: true, - }, }, ], }, diff --git a/platform/viewer/public/config/public_dicomweb.js b/platform/viewer/public/config/public_dicomweb.js index 825f7fc0d..0569b5045 100644 --- a/platform/viewer/public/config/public_dicomweb.js +++ b/platform/viewer/public/config/public_dicomweb.js @@ -11,15 +11,12 @@ window.config = { qidoSupportsIncludeField: true, imageRendering: 'wadors', thumbnailRendering: 'wadors', - requestOptions: { - requestFromBrowser: true, - }, }, ], }, i18n: { LOCIZE_PROJECTID: 'a8da3f9a-e467-4dd6-af33-474d582a0294', LOCIZE_API_KEY: null, // Developers can use this to do in-context editing. DO NOT COMMIT THIS KEY! - USE_LOCIZE: false - } -} + USE_LOCIZE: false, + }, +};