Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix active user sessions not retrieved for b2b users accessing MyAccount #188

Merged
merged 3 commits into from
Nov 20, 2023
Merged

Fix active user sessions not retrieved for b2b users accessing MyAccount #188

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4450c6f
Fix active user sessions not retrieved for b2b users accessing MyAccount
sadilchamishka Nov 19, 2023
ffc3409
Address review comments
sadilchamishka Nov 20, 2023
353acab
Address review comments
sadilchamishka Nov 20, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion ...java/org/wso2/carbon/identity/rest/api/user/session/v1/core/SessionManagementService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -92,7 +94,7 @@ public class SessionManagementService {
public SessionsDTO getSessionsBySessionId(User user, Integer limit, Integer offset, String filter, String sort) {

String userId;
if (isFederatedUser()) {
if (isFederatedUser() && !isOrganizationSsoUser()) {
userId = getFederatedUserIdFromUser(user);
} else {
userId = getUserIdFromUser(user);
Expand Down Expand Up @@ -400,6 +402,12 @@ private boolean isFederatedUser() {
(boolean) IdentityUtil.threadLocalProperties.get().get(IS_FEDERATED_USER);
}

private boolean isOrganizationSsoUser() {

return isFederatedUser() && StringUtils.isNotEmpty(PrivilegedCarbonContext.getThreadLocalCarbonContext()
.getUserResidentOrganizationId());
}

/**
* Get the filter nodes as a list.
*
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
Loading