Address review comments

wso2-extensions · Oct 25, 2023 · 894cb2c · 894cb2c
1 parent f24aa1f
commit 894cb2c
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/...ity/organization/management/authz/service/handler/OrganizationManagementAuthzHandler.java b/...ity/organization/management/authz/service/handler/OrganizationManagementAuthzHandler.java
@@ -161,8 +161,8 @@ private String getUserId(User user, String orgId) throws OrganizationManagementA
         try {
             AbstractUserStoreManager userStoreManager = (AbstractUserStoreManager) getUserStoreManager(user);
             String userId = userStoreManager.getUser(null, user.getUserName()).getUserID();
-            Optional<String> optionalUserId = OrganizationSharedUserUtil
-                    .fetchUserIdOfAssociatedUser(userId, orgId);
+            Optional<String> optionalUserId =
+                    OrganizationSharedUserUtil.getUserIdOfAssociatedUserByOrgId(userId, orgId);
             return optionalUserId.orElse(userId);
         } catch (UserStoreException | OrganizationManagementException e) {
             throw new OrganizationManagementAuthzServiceServerException(e);

diff --git a/...ty/organization/management/organization/user/sharing/util/OrganizationSharedUserUtil.java b/...ty/organization/management/organization/user/sharing/util/OrganizationSharedUserUtil.java
@@ -43,10 +43,13 @@ public static String getUserManagedOrganizationClaim(AbstractUserStoreManager us
     }
 
 
-    public static Optional<String> fetchUserIdOfAssociatedUser(String userId, String accessingOrgId)
+    /**
+     * Get the user ID of the associated user by the organization ID.
+     */
+    public static Optional<String> getUserIdOfAssociatedUserByOrgId(String associatedUserId, String orgId)
             throws OrganizationManagementException {
 
         return Optional.ofNullable(OrganizationUserSharingDataHolder.getInstance().getOrganizationUserSharingService()
-                .getUserAssociationOfAssociatedUserByOrgId(userId, accessingOrgId).getUserId());
+                .getUserAssociationOfAssociatedUserByOrgId(associatedUserId, orgId).getUserId());
     }
 }