Temporary change to get resources from dev hapi

uwcirg · Jan 25, 2024 · f9b7858 · f9b7858
1 parent a9bb079
commit f9b7858
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 34 deletions.
diff --git a/src/lib/FetchSoF.svelte b/src/lib/FetchSoF.svelte
@@ -61,14 +61,6 @@
     }
   });
 
-  function endSession() {
-    let key = sessionStorage.getItem('SMART_KEY');
-    if (key) {
-      sessionStorage.removeItem(JSON.parse(key));
-      sessionStorage.removeItem('SMART_KEY');
-    }
-  }
-
   async function fetchData() {
     processing = true;
     let resources = await getResourcesWithReferences(1);

diff --git a/src/lib/FetchSoFLTT.svelte b/src/lib/FetchSoFLTT.svelte
@@ -63,14 +63,6 @@
     }
   });
 
-  function endSession() {
-    let key = sessionStorage.getItem('SMART_KEY');
-    if (key) {
-      sessionStorage.removeItem(JSON.parse(key));
-      sessionStorage.removeItem('SMART_KEY');
-    }
-  }
-
   async function fetchData() {
     processing = true;
     let resources = await getResourcesWithReferences(1);

diff --git a/src/lib/config.ts b/src/lib/config.ts
@@ -6,20 +6,6 @@ export const API_BASE = import.meta.env.VITE_API_BASE;
 export const INTERMEDIATE_FHIR_SERVER_BASE = import.meta.env.VITE_INTERMEDIATE_FHIR_SERVER_BASE;
 
 export const SOF_HOSTS = [
-  {
-    id: "epic",
-    name: "EPIC Demo",
-    url: "https://fhir.epic.com/interconnect-fhir-oauth/api/FHIR/R4",
-    clientId: import.meta.env.VITE_EPIC_CLIENT_ID,
-    note: "<a href='https://fhir.epic.com/Documentation?docId=testpatients' target='_blank' rel='noreferrer'>Test patient credentials <Icon name='box-arrow-up-right' /></a>"
-  },
-  { 
-    id: "cerner",
-    name: "Oracle Cerner Demo",
-    url: "https://fhir-myrecord.cerner.com/r4/ec2458f2-1e24-41c8-b71b-0e701af7583d",
-    clientId: import.meta.env.VITE_CERNER_CLIENT_ID,
-    note: "<a href='https://docs.google.com/document/u/1/d/e/2PACX-1vQwyX3px4qi5t1O6_El6022zYt4ymKAWCrcgxcX5NvYGUJAkJ4WFwOnLoikow6rEccpFZzDWBdcBqsQ/pub' target='_blank' rel='noreferrer'>Test patient credentials <Icon name='box-arrow-up-right' /></a>"
-  },
   {
     id: "smit",
     name: "SMART Health IT Demo",
@@ -28,7 +14,7 @@ export const SOF_HOSTS = [
     note: "Credentials provided"
   }
 ];
-export const SOF_REDIRECT_URI = '/create';
+export const SOF_REDIRECT_URI = '/authenticate';
 export const SOF_RESOURCES = [
   'Patient',
   'AllergyIntolerance',

diff --git a/src/lib/sofClient.js b/src/lib/sofClient.js
@@ -1,7 +1,7 @@
 import FHIR from 'fhirclient';
-import { SOF_REDIRECT_URI, SOF_PATIENT_RESOURCES, SOF_RESOURCES } from './config';
+import { SOF_REDIRECT_URI, SOF_PATIENT_RESOURCES, SOF_RESOURCES } from './config.ts';
 
-export { authorize, getResources, getResourcesWithReferences, activePatient };
+export { authorize, getResources, getResourcesWithReferences, activePatient, endSession };
 
 const patientResourceScope = SOF_PATIENT_RESOURCES.map(resourceType => `patient/${resourceType}.read`);
 const resourceScope = patientResourceScope.join(" ");
@@ -44,7 +44,8 @@ function getReferences(obj, references) {
   }
 
 async function requestResources(client, resourceType) {
-    let endpoint = (resourceType == 'Patient' ? 'Patient/' : `${resourceType}?patient=`) + client.getPatientId();
+    // let endpoint = (resourceType == 'Patient' ? 'Patient/' : `${resourceType}?patient=`) + client.getPatientId();
+    let endpoint = "https://fhir.inform.dev.cirg.uw.edu/fhir/Patient";
     return client.request(endpoint, { flat: true }).then((result) => {
         let resourcesToPass = [];
         if (Array.isArray(result)) {
@@ -111,6 +112,14 @@ async function getResourcesWithReferences(depth=1) {
     return allResources;
 }
 
+function endSession() {
+    let key = sessionStorage.getItem('SMART_KEY');
+    if (key) {
+        sessionStorage.removeItem(JSON.parse(key));
+        sessionStorage.removeItem('SMART_KEY');
+    }
+}
+
 // Utility function to validate a URL
 function isValidUrl(url) {
     try {