Fetch app id in legacy runtime

wso2-extensions · Nov 13, 2023 · 6d3f991 · 6d3f991
1 parent ff7547b
commit 6d3f991
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/...ava/org/wso2/carbon/identity/oauth2/grant/organizationswitch/OrganizationSwitchGrant.java b/...ava/org/wso2/carbon/identity/oauth2/grant/organizationswitch/OrganizationSwitchGrant.java
@@ -88,7 +88,12 @@ public boolean validateGrant(OAuthTokenReqMessageContext tokReqMsgCtx) throws Id
         String appResideOrgId = getOrganizationIdFromTenantDomain(authorizedUser.getTenantDomain());
         OAuthAppDO oAuthAppDO = (OAuthAppDO) tokReqMsgCtx.getProperty(OAUTH_APP_PROPERTY);
         String appName = oAuthAppDO.getApplicationName();
-        String appId = getAppID(appName, authorizedUser.getTenantDomain());
+        String appId;
+        if (CarbonConstants.ENABLE_LEGACY_AUTHZ_RUNTIME && "Console".equalsIgnoreCase(appName)) {
+            appId = oAuthAppDO.getOauthConsumerKey();
+        } else {
+            appId = getAppID(appName, authorizedUser.getTenantDomain());
+        }
         checkOrganizationIsAllowedToSwitch(appResideOrgId, accessingOrgId, appId, appName);
 
         AuthenticatedUser authenticatedUser = new AuthenticatedUser(authorizedUser);