diff --git a/cce/modules/project-manager-compose.yml b/cce/modules/project-manager-compose.yml index 957dcee..0e1c8ea 100644 --- a/cce/modules/project-manager-compose.yml +++ b/cce/modules/project-manager-compose.yml @@ -35,9 +35,9 @@ services: SPRING_MAIL_TEST_PORT: "1025" TEST_EMAIL_DOMAINS: "test.dkfz.de" DB_ENCRYPTION_PRIVATE_KEY_IN_BASE64: "${PROJECT_MANAGER_DB_ENCRYPTION_PRIVATE_KEY_IN_BASE64}" - OIDC_CLIENT_ID: "${OIDC_PUBLIC_CLIENT_ID}" - OIDC_CLIENT_SECRET: "${OIDC_PUBLIC}" - OIDC_URL: "${OIDC_URL}" + OIDC_URL: "${PM_OIDC_URL}" + OIDC_CLIENT_ID: "${PM_OIDC_PRIVATE_CLIENT_ID}" + OIDC_CLIENT_SECRET: "${PM_OIDC_PRIVATE_SECRET}" # Ignore these variables. Remove after disable module in project manager doesn't require disabled module variables APP_REGISTER_BASE_URL: "http://beam-register:3000" @@ -106,8 +106,8 @@ services: image: samply/project-manager-ui:develop environment: STANDALONE_SINGLE_SPA: "true" - VUE_APP_OIDC_URL: "${OIDC_URL}" - VUE_APP_OIDC_CLIENT_ID: "${OIDC_PUBLIC_CLIENT_ID}" + VUE_APP_OIDC_URL: "${PM_OIDC_URL}" + VUE_APP_OIDC_CLIENT_ID: "${PM_OIDC_PUBLIC_CLIENT_ID}" VUE_APP_PROJECT_MANAGER_BACKEND_URL: "https://${HOST}/requester-api" VUE_APP_FRONTEND_NAME: "CCE BioDataHub Requester" labels: diff --git a/cce/modules/project-manager-setup.sh b/cce/modules/project-manager-setup.sh index dc068b9..f1f976e 100644 --- a/cce/modules/project-manager-setup.sh +++ b/cce/modules/project-manager-setup.sh @@ -16,4 +16,9 @@ if [ "$ENABLE_PROJECT_MANAGER" == true ]; then SQL_GUI_AUTH="$(echo \"This is a salt string to generate one consistent basic authentication password for the project manager database GUI. It is not required to be secret.\" | sha1sum | openssl pkeyutl -sign -inkey /etc/bridgehead/pki/${SITE_ID}.priv.pem | base64 | head -c 30)" TEST_SMTP_AUTH="$(echo \"This is a salt string to generate one consistent basic authentication password for the project manager test SMTP server. It is not required to be secret.\" | sha1sum | openssl pkeyutl -sign -inkey /etc/bridgehead/pki/${SITE_ID}.priv.pem | base64 | head -c 30)" + PM_OIDC_URL="https://sso.verbis.dkfz.de/application/o/cce-project-manager-api/" + PM_OIDC_PUBLIC_CLIENT_ID="cce-project-manager-ui" + PM_OIDC_PRIVATE_CLIENT_ID="cce-project-manager-api" + PM_OIDC_PRIVATE_SECRET="$(echo \"This is a salt string to generate the private secret for the project manager oidc public client. It is not required to be secret.\" | sha1sum | openssl pkeyutl -sign -inkey /etc/bridgehead/pki/${SITE_ID}.priv.pem | base64 | head -c 30)" + fi