From 0a311fdddfecbe42e8ad8a956b5d2227bbf2d8bf Mon Sep 17 00:00:00 2001 From: Kittapath Date: Mon, 16 Oct 2023 00:31:36 +0700 Subject: [PATCH] set key cloak env --- .env.production | 5 ++++- entrypoint.sh | 5 ++++- src/plugins/keycloak.ts | 6 +++--- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/.env.production b/.env.production index 9fa54e36e..295eebac6 100644 --- a/.env.production +++ b/.env.production @@ -1,4 +1,7 @@ VITE_COMPETITIVE_EXAM_PANEL=VITE_COMPETITIVE_EXAM_PANEL VITE_QUALIFY_DISABLE_EMAM_PANEL=VITE_QUALIFY_DISABLE_EMAM_PANEL VITE_QUALIFY_EXAM_PANEL=VITE_QUALIFY_EXAM_PANEL -VITE_S3CLUSTER_PUBLIC_URL=VITE_S3CLUSTER_PUBLIC_URL \ No newline at end of file +VITE_S3CLUSTER_PUBLIC_URL=VITE_S3CLUSTER_PUBLIC_URL +VITE_REALM_KEYCLOAK=VITE_REALM_KEYCLOAK +VITE_CLIENTID_KEYCLOAK=VITE_CLIENTID_KEYCLOAK +VITE_URL_KEYCLOAK=VITE_URL_KEYCLOAK \ No newline at end of file diff --git a/entrypoint.sh b/entrypoint.sh index 59fe7828f..6de45f224 100644 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -4,7 +4,7 @@ ROOT_DIR=/app # Replace env vars in JavaScript files echo "Replacing env constants in JS" -for file in $ROOT_DIR/assets/app.*.js* $ROOT_DIR/js/app.*.js* $ROOT_DIR/index.html $ROOT_DIR/precache-manifest*.js; +for file in $ROOT_DIR/assets/app.*.js* $ROOT_DIR/js/app.*.js* $ROOT_DIR/index.html $ROOT_DIR/precache-manifest*.js $ROOT_DIR/assets/index*.js*; do echo "Processing $file ..."; @@ -12,6 +12,9 @@ do sed -i 's|VITE_QUALIFY_DISABLE_EMAM_PANEL|'${VITE_QUALIFY_DISABLE_EMAM_PANEL}'|g' $file sed -i 's|VITE_QUALIFY_EXAM_PANEL|'${VITE_QUALIFY_EXAM_PANEL}'|g' $file sed -i 's|VITE_S3CLUSTER_PUBLIC_URL|'${VITE_S3CLUSTER_PUBLIC_URL}'|g' $file + sed -i 's|VITE_REALM_KEYCLOAK|'${VITE_REALM_KEYCLOAK}'|g' $file + sed -i 's|VITE_CLIENTID_KEYCLOAK|'${VITE_CLIENTID_KEYCLOAK}'|g' $file + sed -i 's|VITE_URL_KEYCLOAK|'${VITE_URL_KEYCLOAK}'|g' $file done diff --git a/src/plugins/keycloak.ts b/src/plugins/keycloak.ts index 3c83199b4..2b54780aa 100644 --- a/src/plugins/keycloak.ts +++ b/src/plugins/keycloak.ts @@ -8,9 +8,9 @@ import Keycloak from "keycloak-js"; const initOptions = { // url: "https://keycloak.frappet.synology.me/auth/", - realm: "bma-ehr", - clientId: "bma-ehr-vue3", - url: "https://id.frappet.synology.me/", + realm: import.meta.env.VITE_REALM_KEYCLOAK, + clientId: import.meta.env.VITE_CLIENTID_KEYCLOAK, + url: import.meta.env.VITE_URL_KEYCLOAK, // realm: "bma-ehr-exam", // clientId: "bma-ehr-exam-vue3", }; //option keycloak ที่จะ connect