Compare commits
8 Commits
bisone-int
...
bisone
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
ac93416413 | ||
|
|
0283fb5f61 | ||
|
|
e40d2f0e1d | ||
|
|
305eaf11ee | ||
|
|
0bb6d19e92 | ||
|
|
5130b9f73c | ||
|
|
bc0c68e09d | ||
|
|
7bd3f96158 |
2
.gitignore
vendored
2
.gitignore
vendored
@@ -12,6 +12,7 @@ coverage/
|
||||
.yarn/
|
||||
.nx/
|
||||
addOns/yarn.lock
|
||||
**.zip
|
||||
|
||||
# YALC (for Erik)
|
||||
.yalc
|
||||
@@ -59,4 +60,5 @@ tests/playwright-report/
|
||||
|
||||
# Dummy
|
||||
/dump
|
||||
jwt-auth-inject.json
|
||||
platform/app/dist.zip
|
||||
|
||||
@@ -102,8 +102,20 @@ export const studyDataForOverlayItem = (studyInstanceUID: string) => {
|
||||
try {
|
||||
const qidoRootUrl = getQidoRootUrl();
|
||||
|
||||
// Get the authentication token from session storage
|
||||
const authToken = window.sessionStorage.getItem('ohif-auth-token');
|
||||
|
||||
// Create request headers with Authorization if token exists
|
||||
const headers: HeadersInit = {};
|
||||
if (authToken) {
|
||||
headers['Authorization'] = `Bearer ${authToken}`;
|
||||
}
|
||||
|
||||
const response = await fetch(
|
||||
`${qidoRootUrl}/studies?limit=101&offset=0&fuzzymatching=false&includefield=00080050,00081030,00101010,0010004&StudyInstanceUID=${studyInstanceUID}`
|
||||
`${qidoRootUrl}/studies?limit=101&offset=0&fuzzymatching=false&includefield=00080050,00081030,00101010,0010004&StudyInstanceUID=${studyInstanceUID}`,
|
||||
{
|
||||
headers,
|
||||
}
|
||||
);
|
||||
|
||||
if (!response.ok) {
|
||||
|
||||
@@ -39,6 +39,16 @@ export default function initWADOImageLoader(
|
||||
Accept: acceptHeader,
|
||||
};
|
||||
|
||||
// // Patch Mario:
|
||||
const authToken = sessionStorage.getItem('ohif-auth-token');
|
||||
if (!authToken) {
|
||||
// window.location.href = '/login'; // Kalau mau pakae login tinggal uncomment
|
||||
window.location.href = '/';
|
||||
return;
|
||||
}
|
||||
|
||||
xhrRequestHeaders.Authorization = `Bearer ${authToken}`;
|
||||
|
||||
if (headers) {
|
||||
Object.assign(xhrRequestHeaders, headers);
|
||||
}
|
||||
|
||||
@@ -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();
|
||||
});
|
||||
};
|
||||
|
||||
@@ -85,6 +85,15 @@ function createDicomWebApi(dicomWebConfig, servicesManager) {
|
||||
if (authHeaders && authHeaders.Authorization) {
|
||||
xhrRequestHeaders.Authorization = authHeaders.Authorization;
|
||||
}
|
||||
|
||||
const authToken = sessionStorage.getItem('ohif-auth-token');
|
||||
if (!authToken) {
|
||||
// window.location.href = '/login'; // Kalau mau pakae login tinggal uncomment
|
||||
window.location.href = '/';
|
||||
return;
|
||||
}
|
||||
xhrRequestHeaders.Authorization = `Bearer ${authToken}`;
|
||||
|
||||
return xhrRequestHeaders;
|
||||
};
|
||||
|
||||
|
||||
@@ -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 = `${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);
|
||||
|
||||
@@ -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');
|
||||
|
||||
BIN
platform/app/public/assets/logo-sismedika.png
Normal file
BIN
platform/app/public/assets/logo-sismedika.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 101 KiB |
@@ -1,12 +1,16 @@
|
||||
/** @type {AppTypes.Config} */
|
||||
|
||||
function sas_get_token() {
|
||||
//implement token here
|
||||
return '';
|
||||
}
|
||||
window.config = {
|
||||
sasGetToken: sas_get_token,
|
||||
routerBasename: '/',
|
||||
// whiteLabeling: {},
|
||||
extensions: [],
|
||||
modes: [],
|
||||
customizationService: {},
|
||||
showStudyList: true,
|
||||
showStudyList: false,
|
||||
// some windows systems have issues with more than 3 web workers
|
||||
maxNumberOfWebWorkers: 3,
|
||||
// below flag is for performance reasons, but it might not work for all servers
|
||||
@@ -24,8 +28,8 @@ window.config = {
|
||||
prefetch: 25,
|
||||
},
|
||||
expertise: false, //* Tambahan untuk enable expertise (CustomizableViewportOverlay)
|
||||
expertise_host: `http://192.168.1.29`, //* Tambahan untuk fetch data Expertise)
|
||||
pacs_document_host: `192.168.1.29`,
|
||||
expertise_host: `https://devone.aplikasi.web.id/one-api/mockup/pacsmwl/Workorder/get_dummy_expertise`, //* Tambahan untuk fetch data Expertise)
|
||||
pacs_document_host: `${window.location.hostname}`,
|
||||
pacs_document_port: 8080,
|
||||
// filterQueryParam: false,
|
||||
// defaultDataSourceName: 'dicomweb',
|
||||
@@ -47,8 +51,8 @@ window.config = {
|
||||
configuration: {
|
||||
friendlyName: 'Static WADO Local Data',
|
||||
name: 'DCM4CHEE',
|
||||
qidoRoot: `http://192.168.1.29:5000/rs`,
|
||||
wadoRoot: `http://192.168.1.29:5000/rs`,
|
||||
qidoRoot: `http://${window.location.hostname}:5000/rs`,
|
||||
wadoRoot: `http://${window.location.hostname}:5000/rs`,
|
||||
qidoSupportsIncludeField: false,
|
||||
supportsReject: true,
|
||||
supportsStow: true,
|
||||
|
||||
57
platform/app/public/config/google-local.js
Normal file
57
platform/app/public/config/google-local.js
Normal file
@@ -0,0 +1,57 @@
|
||||
/** @type {AppTypes.Config} */
|
||||
window.config = {
|
||||
routerBasename: '/',
|
||||
pacs_document_host: `http://152.42.173.210`,
|
||||
pacs_document_port: 8585,
|
||||
goProxyHost: `http://152.42.173.210:5555`,
|
||||
expertise: false, //* Tambahan untuk enable expertise (CustomizableViewportOverlay)
|
||||
expertise_host: `https://devone.aplikasi.web.id/one-api/mockup/pacsmwl/Workorder/get_dummy_expertise`, //* Tambahan untuk fetch data Expertise)
|
||||
enableGoogleCloudAdapter: false,
|
||||
// below flag is for performance reasons, but it might not work for all servers
|
||||
showWarningMessageForCrossOrigin: true,
|
||||
showCPUFallbackMessage: true,
|
||||
showLoadingIndicator: true,
|
||||
strictZSpacingForVolumeViewport: true,
|
||||
extensions: [],
|
||||
modes: [],
|
||||
showStudyList: false,
|
||||
// filterQueryParam: false,
|
||||
defaultDataSourceName: 'dicomweb',
|
||||
dataSources: [
|
||||
{
|
||||
namespace: '@ohif/extension-default.dataSourcesModule.dicomweb',
|
||||
sourceName: 'dicomweb',
|
||||
configuration: {
|
||||
friendlyName: 'dcmjs DICOMWeb Server',
|
||||
name: 'GCP',
|
||||
wadoUriRoot: `http://152.42.173.210:5555/dicomWeb`,
|
||||
qidoRoot: `http://152.42.173.210:5555/dicomWeb`,
|
||||
wadoRoot: `http://152.42.173.210:5555/dicomWeb`,
|
||||
qidoSupportsIncludeField: true,
|
||||
imageRendering: 'wadors',
|
||||
thumbnailRendering: 'wadors',
|
||||
enableStudyLazyLoad: true,
|
||||
supportsFuzzyMatching: false,
|
||||
supportsWildcard: true,
|
||||
dicomUploadEnabled: false,
|
||||
omitQuotationForMultipartRequest: true,
|
||||
configurationAPI: 'ohif.dataSourceConfigurationAPI.google',
|
||||
},
|
||||
},
|
||||
{
|
||||
namespace: '@ohif/extension-default.dataSourcesModule.dicomjson',
|
||||
sourceName: 'dicomjson',
|
||||
configuration: {
|
||||
friendlyName: 'dicom json',
|
||||
name: 'json',
|
||||
},
|
||||
},
|
||||
{
|
||||
namespace: '@ohif/extension-default.dataSourcesModule.dicomlocal',
|
||||
sourceName: 'dicomlocal',
|
||||
configuration: {
|
||||
friendlyName: 'dicom local',
|
||||
},
|
||||
},
|
||||
],
|
||||
};
|
||||
@@ -1,37 +1,20 @@
|
||||
/** @type {AppTypes.Config} */
|
||||
window.config = {
|
||||
routerBasename: '/',
|
||||
pacs_document_host: '152.42.173.210',
|
||||
pacs_document_port: 8080,
|
||||
expertise: false,
|
||||
pacs_document_host: `https://${window.location.hostname}`,
|
||||
pacs_document_port: 8585,
|
||||
goProxyHost: `https://${window.location.hostname}:5555`,
|
||||
expertise: false, //* Tambahan untuk enable expertise (CustomizableViewportOverlay)
|
||||
expertise_host: `https://devone.aplikasi.web.id/one-api/mockup/pacsmwl/Workorder/get_dummy_expertise`, //* Tambahan untuk fetch data Expertise)
|
||||
enableGoogleCloudAdapter: false,
|
||||
// below flag is for performance reasons, but it might not work for all servers
|
||||
showWarningMessageForCrossOrigin: true,
|
||||
showCPUFallbackMessage: true,
|
||||
showLoadingIndicator: true,
|
||||
strictZSpacingForVolumeViewport: true,
|
||||
// This is an array, but we'll only use the first entry for now
|
||||
// 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,
|
||||
showStudyList: false,
|
||||
// filterQueryParam: false,
|
||||
defaultDataSourceName: 'dicomweb',
|
||||
dataSources: [
|
||||
@@ -41,24 +24,18 @@ window.config = {
|
||||
configuration: {
|
||||
friendlyName: 'dcmjs DICOMWeb Server',
|
||||
name: 'GCP',
|
||||
wadoUriRoot: `http://152.42.173.210:5555/dicomWeb`,
|
||||
qidoRoot: `http://152.42.173.210:5555/dicomWeb`,
|
||||
wadoRoot: `http://152.42.173.210:5555/dicomWeb`,
|
||||
wadoUriRoot: `https://${window.location.hostname}:5555/dicomWeb`,
|
||||
qidoRoot: `https://${window.location.hostname}:5555/dicomWeb`,
|
||||
wadoRoot: `https://${window.location.hostname}:5555/dicomWeb`,
|
||||
qidoSupportsIncludeField: true,
|
||||
imageRendering: 'wadors',
|
||||
thumbnailRendering: 'wadors',
|
||||
enableStudyLazyLoad: true,
|
||||
supportsFuzzyMatching: true,
|
||||
supportsFuzzyMatching: false,
|
||||
supportsWildcard: true,
|
||||
dicomUploadEnabled: true,
|
||||
dicomUploadEnabled: false,
|
||||
omitQuotationForMultipartRequest: true,
|
||||
configurationAPI: 'ohif.dataSourceConfigurationAPI.google',
|
||||
// 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'
|
||||
// },
|
||||
},
|
||||
},
|
||||
{
|
||||
|
||||
@@ -14,9 +14,21 @@
|
||||
name="mobile-web-app-capable"
|
||||
content="yes"
|
||||
/>
|
||||
<meta
|
||||
property="og:title"
|
||||
content="SAS Dicom Viewer"
|
||||
/>
|
||||
<meta
|
||||
property="og:description"
|
||||
content="Web-based Cloud DICOM Viewer by SAS for viewing and analyzing DICOM images. Powered by Open Health Imaging Foundation and Google Cloud Healthcare."
|
||||
/>
|
||||
<meta
|
||||
property="og:image"
|
||||
content="<%= PUBLIC_URL %>assets/logo-sismedika.png"
|
||||
/>
|
||||
<meta
|
||||
name="application-name"
|
||||
content="OHIF Viewer"
|
||||
content="SAS Dicom Viewer"
|
||||
/>
|
||||
<meta
|
||||
name="apple-mobile-web-app-capable"
|
||||
@@ -196,7 +208,7 @@
|
||||
src="<%= PUBLIC_URL %>init-service-worker.js"
|
||||
></script>
|
||||
|
||||
<title>OHIF Viewer</title>
|
||||
<title>SAS Dicom Viewer</title>
|
||||
|
||||
<!-- WEB FONTS -->
|
||||
<link
|
||||
@@ -216,7 +228,6 @@
|
||||
}
|
||||
</script>
|
||||
|
||||
|
||||
<!-- EXTENSIONS -->
|
||||
<!-- <script type="text/javascript" src="path/to/some-extension.js"></script>
|
||||
|
||||
@@ -236,7 +247,6 @@
|
||||
<body>
|
||||
<noscript> You need to enable JavaScript to run this app. </noscript>
|
||||
<div id="react-portal"></div>
|
||||
<div id="root">
|
||||
</div>
|
||||
<div id="root"></div>
|
||||
</body>
|
||||
</html>
|
||||
|
||||
@@ -14,9 +14,21 @@
|
||||
name="mobile-web-app-capable"
|
||||
content="yes"
|
||||
/>
|
||||
<meta
|
||||
property="og:title"
|
||||
content="SAS Dicom Viewer"
|
||||
/>
|
||||
<meta
|
||||
property="og:description"
|
||||
content="Web-based Cloud DICOM Viewer by SAS for viewing and analyzing DICOM images. Powered by Open Health Imaging Foundation and Google Cloud Healthcare."
|
||||
/>
|
||||
<meta
|
||||
property="og:image"
|
||||
content="<%= PUBLIC_URL %>assets/logo-sismedika.png"
|
||||
/>
|
||||
<meta
|
||||
name="application-name"
|
||||
content="OHIF Viewer"
|
||||
content="SAS Dicom Viewer"
|
||||
/>
|
||||
<meta
|
||||
name="apple-mobile-web-app-capable"
|
||||
@@ -191,7 +203,7 @@
|
||||
src="<%= PUBLIC_URL %>init-service-worker.js"
|
||||
></script>
|
||||
|
||||
<title>OHIF Viewer</title>
|
||||
<title>SAS Dicom Viewer</title>
|
||||
|
||||
<!-- WEB FONTS -->
|
||||
<link
|
||||
|
||||
@@ -36,6 +36,49 @@ import createRoutes from './routes';
|
||||
import appInit from './appInit.js';
|
||||
import OpenIdConnectRoutes from './utils/OpenIdConnectRoutes';
|
||||
import { ShepherdJourneyProvider } from 'react-shepherd';
|
||||
import { initializeCustomAuth } from './utils/initUserAuthenticationService';
|
||||
|
||||
function injectAuth() {
|
||||
console.log('---> Inject Auth');
|
||||
const originalXHROpen = XMLHttpRequest.prototype.open;
|
||||
const originalXHRSend = XMLHttpRequest.prototype.send;
|
||||
|
||||
// Kalau ingin disable study list (Role Patient)
|
||||
// window.config.showStudyList = false;
|
||||
|
||||
const authToken = sessionStorage.getItem('ohif-auth-token');
|
||||
|
||||
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) {
|
||||
// readyState 4 = DONE
|
||||
try {
|
||||
// Check for auth errors (401/403) and redirect to login if needed
|
||||
if (this.status === 401 || this.status === 403) {
|
||||
window.sessionStorage.removeItem('ohif-auth-token');
|
||||
// window.location.href = '/login'; // Kalau mau pakae login tinggal uncomment
|
||||
}
|
||||
} catch (e) {
|
||||
console.error('Error handling auth response:', e);
|
||||
}
|
||||
}
|
||||
});
|
||||
return originalXHRSend.apply(this, arguments);
|
||||
};
|
||||
}
|
||||
|
||||
// Setup token access function
|
||||
window.config.sasGetToken = () => window.sessionStorage.getItem('ohif-auth-token');
|
||||
|
||||
// Enable auth token injection
|
||||
// injectAuth();
|
||||
|
||||
let commandsManager: CommandsManager,
|
||||
extensionManager: ExtensionManager,
|
||||
@@ -108,6 +151,9 @@ function App({
|
||||
customizationService,
|
||||
} = servicesManager.services;
|
||||
|
||||
// Initialize our custom authentication service
|
||||
initializeCustomAuth(userAuthenticationService);
|
||||
|
||||
const providers = [
|
||||
[AppConfigProvider, { value: appConfigState }],
|
||||
[UserAuthenticationProvider, { service: userAuthenticationService }],
|
||||
|
||||
138
platform/app/src/routes/Login.tsx
Normal file
138
platform/app/src/routes/Login.tsx
Normal file
@@ -0,0 +1,138 @@
|
||||
import React, { useState, useEffect } from 'react';
|
||||
import { useNavigate, useLocation } from 'react-router-dom';
|
||||
import { useUserAuthentication } from '@ohif/ui';
|
||||
import { Icons } from '@ohif/ui-next';
|
||||
|
||||
const Login = () => {
|
||||
const [email, setEmail] = useState('');
|
||||
const [password, setPassword] = useState('');
|
||||
const [error, setError] = useState('');
|
||||
const [isLoading, setIsLoading] = useState(false);
|
||||
const navigate = useNavigate();
|
||||
const location = useLocation();
|
||||
const [, authContext] = useUserAuthentication();
|
||||
|
||||
// Get the intended destination from URL query params or default to home
|
||||
const searchParams = new URLSearchParams(location.search);
|
||||
const redirectPath = searchParams.get('redirect') || '/';
|
||||
|
||||
// Check if already authenticated
|
||||
useEffect(() => {
|
||||
const token = window.sessionStorage.getItem('ohif-auth-token');
|
||||
if (token) {
|
||||
// Already logged in, redirect to destination
|
||||
navigate(redirectPath, { replace: true });
|
||||
}
|
||||
}, [redirectPath, navigate]);
|
||||
|
||||
const handleLogin = async e => {
|
||||
e.preventDefault();
|
||||
setError('');
|
||||
setIsLoading(true);
|
||||
|
||||
try {
|
||||
// Use window.config.goProxyHost for authentication endpoint
|
||||
const proxyHost = window.config?.goProxyHost || `https://${window.location.hostname}:5555`;
|
||||
const authEndpoint = `${proxyHost}/auth/login`;
|
||||
|
||||
// Call go-ohif-proxy login endpoint
|
||||
const response = await fetch(authEndpoint, {
|
||||
method: 'POST',
|
||||
headers: {
|
||||
'Content-Type': 'application/json',
|
||||
},
|
||||
body: JSON.stringify({ email, password }),
|
||||
});
|
||||
|
||||
if (!response.ok) {
|
||||
throw new Error('Login failed. Please check your credentials.');
|
||||
}
|
||||
|
||||
const data = await response.json();
|
||||
|
||||
// Store token in sessionStorage
|
||||
window.sessionStorage.setItem('ohif-auth-token', data.access_token);
|
||||
|
||||
// Decode token to extract role and user information
|
||||
let userInfo = data.user;
|
||||
|
||||
// Update the auth context
|
||||
authContext.setUser({
|
||||
...userInfo,
|
||||
token: data.access_token,
|
||||
});
|
||||
|
||||
// Set window.config.sasGetToken for the injectAuth function
|
||||
if (window.config) {
|
||||
window.config.sasGetToken = () => window.sessionStorage.getItem('ohif-auth-token');
|
||||
}
|
||||
|
||||
// Handle role-specific redirects if specified in response
|
||||
if (data.redirect_url) {
|
||||
navigate(data.redirect_url, { replace: true });
|
||||
} else {
|
||||
// Redirect to the original destination
|
||||
navigate(redirectPath, { replace: true });
|
||||
}
|
||||
} catch (error) {
|
||||
console.error('Login error:', error);
|
||||
setError(error.message || 'Failed to log in. Please try again.');
|
||||
} finally {
|
||||
setIsLoading(false);
|
||||
}
|
||||
};
|
||||
|
||||
return (
|
||||
<div className="flex h-screen w-screen items-center justify-center bg-black">
|
||||
<div className="bg-popover w-88 rounded p-8 shadow-lg">
|
||||
<div className="mb-4 flex justify-center">
|
||||
<Icons.OHIFLogo className="h-12 text-white" />
|
||||
</div>
|
||||
|
||||
<h2 className="text-md text-center font-bold text-white">Login to</h2>
|
||||
<h1 className="mb-8 text-center text-2xl font-bold text-white">Cloud DICOM Viewer</h1>
|
||||
|
||||
{error && <div className="mb-4 rounded bg-red-800 px-4 py-2 text-white">{error}</div>}
|
||||
|
||||
<form onSubmit={handleLogin}>
|
||||
<div className="mb-4">
|
||||
<label className="mb-2 block text-sm font-bold text-white">Email</label>
|
||||
<input
|
||||
type="text"
|
||||
className="focus:shadow-outline w-full appearance-none rounded border py-2 px-3 leading-tight text-gray-700 shadow focus:outline-none"
|
||||
value={email}
|
||||
onChange={e => setEmail(e.target.value)}
|
||||
required
|
||||
/>
|
||||
</div>
|
||||
|
||||
<div className="mb-6">
|
||||
<label className="mb-2 block text-sm font-bold text-white">Password</label>
|
||||
<input
|
||||
type="password"
|
||||
className="focus:shadow-outline w-full appearance-none rounded border py-2 px-3 leading-tight text-gray-700 shadow focus:outline-none"
|
||||
value={password}
|
||||
onChange={e => setPassword(e.target.value)}
|
||||
required
|
||||
/>
|
||||
</div>
|
||||
|
||||
<div className="flex items-center justify-center">
|
||||
<button
|
||||
type="submit"
|
||||
className="focus:shadow-outline w-full rounded bg-blue-500 py-2 px-4 font-bold text-white hover:bg-blue-700 focus:outline-none"
|
||||
disabled={isLoading}
|
||||
>
|
||||
{isLoading ? 'Logging in...' : 'Log In'}
|
||||
</button>
|
||||
</div>
|
||||
<p className="text-muted-foreground mt-8 text-center text-sm">
|
||||
Powered by OHIF & Google Cloud DICOM Storage
|
||||
</p>
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
);
|
||||
};
|
||||
|
||||
export default Login;
|
||||
139
platform/app/src/routes/ShortlinkLogin.tsx
Normal file
139
platform/app/src/routes/ShortlinkLogin.tsx
Normal file
@@ -0,0 +1,139 @@
|
||||
import React, { useState, useEffect } from 'react';
|
||||
import { useNavigate, useLocation } from 'react-router-dom';
|
||||
import { useUserAuthentication } from '@ohif/ui';
|
||||
import { Icons } from '@ohif/ui-next';
|
||||
|
||||
const ShortlinkLogin = () => {
|
||||
const [dob, setDob] = useState('');
|
||||
const [shortToken, setShortToken] = useState('');
|
||||
const [error, setError] = useState('');
|
||||
const [isLoading, setIsLoading] = useState(false);
|
||||
const navigate = useNavigate();
|
||||
const location = useLocation();
|
||||
const [, authContext] = useUserAuthentication();
|
||||
|
||||
// Parse the short token from URL query params
|
||||
useEffect(() => {
|
||||
const searchParams = new URLSearchParams(location.search);
|
||||
const token = searchParams.get('short');
|
||||
|
||||
if (token) {
|
||||
setShortToken(token);
|
||||
} else {
|
||||
// No short token found, redirect to regular login
|
||||
setError('No shortlink token found in URL');
|
||||
setTimeout(() => {
|
||||
navigate('/', { replace: true });
|
||||
}, 3000);
|
||||
}
|
||||
}, [location.search, navigate]);
|
||||
|
||||
// Handle form submission
|
||||
const handleSubmit = async e => {
|
||||
e.preventDefault();
|
||||
setError('');
|
||||
setIsLoading(true);
|
||||
|
||||
try {
|
||||
// Use window.config.goProxyHost for authentication endpoint
|
||||
const proxyHost = window.config?.goProxyHost || `https://${window.location.hostname}:5555`;
|
||||
const authEndpoint = `${proxyHost}/auth/shortlink`;
|
||||
|
||||
// Call the shortlink authentication endpoint
|
||||
const response = await fetch(authEndpoint, {
|
||||
method: 'POST',
|
||||
headers: {
|
||||
'Content-Type': 'application/json',
|
||||
},
|
||||
body: JSON.stringify({ short_token: shortToken, dob }),
|
||||
});
|
||||
|
||||
if (!response.ok) {
|
||||
throw new Error('Authentication failed. Please check your date of birth and try again.');
|
||||
}
|
||||
|
||||
const data = await response.json();
|
||||
|
||||
// Store token in sessionStorage
|
||||
window.sessionStorage.setItem('ohif-auth-token', data.access_token);
|
||||
|
||||
// Decode token to extract user information (if available in token)
|
||||
let userInfo = data.user;
|
||||
|
||||
// Update the auth context
|
||||
authContext.setUser({
|
||||
...userInfo,
|
||||
token: data.access_token,
|
||||
});
|
||||
|
||||
// Set window.config.sasGetToken for the injectAuth function
|
||||
if (window.config) {
|
||||
window.config.sasGetToken = () => window.sessionStorage.getItem('ohif-auth-token');
|
||||
}
|
||||
|
||||
// Navigate to the viewer page with the authenticated patient's study
|
||||
// The actual URL would depend on how studies are loaded in your OHIF instance
|
||||
if (data.redirect_url) {
|
||||
navigate(data.redirect_url, { replace: true });
|
||||
} else {
|
||||
// Default navigation if no specific redirect is provided
|
||||
navigate('/', { replace: true });
|
||||
}
|
||||
} catch (error) {
|
||||
console.error('Authentication error:', error);
|
||||
setError(error.message || 'Failed to authenticate. Please try again.');
|
||||
} finally {
|
||||
setIsLoading(false);
|
||||
}
|
||||
};
|
||||
|
||||
const handleDateChange = e => {
|
||||
// Format date input as YYYY-MM-DD
|
||||
setDob(e.target.value);
|
||||
};
|
||||
|
||||
return (
|
||||
<div className="flex h-screen w-screen items-center justify-center bg-black">
|
||||
<div className="bg-popover w-88 rounded p-8 shadow-lg">
|
||||
<div className="mb-4 flex justify-center">
|
||||
<Icons.OHIFLogo className="h-12 text-white" />
|
||||
</div>
|
||||
|
||||
<h1 className="mb-8 text-center text-2xl font-bold text-white">Cloud DICOM Viewer</h1>
|
||||
|
||||
{error && <div className="mb-4 rounded bg-red-800 px-4 py-2 text-white">{error}</div>}
|
||||
|
||||
<form onSubmit={handleSubmit}>
|
||||
<div className="mb-6">
|
||||
<label className="mb-2 block text-sm font-bold text-white">
|
||||
Masukkan tanggal lahir Anda:
|
||||
</label>
|
||||
<input
|
||||
type="date"
|
||||
className="focus:shadow-outline w-full appearance-none rounded border py-2 px-3 leading-tight text-gray-700 shadow focus:outline-none"
|
||||
value={dob}
|
||||
onChange={handleDateChange}
|
||||
required
|
||||
/>
|
||||
<p className="mt-1 text-xs text-gray-400">Format: Bulan - Tanggal - Tahun</p>
|
||||
</div>
|
||||
|
||||
<div className="flex items-center justify-center">
|
||||
<button
|
||||
type="submit"
|
||||
className="focus:shadow-outline w-full rounded bg-blue-500 py-2 px-4 font-bold text-white hover:bg-blue-700 focus:outline-none"
|
||||
disabled={isLoading || !shortToken}
|
||||
>
|
||||
{isLoading ? 'Verifying...' : 'View'}
|
||||
</button>
|
||||
</div>
|
||||
<p className="text-muted-foreground mt-8 text-center text-sm">
|
||||
Powered by OHIF & Google Cloud DICOM Storage
|
||||
</p>
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
);
|
||||
};
|
||||
|
||||
export default ShortlinkLogin;
|
||||
@@ -85,6 +85,38 @@ function WorkList({
|
||||
const debouncedFilterValues = useDebounce(filterValues, 200);
|
||||
const { resultsPerPage, pageNumber, sortBy, sortDirection } = filterValues;
|
||||
|
||||
/*
|
||||
* Patch untuk Role checking patient gabisa akses ke study list
|
||||
*/
|
||||
const token = window.sessionStorage.getItem('ohif-auth-token');
|
||||
if (!token) {
|
||||
return;
|
||||
}
|
||||
const decodedToken = decodeToken(token);
|
||||
|
||||
// Check jika 'role' = 'patient' tapi akses '/' return ke viewer
|
||||
if (decodedToken && decodedToken.role === 'patient') {
|
||||
const currentPath = window.location.pathname + window.location.search;
|
||||
if (currentPath === '/') {
|
||||
console.log(
|
||||
'User is a patient and trying to access the root path. Redirecting to his/her home URL.'
|
||||
);
|
||||
window.location.href = `${decodedToken.home_url}`;
|
||||
}
|
||||
}
|
||||
|
||||
function decodeToken(token) {
|
||||
try {
|
||||
const payload = token.split('.')[1];
|
||||
if (payload) {
|
||||
return JSON.parse(atob(payload));
|
||||
}
|
||||
} catch (e) {
|
||||
console.error('Error parsing JWT token', e);
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
/*
|
||||
* The default sort value keep the filters synchronized with runtime conditional sorting
|
||||
* Only applied if no other sorting is specified and there are less than 101 studies
|
||||
@@ -542,7 +574,7 @@ function WorkList({
|
||||
/>
|
||||
<Onboarding />
|
||||
<InvestigationalUseDialog dialogConfiguration={appConfig?.investigationalUseDialog} />
|
||||
<div className="flex flex-col h-full overflow-y-auto">
|
||||
<div className="flex h-full flex-col overflow-y-auto">
|
||||
<ScrollArea>
|
||||
<div className="flex grow flex-col">
|
||||
<StudyListFilter
|
||||
@@ -558,9 +590,7 @@ function WorkList({
|
||||
// ? () => dataSourceConfigurationComponent()
|
||||
// : undefined
|
||||
// }
|
||||
getDataSourceConfigurationComponent={
|
||||
undefined
|
||||
}
|
||||
getDataSourceConfigurationComponent={undefined}
|
||||
/>
|
||||
</div>
|
||||
{hasStudies ? (
|
||||
|
||||
@@ -12,6 +12,8 @@ import buildModeRoutes from './buildModeRoutes';
|
||||
import PrivateRoute from './PrivateRoute';
|
||||
import PropTypes from 'prop-types';
|
||||
import { Link } from 'react-router-dom';
|
||||
import Login from './Login';
|
||||
import ShortlinkLogin from './ShortlinkLogin';
|
||||
|
||||
const NotFoundServer = ({
|
||||
message = 'Unable to query for studies at this time. Check your data source configuration or network connection',
|
||||
@@ -74,6 +76,15 @@ const bakedInRoutes = [
|
||||
path: '/localbasic',
|
||||
children: Local.bind(null, { modePath: 'viewer/dicomlocal' }),
|
||||
},
|
||||
// * Custom Patch untuk Login go-ohif-proxy
|
||||
{
|
||||
path: '/login',
|
||||
children: Login,
|
||||
},
|
||||
{
|
||||
path: '/short-auth',
|
||||
children: ShortlinkLogin,
|
||||
},
|
||||
];
|
||||
|
||||
// NOT FOUND (404)
|
||||
|
||||
73
platform/app/src/utils/initUserAuthenticationService.js
Normal file
73
platform/app/src/utils/initUserAuthenticationService.js
Normal file
@@ -0,0 +1,73 @@
|
||||
/**
|
||||
* Initializes the custom authentication service for OHIF Viewer
|
||||
* to work with go-ohif-proxy authentication
|
||||
*/
|
||||
export function initializeCustomAuth(userAuthenticationService) {
|
||||
// Set up the authentication service with custom implementation
|
||||
userAuthenticationService.setServiceImplementation({
|
||||
// Custom implementation to handle unauthenticated users
|
||||
handleUnauthenticated: () => {
|
||||
// Check if there's a shortlink token in the URL
|
||||
const urlParams = new URLSearchParams(window.location.search);
|
||||
const shortToken = urlParams.get('short');
|
||||
|
||||
// If there's a shortlink token, redirect to the shortlink login page
|
||||
if (shortToken) {
|
||||
window.location.href = `/short-auth?short=${shortToken}`;
|
||||
return null;
|
||||
}
|
||||
|
||||
// Otherwise, handle as normal login flow
|
||||
// Get the current path for redirect after login
|
||||
const currentPath = window.location.pathname + window.location.search;
|
||||
|
||||
// Clear any existing tokens
|
||||
window.sessionStorage.removeItem('ohif-auth-token');
|
||||
|
||||
// Redirect to login page with the redirect URL in query params
|
||||
// window.location.href = `/login?redirect=${encodeURIComponent(currentPath)}`;
|
||||
window.location.href = '/';
|
||||
|
||||
// Return null to prevent rendering while redirecting
|
||||
return null;
|
||||
},
|
||||
|
||||
// Custom implementation to get the authorization header
|
||||
// di ohif3.9.1 ini sepertinya masih development
|
||||
// getAuthorizationHeader: () => {
|
||||
// const token = window.sessionStorage.getItem('ohif-auth-token');
|
||||
// return token ? `Bearer ${token}` : undefined;
|
||||
// },
|
||||
});
|
||||
|
||||
// Set authentication as enabled
|
||||
userAuthenticationService.set({ enabled: true });
|
||||
|
||||
// Check if we already have a token and set the user if we do
|
||||
const token = window.sessionStorage.getItem('ohif-auth-token');
|
||||
if (!token) {
|
||||
return;
|
||||
}
|
||||
const decodedToken = decodeToken(token);
|
||||
|
||||
// Check jika 'role' = 'patient' tapi akses '/' return ke viewer
|
||||
if (decodedToken && decodedToken.role === 'patient') {
|
||||
const currentPath = window.location.pathname + window.location.search;
|
||||
if (currentPath === '/') {
|
||||
console.log('User is a patient and trying to access the root path. Redirecting to /patient.');
|
||||
window.location.href = `${decodedToken.home_url}`;
|
||||
}
|
||||
}
|
||||
|
||||
function decodeToken(token) {
|
||||
try {
|
||||
const payload = token.split('.')[1];
|
||||
if (payload) {
|
||||
return JSON.parse(atob(payload));
|
||||
}
|
||||
} catch (e) {
|
||||
console.error('Error parsing JWT token', e);
|
||||
}
|
||||
return null;
|
||||
}
|
||||
}
|
||||
@@ -294,9 +294,20 @@ const SidePanel = ({
|
||||
return;
|
||||
}
|
||||
|
||||
// Create request headers with Authorization if token exists
|
||||
const authToken = window.sessionStorage.getItem('ohif-auth-token');
|
||||
|
||||
const headers: HeadersInit = {};
|
||||
if (authToken) {
|
||||
headers['Authorization'] = `Bearer ${authToken}`;
|
||||
}
|
||||
|
||||
// Fetch data with specific fields including Accession Number
|
||||
const response = await fetch(
|
||||
`${qidoRootUrl}/studies?includefield=00080050&StudyInstanceUID=${studyInstanceUID}`
|
||||
`${qidoRootUrl}/studies?includefield=00080050&StudyInstanceUID=${studyInstanceUID}`,
|
||||
{
|
||||
headers,
|
||||
}
|
||||
);
|
||||
|
||||
if (!response.ok) {
|
||||
@@ -356,14 +367,21 @@ const SidePanel = ({
|
||||
}
|
||||
|
||||
setIsExpertiseLoading(true);
|
||||
const url = `${window.config.expertise_host}/nv/query.php?method=view&AccessionNumber=${encodeURIComponent(accessionNumber)}`;
|
||||
const url = `${window.config.expertise_host}?accessionNo=${accessionNumber}`;
|
||||
|
||||
const response = await fetch(url);
|
||||
const data = await response.json();
|
||||
console.log('Study data:', data);
|
||||
if (data?.status === 'OK' && data?.data) {
|
||||
// Create expertise data in the format expected by your component
|
||||
const formattedExpertiseData = {
|
||||
ordering_physician: data.data.senderDoctorName,
|
||||
radiologist: data.data.pjDoctorName,
|
||||
expertise_dttm: data.data.expTime,
|
||||
// Convert the expertise object to a string format that parseExpertise can handle
|
||||
expertise: formatExpertiseToString(data.data.expertise),
|
||||
};
|
||||
|
||||
if (data?.study?.expertise && data.study.expertise.length > 0) {
|
||||
setExpertiseData(data.study.expertise[0]);
|
||||
setExpertiseData(formattedExpertiseData);
|
||||
}
|
||||
} catch (error) {
|
||||
console.error('Error fetching expertise data:', error);
|
||||
@@ -372,6 +390,32 @@ const SidePanel = ({
|
||||
}
|
||||
};
|
||||
|
||||
// Helper function to convert expertise object to string format
|
||||
const formatExpertiseToString = expertiseObj => {
|
||||
if (!expertiseObj) return '';
|
||||
|
||||
let result = '';
|
||||
|
||||
// Add each section with proper formatting
|
||||
if (expertiseObj.Indikasi) {
|
||||
result += `KLINIS: ${expertiseObj.Indikasi}\r\n`;
|
||||
}
|
||||
|
||||
if (expertiseObj.Teknik) {
|
||||
result += `TEKNIK: ${expertiseObj.Teknik}\r\n\r\n`;
|
||||
}
|
||||
|
||||
if (expertiseObj.Deskripsi) {
|
||||
result += `KETERANGAN:\r\n${expertiseObj.Deskripsi.replace(/\n/g, '\r\n')}\r\n\r\n`;
|
||||
}
|
||||
|
||||
if (expertiseObj.Kesan) {
|
||||
result += `KESAN: ${expertiseObj.Kesan}`;
|
||||
}
|
||||
|
||||
return result;
|
||||
};
|
||||
|
||||
const getExpertisePanel = () => {
|
||||
if (side !== 'right') return null; // Only show in the right side panel
|
||||
|
||||
|
||||
Reference in New Issue
Block a user