Merge pull request #188 from sadilchamishka/fix-active-session-not-re…

…trived-for-b2b-user-issue Fix active user sessions not retrieved for b2b users accessing MyAccount
wso2 · Nov 20, 2023 · 878b9f2 · 878b9f2
2 parents 87bb2af + 353acab
commit 878b9f2
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/...java/org/wso2/carbon/identity/rest/api/user/session/v1/core/SessionManagementService.java b/...java/org/wso2/carbon/identity/rest/api/user/session/v1/core/SessionManagementService.java
@@ -21,6 +21,7 @@
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.wso2.carbon.context.PrivilegedCarbonContext;
 import org.wso2.carbon.identity.api.user.common.error.APIError;
 import org.wso2.carbon.identity.api.user.common.error.ErrorResponse;
 import org.wso2.carbon.identity.api.user.common.function.UserToUniqueId;
@@ -53,6 +54,7 @@
 import java.util.List;
 import java.util.Optional;
 import java.util.stream.Collectors;
+
 import javax.ws.rs.core.Response;
 
 import static org.wso2.carbon.identity.api.user.common.Constants.ERROR_CODE_DELIMITER;
@@ -93,7 +95,14 @@ public SessionsDTO getSessionsBySessionId(User user, Integer limit, Integer offs
 
         String userId;
         if (isFederatedUser()) {
-            userId = getFederatedUserIdFromUser(user);
+            boolean isOrganizationSSOUser = StringUtils.isNotEmpty(PrivilegedCarbonContext.getThreadLocalCarbonContext()
+                    .getUserResidentOrganizationId());
+            // For organization SSO users, user ID resolve same as for a local user.
+            if (isOrganizationSSOUser) {
+                userId = getUserIdFromUser(user);
+            } else {
+                userId = getFederatedUserIdFromUser(user);
+            }
         } else {
             userId = getUserIdFromUser(user);
         }

diff --git a/pom.xml b/pom.xml
@@ -420,7 +420,7 @@
         <version.org.wso2.orbit.javax.xml.bind>2.3.1.wso2v1</version.org.wso2.orbit.javax.xml.bind>
         <maven.buildnumber.plugin.version>1.4</maven.buildnumber.plugin.version>
         <org.apache.felix.annotations.version>1.2.4</org.apache.felix.annotations.version>
-        <carbon.kernel.version>4.9.0</carbon.kernel.version>
+        <carbon.kernel.version>4.9.17</carbon.kernel.version>
         <identity.governance.version>1.8.73</identity.governance.version>
         <carbon.identity.framework.version>5.25.380</carbon.identity.framework.version>
         <carbon.identity.account.association.version>5.3.7</carbon.identity.account.association.version>