Monkey Patch XMLHttpRequest -- inject bearer token and verify response

extensions/cornerstone/src/utils/CornerstoneViewportDownloadForm.tsx

@@ -26,6 +26,15 @@ const CornerstoneViewportDownloadForm = ({
   const activeViewportElement = enabledElement?.element;
   const activeViewportEnabledElement = getEnabledElement(activeViewportElement);
 
+  // console.log('cornerstoneViewportService', cornerstoneViewportService);
+  const viewportInfo = cornerstoneViewportService.getViewportInfo("default");
+  // console.log('viewportInfo', viewportInfo);
+
+  // Retrieve StudyInstanceUID from viewportInfo
+  const StudyInstanceUID = viewportInfo.getViewportData().data[0].StudyInstanceUID;
+  const SetInstanceUID = viewportInfo.getViewportData().data[0].displaySetInstanceUID;
+  // console.log('StudyInstanceUID', StudyInstanceUID);
+  // console.log('SetInstanceUID', SetInstanceUID);
   const {
     viewportId: activeViewportId,
     renderingEngineId,
@@ -108,6 +117,10 @@ const CornerstoneViewportDownloadForm = ({
 
           const downloadCanvas = getOrCreateCanvas(element);
 
+          // Log the canvas content before conversion
+          const context = downloadCanvas.getContext('2d');
+          const imageData = context.getImageData(0, 0, downloadCanvas.width, downloadCanvas.height);
+
           const type = 'image/' + fileType;
           const dataUrl = downloadCanvas.toDataURL(type, 1);
 
@@ -214,6 +227,43 @@ const CornerstoneViewportDownloadForm = ({
     });
   };
 
+  // New function to send annotation data
+  const sendAnnotationData = async (base64Image, activeViewportElement) => {
+    try {
+      // Get the SOPInstanceUID from the active viewport
+      const activeViewportEnabledElement = getEnabledElement(activeViewportElement);
+      const imageId = activeViewportEnabledElement?.viewport?.getCurrentImageId();
+
+      if (!base64Image || !StudyInstanceUID) {
+        throw new Error('Missing required data');
+      }
+
+      const payload = {
+        image: base64Image,
+        StudyInstanceUID: StudyInstanceUID
+      };
+
+      const response = await fetch('http://host:port/one-api/tools/annotation/store', {
+        method: 'POST',
+        headers: {
+          'Content-Type': 'application/json',
+        },
+        body: JSON.stringify(payload)
+      });
+
+      if (!response.ok) {
+        throw new Error('Network response was not ok');
+      }
+
+      const data = await response.json();
+      console.log('Annotation data sent successfully:', data);
+      return data;
+    } catch (error) {
+      console.error('Error sending annotation data:', error);
+      throw error;
+    }
+  };
+
   const downloadBlob = (filename, fileType) => {
     const file = `${filename}.${fileType}`;
     const divForDownloadViewport = document.querySelector(
@@ -221,9 +271,16 @@ const CornerstoneViewportDownloadForm = ({
     );
 
     html2canvas(divForDownloadViewport).then(canvas => {
+      const dataUrl = canvas.toDataURL(fileType, 1.0);
+      const base64Image = dataUrl.split(',')[1];  // Remove prefix 'data:image/png;base64,'
+
+      // Send annotation data
+      sendAnnotationData(base64Image, activeViewportElement)
+        .catch(error => console.error('Annotation data sending failed:', error));
+
       const link = document.createElement('a');
       link.download = file;
-      link.href = canvas.toDataURL(fileType, 1.0);
+      link.href = dataUrl;
       link.click();
     });
   };

extensions/dicom-pdf/src/viewports/OHIFCornerstonePdfViewport.tsx

@@ -6,7 +6,8 @@ function OHIFCornerstonePdfViewport({ displaySets }) {
   var [url, setUrl] = useState(null);
 
   const sopInstanceUid = displaySets[0].SOPInstanceUID;
-  url = `http://128.199.154.150:8080/rid/IHERetrieveDocument?requestType=DOCUMENT&documentUID=${sopInstanceUid}&preferredContentType=application%2Fpdf`;
+  url = `http://${window.config.pacs_document_host}:${window.config.pacs_document_port}/rid/IHERetrieveDocument?requestType=DOCUMENT&documentUID=${sopInstanceUid}&preferredContentType=application%2Fpdf`;
+  console.log("URL PDF", url);
 
   useEffect(() => {
     document.body.addEventListener('drag', makePdfDropTarget);

platform/app/.webpack/webpack.pwa.js

@@ -25,7 +25,7 @@ const PROXY_DOMAIN = process.env.PROXY_DOMAIN;
 const PROXY_PATH_REWRITE_FROM = process.env.PROXY_PATH_REWRITE_FROM;
 const PROXY_PATH_REWRITE_TO = process.env.PROXY_PATH_REWRITE_TO;
 
-const OHIF_PORT = Number(process.env.OHIF_PORT || 3000);
+const OHIF_PORT = Number(process.env.OHIF_PORT || 3030);
 const ENTRY_TARGET = process.env.ENTRY_TARGET || `${SRC_DIR}/index.js`;
 const Dotenv = require('dotenv-webpack');
 const writePluginImportFile = require('./writePluginImportsFile.js');

platform/app/public/config/default.js

@@ -1,6 +1,10 @@
 /** @type {AppTypes.Config} */
-
+function sas_get_token() {
+  //implement token here
+  return "kris-check-token-is-here";
+}
 window.config = {
+  sasGetToken: sas_get_token,
   routerBasename: '/',
   // whiteLabeling: {},
   extensions: [],
@@ -23,7 +27,10 @@ window.config = {
     // above, the number of requests can be go a lot higher.
     prefetch: 25,
   },
-  expertise: true, //* Tambahan untuk enable expertise (CustomizableViewportOverlay)
+  expertise: false, //* Tambahan untuk enable expertise (CustomizableViewportOverlay)
+  expertise_host: `http://152.42.173.210`, //* Tambahan untuk fetch data Expertise)
+  pacs_document_host: `${window.location.hostname}`,
+  pacs_document_port: 8080,
   // filterQueryParam: false,
   // defaultDataSourceName: 'dicomweb',
   defaultDataSourceName: 'local-proxy',
@@ -38,100 +45,14 @@ window.config = {
   //   regex: /.*/,
   // },
   dataSources: [
-    {
-      namespace: '@ohif/extension-default.dataSourcesModule.dicomweb',
-      sourceName: 'dicomweb',
-      configuration: {
-        friendlyName: 'AWS S3 Static wado server',
-        name: 'aws',
-        wadoUriRoot: 'https://d14fa38qiwhyfd.cloudfront.net/dicomweb',
-        qidoRoot: 'https://d14fa38qiwhyfd.cloudfront.net/dicomweb',
-        wadoRoot: 'https://d14fa38qiwhyfd.cloudfront.net/dicomweb',
-        qidoSupportsIncludeField: false,
-        imageRendering: 'wadors',
-        thumbnailRendering: 'wadors',
-        enableStudyLazyLoad: true,
-        supportsFuzzyMatching: false,
-        supportsWildcard: true,
-        staticWado: true,
-        singlepart: 'bulkdata,video',
-        // whether the data source should use retrieveBulkData to grab metadata,
-        // and in case of relative path, what would it be relative to, options
-        // are in the series level or study level (some servers like series some study)
-        bulkDataURI: {
-          enabled: true,
-          relativeResolution: 'studies',
-          transform: url => url.replace('/pixeldata.mp4', '/rendered'),
-        },
-        omitQuotationForMultipartRequest: true,
-      },
-    },
-
-    {
-      namespace: '@ohif/extension-default.dataSourcesModule.dicomweb',
-      sourceName: 'ohif2',
-      configuration: {
-        friendlyName: 'AWS S3 Static wado secondary server',
-        name: 'aws',
-        wadoUriRoot: 'https://dd14fa38qiwhyfd.cloudfront.net/dicomweb',
-        qidoRoot: 'https://dd14fa38qiwhyfd.cloudfront.net/dicomweb',
-        wadoRoot: 'https://dd14fa38qiwhyfd.cloudfront.net/dicomweb',
-        qidoSupportsIncludeField: false,
-        supportsReject: false,
-        imageRendering: 'wadors',
-        thumbnailRendering: 'wadors',
-        enableStudyLazyLoad: true,
-        supportsFuzzyMatching: false,
-        supportsWildcard: true,
-        staticWado: true,
-        singlepart: 'bulkdata,video',
-        // whether the data source should use retrieveBulkData to grab metadata,
-        // and in case of relative path, what would it be relative to, options
-        // are in the series level or study level (some servers like series some study)
-        bulkDataURI: {
-          enabled: true,
-          relativeResolution: 'studies',
-        },
-        omitQuotationForMultipartRequest: true,
-      },
-    },
-    {
-      namespace: '@ohif/extension-default.dataSourcesModule.dicomweb',
-      sourceName: 'ohif3',
-      configuration: {
-        friendlyName: 'AWS S3 Static wado secondary server',
-        name: 'aws',
-        wadoUriRoot: 'https://d3t6nz73ql33tx.cloudfront.net/dicomweb',
-        qidoRoot: 'https://d3t6nz73ql33tx.cloudfront.net/dicomweb',
-        wadoRoot: 'https://d3t6nz73ql33tx.cloudfront.net/dicomweb',
-        qidoSupportsIncludeField: false,
-        supportsReject: false,
-        imageRendering: 'wadors',
-        thumbnailRendering: 'wadors',
-        enableStudyLazyLoad: true,
-        supportsFuzzyMatching: false,
-        supportsWildcard: true,
-        staticWado: true,
-        singlepart: 'bulkdata,video',
-        // whether the data source should use retrieveBulkData to grab metadata,
-        // and in case of relative path, what would it be relative to, options
-        // are in the series level or study level (some servers like series some study)
-        bulkDataURI: {
-          enabled: true,
-          relativeResolution: 'studies',
-        },
-        omitQuotationForMultipartRequest: true,
-      },
-    },
-
     {
       namespace: '@ohif/extension-default.dataSourcesModule.dicomweb',
       sourceName: 'local-proxy',
       configuration: {
         friendlyName: 'Static WADO Local Data',
         name: 'DCM4CHEE',
-        qidoRoot: 'http://128.199.154.150:5000/rs',
-        wadoRoot: 'http://128.199.154.150:5000/rs',
+        qidoRoot: `http://152.42.173.210:5000/rs`,
+        wadoRoot: `http://152.42.173.210:5000/rs`,
         qidoSupportsIncludeField: false,
         supportsReject: true,
         supportsStow: true,

platform/app/public/config/google.js

@@ -1,6 +1,9 @@
 /** @type {AppTypes.Config} */
 window.config = {
   routerBasename: '/',
+  pacs_document_host: '152.42.173.210',
+  pacs_document_port: 8080,
+  expertise:false,
   enableGoogleCloudAdapter: false,
   // below flag is for performance reasons, but it might not work for all servers
   showWarningMessageForCrossOrigin: true,
@@ -8,37 +11,24 @@ window.config = {
   showLoadingIndicator: true,
   strictZSpacingForVolumeViewport: true,
   // This is an array, but we'll only use the first entry for now
-  oidc: [
-    {
-      // ~ REQUIRED
-      // Authorization Server URL
-      authority: 'https://accounts.google.com',
-      client_id: '382212153306-7q39hdie4ecj0uhemkitvedo93bnvfhn.apps.googleusercontent.com',
-      redirect_uri: '/callback',
-      response_type: 'id_token token',
-      scope:
-        'email profile openid https://www.googleapis.com/auth/cloudplatformprojects.readonly https://www.googleapis.com/auth/cloud-healthcare', // email profile openid
-      // ~ OPTIONAL
-      post_logout_redirect_uri: '/logout-redirect.html',
-      revoke_uri: 'https://accounts.google.com/o/oauth2/revoke?token=',
-      automaticSilentRenew: true,
-      revokeAccessTokenOnSignout: true,
-
-      // Tambahan dari Google CLoud Secret
-      project_id: "westone-433204",
-      auth_uri: "https://accounts.google.com/o/oauth2/auth",
-      token_uri: "https://oauth2.googleapis.com/token",
-      auth_provider_x509_cert_url: "https://www.googleapis.com/oauth2/v1/certs",
-      client_secret: "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",
-      redirect_uris: [
-        "http://devkedungdoro.aplikasi.web.id:3000/callback"
-      ],
-      javascript_origins: [
-        "https://devone.aplikasi.web.id",
-        "http://devkedungdoro.aplikasi.web.id:3000"
-      ]
-    },
-  ],
+  // Remove OIDC configuration since proxy handles authentication
+  // oidc: [
+  //   {
+  //     // ~ REQUIRED
+  //     // Authorization Server URL
+  //     authority: 'https://accounts.google.com',
+  //     client_id: '382212153306-7q39hdie4ecj0uhemkitvedo93bnvfhn.apps.googleusercontent.com',
+  //     redirect_uri: '/callback',
+  //     response_type: 'id_token token',
+  //     scope:
+  //       'email profile openid https://www.googleapis.com/auth/cloudplatformprojects.readonly https://www.googleapis.com/auth/cloud-healthcare', // email profile openid
+  //     // ~ OPTIONAL
+  //     post_logout_redirect_uri: '/logout-redirect.html',
+  //     revoke_uri: 'https://accounts.google.com/o/oauth2/revoke?token=',
+  //     automaticSilentRenew: true,
+  //     revokeAccessTokenOnSignout: true,
+  //   },
+  // ],
   extensions: [],
   modes: [],
   showStudyList: true,
@@ -51,12 +41,9 @@ window.config = {
       configuration: {
         friendlyName: 'dcmjs DICOMWeb Server',
         name: 'GCP',
-        wadoUriRoot:
-          'https://healthcare.googleapis.com/v1/projects/westone-433204/locations/asia-southeast2/datasets/sas-dicom-storage/dicomStores/ohif/dicomWeb',
-        qidoRoot:
-          'https://healthcare.googleapis.com/v1/projects/westone-433204/locations/asia-southeast2/datasets/sas-dicom-storage/dicomStores/ohif/dicomWeb',
-        wadoRoot:
-          'https://healthcare.googleapis.com/v1/projects/westone-433204/locations/asia-southeast2/datasets/sas-dicom-storage/dicomStores/ohif/dicomWeb',
+        wadoUriRoot: `http://${window.location.hostname}:5555/dicomWeb`,
+        qidoRoot: `http://${window.location.hostname}:5555/dicomWeb`,
+        wadoRoot: `http://${window.location.hostname}:5555/dicomWeb`,
         qidoSupportsIncludeField: true,
         imageRendering: 'wadors',
         thumbnailRendering: 'wadors',
@@ -66,12 +53,12 @@ window.config = {
         dicomUploadEnabled: true,
         omitQuotationForMultipartRequest: true,
         configurationAPI: 'ohif.dataSourceConfigurationAPI.google',
-        defaultDicomStoreConfiguredItems: {
-          id: 'projects/westone-433204/locations/asia-southeast2/datasets/sas-dicom-storage',
-          itemType: '3',
-          name: 'ohif',
-          url: 'https://healthcare.googleapis.com/v1/projects/westone-433204/locations/asia-southeast2/datasets/sas-dicom-storage/dicomStores/ohif'
-        },
+        // defaultDicomStoreConfiguredItems: {
+        //   id: 'projects/ohifproxy/locations/asia-southeast2/datasets/sas-storage',
+        //   itemType: '3',
+        //   name: 'store-1',
+        //   url: 'https://healthcare.googleapis.com/v1/projects/ohifproxy/locations/asia-southeast2/datasets/sas-storage/dicomStores/store-1'
+        // },
       },
     },
     {

platform/app/src/App.tsx

@@ -37,6 +37,38 @@ import appInit from './appInit.js';
 import OpenIdConnectRoutes from './utils/OpenIdConnectRoutes';
 import { ShepherdJourneyProvider } from 'react-shepherd';
 
+function injectAuth() {
+  console.log("---> Inject Auth");
+  const originalXHROpen = XMLHttpRequest.prototype.open;
+  const originalXHRSend = XMLHttpRequest.prototype.send;
+
+  //take from local storage for the token
+  // let authToken = '--kris-auth-token-check--';
+  let authToken = window.config.sasGetToken();
+
+  XMLHttpRequest.prototype.open = function (method, url, async, user, password) {
+    this._url = url; // Save URL if you want conditional logic
+    return originalXHROpen.apply(this, arguments);
+  };
+
+  XMLHttpRequest.prototype.send = function (body) {
+    this.setRequestHeader('Authorization', `Bearer ${authToken}`);
+    this.addEventListener('readystatechange', function () {
+      if (this.readyState === 4) { // DONE
+        try {
+          //check responseType ie json, and then check the auth response status
+          //redirect to custom login page if needed
+          console.log("response type :", this.responseType);
+          console.log("response :", this.response);
+          console.log("responseText :", this.responseText);
+        } catch (e) { }
+      }
+    });
+    return originalXHRSend.apply(this, arguments);
+  };
+}
+
+injectAuth();
 let commandsManager: CommandsManager,
   extensionManager: ExtensionManager,
   servicesManager: AppTypes.ServicesManager,