Provide support for organization bound tokens for B2B applications #2187
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
sadilchamishka
force-pushed
the
add-authorized-organization-oauth2-token-table
branch
5 times, most recently
from
d8a771d to
e3dc8b2
Compare
sadilchamishka
commented
Oct 15, 2023
...entity.oauth/src/main/java/org/wso2/carbon/identity/oauth2/dao/AuthorizationCodeDAOImpl.java
Show resolved
Hide resolved
|
PR builder started |
sadilchamishka
commented
Oct 15, 2023
...identity.oauth/src/main/java/org/wso2/carbon/identity/oauth2/dao/TokenManagementDAOImpl.java
Show resolved
Hide resolved
sadilchamishka
commented
Oct 15, 2023
.../org/wso2/carbon/identity/oauth2/token/handlers/grant/AbstractAuthorizationGrantHandler.java
Show resolved
Hide resolved
sadilchamishka
commented
Oct 15, 2023
...va/org/wso2/carbon/identity/oauth2/validators/JDBCPermissionBasedInternalScopeValidator.java
Show resolved
Hide resolved
sadilchamishka
commented
Oct 15, 2023
...bon.identity.oauth/src/main/java/org/wso2/carbon/identity/oauth2/dao/AccessTokenDAOImpl.java
Show resolved
Hide resolved
sadilchamishka
commented
Oct 15, 2023
...bon.identity.oauth/src/main/java/org/wso2/carbon/identity/oauth2/dao/AccessTokenDAOImpl.java
Show resolved
Hide resolved
sadilchamishka
commented
Oct 15, 2023
...bon.identity.oauth/src/main/java/org/wso2/carbon/identity/oauth2/dao/AccessTokenDAOImpl.java
Show resolved
Hide resolved
|
PR builder completed |
|
PR builder started |
|
PR builder completed |
|
PR builder started |
|
PR builder completed |
jenkins-is-staging
approved these changes
Oct 16, 2023
There was a problem hiding this comment.
Approving the pull request based on the successful pr build https://github.com/wso2/product-is/actions/runs/6536452532
thanujalk
reviewed
Oct 17, 2023
...bon.identity.oauth/src/main/java/org/wso2/carbon/identity/oauth2/dao/AccessTokenDAOImpl.java
Show resolved
Hide resolved
...bon.identity.oauth/src/main/java/org/wso2/carbon/identity/oauth2/dao/AccessTokenDAOImpl.java
Outdated
Show resolved
Hide resolved
...bon.identity.oauth/src/main/java/org/wso2/carbon/identity/oauth2/dao/AccessTokenDAOImpl.java
Outdated
Show resolved
Hide resolved
sadilchamishka
commented
Oct 17, 2023
Comment on lines
+534
to
+550
| String fullQualifiedUsername = authenticatedUser.toFullQualifiedUsername(); | ||
| String userTenantDomain = authenticatedUser.getTenantDomain(); | ||
| String userResidentTenantDomain = userTenantDomain; | ||
| if (StringUtils.isNotEmpty(authenticatedUser.getUserResidentOrganization())) { | ||
| userResidentTenantDomain = OAuthComponentServiceHolder.getInstance().getOrganizationManager() | ||
| .resolveTenantDomain(authenticatedUser.getUserResidentOrganization()); | ||
| } | ||
| /* For B2B users, the resident organization is available to find the tenant where the user's identity is | ||
| managed. Hence, the correct tenant domain should be used to fetch user claims. */ | ||
| if (!StringUtils.equals(userTenantDomain, userResidentTenantDomain)) { | ||
| AbstractUserStoreManager userStoreManager = | ||
| (AbstractUserStoreManager) OAuthComponentServiceHolder.getInstance().getRealmService() | ||
| .getTenantUserRealm(IdentityTenantUtil.getTenantId(userResidentTenantDomain)) | ||
| .getUserStoreManager(); | ||
| userTenantDomain = userResidentTenantDomain; | ||
| fullQualifiedUsername = userStoreManager.getUser(authenticatedUser.getUserId(), null) | ||
| .getFullQualifiedUsername(); |
There was a problem hiding this comment.
Need to check this code is executed for B2B organization login users as they are treated as federated users.
For B2C users with switched to different org won't need this as the user's and app tenant domain remain same.
AnuradhaSK
reviewed
Oct 17, 2023
...s/org.wso2.carbon.identity.oauth/src/main/java/org/wso2/carbon/identity/oauth/OAuthUtil.java
Outdated
Show resolved
Hide resolved
AnuradhaSK
reviewed
Oct 17, 2023
...bon.identity.oauth/src/main/java/org/wso2/carbon/identity/oauth2/dao/AccessTokenDAOImpl.java
Outdated
Show resolved
Hide resolved
sadilchamishka
force-pushed
the
add-authorized-organization-oauth2-token-table
branch
from
7386f21 to
377c45e
Compare
sadilchamishka
force-pushed
the
add-authorized-organization-oauth2-token-table
branch
from
377c45e to
43bb4e5
Compare
thanujalk
approved these changes
Oct 17, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Proposed changes in this pull request
Add
AUTHORIZED_ORGANIZATIONnew column to the IDN_OAUTH2_ACCESS_TOKEN table in order to support organization bound tokens to accomplish B2B IAM use cases.Related Issues.
When should this PR be merged
Depends on