Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions medcat-trainer/webapp/frontend/src/runtimeConfig.ts
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,12 @@ declare global {
*/
const DEFAULT_CONFIG: RuntimeConfig = {
USE_OIDC: '0',
KEYCLOAK_URL: 'http://keycloak.cogstack.localhost/',
KEYCLOAK_REALM: 'cogstack-realm',
KEYCLOAK_CLIENT_ID: 'cogstack-medcattrainer-frontend',
LOGOUT_REDIRECT_URI: 'http://launch.cogstack.localhost/',
KEYCLOAK_TOKEN_MIN_VALIDITY: 10000,
KEYCLOAK_TOKEN_REFRESH_INTERVAL: 30
KEYCLOAK_URL: '',
KEYCLOAK_REALM: '',
KEYCLOAK_CLIENT_ID: '',
LOGOUT_REDIRECT_URI: '',
KEYCLOAK_TOKEN_MIN_VALIDITY: 0,
KEYCLOAK_TOKEN_REFRESH_INTERVAL: 0
};

/**
Expand Down
58 changes: 34 additions & 24 deletions medcat-trainer/webapp/scripts/nginx-entrypoint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,30 +3,40 @@ set -e

echo "Generating runtime config.json from template..."

# Verify required environment variables are set
if [ -z "$VITE_USE_OIDC" ]; then
echo "ERROR: VITE_USE_OIDC environment variable is required"
exit 1
fi

if [ -z "$VITE_KEYCLOAK_URL" ]; then
echo "ERROR: VITE_KEYCLOAK_URL environment variable is required"
exit 1
fi

if [ -z "$VITE_KEYCLOAK_REALM" ]; then
echo "ERROR: VITE_KEYCLOAK_REALM environment variable is required"
exit 1
fi

if [ -z "$VITE_KEYCLOAK_CLIENT_ID" ]; then
echo "ERROR: VITE_KEYCLOAK_CLIENT_ID environment variable is required"
exit 1
fi

if [ -z "$VITE_LOGOUT_REDIRECT_URI" ]; then
echo "ERROR: VITE_LOGOUT_REDIRECT_URI environment variable is required"
exit 1
# Set VITE_USE_OIDC to 0 if not provided (traditional auth mode)
export VITE_USE_OIDC="${VITE_USE_OIDC:-0}"

# If OIDC is enabled, require all OIDC-related variables
if [ "$VITE_USE_OIDC" = "1" ]; then
echo "OIDC mode enabled - validating OIDC environment variables..."

if [ -z "$VITE_KEYCLOAK_URL" ]; then
echo "ERROR: VITE_KEYCLOAK_URL environment variable is required when VITE_USE_OIDC=1"
exit 1
fi

if [ -z "$VITE_KEYCLOAK_REALM" ]; then
echo "ERROR: VITE_KEYCLOAK_REALM environment variable is required when VITE_USE_OIDC=1"
exit 1
fi

if [ -z "$VITE_KEYCLOAK_CLIENT_ID" ]; then
echo "ERROR: VITE_KEYCLOAK_CLIENT_ID environment variable is required when VITE_USE_OIDC=1"
exit 1
fi

if [ -z "$VITE_LOGOUT_REDIRECT_URI" ]; then
echo "ERROR: VITE_LOGOUT_REDIRECT_URI environment variable is required when VITE_USE_OIDC=1"
exit 1
fi

else
echo "Traditional auth mode enabled (VITE_USE_OIDC=0)"
# Traditional auth mode - set defaults for unused variables
export VITE_KEYCLOAK_URL="${VITE_KEYCLOAK_URL:-http://localhost}"
export VITE_KEYCLOAK_REALM="${VITE_KEYCLOAK_REALM:-default}"
export VITE_KEYCLOAK_CLIENT_ID="${VITE_KEYCLOAK_CLIENT_ID:-medcattrainer}"
export VITE_LOGOUT_REDIRECT_URI="${VITE_LOGOUT_REDIRECT_URI:-/}"
fi

# Check if template exists
Expand Down