Skip to content

[Sync][master -> next][#3186]: Improve building authenticated org user for enhanced org authentication #3187

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

Open
github-actions wants to merge 1 commit into
base: next
Choose a base branch
from
Open

[Sync][master -> next][#3186]: Improve building authenticated org user for enhanced org authentication #3187

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
6 changes: 3 additions & 3 deletions ...rg.wso2.carbon.identity.oauth/src/main/java/org/wso2/carbon/identity/oauth/OAuthUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -766,7 +766,7 @@ private static AuthenticatedUser buildAuthenticatedUser(UserStoreManager userSto
.isPrimaryOrganization(managedOrg)) {
userId = OAuthComponentServiceHolder.getInstance().getOrganizationUserSharingService()
.getUserAssociation(userId, accessingOrg).getAssociatedUserId();
authenticatedUser.setUserName(userId);
authenticatedUser.setUserId(userId);
setOrganizationSSOUserDetails(authenticatedUser);
} else {
UserAssociation userAssociation = OAuthComponentServiceHolder.getInstance()
Expand Down Expand Up @@ -908,7 +908,7 @@ private static RoleBasicInfo getRoleBasicInfo(String roleId, String tenantDomain

/**
* Initiate token revocation process for the associated clientIds for the given user.
* @param clientIds Set of clientIds
* @param clientAppInfos Set of clientIds
* @param authenticatedUser Authenticated User object of the user.
* @param userStoreDomain User store domain of the user.
* @param username Username.
Expand Down Expand Up @@ -1071,7 +1071,7 @@ public static boolean revokeTokens(String username, UserStoreManager userStoreMa
authenticatedOrgUser.setUserName(authenticatedUserName);
authenticatedOrgUser.setUserResidentOrganization(authenticatedUser.
getUserResidentOrganization());
authenticatedOrgUser.setAccessingOrganization(authenticatedUser.getUserResidentOrganization());
authenticatedOrgUser.setAccessingOrganization(authenticatedUser.getAccessingOrganization());
authenticatedOrgUser.setFederatedUser(false);
authenticatedOrgUser.setUserStoreDomain(user.get().getUserStoreDomain());
String userTenantDomain = OAuthComponentServiceHolder.getInstance().
Expand Down