Merge pull request #5426 from sadilchamishka/fix-organizaion-sso-issue

Fix organization SSO failure for multiple b2b apps
wso2 · Jan 25, 2024 · 8cf73b7 · 8cf73b7
2 parents 5188a85 + bd889d9
commit 8cf73b7
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/...n/identity/application/authentication/framework/handler/step/impl/DefaultStepHandler.java b/...n/identity/application/authentication/framework/handler/step/impl/DefaultStepHandler.java
@@ -553,7 +553,8 @@ protected void handleHomeRealmDiscovery(HttpServletRequest request,
 
             if (authenticatedStepIdps.containsKey(idpName)
                     && !(context.isForceAuthenticate() || stepConfig.isForced())
-                    && !context.isReAuthenticate()) {
+                    && !context.isReAuthenticate()
+                    && !FrameworkConstants.ORGANIZATION_LOGIN_HOME_REALM_IDENTIFIER.equals(homeRealm)) {
                 // skip the step if this is a normal request
                 AuthenticatedIdPData authenticatedIdPData = authenticatedIdPs.get(idpName);
                 populateStepConfigWithAuthenticationDetails(stepConfig, authenticatedIdPData, authenticatedStepIdps

diff --git a/...rg/wso2/carbon/identity/application/authentication/framework/util/FrameworkConstants.java b/...rg/wso2/carbon/identity/application/authentication/framework/util/FrameworkConstants.java
@@ -148,6 +148,7 @@ public abstract class FrameworkConstants {
     public static final String AUTHENTICATION_CONTEXT_PROPERTIES = "AUTHENTICATION_CONTEXT_PROPERTIES";
     public static final String ORGANIZATION_USER_PROPERTIES = "ORGANIZATION_USER_PROPERTIES";
     public static final String ORGANIZATION_AUTHENTICATOR = "OrganizationAuthenticator";
+    public static final String ORGANIZATION_LOGIN_HOME_REALM_IDENTIFIER = "OrganizationSSO";
     public static final String ORG_ID_PARAMETER = "orgId";
     public static final String USER_ORGANIZATION_CLAIM = "user_organization";
     public static final String SESSION_AUTH_HISTORY = "SESSION_AUTH_HISTORY";