Skip to content

Commit 24a4ced

Browse files
committed
update to prefer globalConfig for env vars
1 parent 68cc644 commit 24a4ced

File tree

3 files changed

+8
-7
lines changed

3 files changed

+8
-7
lines changed

src/app.html

+1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
<meta charset="utf-8" />
55
<link rel="icon" href="%sveltekit.assets%/favicon.png" />
66
<meta name="viewport" content="width=device-width, initial-scale=1, minimum-scale=1" />
7+
<script src="/env.js" type="text/javascript"></script>
78

89
%sveltekit.head%
910
</head>

src/lib/config.ts

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
// import {PUBLIC_BASE_URL} from '$env/static/public';
22
import { dev } from '$app/environment';
33

4-
export const API_BASE = import.meta.env.VITE_API_BASE;
4+
export const API_BASE = ( window.globalConfig?.VITE_API_BASE ?? import.meta.env.VITE_API_BASE);
55

6-
export const INTERMEDIATE_FHIR_SERVER_BASE = import.meta.env.VITE_INTERMEDIATE_FHIR_SERVER_BASE;
6+
export const INTERMEDIATE_FHIR_SERVER_BASE = ( window.globalConfig?.VITE_INTERMEDIATE_FHIR_SERVER_BASE ?? import.meta.env.VITE_INTERMEDIATE_FHIR_SERVER_BASE);
77

8-
export const FHIR_R4_EXTERNAL_ID_SYSTEM = import.meta.env.VITE_FHIR_R4_EXTERNAL_ID_SYSTEM;
8+
export const FHIR_R4_EXTERNAL_ID_SYSTEM = ( window.globalConfig?.VITE_FHIR_R4_EXTERNAL_ID_SYSTEM ?? import.meta.env.VITE_FHIR_R4_EXTERNAL_ID_SYSTEM);
99

1010
export const SOF_RESOURCES = [
1111
'Patient',
@@ -68,16 +68,16 @@ export const SOF_HOSTS = [
6868
{
6969
id: "keycloak",
7070
name: "Let's Talk Tech Login",
71-
iss: import.meta.env.VITE_SOF_ISS,//"https://fhir-auth.inform.dev.cirg.uw.edu/fhir",
72-
clientId: import.meta.env.VITE_SOF_CLIENT_ID, // shl_creator
71+
iss: ( window.globalConfig?.VITE_SOF_ISS ?? import.meta.env.VITE_SOF_ISS),//"https://fhir-auth.inform.dev.cirg.uw.edu/fhir",
72+
clientId: ( window.globalConfig?.VITE_SOF_CLIENT_ID ?? import.meta.env.VITE_SOF_CLIENT_ID), // shl_creator
7373
scope: keycloakScope,
7474
redirect_uri: SOF_REDIRECT_URI,
7575
note: "Credentials provided"
7676
}
7777
];
7878

7979
export const VIEWER_BASE = new URL(
80-
(import.meta.env.VITE_VIEWER_BASE ? import.meta.env.VITE_VIEWER_BASE : `/ips${dev ? '/index.html' : ''}`)+'#',
80+
(( window.globalConfig?.VITE_VIEWER_BASE ?? import.meta.env.VITE_VIEWER_BASE) ? ( window.globalConfig?.VITE_VIEWER_BASE ?? import.meta.env.VITE_VIEWER_BASE) : `/ips${dev ? '/index.html' : ''}`)+'#',
8181
window.location.href
8282
).toString();
8383
export const PATIENT_IPS = {

src/routes/+page.svelte

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,5 @@
66
77
let shlClient: SHLClient = getContext('shlClient');
88
let shlStore: Writable<SHLAdminParams[]> = getContext('shlStore');
9-
goto('/home');
9+
goto('/share');
1010
</script>

0 commit comments

Comments
 (0)