diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/PACConfigurationServiceCE.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/PACConfigurationServiceCE.java index 371ce06cea..44801efd8d 100644 --- a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/PACConfigurationServiceCE.java +++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/PACConfigurationServiceCE.java @@ -5,6 +5,5 @@ import com.appsmith.server.dtos.UserProfileDTO; import reactor.core.publisher.Mono; public interface PACConfigurationServiceCE { - Mono setRolesAndGroups( - UserProfileDTO profile, User user, boolean showUsersAndGroups, boolean isCloudHosting); + Mono setRolesAndGroups(UserProfileDTO profile, User user, boolean showUsersAndGroups); } diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/PACConfigurationServiceCEImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/PACConfigurationServiceCEImpl.java index debabcf11e..f801b5e18c 100644 --- a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/PACConfigurationServiceCEImpl.java +++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/PACConfigurationServiceCEImpl.java @@ -12,8 +12,7 @@ import static com.appsmith.server.constants.ce.AccessControlConstantsCE.UPGRADE_ @Service public class PACConfigurationServiceCEImpl implements PACConfigurationServiceCE { @Override - public Mono setRolesAndGroups( - UserProfileDTO profile, User user, boolean showUsersAndGroups, boolean isCloudHosting) { + public Mono setRolesAndGroups(UserProfileDTO profile, User user, boolean showUsersAndGroups) { profile.setRoles( List.of(UPGRADE_TO_BUSINESS_EDITION_TO_ACCESS_ROLES_AND_GROUPS_FOR_CONDITIONAL_BUSINESS_LOGIC)); profile.setGroups( diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/UserServiceCEImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/UserServiceCEImpl.java index 2670130dbf..4c68662673 100644 --- a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/UserServiceCEImpl.java +++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/UserServiceCEImpl.java @@ -775,8 +775,7 @@ public class UserServiceCEImpl extends BaseService commonConfig.isCloudHosting() ? true : userData.isIntercomConsentGiven()); profile.setSuperUser(isSuperUser); profile.setConfigurable(!StringUtils.isEmpty(commonConfig.getEnvFilePath())); - return pacConfigurationService.setRolesAndGroups( - profile, userFromDb, true, commonConfig.isCloudHosting()); + return pacConfigurationService.setRolesAndGroups(profile, userFromDb, true); }); } diff --git a/app/server/appsmith-server/src/test/java/com/appsmith/server/services/ce/PACConfigurationServiceCETest.java b/app/server/appsmith-server/src/test/java/com/appsmith/server/services/ce/PACConfigurationServiceCETest.java index 1a276bfe52..7f74618ad2 100644 --- a/app/server/appsmith-server/src/test/java/com/appsmith/server/services/ce/PACConfigurationServiceCETest.java +++ b/app/server/appsmith-server/src/test/java/com/appsmith/server/services/ce/PACConfigurationServiceCETest.java @@ -22,7 +22,7 @@ class PACConfigurationServiceCETest { public void test_setRolesAndGroups_featureFlagDisabled() { UserProfileDTO userProfileDTO = new UserProfileDTO(); Mono userProfileDTOMono = - pacConfigurationService.setRolesAndGroups(userProfileDTO, null, false, false); + pacConfigurationService.setRolesAndGroups(userProfileDTO, null, false); StepVerifier.create(userProfileDTOMono) .assertNext(userProfileDTO1 -> { assertThat(userProfileDTO1.getRoles())