Add validateIDTokenIssuer into idpConfigs

wso2 · Dec 18, 2023 · 4e0f432 · 4e0f432
1 parent b3b5a88
commit 4e0f432
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 16 deletions.
diff --git a/...le/java/org.wso2.identity.apps.console.server.feature/resources/deployment.config.json.j2 b/...le/java/org.wso2.identity.apps.console.server.feature/resources/deployment.config.json.j2
@@ -1726,8 +1726,5 @@
         "theme": {
             "name": "{{ console.theme }}"
         }
-    }{{ "," if console.validate_id_token_issuer is defined }}
-    {% if console.validate_id_token_issuer is defined %}
-    "validateIDTokenIssuer": {{ console.validate_id_token_issuer }}
-    {% endif %}
+    }
 }
diff --git a/apps/console/src/features/authentication/utils/authenticate-utils.ts b/apps/console/src/features/authentication/utils/authenticate-utils.ts
@@ -60,7 +60,7 @@ export class AuthenticateUtils {
                 authorizationEndpoint: window["AppUtils"]?.getConfig()?.idpConfigs?.authorizeEndpointURL,
                 checkSessionIframe: window["AppUtils"]?.getConfig()?.idpConfigs?.oidcSessionIFrameEndpointURL,
                 endSessionEndpoint: window["AppUtils"]?.getConfig()?.idpConfigs?.logoutEndpointURL,
-                issuer: window["AppUtils"]?.getConfig().idpConfigs?.issuer,
+                issuer: window["AppUtils"]?.getConfig()?.idpConfigs?.issuer,
                 jwksUri: window["AppUtils"]?.getConfig()?.idpConfigs?.jwksEndpointURL,
                 revocationEndpoint: window["AppUtils"]?.getConfig()?.idpConfigs?.tokenRevocationEndpointURL,
                 tokenEndpoint: window["AppUtils"]?.getConfig()?.idpConfigs?.tokenEndpointURL
@@ -74,7 +74,7 @@ export class AuthenticateUtils {
             signInRedirectURL: window["AppUtils"]?.getConfig()?.loginCallbackURL,
             signOutRedirectURL: window["AppUtils"]?.getConfig()?.loginCallbackURL,
             storage: AuthenticateUtils.resolveStorage() as Storage.WebWorker,
-            validateIDTokenIssuer: window["AppUtils"].getConfig().validateIDTokenIssuer,
+            validateIDTokenIssuer: window["AppUtils"]?.getConfig()?.idpConfigs?.validateIDTokenIssuer,
             ...window["AppUtils"]?.getConfig().idpConfigs
         };
     };

diff --git a/apps/console/src/init/app-utils.ts b/apps/console/src/init/app-utils.ts
@@ -317,8 +317,7 @@ export const AppUtils: any = (function() {
                 tenantPath: this.getTenantPath(),
                 tenantPathWithoutSuperTenant: this.getTenantPath(true),
                 tenantPrefix: this.getTenantPrefix(),
-                ui: _config.ui,
-                validateIDTokenIssuer: _config.validateIDTokenIssuer ?? true
+                ui: _config.ui
             };
         },
 

diff --git a/.../java/org.wso2.identity.apps.myaccount.server.feature/resources/deployment.config.json.j2 b/.../java/org.wso2.identity.apps.myaccount.server.feature/resources/deployment.config.json.j2
@@ -389,8 +389,5 @@
         "theme": {
             "name": "{{ myaccount.theme }}"
         }
-    }{{ "," if myaccount.validate_id_token_issuer is defined }}
-    {% if myaccount.validate_id_token_issuer is defined %}
-    "validateIDTokenIssuer": {{ myaccount.validate_id_token_issuer }}
-    {% endif %}
+    }
 }
diff --git a/apps/myaccount/src/init/app-utils.ts b/apps/myaccount/src/init/app-utils.ts
@@ -222,8 +222,7 @@ export const AppUtils: AppUtilsInterface = (function() {
                 tenant: (this.isSuperTenant()) ? this.getSuperTenant() : this.getTenantName(),
                 tenantPath: this.getTenantPath(),
                 tenantPrefix: this.getTenantPrefix(),
-                ui: _config.ui,
-                validateIDTokenIssuer: _config.validateIDTokenIssuer ?? true
+                ui: _config.ui
             };
         },
 

diff --git a/apps/myaccount/src/utils/authenticate-util.ts b/apps/myaccount/src/utils/authenticate-util.ts
@@ -126,7 +126,7 @@ export const getAuthInitializeConfig = (): AuthReactConfig => {
             authorizationEndpoint: window["AppUtils"]?.getConfig().idpConfigs?.authorizeEndpointURL,
             checkSessionIframe: window["AppUtils"]?.getConfig().idpConfigs?.oidcSessionIFrameEndpointURL,
             endSessionEndpoint: window["AppUtils"]?.getConfig().idpConfigs?.logoutEndpointURL,
-            issuer: window["AppUtils"]?.getConfig().idpConfigs?.issuer,
+            issuer: window["AppUtils"]?.getConfig()?.idpConfigs?.issuer,
             jwksUri: window["AppUtils"]?.getConfig().idpConfigs?.jwksEndpointURL,
             revocationEndpoint: window["AppUtils"]?.getConfig().idpConfigs?.tokenRevocationEndpointURL,
             tokenEndpoint: window["AppUtils"]?.getConfig().idpConfigs?.tokenEndpointURL
@@ -139,7 +139,7 @@ export const getAuthInitializeConfig = (): AuthReactConfig => {
         signInRedirectURL: window["AppUtils"]?.getConfig().loginCallbackURL,
         signOutRedirectURL: window["AppUtils"]?.getConfig().loginCallbackURL,
         storage: resolveStorage() as Storage.WebWorker,
-        validateIDTokenIssuer: window["AppUtils"].getConfig().validateIDTokenIssuer,
+        validateIDTokenIssuer: window["AppUtils"]?.getConfig()?.idpConfigs?.validateIDTokenIssuer,
         ...window["AppUtils"]?.getConfig().idpConfigs
     };
 };