diff --git a/config/env.js b/config/env.js index 1814baf1a..11c0dc8ed 100644 --- a/config/env.js +++ b/config/env.js @@ -91,7 +91,7 @@ function getClientEnvironment(publicUrl) { CLIENT_SECRET: process.env.CLIENT_SECRET || 'appbuilder_secret', KEYCLOAK_ENABLED: process.env.KEYCLOAK_ENABLED === 'true', APP_BUILDER_VERSION: process.env.npm_package_version || '', - ENTANDO_VIRTUAL_CONTEXTS: process.env.ENTANDO_VIRTUAL_CONTEXTS || '', + AB_ENTANDO_VIRTUAL_CONTEXTS: process.env.AB_ENTANDO_VIRTUAL_CONTEXTS || '', DOMAIN_CM: process.env.DOMAIN_CM || '', }, ); diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh index e89b3f088..eb9720bf6 100755 --- a/docker-entrypoint.sh +++ b/docker-entrypoint.sh @@ -5,7 +5,7 @@ ENV_JSON='{' [ -n "${DOMAIN:-""}" ] && ENV_JSON+='"DOMAIN":"'"$DOMAIN"'", ' [ -n "${DOMAIN_CM:-""}" ] && ENV_JSON+='"DOMAIN_CM":"'"$DOMAIN_CM"'", ' [ -n "${KEYCLOAK_JSON:-""}" ] && ENV_JSON+='"KEYCLOAK_JSON":"'"$KEYCLOAK_JSON"'", ' -[ -n "${ENTANDO_VIRTUAL_CONTEXTS:-""}" ] && ENV_JSON+='"ENTANDO_VIRTUAL_CONTEXTS":"'"$ENTANDO_VIRTUAL_CONTEXTS"'"' +[ -n "${AB_ENTANDO_VIRTUAL_CONTEXTS:-""}" ] && ENV_JSON+='"AB_ENTANDO_VIRTUAL_CONTEXTS":"'"$AB_ENTANDO_VIRTUAL_CONTEXTS"'"' ENV_JSON+='}' ESCAPED_ENV_JSON=$(echo $ENV_JSON | sed 's/\"/\\\"/g' | sed 's/\//\\\//g' | tr -d '\n' | tr -d '[[:blank:]]') diff --git a/src/helpers/contextUtils.js b/src/helpers/contextUtils.js index eab82c308..3c6711ece 100644 --- a/src/helpers/contextUtils.js +++ b/src/helpers/contextUtils.js @@ -5,8 +5,8 @@ const getContextFromURL = (pathname) => { const publicUrlIndex = pathFragments.findIndex(el => el === process.env.PUBLIC_URL.replace('/', '')); const context = pathFragments[publicUrlIndex + 1]; - const { ENTANDO_VIRTUAL_CONTEXTS } = getRuntimeEnv(); - const virtualContexts = ENTANDO_VIRTUAL_CONTEXTS.split(','); + const { AB_ENTANDO_VIRTUAL_CONTEXTS } = getRuntimeEnv(); + const virtualContexts = AB_ENTANDO_VIRTUAL_CONTEXTS.split(','); if (virtualContexts.includes(context)) return context; return ''; }; diff --git a/src/helpers/getRuntimeEnv.js b/src/helpers/getRuntimeEnv.js index d323c35b2..e54f6cb22 100644 --- a/src/helpers/getRuntimeEnv.js +++ b/src/helpers/getRuntimeEnv.js @@ -24,7 +24,7 @@ const getContextFromURL = (pathname, entVirtualContexts) => { }; const validateDomain = (domain) => { - const virtualContext = getContextFromURL(window.location.pathname, getEnvVar('ENTANDO_VIRTUAL_CONTEXTS')); + const virtualContext = getContextFromURL(window.location.pathname, getEnvVar('AB_ENTANDO_VIRTUAL_CONTEXTS')); if (domain) { const isValidURL = isURL(domain, { allow_protocol_relative_urls: true, @@ -54,6 +54,6 @@ export default () => ({ COMPONENT_REPOSITORY_UI_ENABLED: getBooleanEnvVar('COMPONENT_REPOSITORY_UI_ENABLED'), DOMAIN: validateDomain(getEnvVar('DOMAIN')), KEYCLOAK_JSON: getEnvVar('KEYCLOAK_JSON') || `${validateDomain(getEnvVar('DOMAIN'))}/keycloak.json`, - ENTANDO_VIRTUAL_CONTEXTS: getEnvVar('ENTANDO_VIRTUAL_CONTEXTS'), + AB_ENTANDO_VIRTUAL_CONTEXTS: getEnvVar('AB_ENTANDO_VIRTUAL_CONTEXTS'), DOMAIN_CM: getEnvVar('DOMAIN_CM'), }); diff --git a/src/ui/internal-page/ContextSelect.js b/src/ui/internal-page/ContextSelect.js index 2e47b1379..80d916310 100644 --- a/src/ui/internal-page/ContextSelect.js +++ b/src/ui/internal-page/ContextSelect.js @@ -4,7 +4,7 @@ import { injectIntl, intlShape } from 'react-intl'; import getRuntimeEnv from 'helpers/getRuntimeEnv'; import { determineBestLandingUrl, getContextFromURL } from 'helpers/contextUtils'; -const { ENTANDO_VIRTUAL_CONTEXTS } = getRuntimeEnv(); +const { AB_ENTANDO_VIRTUAL_CONTEXTS } = getRuntimeEnv(); const ContextSelect = ({ intl }) => (