diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/dtos/OrganizationApplicationsDTO.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/dtos/OrganizationApplicationsDTO.java index d51d6818dc..8c73326423 100644 --- a/app/server/appsmith-server/src/main/java/com/appsmith/server/dtos/OrganizationApplicationsDTO.java +++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/dtos/OrganizationApplicationsDTO.java @@ -2,6 +2,7 @@ package com.appsmith.server.dtos; import com.appsmith.server.domains.Application; import com.appsmith.server.domains.Organization; +import com.appsmith.server.domains.UserRole; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; @@ -16,4 +17,5 @@ import java.util.List; public class OrganizationApplicationsDTO { Organization organization; List applications; + List userRoles; } diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ApplicationFetcher.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ApplicationFetcher.java index 4750c2c9f0..56ddc1a671 100644 --- a/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ApplicationFetcher.java +++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ApplicationFetcher.java @@ -101,6 +101,7 @@ public class ApplicationFetcher { OrganizationApplicationsDTO organizationApplicationsDTO = new OrganizationApplicationsDTO(); organizationApplicationsDTO.setOrganization(organization); organizationApplicationsDTO.setApplications(applicationList); + organizationApplicationsDTO.setUserRoles(organization.getUserRoles()); organizationApplicationsDTOS.add(organizationApplicationsDTO); } diff --git a/app/server/appsmith-server/src/test/java/com/appsmith/server/services/ApplicationServiceTest.java b/app/server/appsmith-server/src/test/java/com/appsmith/server/services/ApplicationServiceTest.java index 443069440f..2a33f59bae 100644 --- a/app/server/appsmith-server/src/test/java/com/appsmith/server/services/ApplicationServiceTest.java +++ b/app/server/appsmith-server/src/test/java/com/appsmith/server/services/ApplicationServiceTest.java @@ -343,6 +343,9 @@ public class ApplicationServiceTest { Application application = organizationApplicationDTO.getApplications().get(0); assertThat(application.getUserPermissions()).contains("read:applications"); assertThat(application.isAppIsExample()).isFalse(); + + assertThat(organizationApplicationDTO.getUserRoles().get(0).getRole().getName()).isEqualTo("Administrator"); + log.debug(organizationApplicationDTO.getUserRoles().toString()); } }