Skip to content

Remove claim retrieval skip logic from recursive methods. #4438

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

Merged
PasinduYeshan merged 1 commit into from
Dec 5, 2025
Merged

Remove claim retrieval skip logic from recursive methods. #4438

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
26 changes: 0 additions & 26 deletions ...on.user.core/src/main/java/org/wso2/carbon/user/core/common/AbstractUserStoreManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3267,19 +3267,6 @@ private List<String> doGetUserList(String claim, String claimValue, String profi
// For all the user stores append the domain name to the claim and pass it recursively (Including PRIMARY).
String domainName = ((AbstractUserStoreManager) userStoreManager).getMyDomainName();

try {
if (isIdentityStoreManagedClaim(claimManager.getClaim(claim), domainName, userStoreManager)) {
if (log.isDebugEnabled()) {
log.debug("The claim: " + claim + " is an identity store managed claim for the domain: "
+ domainName + ". Hence skipping the user store.");
}
continue;
}
} catch (org.wso2.carbon.user.api.UserStoreException e) {
log.error(String.format("Error occurred while retrieving claim for claim URI: %s for domain: %s.",
claim, domainName), e);
}

String claimValueWithDomain;
if (StringUtils.equalsIgnoreCase(domainName, UserCoreConstants.PRIMARY_DEFAULT_DOMAIN_NAME)) {
claimValueWithDomain = domainName + CarbonConstants.DOMAIN_SEPARATOR + claimValue;
Expand Down Expand Up @@ -3543,19 +3530,6 @@ private List<User> doGetUserListWithID(String claim, String claimValue, String p
// For all the user stores append the domain name to the claim and pass it recursively (Including PRIMARY).
String domainName = ((AbstractUserStoreManager) userStoreManager).getMyDomainName();

try {
if (isIdentityStoreManagedClaim(claimManager.getClaim(claim), domainName, userStoreManager)) {
if (log.isDebugEnabled()) {
log.debug("The claim: " + claim + " is an identity store managed claim for the domain: "
+ domainName + ". Hence skipping the user store.");
}
continue;
}
} catch (org.wso2.carbon.user.api.UserStoreException e) {
log.error(String.format("Error occurred while retrieving claim for claim URI: %s for domain: %s.",
claim, domainName), e);
}

String claimValueWithDomain;
if (StringUtils.equalsIgnoreCase(domainName, UserCoreConstants.PRIMARY_DEFAULT_DOMAIN_NAME)) {
claimValueWithDomain = domainName + CarbonConstants.DOMAIN_SEPARATOR + claimValue;
Expand Down