diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/domains/Organization.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/domains/Organization.java index ab40267488..0dfa59a74f 100644 --- a/app/server/appsmith-server/src/main/java/com/appsmith/server/domains/Organization.java +++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/domains/Organization.java @@ -26,6 +26,8 @@ public class Organization extends BaseDomain { private String website; + private String email; + private List organizationSettings; private List plugins; diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/BaseAppsmithRepositoryImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/BaseAppsmithRepositoryImpl.java index 83f5cffae4..02f4021033 100644 --- a/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/BaseAppsmithRepositoryImpl.java +++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/BaseAppsmithRepositoryImpl.java @@ -119,6 +119,9 @@ public abstract class BaseAppsmithRepositoryImpl { Query query = new Query(Criteria.where("id").is(id)); query.addCriteria(new Criteria().andOperator(notDeleted(), userAcl(user, permission))); + // Set policies to null in the update object + resource.setPolicies(null); + DBObject update = getDbObject(resource); Update updateObj = new Update(); Map updateMap = update.toMap(); diff --git a/app/server/appsmith-server/src/test/java/com/appsmith/server/services/OrganizationServiceTest.java b/app/server/appsmith-server/src/test/java/com/appsmith/server/services/OrganizationServiceTest.java index 26dd37b135..6a5b8b9b24 100644 --- a/app/server/appsmith-server/src/test/java/com/appsmith/server/services/OrganizationServiceTest.java +++ b/app/server/appsmith-server/src/test/java/com/appsmith/server/services/OrganizationServiceTest.java @@ -179,6 +179,14 @@ public class OrganizationServiceTest { @Test @WithUserDetails(value = "api_user") public void validUpdateOrganization() { + Policy manageOrgAppPolicy = Policy.builder().permission(ORGANIZATION_MANAGE_APPLICATIONS.getValue()) + .users(Set.of("api_user")) + .build(); + + Policy manageOrgPolicy = Policy.builder().permission(MANAGE_ORGANIZATIONS.getValue()) + .users(Set.of("api_user")) + .build(); + Organization organization = new Organization(); organization.setName("Test Update Name"); organization.setDomain("example.com"); @@ -200,6 +208,7 @@ public class OrganizationServiceTest { assertThat(t.getName()).isEqualTo(organization.getName()); assertThat(t.getId()).isEqualTo(organization.getId()); assertThat(t.getDomain()).isEqualTo("abc.com"); + assertThat(t.getPolicies()).contains(manageOrgAppPolicy, manageOrgPolicy); }) .verifyComplete(); }