From 70ff59d9db5d3ba2e29a27084710b139f9da3ecb Mon Sep 17 00:00:00 2001
From: thisarawelmilla <thisara@wso2.com>
Date: Mon, 10 Mar 2025 09:01:02 +0530
Subject: [PATCH] Re-purpose Organization in pre-issue access token Request.

---
 .../PreIssueAccessTokenRequestBuilder.java    | 27 +++----------------
 pom.xml                                       |  2 +-
 2 files changed, 4 insertions(+), 25 deletions(-)

diff --git a/components/org.wso2.carbon.identity.oauth/src/main/java/org/wso2/carbon/identity/oauth/action/execution/PreIssueAccessTokenRequestBuilder.java b/components/org.wso2.carbon.identity.oauth/src/main/java/org/wso2/carbon/identity/oauth/action/execution/PreIssueAccessTokenRequestBuilder.java
index 74147676d9..b13b87c200 100755
--- a/components/org.wso2.carbon.identity.oauth/src/main/java/org/wso2/carbon/identity/oauth/action/execution/PreIssueAccessTokenRequestBuilder.java
+++ b/components/org.wso2.carbon.identity.oauth/src/main/java/org/wso2/carbon/identity/oauth/action/execution/PreIssueAccessTokenRequestBuilder.java
@@ -29,7 +29,6 @@
 import org.wso2.carbon.identity.action.execution.api.model.Event;
 import org.wso2.carbon.identity.action.execution.api.model.FlowContext;
 import org.wso2.carbon.identity.action.execution.api.model.Operation;
-import org.wso2.carbon.identity.action.execution.api.model.Organization;
 import org.wso2.carbon.identity.action.execution.api.model.Request;
 import org.wso2.carbon.identity.action.execution.api.model.Tenant;
 import org.wso2.carbon.identity.action.execution.api.model.User;
@@ -56,7 +55,7 @@
 import org.wso2.carbon.identity.openidconnect.CustomClaimsCallbackHandler;
 import org.wso2.carbon.identity.openidconnect.OIDCClaimUtil;
 import org.wso2.carbon.identity.openidconnect.util.ClaimHandlerUtil;
-import org.wso2.carbon.identity.organization.management.service.exception.OrganizationManagementException;
+import org.wso2.carbon.identity.organization.management.service.OrganizationManager;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -74,6 +73,8 @@ public class PreIssueAccessTokenRequestBuilder implements ActionExecutionRequest
     public static final String CLAIMS_PATH_PREFIX = "/accessToken/claims/";
     public static final String SCOPES_PATH_PREFIX = "/accessToken/scopes/";
     private static final Log LOG = LogFactory.getLog(PreIssueAccessTokenRequestBuilder.class);
+    private static final OrganizationManager organizationManager = OAuthComponentServiceHolder.getInstance()
+            .getOrganizationManager();
 
     @Override
     public ActionType getSupportedActionType() {
@@ -112,8 +113,6 @@ private Event getEvent(OAuthTokenReqMessageContext tokenMessageContext, Map<Stri
         boolean isAuthorizedForUser = isAccessTokenAuthorizedForUser(tokenReqDTO.getGrantType(), tokenMessageContext);
         if (isAuthorizedForUser) {
             setUserForEventBuilder(eventBuilder, authorizedUser, tokenReqDTO.getClientId(), tokenReqDTO.getGrantType());
-            setOrganizationForEventBuilder(eventBuilder, authorizedUser, tokenReqDTO.getClientId(),
-                    tokenReqDTO.getGrantType());
             eventBuilder.userStore(new UserStore(authorizedUser.getUserStoreDomain()));
         }
 
@@ -139,26 +138,6 @@ private void setUserForEventBuilder(PreIssueAccessTokenEvent.Builder eventBuilde
         }
     }
 
-    private void setOrganizationForEventBuilder(PreIssueAccessTokenEvent.Builder eventBuilder, AuthenticatedUser user,
-                                                String clientID, String grantType) {
-
-        try {
-            String organizationId = user.getUserResidentOrganization();
-            if (organizationId != null && !organizationId.isEmpty()) {
-                String organizationName = OAuthComponentServiceHolder.getInstance().getOrganizationManager()
-                        .getOrganizationNameById(user.getUserResidentOrganization());
-                eventBuilder.organization(new Organization(user.getUserResidentOrganization(),
-                        organizationName));
-            }
-        } catch (OrganizationManagementException e) {
-            if (LOG.isDebugEnabled()) {
-                LOG.debug(String.format(
-                        "Error occurred while retrieving organization name of the authorized user for application: " +
-                                clientID + "for grantType: " + grantType), e);
-            }
-        }
-    }
-
     private Request getRequest(OAuth2AccessTokenReqDTO tokenRequestDTO) {
 
         TokenRequest.Builder tokenRequestBuilder = new TokenRequest.Builder();
diff --git a/pom.xml b/pom.xml
index eb5390edc6..e66057d1b0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -977,7 +977,7 @@
         <carbon.identity.organization.management.version.range>[1.1.14, 2.0.0)
         </carbon.identity.organization.management.version.range>
 
-        <carbon.identity.organization.management.core.version>1.1.20
+        <carbon.identity.organization.management.core.version>1.1.24
         </carbon.identity.organization.management.core.version>
         <carbon.identity.organization.management.core.version.range>[1.0.0, 2.0.0)
         </carbon.identity.organization.management.core.version.range>