Merge pull request #271 from sadilchamishka/resolve-user-id

Fix NPE
wso2-extensions · Oct 25, 2023 · 31004a3 · 31004a3
2 parents 58cd12a + cdfeac6
commit 31004a3
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/...ity/organization/management/authz/service/handler/OrganizationManagementAuthzHandler.java b/...ity/organization/management/authz/service/handler/OrganizationManagementAuthzHandler.java
@@ -161,6 +161,7 @@ private String getUserId(User user, String orgId) throws OrganizationManagementA
         try {
             AbstractUserStoreManager userStoreManager = (AbstractUserStoreManager) getUserStoreManager(user);
             String userId = userStoreManager.getUser(null, user.getUserName()).getUserID();
+            // Retrieve the user ID of the shared user if an user association exists.
             Optional<String> optionalUserId =
                     OrganizationSharedUserUtil.getUserIdOfAssociatedUserByOrgId(userId, orgId);
             return optionalUserId.orElse(userId);

diff --git a/...ty/organization/management/organization/user/sharing/util/OrganizationSharedUserUtil.java b/...ty/organization/management/organization/user/sharing/util/OrganizationSharedUserUtil.java
@@ -19,6 +19,7 @@
 package org.wso2.carbon.identity.organization.management.organization.user.sharing.util;
 
 import org.wso2.carbon.identity.organization.management.organization.user.sharing.internal.OrganizationUserSharingDataHolder;
+import org.wso2.carbon.identity.organization.management.organization.user.sharing.models.UserAssociation;
 import org.wso2.carbon.identity.organization.management.service.exception.OrganizationManagementException;
 import org.wso2.carbon.user.core.UserStoreException;
 import org.wso2.carbon.user.core.common.AbstractUserStoreManager;
@@ -49,7 +50,12 @@ public static String getUserManagedOrganizationClaim(AbstractUserStoreManager us
     public static Optional<String> getUserIdOfAssociatedUserByOrgId(String associatedUserId, String orgId)
             throws OrganizationManagementException {
 
-        return Optional.ofNullable(OrganizationUserSharingDataHolder.getInstance().getOrganizationUserSharingService()
-                .getUserAssociationOfAssociatedUserByOrgId(associatedUserId, orgId).getUserId());
+        UserAssociation userAssociation = OrganizationUserSharingDataHolder.getInstance()
+                .getOrganizationUserSharingService()
+                .getUserAssociationOfAssociatedUserByOrgId(associatedUserId, orgId);
+        if (userAssociation == null) {
+            return Optional.empty();
+        }
+        return Optional.of(userAssociation.getUserId());
     }
 }