fix: remove requestOptions when key is not needed

docs/latest/deployment/recipes/embedded-viewer.md

@@ -53,9 +53,6 @@ window.config = {
         qidoSupportsIncludeField: true,
         imageRendering: 'wadors',
         thumbnailRendering: 'wadors',
-        requestOptions: {
-          requestFromBrowser: true,
-        },
       },
     ],
   },

docs/latest/essentials/configuration.md

@@ -59,9 +59,6 @@ window.config = {
         qidoSupportsIncludeField: true,
         imageRendering: 'wadors',
         thumbnailRendering: 'wadors',
-        requestOptions: {
-          requestFromBrowser: true,
-        },
       },
     ],
   },

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}`;
   }

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',

platform/viewer/public/config/default.js

@@ -13,9 +13,6 @@ window.config = {
         qidoSupportsIncludeField: true,
         imageRendering: 'wadors',
         thumbnailRendering: 'wadors',
-        requestOptions: {
-          requestFromBrowser: true,
-        },
       },
     ],
   },

platform/viewer/public/config/demo.js

@@ -12,9 +12,6 @@ window.config = {
         qidoSupportsIncludeField: true,
         imageRendering: 'wadors',
         thumbnailRendering: 'wadors',
-        requestOptions: {
-          requestFromBrowser: true,
-        },
       },
     ],
   },

platform/viewer/public/config/docker_nginx-orthanc.js

@@ -11,9 +11,6 @@ window.config = {
         qidoSupportsIncludeField: false,
         imageRendering: 'wadors',
         thumbnailRendering: 'wadors',
-        requestOptions: {
-          requestFromBrowser: true,
-        },
       },
     ],
   },

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: {
+        // requestOptions: {
-          // undefined to use JWT + Bearer auth
+        // undefined to use JWT + Bearer auth
-          // auth: 'orthanc:orthanc',
+        // auth: 'orthanc:orthanc',
-          requestFromBrowser: true,
+        // },
-        },
       },
     ],
   },

platform/viewer/public/config/docker_openresty-orthanc.js

@@ -12,15 +12,11 @@ window.config = {
         qidoSupportsIncludeField: false,
         imageRendering: 'wadors',
         thumbnailRendering: 'wadors',
-        // REQUIRED TAG:
+        // requestOptions: {
-        // https://github.com/OHIF/ohif-core/blob/59e1e04b92be24aee5d4402445cb3dcedb746995/src/studies/retrieveStudyMetadata.js#L54
+        // undefined to use JWT + Bearer auth
-        // TODO: Remove tag after https://github.com/OHIF/ohif-core/pull/19 is merged and we bump version
+        // auth: 'orthanc:orthanc',
-        requestOptions: {
+        // },
-          // undefined to use JWT + Bearer auth
-          // auth: 'orthanc:orthanc',
-          requestFromBrowser: true,
-        },
       },
     ],
   },
-}
+};

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,
-}
+};

platform/viewer/public/config/netlify.js

@@ -11,9 +11,6 @@ window.config = {
         qidoSupportsIncludeField: true,
         imageRendering: 'wadors',
         thumbnailRendering: 'wadors',
-        requestOptions: {
-          requestFromBrowser: true,
-        },
       },
     ],
   },

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,
-  }
+  },
-}
+};