fix: added a check to address NPE in home page when user has no organ…

…ization (appsmithorg#8259)
onifs10 · Oct 8, 2021 · 72dd22d · 72dd22d
1 parent 8590ff3
commit 72dd22d
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/...erver/appsmith-server/src/main/java/com/appsmith/server/solutions/ApplicationFetcher.java b/...erver/appsmith-server/src/main/java/com/appsmith/server/solutions/ApplicationFetcher.java
@@ -70,11 +70,18 @@ public Mono<UserHomepageDTO> getAllApplications() {
                     User user = userAndUserDataTuple.getT1();
                     UserData userData = userAndUserDataTuple.getT2();
 
+                    UserHomepageDTO userHomepageDTO = new UserHomepageDTO();
+                    userHomepageDTO.setUser(user);
+
                     Set<String> orgIds = user.getOrganizationIds();
+                    if(CollectionUtils.isEmpty(orgIds)) {
+                        userHomepageDTO.setOrganizationApplications(new ArrayList<>());
+                        return Mono.just(userHomepageDTO);
+                    }
 
                     // create a set of org id where recently used ones will be at the beginning
                     List<String> recentlyUsedOrgIds = userData.getRecentlyUsedOrgIds();
-                    Set<String> orgIdSortedSet = new LinkedHashSet<>(orgIds.size());
+                    Set<String> orgIdSortedSet = new LinkedHashSet<>();
                     if(recentlyUsedOrgIds != null && recentlyUsedOrgIds.size() > 0) {
                         // user has a recently used list, add them to the beginning
                         orgIdSortedSet.addAll(recentlyUsedOrgIds);
@@ -86,9 +93,6 @@ public Mono<UserHomepageDTO> getAllApplications() {
                             .findByMultipleOrganizationIds(orgIds, READ_APPLICATIONS)
                             .collectMultimap(Application::getOrganizationId, Function.identity());
 
-                    UserHomepageDTO userHomepageDTO = new UserHomepageDTO();
-                    userHomepageDTO.setUser(user);
-
                     return organizationService
                             .findByIdsIn(orgIds, READ_ORGANIZATIONS)
                             .collectMap(Organization::getId, v -> v)