From 99e331d91ea22cdb50e456e6b6095e9da4bea5f2 Mon Sep 17 00:00:00 2001
From: sadilchamishka <sandilchamishka@gmail.com>
Date: Fri, 22 Dec 2023 10:00:28 +0530
Subject: [PATCH] step1

---
 .../auth/service/handler/AuthenticationHandler.java         | 6 +++---
 pom.xml                                                     | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/components/org.wso2.carbon.identity.auth.service/src/main/java/org/wso2/carbon/identity/auth/service/handler/AuthenticationHandler.java b/components/org.wso2.carbon.identity.auth.service/src/main/java/org/wso2/carbon/identity/auth/service/handler/AuthenticationHandler.java
index 95422587..930df9e6 100644
--- a/components/org.wso2.carbon.identity.auth.service/src/main/java/org/wso2/carbon/identity/auth/service/handler/AuthenticationHandler.java
+++ b/components/org.wso2.carbon.identity.auth.service/src/main/java/org/wso2/carbon/identity/auth/service/handler/AuthenticationHandler.java
@@ -128,8 +128,8 @@ protected void postAuthenticate(MessageContext messageContext, AuthenticationRes
                     AuthenticatedUser authenticatedUser;
                     if (user instanceof AuthenticatedUser) {
                         authenticatedUser = (AuthenticatedUser) user;
-                        // For B2B organization users, set the user ID which is set as username in user object.
-                        if (authenticatedUser.isFederatedUser() && StringUtils.isNotEmpty(authorizedOrganization)) {
+                        // For organization SSO users, set the user ID which is set as username in user object.
+                        if (authenticatedUser.isOrganizationSSOUser()) {
                             String userName = MultitenantUtils.getTenantAwareUsername(authenticatedUser.getUserName());
                             userName = UserCoreUtil.removeDomainFromName(userName);
                             PrivilegedCarbonContext.getThreadLocalCarbonContext().setUserId(userName);
@@ -146,7 +146,7 @@ protected void postAuthenticate(MessageContext messageContext, AuthenticationRes
                 }
 
                 if (StringUtils.isNotEmpty(authorizedOrganization)) {
-                    // Set the user's resident organization if user is accessing an organization
+                    // Set the user's resident organization in the carbon context if user is accessing an organization
                     PrivilegedCarbonContext.getThreadLocalCarbonContext()
                             .setUserResidentOrganizationId(userResidentOrganization);
                     if (((AuthenticatedUser) user).isFederatedUser()) {
diff --git a/pom.xml b/pom.xml
index 04336d8b..b8d98ec8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -350,7 +350,7 @@
         <org.wso2.carbon.identity.cors.valve.version>${project.version}</org.wso2.carbon.identity.cors.valve.version>
 
         <!--Carbon identity version-->
-        <identity.framework.version>5.25.652</identity.framework.version>
+        <identity.framework.version>7.0.46</identity.framework.version>
         <carbon.identity.package.import.version.range>[5.17.8, 8.0.0)</carbon.identity.package.import.version.range>
 
         <org.wso2.carbon.identity.oauth.version>6.11.168</org.wso2.carbon.identity.oauth.version>