feat: configuration to hook into XHR Error handling

* Error handling.

* Fix error handling, add redirect example.

* remove debugger

* docs: whitelabeling and httpErrorHandler

* bump dicomweb-client version

* bump cornerstone-wado-image-loader version

* Add more documentation around httpErrorHandler callback

* test: add errorHandler as an expected top level export

Co-authored-by: dannyrb <danny.ri.brown@gmail.com>

platform/viewer/src/App.js

@@ -31,7 +31,8 @@ import {
 import i18n from '@ohif/i18n';
 
 // TODO: This should not be here
-import './config';
+//import './config';
+import { setConfiguration } from './config';
 
 /** Utils */
 import {
@@ -123,6 +124,8 @@ class App extends Component {
       oidc,
     } = this._appConfig;
 
+    setConfiguration(this._appConfig);
+
     this.initUserManager(oidc);
     _initServices([
       UINotificationService,

platform/viewer/src/config.js

@@ -3,43 +3,59 @@ import cornerstone from 'cornerstone-core';
 import cornerstoneWADOImageLoader from 'cornerstone-wado-image-loader';
 import dicomParser from 'dicom-parser';
 import version from './version.js';
+import AppContext from './context/AppContext';
 
-let homepage;
-const { process } = window;
-if (process && process.env && process.env.PUBLIC_URL) {
-  homepage = process.env.PUBLIC_URL;
-}
-
-window.info = {
-  version,
-  homepage,
-};
-
-// For debugging
-//if (process.env.node_env === 'development') {
-window.cornerstone = cornerstone;
-window.cornerstoneWADOImageLoader = cornerstoneWADOImageLoader;
-//}
-
-cornerstoneWADOImageLoader.external.cornerstone = cornerstone;
-cornerstoneWADOImageLoader.external.dicomParser = dicomParser;
-
-OHIF.user.getAccessToken = () => {
-  // TODO: Get the Redux store from somewhere else
-  const state = window.store.getState();
-  if (!state.oidc || !state.oidc.user) {
-    return;
+export function setConfiguration(appConfig) {
+  let homepage;
+  const { process } = window;
+  if (process && process.env && process.env.PUBLIC_URL) {
+    homepage = process.env.PUBLIC_URL;
   }
 
-  return state.oidc.user.access_token;
-};
+  window.info = {
+    version,
+    homepage,
+  };
 
-cornerstoneWADOImageLoader.configure({
-  beforeSend: function(xhr) {
-    const headers = OHIF.DICOMWeb.getAuthorizationHeader();
+  // For debugging
+  //if (process.env.node_env === 'development') {
+  window.cornerstone = cornerstone;
+  window.cornerstoneWADOImageLoader = cornerstoneWADOImageLoader;
+  //}
 
-    if (headers.Authorization) {
-      xhr.setRequestHeader('Authorization', headers.Authorization);
+  cornerstoneWADOImageLoader.external.cornerstone = cornerstone;
+  cornerstoneWADOImageLoader.external.dicomParser = dicomParser;
+
+  OHIF.user.getAccessToken = () => {
+    // TODO: Get the Redux store from somewhere else
+    const state = window.store.getState();
+    if (!state.oidc || !state.oidc.user) {
+      return;
     }
-  },
-});
+
+    return state.oidc.user.access_token;
+  };
+
+  OHIF.errorHandler.getHTTPErrorHandler = () => {
+    // const { appConfig = {} } = AppContext;
+
+    return appConfig.httpErrorHandler;
+  };
+
+  cornerstoneWADOImageLoader.configure({
+    beforeSend: function(xhr) {
+      const headers = OHIF.DICOMWeb.getAuthorizationHeader();
+
+      if (headers.Authorization) {
+        xhr.setRequestHeader('Authorization', headers.Authorization);
+      }
+    },
+    errorInterceptor: error => {
+      // const { appConfig = {} } = AppContext;
+
+      if (typeof appConfig.httpErrorHandler === 'function') {
+        appConfig.httpErrorHandler(errorHandler);
+      }
+    },
+  });
+}

platform/viewer/src/googleCloud/api/DicomUploadService.js

@@ -1,5 +1,6 @@
 import { httpErrorToStr, checkDicomFile } from '../utils/helpers';
 import { api } from 'dicomweb-client';
+import { errorHandler } from '@ohif/core';
 
 class DicomUploadService {
   async smartUpload(files, url, uploadCallback, cancellationToken) {
@@ -22,8 +23,7 @@ class DicomUploadService {
         let error = null;
         try {
           if (chunk.length > 1) throw new Error('Not implemented');
-          if (chunk.length === 1)
-            await this.simpleUpload(chunk[0], url);
+          if (chunk.length === 1) await this.simpleUpload(chunk[0], url);
         } catch (err) {
           // It looks like a stupid bug of Babel that err is not an actual Exception object
           error = httpErrorToStr(err);
@@ -76,11 +76,12 @@ class DicomUploadService {
 
   getClient(url) {
     const headers = this.retrieveAuthHeaderFunc();
+    const errorInterceptor = errorHandler.getHTTPErrorHandler();
 
     // TODO: a bit weird we are creating a new dicomweb client instance for every upload
     return new api.DICOMwebClient({
       url,
-      headers
+      headers,
     });
   }
 }