Squashed commit of the following:
commit18d5b6dd9aAuthor: mario <dev.mario@sismedika@gmail.com> Date: Tue May 13 16:15:37 2025 +0700 add: shortlink DoB auth page commit7cad1c5e05Author: mario <dev.mario@sismedika@gmail.com> Date: Tue May 13 08:52:45 2025 +0700 prevent patient to see Worklist commit7f4548e18cAuthor: mario <dev.mario@sismedika@gmail.com> Date: Tue May 13 08:51:38 2025 +0700 add: Login page and route commiteaa18b8389Author: mario <dev.mario@sismedika@gmail.com> Date: Fri May 9 16:40:02 2025 +0700 edit: patch XHR Request dengan coverage lebih luas dari monkeyPatchXML commit86ad0b38ddAuthor: padmanto <padmanto@gmail.com> Date: Tue Apr 29 09:42:53 2025 +0700 Monkey Patch XMLHttpRequest -- inject bearer token and verify response commitcb380a521dAuthor: padmanto <padmanto@gmail.com> Date: Tue Apr 29 08:44:52 2025 +0700 default use cloud pacs commit5f56d06fcdAuthor: mario <mario@sismedika.com> Date: Sat Apr 26 23:38:18 2025 +0700 edit ip pdf dan cloud
This commit is contained in:
129
platform/app/src/routes/Login.tsx
Normal file
129
platform/app/src/routes/Login.tsx
Normal file
@@ -0,0 +1,129 @@
|
||||
import React, { useState, useEffect } from 'react';
|
||||
import { useNavigate, useLocation } from 'react-router-dom';
|
||||
import { useUserAuthentication } from '@ohif/ui';
|
||||
|
||||
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 || `http://${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-primary-dark w-96 rounded p-8 shadow-lg">
|
||||
<h1 className="mb-8 text-center text-2xl font-bold text-white">Login to OHIF 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>
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
);
|
||||
};
|
||||
|
||||
export default Login;
|
||||
131
platform/app/src/routes/ShortlinkLogin.tsx
Normal file
131
platform/app/src/routes/ShortlinkLogin.tsx
Normal file
@@ -0,0 +1,131 @@
|
||||
import React, { useState, useEffect } from 'react';
|
||||
import { useNavigate, useLocation } from 'react-router-dom';
|
||||
import { useUserAuthentication } from '@ohif/ui';
|
||||
|
||||
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('/login', { 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 || `http://${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-primary-dark w-96 rounded p-8 shadow-lg">
|
||||
<h1 className="mb-8 text-center text-2xl font-bold text-white">Patient Access</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">
|
||||
Please enter your date of birth
|
||||
</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...' : 'Access My Images'}
|
||||
</button>
|
||||
</div>
|
||||
</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)
|
||||
|
||||
Reference in New Issue
Block a user