diff --git a/.env b/.env index 3d07b58f0..872a5e0c4 100644 --- a/.env +++ b/.env @@ -2,6 +2,8 @@ VITE_COMPETITIVE_EXAM_PANEL: "https://bma-dashboard.frappet.synology.me/goto/KO0 VITE_QUALIFY_DISABLE_EMAM_PANEL: "https://bma-dashboard.frappet.synology.me/goto/dQQzpIX4z?orgId=1" VITE_QUALIFY_EXAM_PANEL: "https://bma-dashboard.frappet.synology.me/goto/cj1ZtIX4z?orgId=1" VITE_S3CLUSTER_PUBLIC_URL: "https://s3cluster.frappet.com/bma-ehr-fpt/organization/strueture/" + +VITE_URL_KEYCLOAK: "https://id.frappet.synology.me" VITE_REALM_KEYCLOAK: "bma-ehr" -VITE_CLIENTID_KEYCLOAK: "bma-ehr-vue3" -VITE_URL_KEYCLOAK: "https://id.frappet.synology.me/" \ No newline at end of file +VITE_CLIENTID_KEYCLOAK: "gettoken" +VITE_CLIENTSECRET_KEYCLOAK: "qsFwDb5anVoXKKwoeivrByIn9VYWQNRn" \ No newline at end of file diff --git a/.env.production b/.env.production index 7d20397f2..442b3bf30 100644 --- a/.env.production +++ b/.env.production @@ -7,13 +7,7 @@ VITE_CLIENTID_KEYCLOAK=VITE_CLIENTID_KEYCLOAK VITE_URL_KEYCLOAK=VITE_URL_KEYCLOAK VITE_API_PUBLISH_URL=VITE_API_PUBLISH_URL VITE_API_REPORT_URL=VITE_API_REPORT_URL - -# VITE_COMPETITIVE_EXAM_PANEL: "https://bma-dashboard.frappet.synology.me/goto/KO0GpSu4z?orgId=1" -# VITE_QUALIFY_DISABLE_EMAM_PANEL: "https://bma-dashboard.frappet.synology.me/goto/dQQzpIX4z?orgId=1" -# VITE_QUALIFY_EXAM_PANEL: "https://bma-dashboard.frappet.synology.me/goto/cj1ZtIX4z?orgId=1" -# VITE_S3CLUSTER_PUBLIC_URL: "https://s3cluster.frappet.com/bma-ehr-fpt/organization/strueture/" -# VITE_REALM_KEYCLOAK: "bma-ehr" -# VITE_CLIENTID_KEYCLOAK: "bma-ehr-vue3" -# VITE_URL_KEYCLOAK: "https://id.frappet.synology.me/" -# VITE_API_PUBLISH_URL: "https://bma-ehr-publish.frappet.synology.me" -# VITE_API_REPORT_URL: "https://report-server.frappet.synology.me/api/v1/report-template" \ No newline at end of file +VITE_URL_KEYCLOAK: VITE_URL_KEYCLOAK +VITE_REALM_KEYCLOAK: VITE_REALM_KEYCLOAK +VITE_CLIENTID_KEYCLOAK: VITE_CLIENTID_KEYCLOAK +VITE_CLIENTSECRET_KEYCLOAK: VITE_CLIENTSECRET_KEYCLOAK \ No newline at end of file diff --git a/entrypoint.sh b/entrypoint.sh index d9b2d4220..09ca0b056 100644 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -17,6 +17,10 @@ do sed -i 's|VITE_URL_KEYCLOAK|'${VITE_URL_KEYCLOAK}'|g' $file sed -i 's|VITE_API_PUBLISH_URL|'${VITE_API_PUBLISH_URL}'|g' $file sed -i 's|VITE_API_REPORT_URL|'${VITE_API_REPORT_URL}'|g' $file + sed -i 's|VITE_URL_KEYCLOAK|'${VITE_URL_KEYCLOAK}'|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_CLIENTSECRET_KEYCLOAK|'${VITE_CLIENTSECRET_KEYCLOAK}'|g' $file done diff --git a/src/plugins/keycloak.ts b/src/plugins/keycloak.ts index 19e0f9aff..b1ac26ca0 100644 --- a/src/plugins/keycloak.ts +++ b/src/plugins/keycloak.ts @@ -4,10 +4,10 @@ import Keycloak from "keycloak-js"; const ACCESS_TOKEN = "BMAHRIS_KEYCLOAK_IDENTITY"; const REFRESH_TOKEN = "BMAHRIS_KEYCLOAK_REFRESH"; const keycloakConfig = { - url: "https://id.frappet.synology.me", - realm: "bma-ehr", - clientId: "gettoken", - clientSecret: "qsFwDb5anVoXKKwoeivrByIn9VYWQNRn", + url: import.meta.env.VITE_URL_KEYCLOAK, + realm: import.meta.env.VITE_REALM_KEYCLOAK, + clientId: import.meta.env.VITE_CLIENTID_KEYCLOAK, + clientSecret: import.meta.env.VITE_CLIENTSECRET_KEYCLOAK, }; const keycloak = new Keycloak(keycloakConfig);