From d8531dcb30368ecaa92787617c53d8821d9ebe2f Mon Sep 17 00:00:00 2001 From: Soni Jay Date: Mon, 5 Jan 2026 07:34:11 +0530 Subject: [PATCH] WEB-550 Fix OAUTH (Zitadel) (#2966) --- src/environments/environment.prod.ts | 14 +++++++++----- src/environments/environment.ts | 14 +++++++++----- 2 files changed, 18 insertions(+), 10 deletions(-) diff --git a/src/environments/environment.prod.ts b/src/environments/environment.prod.ts index b75678666..6abeecb3e 100644 --- a/src/environments/environment.prod.ts +++ b/src/environments/environment.prod.ts @@ -73,11 +73,15 @@ export const environment = { minPasswordLength: loadedEnv['minPasswordLength'] || 12, OIDC: { - oidcServerEnabled: window['env']['oidcServerEnabled'] === true || window['env']['oidcServerEnabled'] === 'true', - oidcBaseUrl: window['env']['oidcBaseUrl'] || '', - oidcClientId: window['env']['oidcClientId'] || '', - oidcApiUrl: window['env']['oidcApiUrl'] || '', - oidcFrontUrl: window['env']['oidcFrontUrl'] || '' + // Support legacy FINERACT_PLUGIN_OIDC_* variable names for backward compatibility + oidcServerEnabled: + loadedEnv['oidcServerEnabled'] === true || + loadedEnv['oidcServerEnabled'] === 'true' || + loadedEnv['FINERACT_PLUGIN_OIDC_ENABLED'] === 'true', + oidcBaseUrl: loadedEnv['oidcBaseUrl'] || loadedEnv['FINERACT_PLUGIN_OIDC_BASE_URL'] || '', + oidcClientId: loadedEnv['oidcClientId'] || loadedEnv['FINERACT_PLUGIN_OIDC_CLIENT_ID'] || '', + oidcApiUrl: loadedEnv['oidcApiUrl'] || loadedEnv['FINERACT_PLUGIN_OIDC_API_URL'] || '', + oidcFrontUrl: loadedEnv['oidcFrontUrl'] || loadedEnv['FINERACT_PLUGIN_OIDC_FRONTEND_URL'] || '' } }; diff --git a/src/environments/environment.ts b/src/environments/environment.ts index cba31acf9..7adfe81aa 100644 --- a/src/environments/environment.ts +++ b/src/environments/environment.ts @@ -77,11 +77,15 @@ export const environment = { minPasswordLength: loadedEnv.minPasswordLength || 12, OIDC: { - oidcServerEnabled: window['env']['oidcServerEnabled'] === true || window['env']['oidcServerEnabled'] === 'true', - oidcBaseUrl: window['env']['oidcBaseUrl'] || '', - oidcClientId: window['env']['oidcClientId'] || '', - oidcApiUrl: window['env']['oidcApiUrl'] || '', - oidcFrontUrl: window['env']['oidcFrontUrl'] || '' + // Support legacy FINERACT_PLUGIN_OIDC_* variable names for backward compatibility + oidcServerEnabled: + loadedEnv.oidcServerEnabled === true || + loadedEnv.oidcServerEnabled === 'true' || + loadedEnv.FINERACT_PLUGIN_OIDC_ENABLED === 'true', + oidcBaseUrl: loadedEnv.oidcBaseUrl || loadedEnv.FINERACT_PLUGIN_OIDC_BASE_URL || '', + oidcClientId: loadedEnv.oidcClientId || loadedEnv.FINERACT_PLUGIN_OIDC_CLIENT_ID || '', + oidcApiUrl: loadedEnv.oidcApiUrl || loadedEnv.FINERACT_PLUGIN_OIDC_API_URL || '', + oidcFrontUrl: loadedEnv.oidcFrontUrl || loadedEnv.FINERACT_PLUGIN_OIDC_FRONTEND_URL || '' } };