From ebafcf06b674a6236876eb73a2d0a879310a0c82 Mon Sep 17 00:00:00 2001
From: juarez <d.juarez@dkfz-heidelberg.de>
Date: Fri, 24 Nov 2023 08:52:54 +0100
Subject: [PATCH] Add keycloak configuration

---
 ccp/modules/datashield-compose.yml | 6 +++---
 ccp/modules/mtba-compose.yml       | 1 +
 ccp/modules/teiler-compose.yml     | 8 ++++----
 ccp/vars                           | 6 ++++++
 4 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/ccp/modules/datashield-compose.yml b/ccp/modules/datashield-compose.yml
index 78ff12f..bac8a07 100644
--- a/ccp/modules/datashield-compose.yml
+++ b/ccp/modules/datashield-compose.yml
@@ -41,9 +41,9 @@ services:
       APP_CONTEXT_PATH: "/opal"
       OPAL_PRIVATE_KEY: "/run/secrets/opal-key.pem"
       OPAL_CERTIFICATE: "/run/secrets/opal-cert.pem"
-      KEYCLOAK_URL: "https://login.verbis.dkfz.de"
-      KEYCLOAK_REALM: "test-realm-01"
-      KEYCLOAK_CLIENT_ID: "${SITE_ID}-private"
+      KEYCLOAK_URL: "${KEYCLOAK_URL}"
+      KEYCLOAK_REALM: "${KEYCLOAK_REALM}"
+      KEYCLOAK_CLIENT_ID: "${KEYCLOAK_PRIVATE_CLIENT_ID}"
       KEYCLOAK_CLIENT_SECRET: "${OIDC_CLIENT_SECRET}"
       KEYCLOAK_ADMIN_GROUP: "${KEYCLOAK_ADMIN_GROUP}"
       TOKEN_MANAGER_PASSWORD: "${TOKEN_MANAGER_OPAL_PASSWORD}"
diff --git a/ccp/modules/mtba-compose.yml b/ccp/modules/mtba-compose.yml
index 670d990..b448378 100644
--- a/ccp/modules/mtba-compose.yml
+++ b/ccp/modules/mtba-compose.yml
@@ -19,6 +19,7 @@ services:
       FILE_CHARSET: ${MTBA_FILE_CHARSET}
       FILE_END_OF_LINE: ${MTBA_FILE_END_OF_LINE}
       CSV_DELIMITER: ${MTBA_CSV_DELIMITER}
+      HTTP_RELATIVE_PATH: "/mtba"
     labels:
       - "traefik.enable=true"
       - "traefik.http.routers.mtba_ccp.rule=PathPrefix(`/mtba`)"
diff --git a/ccp/modules/teiler-compose.yml b/ccp/modules/teiler-compose.yml
index 659c9e2..14b8633 100644
--- a/ccp/modules/teiler-compose.yml
+++ b/ccp/modules/teiler-compose.yml
@@ -31,10 +31,10 @@ services:
     environment:
       DEFAULT_LANGUAGE: "${DEFAULT_LANGUAGE}"
       TEILER_BACKEND_URL: "https://${HOST}/ccp-teiler-backend"
-      KEYCLOAK_URL: "https://login.verbis.dkfz.de"
-      KEYCLOAK_REALM: "test-realm-01"
-      KEYCLOAK_CLIENT_ID: "${SITE_ID}-public"
-      KEYCLOAK_TOKEN_GROUP: "groups"
+      KEYCLOAK_URL: "${KEYCLOAK_URL}"
+      KEYCLOAK_REALM: "${KEYCLOAK_REALM}"
+      KEYCLOAK_CLIENT_ID: "${KEYCLOAK_PUBLIC_CLIENT_ID}"
+      KEYCLOAK_TOKEN_GROUP: "${KEYCLOAK_TOKEN_GROUP}"
       TEILER_ADMIN_NAME: "${OPERATOR_FIRST_NAME} ${OPERATOR_LAST_NAME}"
       TEILER_ADMIN_EMAIL: "${OPERATOR_EMAIL}"
       TEILER_ADMIN_PHONE: "${OPERATOR_PHONE}"
diff --git a/ccp/vars b/ccp/vars
index b133cf4..5ca76a2 100644
--- a/ccp/vars
+++ b/ccp/vars
@@ -15,6 +15,12 @@ ENABLE_TEILER=true
 
 KEYCLOAK_USER_GROUP="DKTK_CCP_$(capitalize_first_letter ${SITE_ID})"
 KEYCLOAK_ADMIN_GROUP="DKTK_CCP_$(capitalize_first_letter ${SITE_ID})_Verwalter"
+KEYCLOAK_PRIVATE_CLIENT_ID=${SITE_ID}-private
+KEYCLOAK_PUBLIC_CLIENT_ID=${SITE_ID}-public
+# TODO: Change Keycloak Realm to productive. "test-realm-01" is only for testing
+KEYCLOAK_REALM="test-realm-01"
+KEYCLOAK_URL="https://login.verbis.dkfz.de"
+KEYCLOAK_TOKEN_GROUP="groups"
 POSTGRES_TAG=15.6-alpine
 
 for module in $PROJECT/modules/*.sh