From 9f84a5a8210c2f7a34c291e14ce68bfb19e74daf Mon Sep 17 00:00:00 2001
From: Patrick LaRocque <plarocque@mitre.org>
Date: Fri, 26 Jul 2024 15:08:48 -0400
Subject: [PATCH 1/3] add configuration to send requests to the intermediary

---
 .env                                          |  3 +-
 .../ListSelections/NotificationsSection.jsx   |  5 +-
 src/components/DisplayBox/DisplayBox.jsx      |  4 +-
 src/components/EtasuStatus/EtasuStatus.jsx    |  7 +-
 .../EtasuStatus/EtasuStatusComponent.jsx      |  6 +-
 src/components/RequestBox/RequestBox.jsx      |  6 +-
 .../RequestDashboard/SettingsSection.jsx      | 20 ++---
 src/containers/ContextProvider/reducer.js     | 10 +--
 src/containers/RequestBuilder.jsx             |  6 +-
 src/util/data.js                              | 73 +++++++++++++------
 src/util/util.js                              | 69 ++++++++++++------
 11 files changed, 133 insertions(+), 76 deletions(-)

diff --git a/.env b/.env
index ed37ff6..fe4de04 100644
--- a/.env
+++ b/.env
@@ -19,9 +19,10 @@ VITE_PIMS_SERVER = http://localhost:5051/doctorOrders/api/addRx
 VITE_PUBLIC_KEYS = http://localhost:3000/request-generator/.well-known/jwks.json
 VITE_REALM = ClientFhirServer
 VITE_RESPONSE_EXPIRATION_DAYS = 30
-VITE_SERVER = http://localhost:8090
 VITE_SMART_LAUNCH_URL = http://localhost:4040/
 VITE_URL = http://localhost:3000
 VITE_USER = alice
 VITE_HOOK_TO_SEND = patient-view
 VITE_URL_FILTER = http://localhost:3000/*
+VITE_USE_INTERMEDIARY = false
+VITE_INTERMEDIARY = http://localhost:3003
diff --git a/src/components/Dashboard/ListSelections/NotificationsSection.jsx b/src/components/Dashboard/ListSelections/NotificationsSection.jsx
index 306982d..e1a3cf5 100644
--- a/src/components/Dashboard/ListSelections/NotificationsSection.jsx
+++ b/src/components/Dashboard/ListSelections/NotificationsSection.jsx
@@ -4,7 +4,7 @@ import { SettingsContext } from '../../../containers/ContextProvider/SettingsPro
 import { EtasuStatusComponent } from '../../EtasuStatus/EtasuStatusComponent';
 import axios from 'axios';
 import { createMedicationFromMedicationRequest } from '../../../util/fhir';
-import { standardsBasedGetEtasu } from '../../../util/util';
+import { standardsBasedGetEtasu, getMedicationSpecificEtasuUrl } from '../../../util/util';
 
 const NotificationsSection = () => {
   const [globalState, _] = useContext(SettingsContext);
@@ -49,7 +49,7 @@ const NotificationsSection = () => {
   const getAllEtasu = () => {
     medications.forEach(medication => {
       const body = makeBody(medication);
-      const standardEtasuUrl = `${globalState.remsAdminServer}/4_0_0/GuidanceResponse/$rems-etasu`;
+      const standardEtasuUrl = getMedicationSpecificEtasuUrl(medication?.code, globalState);
       standardsBasedGetEtasu(standardEtasuUrl, body, compileResponses);
     });
   };
@@ -81,6 +81,7 @@ const NotificationsSection = () => {
             display={display}
             remsAdminResponseInit={remsCase}
             data={remsCase.body}
+            medication={remsCase.body.parameter[1]?.resource}
           />
         );
       })}
diff --git a/src/components/DisplayBox/DisplayBox.jsx b/src/components/DisplayBox/DisplayBox.jsx
index 27fd82c..c5df3fe 100644
--- a/src/components/DisplayBox/DisplayBox.jsx
+++ b/src/components/DisplayBox/DisplayBox.jsx
@@ -287,7 +287,7 @@ const DisplayBox = props => {
             card.links.map((link, ind) => {
               if (link.type === 'smart') {
                 linksSection.push(
-                  <ListItem sx={{ marginLeft: '-12px' }}>
+                  <ListItem key={ind} sx={{ marginLeft: '-12px' }}>
                     <Button
                       key={ind}
                       variant="outlined"
@@ -318,7 +318,7 @@ const DisplayBox = props => {
             card.links.map((link, ind) => {
               if (link.type === 'absolute') {
                 documentationSection.push(
-                  <ListItem>
+                  <ListItem key={ind}>
                     <Box key={ind}>
                       <Button
                         variant="text"
diff --git a/src/components/EtasuStatus/EtasuStatus.jsx b/src/components/EtasuStatus/EtasuStatus.jsx
index 1dc0dc7..aeda631 100644
--- a/src/components/EtasuStatus/EtasuStatus.jsx
+++ b/src/components/EtasuStatus/EtasuStatus.jsx
@@ -1,7 +1,7 @@
 import { useState, useEffect, useContext } from 'react';
 import { SettingsContext } from '../../containers/ContextProvider/SettingsProvider.jsx';
 import { EtasuStatusComponent } from './EtasuStatusComponent.jsx';
-import { standardsBasedGetEtasu } from '../../util/util.js';
+import { standardsBasedGetEtasu, getMedicationSpecificEtasuUrl } from '../../util/util.js';
 import { createMedicationFromMedicationRequest, getDrugCodeableConceptFromMedicationRequest } from '../../util/fhir.js';
 
 // converts code into etasu for the component to render
@@ -12,6 +12,7 @@ export const EtasuStatus = props => {
   const { code, request } = props;
   const [remsAdminResponse, setRemsAdminResponse] = useState({});
   const [etasuData, setEtasuData] = useState({});
+  const [medication, setMedication] = useState({});
   const [display, setDisplay] = useState('');
 
   useEffect(() => {
@@ -22,9 +23,10 @@ export const EtasuStatus = props => {
   const getEtasuStatus = medication => {
     const body = makeBody(medication);
     setEtasuData(body);
+    setMedication(medication);
     const display = body.parameter[1]?.resource.code?.coding[0].display;
     setDisplay(display);
-    const standardEtasuUrl = `${globalState.remsAdminServer}/4_0_0/GuidanceResponse/$rems-etasu`;
+    const standardEtasuUrl = getMedicationSpecificEtasuUrl(medication?.code, globalState);
     standardsBasedGetEtasu(standardEtasuUrl, body, setRemsAdminResponse);
   };
 
@@ -52,6 +54,7 @@ export const EtasuStatus = props => {
           remsAdminResponseInit={remsAdminResponse}
           data={etasuData}
           display={display}
+          medication={medication}
         />
       ) : (
         ''
diff --git a/src/components/EtasuStatus/EtasuStatusComponent.jsx b/src/components/EtasuStatus/EtasuStatusComponent.jsx
index 60d3275..7bc0792 100644
--- a/src/components/EtasuStatus/EtasuStatusComponent.jsx
+++ b/src/components/EtasuStatus/EtasuStatusComponent.jsx
@@ -3,12 +3,12 @@ import { EtasuStatusModal } from './EtasuStatusModal.jsx';
 import { useState, useEffect, useContext } from 'react';
 import { Card, Typography } from '@mui/material';
 import { SettingsContext } from '../../containers/ContextProvider/SettingsProvider.jsx';
-import { standardsBasedGetEtasu } from '../../util/util.js';
+import { standardsBasedGetEtasu, getMedicationSpecificEtasuUrl } from '../../util/util.js';
 
 export const EtasuStatusComponent = props => {
   const [globalState, _] = useContext(SettingsContext);
 
-  const { remsAdminResponseInit, data, display } = props;
+  const { remsAdminResponseInit, data, display, medication } = props;
 
   const [remsAdminResponse, setRemsAdminResponse] = useState(remsAdminResponseInit);
   const [lastCheckedEtasuTime, setLastCheckedEtasuTime] = useState(0);
@@ -28,7 +28,7 @@ export const EtasuStatusComponent = props => {
 
   const refreshEtasu = () => {
     if (remsAdminResponse) {
-      const standardEtasuUrl = `${globalState.remsAdminServer}/4_0_0/GuidanceResponse/$rems-etasu`;
+      const standardEtasuUrl = getMedicationSpecificEtasuUrl(medication?.code, globalState);
       standardsBasedGetEtasu(standardEtasuUrl, data, setRemsAdminResponse);
       setLastCheckedEtasuTime(Date.now());
     }
diff --git a/src/components/RequestBox/RequestBox.jsx b/src/components/RequestBox/RequestBox.jsx
index 0fee9bb..cd898c7 100644
--- a/src/components/RequestBox/RequestBox.jsx
+++ b/src/components/RequestBox/RequestBox.jsx
@@ -6,8 +6,8 @@ import buildNewRxRequest from '../../util/buildScript.2017071.js';
 import MuiAlert from '@mui/material/Alert';
 import Snackbar from '@mui/material/Snackbar';
 import { shortNameMap, ORDER_SIGN, PATIENT_VIEW } from '../../util/data.js';
-import { getAge, createMedicationDispenseFromMedicationRequest, createMedicationFromMedicationRequest } from '../../util/fhir.js';
-import { retrieveLaunchContext, prepPrefetch } from '../../util/util.js';
+import { getAge, createMedicationDispenseFromMedicationRequest, createMedicationFromMedicationRequest, getDrugCodeableConceptFromMedicationRequest } from '../../util/fhir.js';
+import { retrieveLaunchContext, prepPrefetch, getMedicationSpecificCdsHooksUrl } from '../../util/util.js';
 import './request.css';
 import axios from 'axios';
 
@@ -217,7 +217,7 @@ const RequestBox = props => {
     console.log('Getting auth number ')
     const medication = createMedicationFromMedicationRequest(request);
     const body = makeBody(medication);
-    const standardEtasuUrl = `${globalState.remsAdminServer}/4_0_0/GuidanceResponse/$rems-etasu`;
+    const standardEtasuUrl = getMedicationSpecificEtasuUrl(getDrugCodeableConceptFromMedicationRequest(request), globalState);
     let authNumber = '';
     await axios({
       method: 'post',
diff --git a/src/components/RequestDashboard/SettingsSection.jsx b/src/components/RequestDashboard/SettingsSection.jsx
index 261bbfe..2f59da0 100644
--- a/src/components/RequestDashboard/SettingsSection.jsx
+++ b/src/components/RequestDashboard/SettingsSection.jsx
@@ -25,11 +25,11 @@ import AddIcon from '@mui/icons-material/Add';
 import env from 'env-var';
 import FHIR from 'fhirclient';
 
-import { headerDefinitions, medicationRequestToRemsAdmins, ORDER_SIGN, ORDER_SELECT, PATIENT_VIEW, ENCOUNTER_START } from '../../util/data';
+import { headerDefinitions, medicationRequestToRemsAdmins, ORDER_SIGN, ORDER_SELECT, PATIENT_VIEW, ENCOUNTER_START, REMS_ETASU } from '../../util/data';
 import { actionTypes, initialState } from '../../containers/ContextProvider/reducer';
 import { SettingsContext } from '../../containers/ContextProvider/SettingsProvider';
 
-const CDS_HOOKS = [ORDER_SIGN, ORDER_SELECT, PATIENT_VIEW, ENCOUNTER_START];
+const ENDPOINT = [ORDER_SIGN, ORDER_SELECT, PATIENT_VIEW, ENCOUNTER_START, REMS_ETASU];
 
 const SettingsSection = props => {
   const [state, dispatch] = React.useContext(SettingsContext);
@@ -299,13 +299,14 @@ const SettingsSection = props => {
             maxHeight: 440
           }}
         >
+          {!state['useIntermediary'] && (
           <Table stickyHeader aria-label="sticky table">
             <TableHead>
               <TableRow sx={{ th: { fontWeight: 'bold' } }}>
                 <TableCell width={500}>Medication Display</TableCell>
                 <TableCell width={200}>Medication RxNorm Code</TableCell>
-                <TableCell width={200}>CDS Hook</TableCell>
-                <TableCell width={500}>REMS Admin Endpoint</TableCell>
+                <TableCell width={200}>Hook / Endpoint</TableCell>
+                <TableCell width={500}>REMS Admin URL</TableCell>
                 {/* This empty TableCell corresponds to the add and delete 
                 buttons. It is used to fill up the sticky header which 
                 will appear over the gray/white table rows. */}
@@ -348,19 +349,19 @@ const SettingsSection = props => {
                       <Select
                         labelId="dropdown-label"
                         id="dropdown"
-                        value={row.hook}
+                        value={row.endpointType}
                         onChange={event =>
                           dispatch({
                             type: actionTypes.updateCdsHookSetting,
                             settingId: key,
-                            value: { hook: event.target.value }
+                            value: { endpointType: event.target.value }
                           })
                         }
                         sx={{ width: '100%' }}
                       >
-                        {CDS_HOOKS.map(hook => (
-                          <MenuItem key={hook} value={hook}>
-                            {hook}
+                        {ENDPOINT.map(endpointType => (
+                          <MenuItem key={endpointType} value={endpointType}>
+                            {endpointType}
                           </MenuItem>
                         ))}
                       </Select>
@@ -408,6 +409,7 @@ const SettingsSection = props => {
               })}
             </TableBody>
           </Table>
+          )}
         </TableContainer>
       </Grid>
 
diff --git a/src/containers/ContextProvider/reducer.js b/src/containers/ContextProvider/reducer.js
index 1324d92..9a8d543 100644
--- a/src/containers/ContextProvider/reducer.js
+++ b/src/containers/ContextProvider/reducer.js
@@ -43,7 +43,7 @@ const getNewStateWithNewCdsHookSetting = (state, settingId) => {
   newState.medicationRequestToRemsAdmins[uuidv4()] = {
     rxnorm: 'Fill out Medication RxNorm Code',
     display: 'Fill out Medication Display Name',
-    hook: ORDER_SIGN,
+    endpointType: ORDER_SIGN,
     remsAdmin: 'REMS Admin URL for CDS Hook'
   };
 
@@ -108,10 +108,10 @@ export const initialState = (() => {
   });
 
   medicationRequestToRemsAdmins.forEach(row => {
-    const { rxnorm, display, hookEndpoints } = row;
-    hookEndpoints.forEach(({ hook, remsAdmin }) => {
-      const key = `${rxnorm}_${hook}`;
-      state.medicationRequestToRemsAdmins[key] = { rxnorm, display, hook, remsAdmin };
+    const { rxnorm, display, endpoints } = row;
+    endpoints.forEach(({ endpointType, remsAdmin }) => {
+      const key = `${rxnorm}_${endpointType}`;
+      state.medicationRequestToRemsAdmins[key] = { rxnorm, display, endpointType, remsAdmin };
     });
   });
   return state;
diff --git a/src/containers/RequestBuilder.jsx b/src/containers/RequestBuilder.jsx
index fcf101b..6dee72d 100644
--- a/src/containers/RequestBuilder.jsx
+++ b/src/containers/RequestBuilder.jsx
@@ -8,7 +8,7 @@ import RequestBox from '../components/RequestBox/RequestBox.jsx';
 import buildRequest from '../util/buildRequest.js';
 import { types, PATIENT_VIEW } from '../util/data.js';
 import { createJwt } from '../util/auth.js';
-import { getMedicationSpecificRemsAdminUrl, prepPrefetch } from '../util/util.js';
+import { getMedicationSpecificCdsHooksUrl, prepPrefetch } from '../util/util.js';
 
 import Accordion from '@mui/material/Accordion';
 import AccordionSummary from '@mui/material/AccordionSummary';
@@ -121,7 +121,7 @@ const RequestBuilder = props => {
     let remsAdminUrls = [];
     // get all the remsAdminUrl for each MedicationRequest
     state.medicationRequests?.data?.forEach(request => {
-      const remsAdminUrl = getMedicationSpecificRemsAdminUrl(request, globalState, hook);
+      const remsAdminUrl = getMedicationSpecificCdsHooksUrl(request, globalState, hook);
       if (remsAdminUrl) {
         remsAdminUrls.push(remsAdminUrl);
       }
@@ -138,7 +138,7 @@ const RequestBuilder = props => {
     console.log('Initiating form submission ', types.info);
     let remsAdminUrl = null;
     if (request) {
-      remsAdminUrl = getMedicationSpecificRemsAdminUrl(request, globalState, hook);
+      remsAdminUrl = getMedicationSpecificCdsHooksUrl(request, globalState, hook);
       sendHook(prefetch, request, patient, hook, remsAdminUrl);
     } else {
       // get all MedicationRequests for the patient, then continue
diff --git a/src/util/data.js b/src/util/data.js
index 29eaadb..1eaa320 100644
--- a/src/util/data.js
+++ b/src/util/data.js
@@ -1,6 +1,11 @@
 import env from 'env-var';
 
 const headerDefinitions = {
+  useIntermediary: {
+    display: 'Use Intermediary',
+    type: 'check',
+    default: env.get('VITE_USE_INTERMEDIARY').asBool()
+  },
   alternativeTherapy: {
     display: 'Alternative Therapy Cards Allowed',
     type: 'check',
@@ -71,10 +76,10 @@ const headerDefinitions = {
     type: 'input',
     default: env.get('VITE_SMART_LAUNCH_URL').asString()
   },
-  remsAdminServer: {
-    display: 'REMS Admin Server',
+  intermediaryUrl: {
+    display: 'REMS Intermediary URL',
     type: 'input',
-    default: env.get('VITE_SERVER').asString()
+    default: env.get('VITE_INTERMEDIARY').asString()
   },
   hookToSend: {
     display: 'Send hook on patient select',
@@ -87,46 +92,63 @@ const ORDER_SIGN = 'order-sign';
 const ORDER_SELECT = 'order-select';
 const PATIENT_VIEW = 'patient-view';
 const ENCOUNTER_START = 'encounter-start';
+const REMS_ETASU = '$rems-etasu';
+
+const CDS_SERVICE = 'cds-services';
+const ETASU_ENDPOINT = 'GuidanceResponse/$rems-etasu';
+
+const serviceEndpoints = {
+  'order-sign': CDS_SERVICE+'/rems-'+ORDER_SIGN,
+  'order-select': CDS_SERVICE+'/rems-'+ORDER_SELECT,
+  'patient-view': CDS_SERVICE+'/rems-'+PATIENT_VIEW,
+  'encounter-start': CDS_SERVICE+'/rems-'+ENCOUNTER_START,
+  '$rems-etasu': '4_0_0/'+ETASU_ENDPOINT
+};
+
 
 const medicationRequestToRemsAdmins = Object.freeze([
   {
     rxnorm: 2183126,
     display: 'Turalio 200 MG Oral Capsule',
-    hookEndpoints: [
-      { hook: ORDER_SIGN, remsAdmin: 'http://localhost:8090/cds-services/rems-order-sign' },
-      { hook: ORDER_SELECT, remsAdmin: 'http://localhost:8090/cds-services/rems-order-select' },
-      { hook: PATIENT_VIEW, remsAdmin: 'http://localhost:8090/cds-services/rems-patient-view' },
-      { hook: ENCOUNTER_START, remsAdmin: 'http://localhost:8090/cds-services/rems-encounter-start' }
+    endpoints: [
+      { endpointType: ORDER_SIGN, remsAdmin: 'http://localhost:8090/cds-services/rems-order-sign' },
+      { endpointType: ORDER_SELECT, remsAdmin: 'http://localhost:8090/cds-services/rems-order-select' },
+      { endpointType: PATIENT_VIEW, remsAdmin: 'http://localhost:8090/cds-services/rems-patient-view' },
+      { endpointType: ENCOUNTER_START, remsAdmin: 'http://localhost:8090/cds-services/rems-encounter-start' },
+      { endpointType: REMS_ETASU, remsAdmin: 'http://localhost:8090/4_0_0/'+ETASU_ENDPOINT }
     ]
   },
   {
     rxnorm: 6064,
     display: 'Isotretinoin 20 MG Oral Capsule',
-    hookEndpoints: [
-      { hook: ORDER_SIGN, remsAdmin: 'http://localhost:8090/cds-services/rems-order-sign' },
-      { hook: ORDER_SELECT, remsAdmin: 'http://localhost:8090/cds-services/rems-order-select' },
-      { hook: PATIENT_VIEW, remsAdmin: 'http://localhost:8090/cds-services/rems-patient-view' },
-      { hook: ENCOUNTER_START, remsAdmin: 'http://localhost:8090/cds-services/rems-encounter-start' }
+    endpoints: [
+      { endpointType: ORDER_SIGN, remsAdmin: 'http://localhost:8090/cds-services/rems-order-sign' },
+      { endpointType: ORDER_SELECT, remsAdmin: 'http://localhost:8090/cds-services/rems-order-select' },
+      { endpointType: PATIENT_VIEW, remsAdmin: 'http://localhost:8090/cds-services/rems-patient-view' },
+      { endpointType: ENCOUNTER_START, remsAdmin: 'http://localhost:8090/cds-services/rems-encounter-start' },
+      { endpointType: REMS_ETASU, remsAdmin: 'http://localhost:8090/4_0_0/'+ETASU_ENDPOINT }
     ]
   },
   {
     rxnorm: 1237051,
     display: 'TIRF 200 UG Oral Transmucosal Lozenge',
-    hookEndpoints: [
-      { hook: ORDER_SIGN, remsAdmin: 'http://localhost:8090/cds-services/rems-order-sign' },
-      { hook: ORDER_SELECT, remsAdmin: 'http://localhost:8090/cds-services/rems-order-select' },
-      { hook: PATIENT_VIEW, remsAdmin: 'http://localhost:8090/cds-services/rems-patient-view' },
-      { hook: ENCOUNTER_START, remsAdmin: 'http://localhost:8090/cds-services/rems-encounter-start' }
+    endpoints: [
+      { endpointType: ORDER_SIGN, remsAdmin: 'http://localhost:8090/cds-services/rems-order-sign' },
+      { endpointType: ORDER_SELECT, remsAdmin: 'http://localhost:8090/cds-services/rems-order-select' },
+      { endpointType: PATIENT_VIEW, remsAdmin: 'http://localhost:8090/cds-services/rems-patient-view' },
+      { endpointType: ENCOUNTER_START, remsAdmin: 'http://localhost:8090/cds-services/rems-encounter-start' },
+      { endpointType: REMS_ETASU, remsAdmin: 'http://localhost:8090/4_0_0/'+ETASU_ENDPOINT }
     ]
   },
   {
     rxnorm: 1666386,
     display: 'Addyi 100 MG Oral Tablet',
-    hookEndpoints: [
-      { hook: ORDER_SIGN, remsAdmin: 'http://localhost:8090/cds-services/rems-order-sign' },
-      { hook: ORDER_SELECT, remsAdmin: 'http://localhost:8090/cds-services/rems-order-select' },
-      { hook: PATIENT_VIEW, remsAdmin: 'http://localhost:8090/cds-services/rems-patient-view' },
-      { hook: ENCOUNTER_START, remsAdmin: 'http://localhost:8090/cds-services/rems-encounter-start' }
+    endpoints: [
+      { endpointType: ORDER_SIGN, remsAdmin: 'http://localhost:8090/cds-services/rems-order-sign' },
+      { endpointType: ORDER_SELECT, remsAdmin: 'http://localhost:8090/cds-services/rems-order-select' },
+      { endpointType: PATIENT_VIEW, remsAdmin: 'http://localhost:8090/cds-services/rems-patient-view' },
+      { endpointType: ENCOUNTER_START, remsAdmin: 'http://localhost:8090/cds-services/rems-encounter-start' },
+      { endpointType: REMS_ETASU, remsAdmin: 'http://localhost:8090/4_0_0/'+ETASU_ENDPOINT }
     ]
   }
 ]);
@@ -267,5 +289,8 @@ export {
   ORDER_SIGN,
   ORDER_SELECT,
   PATIENT_VIEW,
-  ENCOUNTER_START
+  ENCOUNTER_START,
+  REMS_ETASU,
+  CDS_SERVICE,
+  serviceEndpoints
 };
diff --git a/src/util/util.js b/src/util/util.js
index 1373afa..0e42c8b 100644
--- a/src/util/util.js
+++ b/src/util/util.js
@@ -1,6 +1,6 @@
 import axios from 'axios';
 import { getDrugCodeableConceptFromMedicationRequest } from './fhir';
-import { ORDER_SIGN, ORDER_SELECT, PATIENT_VIEW, ENCOUNTER_START } from './data';
+import { ORDER_SIGN, ORDER_SELECT, PATIENT_VIEW, ENCOUNTER_START, CDS_SERVICE, serviceEndpoints, REMS_ETASU } from './data';
 
 /**
  * Retrieves a SMART launch context from an endpoint to append as a "launch" query parameter to a SMART app launch URL (see SMART docs for more about launch context).
@@ -95,37 +95,61 @@ function standardsBasedGetEtasu(etasuUrl, body, responseCallback) {
   );
 }
 
-const getMedicationSpecificRemsAdminUrl = (request, globalState, hook) => {
-  // if empty request, just return
-  if (Object.keys(request).length === 0) {
-    return undefined;
+const getMedicationSpecificRemsAdminUrl = (codeableConcept, globalState, endpointType) => {
+
+  var serverUrl = null;
+  if (globalState.useIntermediary) {
+    serverUrl = `${globalState.intermediaryUrl}/${serviceEndpoints[endpointType]}`;
+  } else {
+    const display = codeableConcept?.coding?.[0]?.display;
+    const rxnorm = codeableConcept?.coding?.[0]?.code;
+
+    if (!rxnorm) {
+      console.log("ERROR: unknown MedicationRequest code: '", rxnorm);
+      return undefined;
+    }
+
+    // This function never gets called with the PATIENT_VIEW hook, however.
+    if (!(endpointType === PATIENT_VIEW || endpointType === ORDER_SIGN || endpointType === ORDER_SELECT  || endpointType === ENCOUNTER_START || endpointType === REMS_ETASU)) {
+      console.log(`ERROR: unknown hook/endpoint type: ${endpointType}`);
+      return undefined;
+    }
+
+    serverUrl = Object.values(globalState.medicationRequestToRemsAdmins).find(
+      value => Number(value.rxnorm) === Number(rxnorm) && value.endpointType === endpointType
+    )?.remsAdmin;
+
+    if (!serverUrl) {
+      console.log(`Medication ${display} is not a REMS medication`);
+      return undefined;
+    }
   }
+  return serverUrl;
+}
 
-  const codeableConcept = getDrugCodeableConceptFromMedicationRequest(request);
-  const display = codeableConcept?.coding?.[0]?.display;
-  const rxnorm = codeableConcept?.coding?.[0]?.code;
+const getMedicationSpecificEtasuUrl = (codeableConcept, globalState) => {
 
-  if (!rxnorm) {
-    console.log("ERROR: unknown MedicationRequest code: '", rxnorm);
+  var serverUrl = getMedicationSpecificRemsAdminUrl(codeableConcept, globalState, REMS_ETASU);
+  if (serverUrl != undefined) {
+    return serverUrl;
+  } else {
     return undefined;
   }
+}
 
-  // This function never gets called with the PATIENT_VIEW hook, however.
-  if (!(hook === PATIENT_VIEW || hook === ORDER_SIGN || hook === ORDER_SELECT  || hook === ENCOUNTER_START)) {
-    console.log(`ERROR: unknown hook type: ${hook}`);
+const getMedicationSpecificCdsHooksUrl = (request, globalState, hook) => {
+  // if empty request, just return
+  if (Object.keys(request).length === 0) {
     return undefined;
   }
 
-  const cdsUrl = Object.values(globalState.medicationRequestToRemsAdmins).find(
-    value => Number(value.rxnorm) === Number(rxnorm) && value.hook === hook
-  )?.remsAdmin;
-
-  if (!cdsUrl) {
-    console.log(`Medication ${display} is not a REMS medication`);
+  const codeableConcept = getDrugCodeableConceptFromMedicationRequest(request);
+  var serverUrl = getMedicationSpecificRemsAdminUrl(codeableConcept, globalState, hook);
+  if (serverUrl != undefined) {
+    return serverUrl;
+  } else {
     return undefined;
   }
-
-  return cdsUrl;
 };
 
 const prepPrefetch = prefetchedResources => {
@@ -148,6 +172,7 @@ const prepPrefetch = prefetchedResources => {
 export {
   retrieveLaunchContext,
   standardsBasedGetEtasu,
-  getMedicationSpecificRemsAdminUrl,
+  getMedicationSpecificEtasuUrl,
+  getMedicationSpecificCdsHooksUrl,
   prepPrefetch
 };

From 4ee908afa2306f20a09a00fb66e1529dd0da7a8b Mon Sep 17 00:00:00 2001
From: Patrick LaRocque <plarocque@mitre.org>
Date: Fri, 26 Jul 2024 15:14:57 -0400
Subject: [PATCH 2/3] update README

---
 README.md | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index f33cb0f..a8e0e52 100644
--- a/README.md
+++ b/README.md
@@ -129,7 +129,8 @@ Following are a list of modifiable paths:
 | VITE_PUBLIC_KEYS                                      | `http://localhost:3000/request-generator/.well-known/jwks.json`                                      | The endpoint which contains the public keys for authentication with the REMS admin.  Should be changed if the keys are moved elsewhere.                     |
 | VITE_REALM                                            | `ClientFhirServer`                                                                                   | The Keycloak realm to use. Only relevant is using Keycloak as an authentication server. This only affects direct logins like through the Patient Portal, not SMART launches like opening the app normally.                     |
 | VITE_RESPONSE_EXPIRATION_DAYS                         | `30`                                                                                                 | The number of days old a Questionnaire Response can be before it is ignored and filtered out.  This ensures the patient search excludes outdated or obsolete prior sessions from creating clutter.                     |
-| VITE_SERVER                                           | `http://localhost:8090`                                                                              | The default base URL of the CDS service. Typically this will be the base url of the REMS Admin.                     |
 | VITE_SMART_LAUNCH_URL                                 | `http://localhost:4040/`                                                                             | The base url of the SMART app. This is used for opening the app directly, rather than doing an EHR SMART launch.                     |
 | VITE_URL                                              | `http://localhost:3000`                                                                              | The base url of this app.  Should be modified if the port or domain change.                     |
-| VITE_USER                                             | `alice`                                                                                              | The default user to login as when opening the app.                      |
\ No newline at end of file
+| VITE_USER                                             | `alice`                                                                                              | The default user to login as when opening the app.                      |
+| VITE_USE_INTERMEDIARY                                 | false                                                                                                | When true, the app will send all CDS Hooks and REMS ETASU check calls to the intermediary defined in VITE_INTERMEDIARY.                      |
+| VITE_INTERMEDIARY                                     | `http://localhost:3030`                                                                              | The base url of the intermediary.                      |
\ No newline at end of file

From 382cbd6a5e8068c00c9f28f0770750caf2f2a5d9 Mon Sep 17 00:00:00 2001
From: Patrick LaRocque <plarocque@mitre.org>
Date: Wed, 31 Jul 2024 13:30:53 -0400
Subject: [PATCH 3/3] updates from review, fix issue with importing wrong
 function from utils

---
 src/components/RequestBox/RequestBox.jsx | 6 +++---
 src/util/util.js                         | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/components/RequestBox/RequestBox.jsx b/src/components/RequestBox/RequestBox.jsx
index cd898c7..2275122 100644
--- a/src/components/RequestBox/RequestBox.jsx
+++ b/src/components/RequestBox/RequestBox.jsx
@@ -7,7 +7,7 @@ import MuiAlert from '@mui/material/Alert';
 import Snackbar from '@mui/material/Snackbar';
 import { shortNameMap, ORDER_SIGN, PATIENT_VIEW } from '../../util/data.js';
 import { getAge, createMedicationDispenseFromMedicationRequest, createMedicationFromMedicationRequest, getDrugCodeableConceptFromMedicationRequest } from '../../util/fhir.js';
-import { retrieveLaunchContext, prepPrefetch, getMedicationSpecificCdsHooksUrl } from '../../util/util.js';
+import { retrieveLaunchContext, prepPrefetch, getMedicationSpecificEtasuUrl } from '../../util/util.js';
 import './request.css';
 import axios from 'axios';
 
@@ -225,8 +225,8 @@ const RequestBox = props => {
       data: body
     }).then(
       response => {
-       if (response.data.parameter[0].resource && response.data.parameter[0].resource.contained) {
-        response.data.parameter[0].resource?.contained[0]?.parameter.map(metRequirements => {
+       if (response.data.parameter[0].resource && response.data.parameter?.[0].resource.contained) {
+        response.data.parameter?.[0].resource?.contained[0]?.parameter.map(metRequirements => {
           if (metRequirements.name === 'auth_number') {
             authNumber = metRequirements.valueString;
           }
diff --git a/src/util/util.js b/src/util/util.js
index 0e42c8b..73986e8 100644
--- a/src/util/util.js
+++ b/src/util/util.js
@@ -77,8 +77,8 @@ function standardsBasedGetEtasu(etasuUrl, body, responseCallback) {
     response => {
       // Sorting an array mutates the data in place.
       const remsMetRes = response.data;
-      if (remsMetRes?.parameter[0]?.resource?.contained) {
-        remsMetRes.parameter[0].resource.contained[0].parameter.sort((first, second) => {
+      if (remsMetRes?.parameter?.[0]?.resource?.contained) {
+        remsMetRes.parameter?.[0].resource.contained[0].parameter.sort((first, second) => {
           // Keep the other forms unsorted.
           if (second.name.includes('Patient Status Update')) {
             // Sort the Patient Status Update forms in descending order of timestamp.